feat!(minecraft): Update to 1.21.9

forge/build.gradle.kts

@@ -1,6 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import net.minecraftforge.gradle.common.util.RunConfig
-import org.gradle.api.tasks.JavaExec
 import org.gradle.internal.DefaultTaskExecutionRequest
 import org.spongepowered.gradle.impl.AWToAT
 import org.spongepowered.gradle.impl.IdeHelper
@@ -432,6 +431,7 @@ tasks {
     test {
         useJUnitPlatform()
 
+        maxHeapSize = "4G"
         testClassesDirs = commonTest.get().output.classesDirs + testSources.get().output.classesDirs
 
         val runServer = minecraft.runs.getByName("server")

generator/src/main/java/org/spongepowered/vanilla/generator/BlockStatePropertiesGenerator.java

@@ -32,6 +32,8 @@
 import net.minecraft.core.FrontAndTop;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.CopperGolemStatueBlock;
+import net.minecraft.world.level.block.WeatheringCopper;
 import net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerState;
 import net.minecraft.world.level.block.entity.vault.VaultState;
 import net.minecraft.world.level.block.state.BlockState;
@@ -56,6 +58,7 @@
 import net.minecraft.world.level.block.state.properties.RailShape;
 import net.minecraft.world.level.block.state.properties.RedstoneSide;
 import net.minecraft.world.level.block.state.properties.SculkSensorPhase;
+import net.minecraft.world.level.block.state.properties.SideChainPart;
 import net.minecraft.world.level.block.state.properties.SlabType;
 import net.minecraft.world.level.block.state.properties.StairsShape;
 import net.minecraft.world.level.block.state.properties.StructureMode;
@@ -152,6 +155,10 @@ static PropertyType ofProperty(final Property<?> prop) {
         vanillaEnumTypeMapping.put(VaultState.class, BlockStatePropertiesGenerator.inDataTypePkg("VaultState"));
         vanillaEnumTypeMapping.put(CreakingHeartState.class, BlockStatePropertiesGenerator.inDataTypePkg("CreakingHeartState"));
         vanillaEnumTypeMapping.put(TestBlockMode.class, BlockStatePropertiesGenerator.inDataTypePkg("TestBlockMode"));
+        vanillaEnumTypeMapping.put(SideChainPart.class,  BlockStatePropertiesGenerator.inDataTypePkg("SideChain"));
+        vanillaEnumTypeMapping.put(CopperGolemStatueBlock.Pose.class, BlockStatePropertiesGenerator.inDataTypePkg("CopperGolemPose"));
+        vanillaEnumTypeMapping.put(WeatheringCopper.WeatherState.class, BlockStatePropertiesGenerator.inDataTypePkg("CopperOxidation"));
+
 
         // Custom Mapping required see StateHolderMixin_API
         final ClassName portionTypeClass = BlockStatePropertiesGenerator.inDataTypePkg("PortionType");

generator/src/main/java/org/spongepowered/vanilla/generator/BlockStatePropertyKeysGenerator.java

@@ -33,6 +33,8 @@
 import com.squareup.javapoet.TypeVariableName;
 import net.minecraft.core.Direction;
 import net.minecraft.core.FrontAndTop;
+import net.minecraft.world.level.block.CopperGolemStatueBlock;
+import net.minecraft.world.level.block.WeatheringCopper;
 import net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerState;
 import net.minecraft.world.level.block.entity.vault.VaultState;
 import net.minecraft.world.level.block.state.BlockState;
@@ -57,6 +59,7 @@
 import net.minecraft.world.level.block.state.properties.RailShape;
 import net.minecraft.world.level.block.state.properties.RedstoneSide;
 import net.minecraft.world.level.block.state.properties.SculkSensorPhase;
+import net.minecraft.world.level.block.state.properties.SideChainPart;
 import net.minecraft.world.level.block.state.properties.SlabType;
 import net.minecraft.world.level.block.state.properties.StairsShape;
 import net.minecraft.world.level.block.state.properties.StructureMode;
@@ -150,6 +153,9 @@ static BlockStatePropertyKeysGenerator.PropertyType ofProperty(final Property<?>
         vanillaEnumTypeMapping.put(VaultState.class, BlockStatePropertyKeysGenerator.inDataTypePkg("VaultState"));
         vanillaEnumTypeMapping.put(CreakingHeartState.class, BlockStatePropertyKeysGenerator.inDataTypePkg("CreakingHeartState"));
         vanillaEnumTypeMapping.put(TestBlockMode.class, BlockStatePropertyKeysGenerator.inDataTypePkg("TestBlockMode"));
+        vanillaEnumTypeMapping.put(SideChainPart.class, BlockStatePropertyKeysGenerator.inDataTypePkg("SideChain"));
+        vanillaEnumTypeMapping.put(CopperGolemStatueBlock.Pose.class, BlockStatePropertyKeysGenerator.inDataTypePkg("CopperGolemPose"));
+        vanillaEnumTypeMapping.put(WeatheringCopper.WeatherState.class, BlockStatePropertyKeysGenerator.inDataTypePkg("CopperOxidation"));
 
         // Custom Mapping required see StateHolderMixin_API
         final ClassName portionTypeClass = BlockStatePropertyKeysGenerator.inDataTypePkg("PortionType");

generator/src/main/java/org/spongepowered/vanilla/generator/Context.java

@@ -85,9 +85,13 @@ public ClassName relativeClass(final String relativePackage, final String simple
 
     public CompilationUnit compilationUnit(final String relativePackage, final String simpleName) {
         final String pkg = relativePackage.isBlank() ? Context.BASE_PACKAGE : String.join(".", Context.BASE_PACKAGE, relativePackage);
-        final CompilationUnit unit = this.sourceRoot.parse(pkg, simpleName + ".java");
-        LexicalPreservingPrinter.setup(unit);
-        return unit;
+        try {
+            final CompilationUnit unit = this.sourceRoot.parse(pkg, simpleName + ".java");
+            LexicalPreservingPrinter.setup(unit);
+            return unit;
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to parse " + simpleName + ".java", e);
+        }
     }
 
   /**

generator/src/main/java/org/spongepowered/vanilla/generator/world/level/block/BlockRegistries.java

@@ -26,12 +26,15 @@
 
 import net.minecraft.core.registries.Registries;
 import net.minecraft.world.level.Explosion;
+import net.minecraft.world.level.block.CopperGolemStatueBlock;
+import net.minecraft.world.level.block.WeatheringCopper;
 import net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerState;
 import net.minecraft.world.level.block.state.properties.BambooLeaves;
 import net.minecraft.world.level.block.state.properties.CreakingHeartState;
 import net.minecraft.world.level.block.state.properties.DripstoneThickness;
 import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
 import net.minecraft.world.level.block.state.properties.SculkSensorPhase;
+import net.minecraft.world.level.block.state.properties.SideChainPart;
 import net.minecraft.world.level.block.state.properties.TestBlockMode;
 import net.minecraft.world.level.block.state.properties.Tilt;
 import org.spongepowered.vanilla.generator.BlockStateDataProviderGenerator;
@@ -90,6 +93,27 @@ public static List<Generator> enumRegistries(final Context context) {
                 TrialSpawnerState.class,
                 "getSerializedName",
                 "sponge"
+            ),
+            new EnumEntriesValidator<>(
+                "data.type",
+                "CopperGolemPoses",
+                CopperGolemStatueBlock.Pose.class,
+                "getSerializedName",
+                "sponge"
+            ),
+            new EnumEntriesValidator<>(
+                "data.type",
+                "SideChains",
+                SideChainPart.class,
+                "getSerializedName",
+                "sponge"
+            ),
+            new EnumEntriesValidator<>(
+                "data.type",
+                "CopperOxidations",
+                WeatheringCopper.WeatherState.class,
+                "getSerializedName",
+                "sponge"
             )
         );
     }

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,mixins.sponge.test.json
 superClassChanges=common.superclasschange
 
-minecraftVersion=1.21.8
+minecraftVersion=1.21.9
 recommendedVersion=0-SNAPSHOT
 
 org.gradle.dependency.verification.console=verbose

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ asm = "9.8"
 log4j = "2.24.1"
 forgeAutoRenamingTool = "1.0.6"
 mixin = "0.8.7"
-mixinextras = "0.4.1"
+mixinextras = "0.5.0"
 modlauncher = "10.2.2"
 securemodules = "2.2.22"
 fancymodloader = "9.0.16"

gradle/verification-metadata.xml

@@ -1517,6 +1517,30 @@
             <sha256 value="838545b541140fed5abec50a4530674caf6175def230f5277dffa6e99a011cfd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.mojang" name="authlib" version="6.0.59">
+         <artifact name="authlib-6.0.59.jar">
+            <sha256 value="dc7f41f1076c7b838d3d5ef9af8a0926d88fca595f135005ebda5563b734635e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="authlib-6.0.59.module">
+            <sha256 value="c65dce3f0f26ece6c4f879a2e9a144740adbcdc0623f1c9c0dfd9e38348e47e7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.mojang" name="authlib" version="7.0.60">
+         <artifact name="authlib-7.0.60.jar">
+            <sha256 value="4c2667278d1e95bf3930a7b9d592054f980b5d9ec6c30cdbdaab8ed8fcfe9792" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="authlib-7.0.60.module">
+            <sha256 value="07952ca671dc41cbaf464ad7a2ced4f6ac3e8f02c0c79c0ad6f346fef42500bc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.mojang" name="authlib" version="7.0.61">
+         <artifact name="authlib-7.0.61.jar">
+            <sha256 value="09a152617bd23c86bf59db1f9ba82ede23ec8f691a824d6c5dec4f0175f82aa4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="authlib-7.0.61.module">
+            <sha256 value="4ecf4140249220cb574ff7cea1b8e32803a3cd4504a809208ff84c7723509c54" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.mojang" name="blocklist" version="1.0.10">
          <artifact name="blocklist-1.0.10.jar">
             <sha256 value="830bfd639c8db49236bbd8e45d3a2b8c96c56ff654a10118654958a6235d4c44" origin="Generated by Gradle"/>
@@ -1594,6 +1618,23 @@
             <sha256 value="85ba29742305205f32dc4f09c28573484ed2288614eb6ef0f23b236a2187759f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.mojang" name="jtracy" version="1.0.36">
+         <artifact name="jtracy-1.0.36-natives-linux.jar">
+            <sha256 value="2a0716b5b176f1590de64139cf55ef625e9e5e1fc3ccff68b3f45f2b8322070a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jtracy-1.0.36-natives-macos-arm64.jar">
+            <sha256 value="4fef052bb6338c380cf93c5743fc1f029329b5bbf9af7fe872b079ab50f83586" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jtracy-1.0.36-natives-macos.jar">
+            <sha256 value="4f067d4a7f39c117a87fe32cb5a38ec141dc8faec653cd73eb360f1cdb80940c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jtracy-1.0.36.jar">
+            <sha256 value="9c92b24db9be79f1c3631e0c39ab81d57c9dbb877e64bdffacd61a28f995afbc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jtracy-1.0.36.module">
+            <sha256 value="db4c4a4b703833cb0cf9229508a24aab8f60bd97d7b9a046cf236f4496597f45" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.mojang" name="logging" version="1.1.1">
          <artifact name="logging-1.1.1.jar">
             <sha256 value="c1756eaf0685da94142bacc84309bb7ccddf65e004638c3299ab645710b5938c" origin="Generated by Gradle"/>
@@ -2377,6 +2418,14 @@
             <sha256 value="bc224bc9bb3c376b76a673e146f548dfb5152b15f2cf0a1f1df697cf1a3acc9e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.github.llamalad7" name="mixinextras-common" version="0.5.0">
+         <artifact name="mixinextras-common-0.5.0.jar">
+            <sha256 value="42c6bdf93c12cbf90f5451988dfed763ab8489ce2e40a1d843518b309ff0abaa" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="mixinextras-common-0.5.0.pom">
+            <sha256 value="e2273bd2198d4ee243ec4f84c5feed1dcbb2c8a86586580a5849ed5b7608a005" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.github.llamalad7" name="mixinextras-forge" version="0.4.1">
          <artifact name="mixinextras-forge-0.4.1.jar">
             <sha256 value="9d48cb0a40299d283248fdad8b02c6d175c45b27f9bec48ef63d7ee8a4ee3066" origin="Generated by Gradle"/>
@@ -2480,6 +2529,14 @@
             <sha256 value="fb9f9476e733f09760c9d1860d25dee624e4a942e611623933b577807dbf413d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.netty" name="netty-codec-http" version="4.1.118.Final">
+         <artifact name="netty-codec-http-4.1.118.Final.jar">
+            <sha256 value="09822d785e9a794838031ddd5346cf419b30c036a981c2e277a062bea884174b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-http-4.1.118.Final.pom">
+            <sha256 value="efa0a65fa1bccbd98dd14def99fda66dae999f6efc4b6418803bb50c6713c716" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.netty" name="netty-common" version="4.1.115.Final">
          <artifact name="netty-common-4.1.115.Final.jar">
             <sha256 value="39f1b5a2aaa4eab5d036dfd0486e35a4276df412e092d36b2d88b494705a134d" origin="Generated by Gradle"/>
@@ -3859,6 +3916,11 @@
             <sha256 value="8776a213deaa1cbbadb77820225211e1b9adead2341b55cc35bc92c9076620a3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.ltgt.errorprone" name="net.ltgt.errorprone.gradle.plugin" version="4.3.0">
+         <artifact name="net.ltgt.errorprone.gradle.plugin-4.3.0.pom">
+            <sha256 value="3370e20ef3213ffce47f7fda31266c33e9cca3b1b7f4d54169b482277042654b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.ltgt.gradle" name="gradle-errorprone-plugin" version="3.1.0">
          <artifact name="gradle-errorprone-plugin-3.1.0.jar">
             <sha256 value="10fb66b55747ced1db9c89c8c3d0adb5dbd3f8f12f2a183bee2b5ff818d1fd6c" origin="Generated by Gradle"/>
@@ -3867,6 +3929,14 @@
             <sha256 value="d393a0d3337193cb21b64a98714a1da8a966349be214cbb16171a9925a7985ee" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.ltgt.gradle" name="gradle-errorprone-plugin" version="4.3.0">
+         <artifact name="gradle-errorprone-plugin-4.3.0.jar">
+            <sha256 value="42f89c1f582ecd09459586d3d19c0fa92a332035e4a70b5699a8ec6a81aec32c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gradle-errorprone-plugin-4.3.0.module">
+            <sha256 value="6d2b0a7809ffde227ec15a4cf28e68929be22a1a12a0f56ad5e795d5058f2f6e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.md-5" name="SpecialSource" version="1.8.5">
          <artifact name="SpecialSource-1.8.5.jar">
             <sha256 value="0ac4b7acac8d927e75cf47061b0c067130dd3bd713c493205ea7607241df2813" origin="Generated by Gradle"/>

neoforge/build.gradle.kts

@@ -1,6 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import net.neoforged.moddevgradle.internal.RunGameTask
-import org.gradle.api.tasks.JavaExec
 import org.spongepowered.gradle.impl.AWToAT
 
 buildscript {
@@ -405,6 +404,7 @@ tasks {
     test {
         useJUnitPlatform()
 
+        maxHeapSize = "4G"
         testClassesDirs = commonTest.get().output.classesDirs + testSources.get().output.classesDirs
 
         jvmArgs(runServer.get().jvmArgs)

src/accessors/java/org/spongepowered/common/accessor/network/chat/StyleAccessor.java

@@ -25,10 +25,10 @@
 package org.spongepowered.common.accessor.network.chat;
 
 import net.minecraft.network.chat.ClickEvent;
+import net.minecraft.network.chat.FontDescription;
 import net.minecraft.network.chat.HoverEvent;
 import net.minecraft.network.chat.Style;
 import net.minecraft.network.chat.TextColor;
-import net.minecraft.resources.ResourceLocation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
@@ -40,23 +40,38 @@
 public interface StyleAccessor {
 
     @Invoker("<init>")
-    static Style invoker$new(final @Nullable TextColor color, final @Nullable Integer shadowColor, final @Nullable Boolean bold, final @Nullable Boolean italic,
-         final @Nullable Boolean underlined, final @Nullable Boolean strikethrough, final @Nullable Boolean obfuscated,
-         final @Nullable ClickEvent clickEvent, final @Nullable HoverEvent hoverEvent, final @Nullable String insertion,
-         final @Nullable ResourceLocation font) {
+    static Style invoker$new(
+        final @Nullable TextColor color,
+        final @Nullable Integer shadowColor,
+        final @Nullable Boolean bold,
+        final @Nullable Boolean italic,
+        final @Nullable Boolean underlined,
+        final @Nullable Boolean strikethrough,
+        final @Nullable Boolean obfuscated,
+        final @Nullable ClickEvent clickEvent,
+        final @Nullable HoverEvent hoverEvent,
+        final @Nullable String insertion,
+        final @Nullable FontDescription fontDescription
+    ) {
         throw new UntransformedInvokerError();
     }
 
-    @Accessor("bold") Boolean accessor$bold();
+    @Accessor("bold")
+    Boolean accessor$bold();
 
-    @Accessor("italic") Boolean accessor$italic();
+    @Accessor("italic")
+    Boolean accessor$italic();
 
-    @Accessor("underlined") Boolean accessor$underlined();
+    @Accessor("underlined")
+    Boolean accessor$underlined();
 
-    @Accessor("strikethrough") Boolean accessor$strikethrough();
+    @Accessor("strikethrough")
+    Boolean accessor$strikethrough();
 
-    @Accessor("obfuscated") Boolean accessor$obfuscated();
+    @Accessor("obfuscated")
+    Boolean accessor$obfuscated();
 
-    @Accessor("font") ResourceLocation accessor$font();
+    @Accessor("font")
+    FontDescription accessor$font();
 
 }

src/accessors/java/org/spongepowered/common/accessor/server/MinecraftServerAccessor.java

@@ -27,7 +27,7 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.progress.ChunkProgressListenerFactory;
+import net.minecraft.server.level.progress.LevelLoadListener;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.storage.LevelStorageSource;
 import net.minecraft.world.level.storage.ServerLevelData;
@@ -49,7 +49,7 @@ public interface MinecraftServerAccessor {
         throw new UntransformedAccessorError();
     }
 
-    @Invoker("setInitialSpawn") static void invoker$setInitialSpawn(final ServerLevel serverWorld, final ServerLevelData levelData, final boolean generateBonusChest, final boolean debugWorld) {
+    @Invoker("setInitialSpawn") static void invoker$setInitialSpawn(final ServerLevel serverWorld, final ServerLevelData levelData, final boolean generateBonusChest, final boolean debugWorld, LevelLoadListener listener) {
         throw new UntransformedInvokerError();
     }
 
@@ -59,8 +59,6 @@ public interface MinecraftServerAccessor {
 
     @Accessor("executor") Executor accessor$executor();
 
-    @Accessor("progressListenerFactory") ChunkProgressListenerFactory accessor$progressListenerFactory();
-
     @Accessor("nextTickTimeNanos") void accessor$nextTickTimeNanos(final long nextTickTime);
 
     @Invoker("isSpawningMonsters") boolean invoker$isSpawningMonsters();

src/accessors/java/org/spongepowered/common/accessor/server/level/ChunkMapAccessor.java

@@ -43,7 +43,7 @@ public interface ChunkMapAccessor {
 
     @Invoker("saveAllChunks") void invoker$saveAllChunks(boolean flush);
 
-    @Invoker("getChunks") Iterable<ChunkHolder> invoker$getChunks();
+    @Accessor("visibleChunkMap") Long2ObjectLinkedOpenHashMap<ChunkHolder> accessor$visibleChunkMap();
 
     @Accessor("level") ServerLevel accessor$level();
 }

src/accessors/java/org/spongepowered/common/accessor/server/level/ServerLevelAccessor.java

@@ -46,8 +46,4 @@ public interface ServerLevelAccessor {
 
     @Accessor("entityManager") PersistentEntitySectionManager<Entity> accessor$getEntityManager();
 
-    @Accessor("lastSpawnChunkRadius") int accessor$lastSpawnChunkRadius();
-
-    @Accessor("lastSpawnChunkRadius") void accessor$setLastSpawnChunkRadius(int value);
-
 }