chore(update): update for 1.21.2-pre1

Signed-off-by: Gabriel Harris-Rouquette <[email protected]>
SpongePowered · Oct 9, 2024 · 4739588 · 4739588
1 parent f79def5
commit 4739588
Show file tree

Hide file tree

Showing 58 changed files with 598 additions and 520 deletions.
diff --git a/generator/src/main/java/org/spongepowered/vanilla/generator/GeneratorMain.java b/generator/src/main/java/org/spongepowered/vanilla/generator/GeneratorMain.java
@@ -62,7 +62,6 @@
 import net.minecraft.world.entity.animal.horse.Markings;
 import net.minecraft.world.entity.animal.horse.Variant;
 import net.minecraft.world.entity.monster.SpellcasterIllager;
-import net.minecraft.world.entity.vehicle.Boat;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.Rarity;

diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ mixinConfigs=mixins.sponge.accessors.json,mixins.sponge.api.json,mixins.sponge.c
   mixins.sponge.tracker.json,mixins.sponge.ipforward.json,mixins.sponge.optimization.json
 superClassChanges=common.superclasschange
 
-minecraftVersion=24w40a
+minecraftVersion=1.21.2-pre1
 recommendedVersion=0-SNAPSHOT
 
 org.gradle.dependency.verification.console=verbose

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -1241,6 +1241,14 @@
             <sha256 value="9f5250ef35c6e3cda137b4ed3a9241f4bc4392a4eb6568c50bbd23610ea08656" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.mojang" name="logging" version="1.4.9">
+         <artifact name="logging-1.4.9.jar">
+            <sha256 value="01306cf798c46dba0e72c769a67b96f71cb7492a1572a74ef4d8268e3f9ffb9d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="logging-1.4.9.module">
+            <sha256 value="cef0bf199e24b3822fa22541d203964cb0839c4f7e69824100db9b80f487944b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.mojang" name="patchy" version="2.2.10">
          <artifact name="patchy-2.2.10.jar">
             <sha256 value="16d70e7968b45caffc81576268eb000f473fb60bf257182d3447dea8ec919d5a" origin="Generated by Gradle"/>
@@ -1664,6 +1672,14 @@
             <sha256 value="22c44e5c0629bccc3a12e8e2dad313ecad1e7a6071dd529ef7fa98f7aaf3abc0" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="gradle.plugin.org.jetbrains.gradle.plugin.idea-ext" name="gradle-idea-ext" version="1.1.9">
+         <artifact name="gradle-idea-ext-1.1.9.jar">
+            <sha256 value="e7cd481f6c44af53d17920ff550536e7a3f94a3182e9bd1eb8df94772dc4e8ec" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gradle-idea-ext-1.1.9.pom">
+            <sha256 value="14e4faabaa430bfc33a6e93ddafcc88f50adf3cb866ff457ceaa8294911535c7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="info.picocli" name="picocli" version="4.7.5">
          <artifact name="picocli-4.7.5.jar">
             <sha256 value="e83a906fb99b57091d1d68ac11f7c3d2518bd7a81a9c71b259e2c00d1564c8e8" origin="Generated by Gradle"/>
@@ -3788,6 +3804,14 @@
             <sha256 value="7ee19df1e2b6769c40cd79302c84916095e1cfaec4a310c06d58e4150b881f20" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.httpcomponents.client5" name="httpclient5" version="5.4">
+         <artifact name="httpclient5-5.4.jar">
+            <sha256 value="40a72f6dca0f20d304b4bcb045a020522a6ada0b69aff48398988ecab5f6badc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="httpclient5-5.4.pom">
+            <sha256 value="4c0507e9ae7e208cb60c0405036b8224f35d0d1b2788918059920b9eb7c1cc0d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.httpcomponents.client5" name="httpclient5-parent" version="5.1.3">
          <artifact name="httpclient5-parent-5.1.3.pom">
             <sha256 value="a27b1413aece92a3aa4774915f7589e0c6179d728d2ac6a295d758ee4fa24cc5" origin="Generated by Gradle"/>
@@ -3798,6 +3822,11 @@
             <sha256 value="36889434eaacdca47017406b7941203b37bcf7962478def8f9489294242deee4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.httpcomponents.client5" name="httpclient5-parent" version="5.4">
+         <artifact name="httpclient5-parent-5.4.pom">
+            <sha256 value="f8471392d3548b0fa3c2579ea76a7f4ca4a8457bdfb99fd70e6ff99b3bf0fc02" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.httpcomponents.core5" name="httpcore5" version="5.1.3">
          <artifact name="httpcore5-5.1.3.jar">
             <sha256 value="f2bf2f2c7772169c9e30699719667ad30f9b46c4e9d7841907deb2d12d9923fe" origin="Generated by Gradle"/>
