Update to 1.21.11

Author: DrexHD

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.11-SNAPSHOT'
+    id 'fabric-loom' version '1.14-SNAPSHOT'
     id 'maven-publish'
 }
 

gradle.properties

@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.9
-curseforge_minecraft_version=1.21.9
-loader_version=0.17.2
+minecraft_version=1.21.11-rc2
+curseforge_minecraft_version=1.21.11-snapshot
+loader_version=0.18.1
 
 # Mod Properties
 mod_version=1.0.1
 maven_group=seedguard
 archives_base_name=seedguard
 
 # Testmod dependencies
-fabric_version=0.133.14+1.21.9
+fabric_version=0.139.4+1.21.11

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/me/drex/seedguard/SeedManager.java

@@ -11,8 +11,8 @@
 import it.unimi.dsi.fastutil.objects.*;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.Identifier;
 import net.minecraft.resources.RegistryOps;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.levelgen.structure.StructureSet;
@@ -34,7 +34,7 @@ public class SeedManager {
 
     private static final Codec<Map<Holder<StructureSet>, Integer>> STRUCTURE_SEEDS_MAP_CODEC = Codec.unboundedMap(StructureSet.CODEC, Codec.INT);
     private static final Codec<Map<Holder<ConfiguredFeature<?, ?>>, Long>> FEATURE_SEEDS_MAP_CODEC = Codec.unboundedMap(ConfiguredFeature.CODEC, Codec.LONG);
-    private static final Codec<Map<ResourceLocation, Long>> SURFACE_RULE_SEEDS_MAP_CODEC = Codec.unboundedMap(ResourceLocation.CODEC, Codec.LONG);
+    private static final Codec<Map<Identifier, Long>> SURFACE_RULE_SEEDS_MAP_CODEC = Codec.unboundedMap(Identifier.CODEC, Codec.LONG);
     private static final String STRUCTURE_SEEDS_FILE = "structure-seeds.json";
     private static final String FEATURE_SEEDS_FILE = "feature-seeds.json";
     private static final String SURFACE_RULE_SEEDS_FILE = "surface-rule-seeds.json";
@@ -46,7 +46,7 @@ public class SeedManager {
     private static final SecureRandom random = new SecureRandom();
     private static final Reference2IntMap<Holder<StructureSet>> structureSeeds = new Reference2IntOpenHashMap<>();
     private static final Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> featureSeeds = new Reference2LongOpenHashMap<>();
-    private static final Object2LongMap<ResourceLocation> surfaceRuleSeeds = new Object2LongOpenHashMap<>();
+    private static final Object2LongMap<Identifier> surfaceRuleSeeds = new Object2LongOpenHashMap<>();
     public static final Logger LOGGER = LoggerFactory.getLogger("SeedManager");
 
     public static void load(MinecraftServer server) {
@@ -64,7 +64,7 @@ public static void load(MinecraftServer server) {
             featureSeeds.computeIfAbsent(holder, ignored -> random.nextLong());
         });
         for (String vanillaSurfaceRule : VANILLA_SURFACE_RULES) {
-            surfaceRuleSeeds.computeIfAbsent(ResourceLocation.parse(vanillaSurfaceRule), ignored -> random.nextLong());
+            surfaceRuleSeeds.computeIfAbsent(Identifier.parse(vanillaSurfaceRule), ignored -> random.nextLong());
         }
         save(server);
     }
@@ -92,9 +92,9 @@ public static long getFeatureSeed(Holder<ConfiguredFeature<?, ?>> holder) {
         return featureSeeds.getLong(holder);
     }
 
-    public static Optional<Long> getSurfaceRuleSeed(ResourceLocation resourceLocation) {
-        if (surfaceRuleSeeds.containsKey(resourceLocation)) {
-            return Optional.of(surfaceRuleSeeds.getLong(resourceLocation));
+    public static Optional<Long> getSurfaceRuleSeed(Identifier identifier) {
+        if (surfaceRuleSeeds.containsKey(identifier)) {
+            return Optional.of(surfaceRuleSeeds.getLong(identifier));
         }
         return Optional.empty();
     }

src/main/java/me/drex/seedguard/mixin/RandomStateMixin.java

@@ -3,7 +3,7 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import me.drex.seedguard.SeedManager;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.levelgen.PositionalRandomFactory;
 import net.minecraft.world.level.levelgen.RandomState;
@@ -23,13 +23,13 @@ public abstract class RandomStateMixin {
         method = "method_41561",
         at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/world/level/levelgen/PositionalRandomFactory;fromHashOf(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/util/RandomSource;"
+            target = "Lnet/minecraft/world/level/levelgen/PositionalRandomFactory;fromHashOf(Lnet/minecraft/resources/Identifier;)Lnet/minecraft/util/RandomSource;"
         )
     )
-    public RandomSource modifyResourceLocationDependentRandom(PositionalRandomFactory instance, ResourceLocation resourceLocation, Operation<RandomSource> original) {
-        return SeedManager.getSurfaceRuleSeed(resourceLocation)
+    public RandomSource modifyIdentifierDependentRandom(PositionalRandomFactory instance, Identifier identifier, Operation<RandomSource> original) {
+        return SeedManager.getSurfaceRuleSeed(identifier)
             .map(seed -> this.random.fromSeed(seed))
-            .orElseGet(() -> original.call(instance, resourceLocation));
+            .orElseGet(() -> original.call(instance, identifier));
     }
 
 }