Update to MC 1.21.2

.editorconfig

@@ -10,4 +10,7 @@ max_line_length = 120
 tab_width = 4
 
 [*mixins*.json]
-indent_size = 4
+indent_size = 4
+
+[*.yaml]
+indent_size = 2

.github/workflows/common-run-build.yaml

@@ -11,15 +11,30 @@ jobs:
     # Only run on PRs if the source branch is on someone else's repo
     if: "${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}"
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        project:
+          - vanilla
+          - forge
+          - neoforge
+        include:
+          - project: vanilla
+            gradleProject: SpongeVanilla
+          - project: forge
+            gradleProject: SpongeForge
+          - project: neoforge
+            gradleProject: SpongeNeo
     steps:
       - name: setup
         id: setup
         uses: SpongePowered/.github/.github/actions/setup-java-env@master
+        if: "!startsWith(github.ref, 'refs/heads/update/') || matrix.project == 'vanilla'"
         with:
           runtime_version: 21
           publishing_branch_regex: 'api-\d+'
       - name: setup / cache minecraft dependencies
         uses: "actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9" # v4.0.2
+        if: "!startsWith(github.ref, 'refs/heads/update/') || matrix.project == 'vanilla'"
         with:
           path: |
             ${{ github.workspace}}/buildSrc/.gradle/
@@ -28,15 +43,18 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-minecraft-${{ env.CACHE_REV }}-
       - name: setup / environment
+        if: "!startsWith(github.ref, 'refs/heads/update/') || matrix.project == 'vanilla'"
         run: |
           echo "GIT_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
           echo "GIT_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
           echo "BUILD_NUMBER=${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
       - name: build with Gradle
-        run: ./gradlew -Pprojects=vanilla,forge,neoforge,testplugins build --stacktrace
+        if: "!startsWith(github.ref, 'refs/heads/update/') || matrix.project == 'vanilla'"
+        run: ./gradlew -Pprojects=${{ matrix.project }},testplugins build --stacktrace
         env:
           CI_SYSTEM: Github Actions
       - name: Archive artifacts for build
+        if: "!startsWith(github.ref, 'refs/heads/update/') || matrix.project == 'vanilla'"
         uses: "actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3" # v4.3.1
         with:
           name: Sponge Jars
