Merge pull request #4003 from SpongePowered/update/1.20.6

Update/1.20.6

.github/workflows/check-spotless.yaml

@@ -10,6 +10,6 @@ jobs:
   call-check:
     uses: SpongePowered/.github/.github/workflows/shared-check-spotless.yaml@master
     with:
-      runtime_version: 17
+      runtime_version: 21
       extra_gradle_params: "-PenableTestPlugins=true -PenableSpongeForge=true"
     secrets: inherit

.github/workflows/common-integration-test.yaml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04, windows-latest, macos-latest]
-        java: [17, 21]
+        java: [ 21 ]
     runs-on: "${{ matrix.os }}"
     steps:
       - name: Check out repository to use the build.gradle.kts as a hash file

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

@@ -16,7 +16,7 @@ jobs:
         id: setup
         uses: SpongePowered/.github/.github/actions/setup-java-env@master
         with:
-          runtime_version: 17
+          runtime_version: 21
           publishing_branch_regex: 'api-\d+'
       - name: setup / cache minecraft dependencies
         uses: "actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9" # v4.0.2

.github/workflows/deploy.yaml

@@ -27,7 +27,7 @@ jobs:
         id: setup
         uses: SpongePowered/.github/.github/actions/setup-java-env@master
         with:
-          runtime_version: 17
+          runtime_version: 21
       - name: setup / minecraft cache
         uses: "actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9" # v4.0.2
         with:

README.md

@@ -1,4 +1,4 @@
-Sponge ![Java CI with Gradle](https://github.com/SpongePowered/Sponge/workflows/Java%20CI%20with%20Gradle/badge.svg?branch=api-8&event=push)
+Sponge ![Java CI with Gradle](https://github.com/SpongePowered/Sponge/workflows/Java%20CI%20with%20Gradle/badge.svg?branch=api-11&event=push)
 =============
 
 The SpongeAPI implementation targeting vanilla Minecraft and 3rd party platforms. It is licensed under the [MIT License].
@@ -25,7 +25,7 @@ The SpongeAPI implementation targeting vanilla Minecraft and 3rd party platforms
 
 
 ## Prerequisites
-* [Java] 8
+* [Java] 21
 
 ## Clone
 The following steps will ensure your project is cloned properly.

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

@@ -55,14 +55,12 @@
 import net.minecraft.world.entity.animal.horse.Markings;
 import net.minecraft.world.entity.animal.horse.Variant;
 import net.minecraft.world.entity.vehicle.Boat;
-import net.minecraft.world.flag.FeatureFlags;
-import net.minecraft.world.item.ArmorMaterials;
 import net.minecraft.world.item.DyeColor;
-import net.minecraft.world.item.FireworkRocketItem;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.Rarity;
-import net.minecraft.world.level.DataPackConfig;
+import net.minecraft.world.item.component.FireworkExplosion;
 import net.minecraft.world.level.GameRules;
+import net.minecraft.world.level.WorldDataConfiguration;
 import net.minecraft.world.level.block.state.properties.BambooLeaves;
 import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
 import org.tinylog.Logger;
@@ -147,7 +145,7 @@ private static Pair<RegistryAccess.Frozen, ReloadableServerResources> loadVanill
         // and call to WorldStem.load in net.minecraft.server.Main
         // We don't currently try to load any datapacks here
         final var packRepository = ServerPacksSource.createVanillaTrustedRepository();
-        MinecraftServer.configurePackRepository(packRepository, DataPackConfig.DEFAULT, /* safeMode = */ false, FeatureFlags.DEFAULT_FLAGS);
+        MinecraftServer.configurePackRepository(packRepository, WorldDataConfiguration.DEFAULT, /* safeMode = */ false, true);
         final CloseableResourceManager resourceManager = new MultiPackResourceManager(PackType.SERVER_DATA, packRepository.openAllSelected());
 
         // WorldLoader.load
@@ -165,7 +163,7 @@ private static Pair<RegistryAccess.Frozen, ReloadableServerResources> loadVanill
         final RegistryAccess.Frozen compositeRegistries = withDimensions.getAccessForLoading(RegistryLayer.RELOADABLE);
         final var resourcesFuture = ReloadableServerResources.loadResources(
             resourceManager,
-            compositeRegistries,
+            withDimensions,
             packRepository.getRequestedFeatureFlags(),
             CommandSelection.ALL,
             2, // functionPermissionLevel
@@ -176,7 +174,7 @@ private static Pair<RegistryAccess.Frozen, ReloadableServerResources> loadVanill
                 resourceManager.close();
             }
         }).thenApply(resources -> {
-            resources.updateRegistryTags(compositeRegistries);
+            resources.updateRegistryTags();
             return resources;
         });
 
@@ -221,8 +219,8 @@ private static List<Generator> generators(final Context context) {
             new EnumEntriesValidator<>(
                  "item",
                  "FireworkShapes",
-                  FireworkRocketItem.Shape.class,
-                 "getName",
+                  FireworkExplosion.Shape.class,
+                 "getSerializedName",
                  "sponge"
             ),
             new EnumEntriesValidator<>(
@@ -239,12 +237,12 @@ private static List<Generator> generators(final Context context) {
                  "getName",
                  "sponge"
             ),
-            new EnumEntriesValidator<>(
+            new RegistryEntriesGenerator<>(
                  "data.type",
                  "ArmorMaterials",
-                 ArmorMaterials.class,
-                 "getName",
-                 "sponge"
+                 "ARMOR_MATERIAL",
+                 context.relativeClass("data.type", "ArmorMaterial"),
+                 Registries.ARMOR_MATERIAL
             ),
             new EnumEntriesValidator<>(
                  "data.type",
@@ -576,7 +574,8 @@ private static List<Generator> generators(final Context context) {
             ),
             new BlockStateDataProviderGenerator(),
             new BlockStatePropertiesGenerator(),
-            new BlockStatePropertyKeysGenerator(),
+            // TODO fix me
+            //new BlockStatePropertyKeysGenerator(),
             new RegistryEntriesGenerator<>(
                     "world.generation.feature",
                     "PlacedFeatures",

gradle.properties

@@ -9,10 +9,10 @@ projectDescription=The SpongeAPI implementation targeting vanilla Minecraft and
 
 mixinConfigs=mixins.sponge.accessors.json,mixins.sponge.api.json,mixins.sponge.concurrent.json,mixins.sponge.core.json,\
   mixins.sponge.entityactivation.json,mixins.sponge.exploit.json,mixins.sponge.inventory.json,mixins.sponge.movementcheck.json,\
-  mixins.sponge.tracker.json,mixins.sponge.ipforward.json,mixins.sponge.optimization.json,mixins.sponge.bugfix.json
+  mixins.sponge.tracker.json,mixins.sponge.ipforward.json,mixins.sponge.optimization.json
 superClassChanges=common.superclasschange
 
-minecraftVersion=1.20.4
+minecraftVersion=1.20.6
 recommendedVersion=0-SNAPSHOT
 
 org.gradle.dependency.verification.console=verbose