Update to MC 1.21.2

.github/workflows/deploy.yaml

@@ -44,8 +44,8 @@ jobs:
           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 -PenableSpongeForge=true :publish :SpongeVanilla:publish :SpongeForge:publish
-        # run: ./gradlew -s -PenableSpongeForge=true :publish :SpongeVanilla:publish
+#        run: ./gradlew -s -PenableSpongeForge=true :publish :SpongeVanilla:publish :SpongeForge:publish
+        run: ./gradlew -s -PenableSpongeForge=true :publish :SpongeVanilla: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/GeneratorMain.java

@@ -66,8 +66,8 @@
 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.entity.trialspawner.TrialSpawnerState;
@@ -167,18 +167,19 @@ private static Pair<RegistryAccess.Frozen, ReloadableServerResources> loadVanill
         final LayeredRegistryAccess<RegistryLayer> staticRegistries = RegistryLayer.createRegistryAccess();
         final LayeredRegistryAccess<RegistryLayer> withWorldgen = staticRegistries.replaceFrom(
             RegistryLayer.WORLDGEN,
-            RegistryDataLoader.load(resourceManager, staticRegistries.getAccessForLoading(RegistryLayer.WORLDGEN), RegistryDataLoader.WORLDGEN_REGISTRIES)
+            RegistryDataLoader.load(resourceManager, staticRegistries.getAccessForLoading(RegistryLayer.WORLDGEN).listRegistries().toList(), RegistryDataLoader.WORLDGEN_REGISTRIES)
         );
         final LayeredRegistryAccess<RegistryLayer> withDimensions = withWorldgen.replaceFrom(
             RegistryLayer.DIMENSIONS,
-            RegistryDataLoader.load(resourceManager, staticRegistries.getAccessForLoading(RegistryLayer.DIMENSIONS), RegistryDataLoader.DIMENSION_REGISTRIES)
+            RegistryDataLoader.load(resourceManager, staticRegistries.getAccessForLoading(RegistryLayer.DIMENSIONS).listRegistries().toList(), RegistryDataLoader.DIMENSION_REGISTRIES)
         );
 
 
         final RegistryAccess.Frozen compositeRegistries = withDimensions.getAccessForLoading(RegistryLayer.RELOADABLE);
         final var resourcesFuture = ReloadableServerResources.loadResources(
             resourceManager,
             withDimensions,
+            List.of(),
             packRepository.getRequestedFeatureFlags(),
             CommandSelection.ALL,
             2, // functionPermissionLevel
@@ -189,7 +190,7 @@ private static Pair<RegistryAccess.Frozen, ReloadableServerResources> loadVanill
                 resourceManager.close();
             }
         }).thenApply(resources -> {
-            resources.updateRegistryTags();
+            resources.updateStaticRegistryTags();
             return resources;
         });
 
@@ -216,7 +217,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",
@@ -252,13 +253,6 @@ private static List<Generator> generators(final Context context) {
                  "getSerializedName",
                  "sponge"
             ),
-            new RegistryEntriesGenerator<>(
-                 "data.type",
-                 "ArmorMaterials",
-                 "ARMOR_MATERIAL",
-                 context.relativeClass("data.type", "ArmorMaterial"),
-                 Registries.ARMOR_MATERIAL
-            ),
             new RegistryEntriesGenerator<>(
                  "map.decoration",
                  "MapDecorationTypes",
@@ -318,14 +312,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 +372,13 @@ private static List<Generator> generators(final Context context) {
                  "getSerializedName",
                  "sponge"
             ),
+            new EnumEntriesValidator<>(
+                "world.explosion",
+                "BlockInteractions",
+                Explosion.BlockInteraction.class,
+                "name",
+                "sponge"
+            ),
             new RegistryEntriesGenerator<>(
                 "data.type",
                 "ArtTypes",
@@ -789,13 +790,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",

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

@@ -121,9 +121,9 @@ public void generate(final Context ctx) throws IOException {
         clazz.addAnnotation(Types.suppressWarnings("unused"));
 
         final RegistryScope scopeType;
-        Registry<V> registry = (Registry<V>) BuiltInRegistries.REGISTRY.get(this.registry.location());
+        Registry<V> registry = (Registry<V>) BuiltInRegistries.REGISTRY.get(this.registry.location()).orElse(null);
         if (registry == null) {
-            registry = ctx.registries().registry(this.registry).orElse(null);
+            registry = ctx.registries().lookup(this.registry).orElse(null);
             if (registry == null) {
                 throw new IllegalArgumentException("Unknown registry " + this.registry);
             }

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

@@ -96,12 +96,10 @@ public void generate(final Context ctx) {
         final var primaryTypeDeclaration = compilationUnit.getPrimaryType()
             .orElseThrow(() -> new IllegalStateException("Could not find primary type for registry type " + this.targetClassSimpleName));
 
-        Registry<V> registry = ctx.registries().registry(this.registry).orElse(null);
+        Registry<V> registry = ctx.registries().lookup(this.registry).orElse(null);
         if (registry == null) {
-            registry = (Registry<V>) BuiltInRegistries.REGISTRY.get(this.registry.location());
-            if (registry == null) {
-                throw new IllegalArgumentException("Unknown registry " + this.registry);
-            }
+            registry = (Registry<V>) BuiltInRegistries.REGISTRY.get(this.registry.location())
+                .orElseThrow(() -> new IllegalArgumentException("Unknown registry " + this.registry));
         }
 
         primaryTypeDeclaration.setJavadocComment(new Javadoc(JavadocDescription.parseText(Generator.GENERATED_FILE_JAVADOCS)));
@@ -130,7 +128,7 @@ public void generate(final Context ctx) {
         final Set<ResourceLocation> allKeys = new HashSet<>(registry.keySet());
         allKeys.addAll(this.extraEntries);
         for (final ResourceLocation key : allKeys) {
-            if (!this.filter.test(registry.get(key))) {
+            if (!this.filter.test(registry.getValue(key))) {
                 continue;
             }
 

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

@@ -29,6 +29,7 @@
 import com.squareup.javapoet.ParameterSpec;
 import com.squareup.javapoet.ParameterizedTypeName;
 import com.squareup.javapoet.TypeName;
+import net.minecraft.core.HolderSet;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -93,8 +94,9 @@ public void generate(final Context ctx) throws IOException {
                 ).build();
 
 
-        ctx.registries().registryOrThrow(this.taggedRegistry).getTagNames()
-            .<ResourceLocation>map(TagKey::location)
+        ctx.registries().lookupOrThrow(this.taggedRegistry).getTags()
+            .<TagKey<?>>map(HolderSet.Named::key)
+            .map(TagKey::location)
             .sorted(Comparator.naturalOrder())
             .map(v -> this.makeField(this.targetClassSimpleName, fieldType, factoryMethod, v))
             .forEachOrdered(clazz::addField);

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=1.21.1
+minecraftVersion=24w38a
 recommendedVersion=0-SNAPSHOT
 
 org.gradle.dependency.verification.console=verbose