@@ -46,22 +64,14 @@ jobs:
             ${{ github.workspace }}/vanilla/build/libs/*.jar
             ${{ github.workspace }}/forge/build/libs/*.jar
             ${{ github.workspace }}/neoforge/build/libs/*.jar
-      - name: SpongeVanilla Production Jar
+      - name: ${{ matrix.gradleProject }} Production Jar
+        if: "!startsWith(github.ref, 'refs/heads/update/') || matrix.project == 'vanilla'"
         uses: "actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3" # v4.3.1
         with:
-          name: SpongeVanilla Production Jar
-          path: "${{ github.workspace }}/vanilla/build/libs/*-universal.jar"
-      - name: SpongeForge Production Jar
-        uses: "actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3" # v4.3.1
-        with:
-          name: SpongeForge Production Jar
-          path: "${{ github.workspace }}/forge/build/libs/*-universal.jar"
-      - name: SpongeNeo Production Jar
-        uses: "actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3" # v4.3.1
-        with:
-          name: SpongeNeo Production Jar
-          path: "${{ github.workspace }}/neoforge/build/libs/*-universal.jar"
+          name: ${{ matrix.gradleProject }} Production Jar
+          path: "${{ github.workspace }}/${{ matrix.project }}/build/libs/*-universal.jar"
       - name: SpongeVanilla libraries
+        if: "matrix.project == 'vanilla'"
         uses: "actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3" # v4.3.1
         with:
           name: SpongeVanilla installer libraries

.github/workflows/deploy.yaml

@@ -5,7 +5,9 @@ name: Build and Deploy
 
 on:
   push:
-    branches: [ 'api-*' ]
+    branches:
+      - 'api-*'
+      - 'update/*'
     tags-ignore: [ '**' ]
 
 env:
@@ -22,13 +24,30 @@ jobs:
   publish:
     needs: integrationTest
     runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        project:
+          - vanilla
+          - forge
+          - neoforge
+        include:
+          - project: vanilla
+            gradleProject: SpongeVanilla
+          - project: forge
+            gradleProject: SpongeForge
+          - project: neoforge
+            gradleProject: SpongeNeo
     steps:
       - name: setup
+        if: "!startsWith(github.ref, 'refs/heads/update/') || matrix.project == 'vanilla'"
         id: setup
         uses: SpongePowered/.github/.github/actions/setup-java-env@master
         with:
           runtime_version: 21
+          publishing_branch_regex: ''
       - name: setup / minecraft cache
+        if: "!startsWith(github.ref, 'refs/heads/update/') || matrix.project == 'vanilla'"
         uses: "actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9" # v4.0.2
         with:
           path: |
@@ -39,12 +58,14 @@ jobs:
             ${{ runner.os }}-minecraft-${{ env.CACHE_REV }}-
         # We don't need to run tests again, so we just publish
       - name: setup / workspace
+        if: "!startsWith(github.ref, 'refs/heads/update/') || matrix.project == 'vanilla'"
         run: |
           echo "GIT_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
           echo "GIT_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
           echo "BUILD_NUMBER=${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
       - name: Publish to Sponge Maven & GitHub Packages
-        run: ./gradlew -s -Pprojects=vanilla,forge,neoforge :publish :SpongeVanilla:publish :SpongeForge:publish :SpongeNeo:publish
+        if: "!startsWith(github.ref, 'refs/heads/update/') || matrix.project == 'vanilla'"
+        run: ./gradlew -s -Pprojects=vanilla,${{ matrix.project }} :${{ matrix.gradleProject }}:publish
         env:
           CI_SYSTEM: Github Actions
           GITHUB_USERNAME: "${{ github.actor }}"

.gitignore

@@ -11,6 +11,7 @@ dist
 lib
 out
 run
+run_snap
 /target
 *.com
 *.class

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

@@ -32,6 +32,7 @@
 import net.minecraft.core.FrontAndTop;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.CreakingHeartBlock;
 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;
@@ -131,6 +132,7 @@ static PropertyType ofProperty(final Property<?> prop) {
         vanillaEnumTypeMapping.put(StructureMode.class, BlockStatePropertiesGenerator.inDataTypePkg("StructureMode"));
         vanillaEnumTypeMapping.put(PistonType.class, BlockStatePropertiesGenerator.inDataTypePkg("PistonType"));
         vanillaEnumTypeMapping.put(BambooLeaves.class, BlockStatePropertiesGenerator.inDataTypePkg("BambooLeavesType"));
+        vanillaEnumTypeMapping.put(CreakingHeartBlock.CreakingHeartState.class, BlockStatePropertiesGenerator.inDataTypePkg("CreakingHeart"));
         vanillaEnumTypeMapping.put(WallSide.class, BlockStatePropertiesGenerator.inDataTypePkg("WallConnectionState"));
         vanillaEnumTypeMapping.put(RailShape.class, BlockStatePropertiesGenerator.inDataTypePkg("RailDirection"));
         vanillaEnumTypeMapping.put(AttachFace.class, BlockStatePropertiesGenerator.inDataTypePkg("AttachmentSurface"));

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

@@ -33,6 +33,7 @@
 import com.squareup.javapoet.TypeVariableName;
 import net.minecraft.core.Direction;
 import net.minecraft.core.FrontAndTop;
+import net.minecraft.world.level.block.CreakingHeartBlock;
 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;
@@ -129,6 +130,7 @@ static BlockStatePropertyKeysGenerator.PropertyType ofProperty(final Property<?>
         vanillaEnumTypeMapping.put(StructureMode.class, BlockStatePropertyKeysGenerator.inDataTypePkg("StructureMode"));
         vanillaEnumTypeMapping.put(PistonType.class, BlockStatePropertyKeysGenerator.inDataTypePkg("PistonType"));
         vanillaEnumTypeMapping.put(BambooLeaves.class, BlockStatePropertyKeysGenerator.inDataTypePkg("BambooLeavesType"));
+        vanillaEnumTypeMapping.put(CreakingHeartBlock.CreakingHeartState.class, BlockStatePropertyKeysGenerator.inDataTypePkg("CreakingHeart"));
         vanillaEnumTypeMapping.put(WallSide.class, BlockStatePropertyKeysGenerator.inDataTypePkg("WallConnectionState"));
         vanillaEnumTypeMapping.put(RailShape.class, BlockStatePropertyKeysGenerator.inDataTypePkg("RailDirection"));
         vanillaEnumTypeMapping.put(AttachFace.class, BlockStatePropertyKeysGenerator.inDataTypePkg("AttachmentSurface"));

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

@@ -136,7 +136,11 @@ public void generate(final Context ctx) {
 
         // Sort field entries and add them back to the class
         processedFields.sort(Comparator.comparing(field -> field.getVariable(0).getNameAsString()));
-        primaryTypeDeclaration.getMembers().addAll(lastNonFieldIndex, processedFields);
+        var indextoAddAt = lastNonFieldIndex;
+        if (indextoAddAt == -1) {
+            indextoAddAt = 0;
+        }
+        primaryTypeDeclaration.getMembers().addAll(indextoAddAt, processedFields);
 
         if (!added.isEmpty()) {
             Logger.info("Added {} entries to {} that will require manual action to implement: {}", added.size(), this.targetClassSimpleName, added);

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

@@ -33,19 +33,19 @@
 import net.minecraft.Util;
 import net.minecraft.advancements.AdvancementType;
 import net.minecraft.commands.Commands.CommandSelection;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.core.LayeredRegistryAccess;
+import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.RegistryDataLoader;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.Bootstrap;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.RegistryLayer;
-import net.minecraft.server.ReloadableServerResources;
+import net.minecraft.server.*;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.repository.ServerPacksSource;
 import net.minecraft.server.packs.resources.CloseableResourceManager;
 import net.minecraft.server.packs.resources.MultiPackResourceManager;
+import net.minecraft.tags.TagLoader;
 import net.minecraft.world.Difficulty;
 import net.minecraft.world.damagesource.DamageEffects;
 import net.minecraft.world.damagesource.DamageScaling;
@@ -62,14 +62,14 @@
 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;
-import net.minecraft.world.item.Tiers;
 import net.minecraft.world.item.component.FireworkExplosion;
+import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.level.WorldDataConfiguration;
+import net.minecraft.world.level.block.CreakingHeartBlock;
 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.DripstoneThickness;
@@ -91,6 +91,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * A generator that will output source code containing constants used in <em>Minecraft: Java Edition</em>.
@@ -161,35 +162,36 @@ private static Pair<RegistryAccess.Frozen, ReloadableServerResources> loadVanill
         // We don't currently try to load any datapacks here
         final var packRepository = ServerPacksSource.createVanillaTrustedRepository();
         MinecraftServer.configurePackRepository(packRepository, WorldDataConfiguration.DEFAULT, /* safeMode = */ false, true);
