feat(minecraft): update towards 25w44a

Breaking changes:
- GameRules are now registered and have therefor real
IDs, so all field names are changed

Notable Additions:
- Added Parched
- Added CamelHusk

See https://minecraft.wiki/w/Java_Edition_25w44a

Author: gabizou

SpongeAPI

@@ -24,39 +24,23 @@
  */
 package org.spongepowered.vanilla.generator.world.level;
 
-import com.google.common.base.CaseFormat;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.GameRules;
 import org.spongepowered.vanilla.generator.Context;
 import org.spongepowered.vanilla.generator.Generator;
-import org.spongepowered.vanilla.generator.MapEntriesValidator;
 import org.spongepowered.vanilla.generator.RegistryEntriesGenerator;
 import org.spongepowered.vanilla.generator.RegistryEntriesValidator;
 import org.spongepowered.vanilla.generator.RegistryScope;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.function.BiConsumer;
 
 public class LevelDataRegistries {
 
     public static List<Generator> levelDataRegistries(final Context context) {
         return List.<Generator>of(
-            new MapEntriesValidator<>(
+            new RegistryEntriesValidator<>(
                 "world.gamerule",
                 "GameRules",
-                GameRules.class,
-                "GAME_RULE_TYPES",
-                map -> {
-                    final Map<ResourceLocation, Object> out = new HashMap<>(map.size());
-                    map.forEach((BiConsumer<Object, Object>) (k, v) -> {
-                        var key = (GameRules.Key<?>) k;
-                        out.put(ResourceLocation.fromNamespaceAndPath("sponge", CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, key.getId())), v);
-                    });
-                    return out;
-                }
+                Registries.GAME_RULE
             ),
             new RegistryEntriesGenerator<>(
                 "map.decoration",

generator/src/main/java/org/spongepowered/vanilla/generator/world/level/LevelDataRegistries.java

@@ -11,7 +11,7 @@ mixinConfigs=mixins.sponge.accessors.json,mixins.sponge.api.json,mixins.sponge.c
   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.test.json
 
-minecraftVersion=25w42a
+minecraftVersion=25w44a
 recommendedVersion=0-SNAPSHOT
 
 org.gradle.dependency.verification.console=verbose

gradle.properties

@@ -24,20 +24,16 @@
  */
 package org.spongepowered.common.accessor.world.level;
 
-import net.minecraft.world.level.GameRules;
+import net.minecraft.world.level.gamerules.GameRuleMap;
+import net.minecraft.world.level.gamerules.GameRules;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
-import org.spongepowered.common.UntransformedAccessorError;
 
-import java.util.Map;
 
 @Mixin(GameRules.class)
 public interface GameRulesAccessor {
 
-    @Accessor("rules") Map<GameRules.Key<?>, GameRules.Value<?>> accessor$rules();
+    @Accessor("rules") GameRuleMap accessor$rules();
 
-    @Accessor("GAME_RULE_TYPES") static Map<GameRules.Key<?>, GameRules.Type<?>> accessor$GAME_RULE_TYPES() {
-        throw new UntransformedAccessorError();
-    }
 
 }

gradle/verification-metadata.xml

@@ -24,13 +24,14 @@
  */
 package org.spongepowered.common.accessor.world.level;
 
-import net.minecraft.world.level.GameRules;
+import com.mojang.serialization.DataResult;
+import net.minecraft.world.level.gamerules.GameRule;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
-@Mixin(GameRules.Value.class)
+@Mixin(GameRule.class)
 public interface GameRules_ValueAccessor {
 
-    @Invoker("deserialize") void invoker$deserialize(final String serialized);
+    @Invoker("deserialize") DataResult<?> invoker$deserialize(final String serialized);
 
 }

src/accessors/java/org/spongepowered/common/accessor/world/level/GameRulesAccessor.java

@@ -202,7 +202,6 @@
     "world.level.chunk.LevelChunk$BoundTickingBlockEntityAccessor",
     "world.level.chunk.LevelChunk$RebindableTickingBlockEntityWrapperAccessor",
     "world.level.chunk.LevelChunkAccessor",
-    "world.level.chunk.storage.ChunkStorageAccessor",
     "world.level.chunk.storage.IOWorker$PendingStoreAccessor",
     "world.level.chunk.storage.RegionFileAccessor",
     "world.level.chunk.storage.SimpleRegionStorageAccessor",

src/accessors/java/org/spongepowered/common/accessor/world/level/GameRules_ValueAccessor.java

@@ -25,9 +25,9 @@
 package org.spongepowered.common.data.provider.world;
 
 import net.minecraft.core.GlobalPos;
-import net.minecraft.world.level.GameRules;
 import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.gamerules.GameRules;
 import net.minecraft.world.level.storage.LevelData;
 import net.minecraft.world.level.storage.PrimaryLevelData;
 import net.minecraft.world.level.storage.ServerLevelData;
@@ -88,7 +88,7 @@ public static void register(final DataProviderRegistrator registrator) {
                     .create(Keys.WORLD_TYPE)
                         .get(h -> (WorldType) (Object) h.bridge$dimensionType())
                     .create(Keys.PVP)
-                        .get(h -> h.bridge$pvp().orElseGet(() -> SpongeCommon.server().getWorldData().getGameRules().getBoolean(GameRules.RULE_PVP)))
+                        .get(h -> h.bridge$pvp().orElseGet(() -> SpongeCommon.server().getWorldData().getGameRules().get(GameRules.PVP)))
                     .create(Keys.SERIALIZATION_BEHAVIOR)
                         .get(h -> h.bridge$serializationBehavior().orElse(SerializationBehavior.AUTOMATIC))
                     .create(Keys.VIEW_DISTANCE)

src/accessors/resources/mixins.sponge.accessors.json

@@ -95,7 +95,7 @@ public static void register(final DataProviderRegistrator registrator) {
                         return Color.ofRgb(value);
                     })
                     .create(Keys.WATER_COLOR)
-                        .get(h -> Color.ofRgb(h.getSpecialEffects().getWaterColor()))
+                        .get(h -> Color.ofRgb(h.getSpecialEffects().waterColor()))
                     .create(Keys.WATER_FOG_COLOR)
                     .get(h -> {
                         final var value = h.getAttributes().applyModifier(EnvironmentAttributes.WATER_FOG_COLOR, EnvironmentAttributes.WATER_FOG_COLOR.defaultValue());
@@ -107,11 +107,11 @@ public static void register(final DataProviderRegistrator registrator) {
                         return Color.ofRgb(value);
                     })
                     .create(Keys.FOLIAGE_COLOR)
-                        .get(h -> h.getSpecialEffects().getFoliageColorOverride().map(Color::ofRgb).orElse(null))
+                        .get(h -> h.getSpecialEffects().foliageColorOverride().map(Color::ofRgb).orElse(null))
                     .create(Keys.GRASS_COLOR)
-                        .get(h -> h.getSpecialEffects().getGrassColorOverride().map(Color::ofRgb).orElse(null))
+                        .get(h -> h.getSpecialEffects().grassColorOverride().map(Color::ofRgb).orElse(null))
                     .create(Keys.GRASS_COLOR_MODIFIER)
-                        .get(h -> (GrassColorModifier) (Object) h.getSpecialEffects().getGrassColorModifier())
+                        .get(h -> (GrassColorModifier) (Object) h.getSpecialEffects().grassColorModifier())
                     .create(Keys.BACKGROUND_MUSIC)
                         .get(h -> {
                             final var value = h.getAttributes().applyModifier(EnvironmentAttributes.BACKGROUND_MUSIC, EnvironmentAttributes.BACKGROUND_MUSIC.defaultValue());

src/main/java/org/spongepowered/common/data/provider/world/WorldPropertiesData.java

@@ -36,12 +36,12 @@
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.GameRules;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.DirectionalBlock;
 import net.minecraft.world.level.block.entity.JukeboxBlockEntity;
 import net.minecraft.world.level.block.piston.PistonStructureResolver;
+import net.minecraft.world.level.gamerules.GameRules;
 import net.minecraft.world.level.saveddata.maps.MapId;
 import net.minecraft.world.level.saveddata.maps.MapIndex;
 import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
@@ -515,7 +515,7 @@ public static DestructEntityEvent.Death callDestructEntityEventDeath(final Livin
 
             final DestructEntityEvent.Death event = SpongeEventFactory.createDestructEntityEventDeath(frame.currentCause(),
                     originalChannel, Optional.of(originalChannel), originalMessage, originalMessage, (Living) entity,
-                ((ServerLevel) entity.level()).getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY), messageCancelled);
+                ((ServerLevel) entity.level()).getGameRules().get(GameRules.KEEP_INVENTORY), messageCancelled);
             SpongeCommon.post(event);
 
             return event;