@@ -3814,6 +3843,14 @@
             <sha256 value="01bab6a76efbd4d26849fd450eaae87caef9a1c1c0cc5f60fe4f3b918f077164" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.httpcomponents.core5" name="httpcore5" version="5.3">
+         <artifact name="httpcore5-5.3.jar">
+            <sha256 value="33b9eca7890ea3908a4d17fad19c70b10e30ce902ef85f913cdfdedf242aa14f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="httpcore5-5.3.pom">
+            <sha256 value="e3237e33781b4ac04715e93a0aceb9a4813f4ed180ab74c99c29780c5605d9da" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.httpcomponents.core5" name="httpcore5-h2" version="5.1.3">
          <artifact name="httpcore5-h2-5.1.3.jar">
             <sha256 value="d0e78ba15aa8ebe77982b660ac4b09a95d6e035dbdbea762577dc1c8e2935807" origin="Generated by Gradle"/>
@@ -3830,6 +3867,14 @@
             <sha256 value="4d167685c0a9a398cc244a73a9086e2acf635160801a0a4eb8cfd3e3271cf9d3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.httpcomponents.core5" name="httpcore5-h2" version="5.3">
+         <artifact name="httpcore5-h2-5.3.jar">
+            <sha256 value="3120037300a84a93bf83825051f19a103e126b27216e6aebeb0c9addb8e936a0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="httpcore5-h2-5.3.pom">
+            <sha256 value="c7c903305e3c5b6968fe9c945b69dbca99b5e1a684dbcc6fcc27e9f338356838" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.httpcomponents.core5" name="httpcore5-parent" version="5.1.3">
          <artifact name="httpcore5-parent-5.1.3.pom">
             <sha256 value="a67538865ae0f3744b21e91ca47d461054737c552d1ff29da714c860c992d5bb" origin="Generated by Gradle"/>
@@ -3840,6 +3885,11 @@
             <sha256 value="83fdeedb1a25049b5fe7e00afcd35743f7a89f99040fb9a3a5135fb9269a5a4a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.httpcomponents.core5" name="httpcore5-parent" version="5.3">
+         <artifact name="httpcore5-parent-5.3.pom">
+            <sha256 value="896ccfc04dcdab52159457752b593e93a9af7ec85476bd13ba7dd8f862fd5020" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.logging" name="logging-parent" version="1">
          <artifact name="logging-parent-1.pom">
             <sha256 value="34b2bf4f531a809168961672ff419d1abf96725b8dfe52980f00c8c4eb134bd6" origin="Generated by Gradle"/>
@@ -4884,6 +4934,11 @@
             <sha256 value="169dd904a4b0f6520cffe658cc62292bfe9f3c14a989fa92120724cde43a9968" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="5.11.0">
+         <artifact name="junit-bom-5.11.0.pom">
+            <sha256 value="e67459d4882424ac6374f40db1c8f4a2e88946b340ba072c80be932a2be4644d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit" name="junit-bom" version="5.7.0">
          <artifact name="junit-bom-5.7.0.module">
             <sha256 value="25de454b3add67654d6691b53de7593b502967b5ff549547b104d7961f1a52bd" origin="Generated by Gradle"/>
@@ -5630,6 +5685,14 @@
             <sha256 value="de00115f1d84f3a0b2ee3a4b6f6192d066f86d185d67b9d1522f2c80feac5f00" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm" version="9.7.1">
+         <artifact name="asm-9.7.1.jar">
+            <sha256 value="8cadd43ac5eb6d09de05faecca38b917a040bb9139c7edeb4cc81c740b713281" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-9.7.1.pom">
+            <sha256 value="7229b03b30a73ee91008072d9e4569a51d8547fae8c50f527841aef4c1b0baa8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ow2.asm" name="asm-analysis" version="9.1">
          <artifact name="asm-analysis-9.1.jar">
             <sha256 value="81a88041b1b8beda5a8a99646098046c48709538270c49def68abff25ac3be34" origin="Generated by Gradle"/>
@@ -5654,6 +5717,14 @@
             <sha256 value="9c33080ebcb631ae4f77eb62ed67bfc40cb872e8cfd058ac863e445c1dd973df" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm-analysis" version="9.7.1">