-        final CloseableResourceManager resourceManager = new MultiPackResourceManager(PackType.SERVER_DATA, packRepository.openAllSelected());
+        final CloseableResourceManager rm = new MultiPackResourceManager(PackType.SERVER_DATA, packRepository.openAllSelected());
 
         // WorldLoader.load
         final LayeredRegistryAccess<RegistryLayer> staticRegistries = RegistryLayer.createRegistryAccess();
-        final LayeredRegistryAccess<RegistryLayer> withWorldgen = staticRegistries.replaceFrom(
-            RegistryLayer.WORLDGEN,
-            RegistryDataLoader.load(resourceManager, staticRegistries.getAccessForLoading(RegistryLayer.WORLDGEN), RegistryDataLoader.WORLDGEN_REGISTRIES)
-        );
-        final LayeredRegistryAccess<RegistryLayer> withDimensions = withWorldgen.replaceFrom(
-            RegistryLayer.DIMENSIONS,
-            RegistryDataLoader.load(resourceManager, staticRegistries.getAccessForLoading(RegistryLayer.DIMENSIONS), RegistryDataLoader.DIMENSION_REGISTRIES)
-        );
-
+        List<Registry.PendingTags<?>> pendingTags = TagLoader.loadTagsForExistingRegistries(rm, staticRegistries.getLayer(RegistryLayer.STATIC));
+        final var wga = staticRegistries.getAccessForLoading(RegistryLayer.WORLDGEN);
+        List<HolderLookup.RegistryLookup<?>> tl = TagLoader.buildUpdatedLookups(wga, pendingTags);
+        RegistryAccess.Frozen wgr = RegistryDataLoader.load(rm, tl, RegistryDataLoader.WORLDGEN_REGISTRIES);
+        List<HolderLookup.RegistryLookup<?>> cl = Stream.concat(tl.stream(), wgr.listRegistries()).toList();
+        final LayeredRegistryAccess<RegistryLayer> withWorldGen = staticRegistries.replaceFrom(RegistryLayer.WORLDGEN, wgr);
+        RegistryAccess.Frozen da = RegistryDataLoader.load(rm, cl, RegistryDataLoader.DIMENSION_REGISTRIES);
+        final LayeredRegistryAccess<RegistryLayer> withDimensions = withWorldGen.replaceFrom(RegistryLayer.DIMENSIONS, da);
+        TagLoader.loadTagsForExistingRegistries(rm, withDimensions.getLayer(RegistryLayer.WORLDGEN));
 
         final RegistryAccess.Frozen compositeRegistries = withDimensions.getAccessForLoading(RegistryLayer.RELOADABLE);
         final var resourcesFuture = ReloadableServerResources.loadResources(
-            resourceManager,
+            rm,
             withDimensions,
+            pendingTags,
             packRepository.getRequestedFeatureFlags(),
             CommandSelection.ALL,
             2, // functionPermissionLevel
             Util.backgroundExecutor(), // prepareExecutor
             Runnable::run // applyExecutor
         ).whenComplete((result, ex) -> {
             if (ex != null) {
-                resourceManager.close();
+                rm.close();
             }
         }).thenApply(resources -> {
-            resources.updateRegistryTags();
+            resources.updateStaticRegistryTags();
             return resources;
         });
 