+         <artifact name="asm-analysis-9.7.1.jar">
+            <sha256 value="85b29371884ba31bb76edf22323c2c24e172c3267a67152eba3d1ccc2e041ef2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-analysis-9.7.1.pom">
+            <sha256 value="25c2379f2bfc2a1e64e62c39e2b93cfb0e489707852b08d6fc470b1c6a52b9ee" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ow2.asm" name="asm-commons" version="9.1">
          <artifact name="asm-commons-9.1.jar">
             <sha256 value="afcb26dc1fc12c0c4a99ada670908dd82e18dfc488caf5ee92546996b470c00c" origin="Generated by Gradle"/>
@@ -5686,6 +5757,14 @@
             <sha256 value="5acee3ee7252ed90b8074c755d022787499a95fafff98ac4a685107c4da409b4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm-commons" version="9.7.1">
+         <artifact name="asm-commons-9.7.1.jar">
+            <sha256 value="9a579b54d292ad9be171d4313fd4739c635592c2b5ac3a459bbd1049cddec6a0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-commons-9.7.1.pom">
+            <sha256 value="0bf1d31da0c9f9d8edc2f27dbbfdbbf73f1a715b72cd2fa28f3f195994d74ad1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ow2.asm" name="asm-tree" version="7.2">
          <artifact name="asm-tree-7.2.pom">
             <sha256 value="56765f0a8bd0978214f7ec87a9dafb5825b8191cff554a5adc14c65d1f5b0442" origin="Generated by Gradle"/>
@@ -5723,6 +5802,14 @@
             <sha256 value="a34ea1e3e4128c01038db43c6976e88c779cf5af84b0505da266dfe6965668ec" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm-tree" version="9.7.1">
+         <artifact name="asm-tree-9.7.1.jar">
+            <sha256 value="9929881f59eb6b840e86d54570c77b59ce721d104e6dfd7a40978991c2d3b41f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-tree-9.7.1.pom">
+            <sha256 value="13b905f65e7fd43ca7674f40cdaa37679ba4858c6c9d9fb8f17a7afd9baabc9e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ow2.asm" name="asm-util" version="9.6">
          <artifact name="asm-util-9.6.jar">
             <sha256 value="c635a7402f4aa9bf66b2f4230cea62025a0fe1cd63e8729adefc9b1994fac4c3" origin="Generated by Gradle"/>
@@ -5739,6 +5826,14 @@
             <sha256 value="5d014d8c870d4871825bd2ddb5567b21ef6dac8ec48bbb8dbb465b0b3a2bf452" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm-util" version="9.7.1">
+         <artifact name="asm-util-9.7.1.jar">
+            <sha256 value="f885be71b5c90556f5f1ad1c4f9276b29b96057c497d46666fe4ddbec3cb43c6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-util-9.7.1.pom">
+            <sha256 value="7fb5e63362b2d52d77dca3b754aebad635751d3fc520191e9500ece9e2345b71" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.pcollections" name="pcollections" version="3.1.4">
          <artifact name="pcollections-3.1.4.jar">
             <sha256 value="34f579ba075c8da2c8a0fedd0f04e21eac2fb6c660d90d0fabb573e8b4dc6918" origin="Generated by Gradle"/>

diff --git a/.../spongepowered/common/accessor/world/entity/ai/targeting/TargetingConditionsAccessor.java b/.../spongepowered/common/accessor/world/entity/ai/targeting/TargetingConditionsAccessor.java
@@ -24,12 +24,10 @@
  */
 package org.spongepowered.common.accessor.world.entity.ai.targeting;
 
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.targeting.TargetingConditions;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-import java.util.function.Predicate;
 
 @Mixin(TargetingConditions.class)
 public interface TargetingConditionsAccessor {

diff --git a/...ssors/java/org/spongepowered/common/accessor/world/inventory/StonecutterMenuAccessor.java b/...ssors/java/org/spongepowered/common/accessor/world/inventory/StonecutterMenuAccessor.java
diff --git a/...ock/entity/CampfireBlockEntityBridge.java → ...orld/item/crafting/RecipeMapAccessor.java b/...ock/entity/CampfireBlockEntityBridge.java → ...orld/item/crafting/RecipeMapAccessor.java
@@ -22,12 +22,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.common.bridge.world.level.block.entity;
+package org.spongepowered.common.accessor.world.item.crafting;
 
-import net.minecraft.world.item.crafting.CampfireCookingRecipe;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeHolder;
+import net.minecraft.world.item.crafting.RecipeMap;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
 
-public interface CampfireBlockEntityBridge {
+import java.util.Map;
 
-    void bridge$placeRecipe(RecipeHolder<CampfireCookingRecipe> recipe);
+@Mixin(RecipeMap.class)
+public interface RecipeMapAccessor {
+
+    @Accessor("byKey")
+    Map<ResourceKey<Recipe<?>>, RecipeHolder<?>> accessor$byKey();
 }