@@ -216,7 +218,7 @@ private static List<Generator> generators(final Context context) {
         // Prepare a set of generators
         // We are starting out by just generating Vanilla registry-backed catalogs
         // Enum-backed (automatically-named) catalogs can be added later as necessary
-        return List.of(
+        return List.<Generator>of(
             new MapEntriesValidator<>(
                 "world.gamerule",
                 "GameRules",
@@ -246,18 +248,11 @@ private static List<Generator> generators(final Context context) {
                  "sponge"
             ),
             new EnumEntriesValidator<>(
-                 "data.type",
-                 "BoatTypes",
-                 Boat.Type.class,
-                 "getSerializedName",
-                 "sponge"
-            ),
-            new RegistryEntriesGenerator<>(
-                 "data.type",
-                 "ArmorMaterials",
-                 "ARMOR_MATERIAL",
-                 context.relativeClass("data.type", "ArmorMaterial"),
-                 Registries.ARMOR_MATERIAL
+                "data.type",
+                "CreakingHearts",
+                CreakingHeartBlock.CreakingHeartState.class,
+                "getSerializedName",
+                "sponge"
             ),
             new RegistryEntriesGenerator<>(
                  "map.decoration",
@@ -318,14 +313,14 @@ private static List<Generator> generators(final Context context) {
             new EnumEntriesValidator<>(
                  "data.type",
                  "MooshroomTypes",
-                 MushroomCow.MushroomType.class,
+                 MushroomCow.Variant.class,
                  "getSerializedName",
                  "sponge"
             ),
             new EnumEntriesValidator<>(
                  "data.type",
                  "FoxTypes",
-                 Fox.Type.class,
+                 Fox.Variant.class,
                  "getSerializedName",
                  "sponge"
             ),
@@ -378,6 +373,13 @@ private static List<Generator> generators(final Context context) {
                  "getSerializedName",
                  "sponge"
             ),
+            new EnumEntriesValidator<>(
+                "world.explosion",
+                "ExplosionBlockInteractions",
+                Explosion.BlockInteraction.class,
+                "name",
+                "sponge"
+            ),
             new RegistryEntriesGenerator<>(
                 "data.type",
                 "ArtTypes",
@@ -789,13 +791,14 @@ private static List<Generator> generators(final Context context) {
                     "getSerializedName",
                     "sponge"
             ),
-            new EnumEntriesValidator<>(
-                    "data.type",
-                    "ItemTiers",
-                    Tiers.class,
-                    "name",
-                    "sponge"
-            ),
+// TODO - Figure out this change since ToolMaterials aren't registered, nor an enum anymore. - Snapshot 24w34a
+//            new EnumEntriesValidator<>(
+//                    "data.type",
+//                    "ItemTiers",
+//                    ToolMaterial.class,
+//                    "name",
+//                    "sponge"
+//            ),
             new EnumEntriesValidator<>(
                     "entity.display",
                     "BillboardTypes",