Update for Minecraft 25w43a.

- Update for Minecraft 25w43a
- Followed PersistentState changes
- State files renamed, therefore biome replacement order will not be preserved when upgrading from prior versions
- No NeoForge or MinecraftForge yet

Author: gniftygnome

common/src/main/java/com/terraformersmc/biolith/impl/biome/BiomeCoordinator.java

@@ -59,6 +59,7 @@ public static void handleServerStarting(MinecraftServer server) {
 
         // When TerraBlender is present, it ignores our surface rules.
         // To avoid this, we submit a duplicate registration to TerraBlender (but only once).
+        // TODO: Pretty sure this breaks for datapack surface rules added after first startup...
         if (BiolithCompat.COMPAT_TERRABLENDER && !registeredWithTerrablender) {
             Services.PLATFORM.getTerraBlenderCompat().registerSurfaceRules();
             registeredWithTerrablender = true;
@@ -81,21 +82,21 @@ public static void handleWorldStarting(ServerWorld world) {
         if (dimensionKey.isPresent()) {
             if (DimensionTypes.THE_END.equals(dimensionKey.get())) {
                 if (END_STATE == null) {
-                    END_STATE = world.getPersistentStateManager().getOrCreate(BiolithState.getPersistentStateType("end"));
+                    END_STATE = world.getPersistentStateManager().getOrCreate(BiolithState.getPersistentStateType(world));
                     END.serverReplaced(END_STATE, world);
                 } else {
                     Biolith.LOGGER.warn("More than one End dimension world created; cowardly ignoring '{}' in favor of '{}'", world.getRegistryKey().getValue(), END_STATE.getWorldId());
                 }
             } else if (DimensionTypes.THE_NETHER.equals(dimensionKey.get())) {
                 if (NETHER_STATE == null) {
-                    NETHER_STATE = world.getPersistentStateManager().getOrCreate(BiolithState.getPersistentStateType("nether"));
+                    NETHER_STATE = world.getPersistentStateManager().getOrCreate(BiolithState.getPersistentStateType(world));
                     NETHER.serverReplaced(NETHER_STATE, world);
                 } else {
                     Biolith.LOGGER.warn("More than one Nether dimension world created; cowardly ignoring '{}' in favor of '{}'", world.getRegistryKey().getValue(), NETHER_STATE.getWorldId());
                 }
             } else if (DimensionTypes.OVERWORLD.equals(dimensionKey.get())) {
                 if (OVERWORLD_STATE == null) {
-                    OVERWORLD_STATE = world.getPersistentStateManager().getOrCreate(BiolithState.getPersistentStateType("overworld"));
+                    OVERWORLD_STATE = world.getPersistentStateManager().getOrCreate(BiolithState.getPersistentStateType(world));
                     OVERWORLD.serverReplaced(OVERWORLD_STATE, world);
                 } else {
                     Biolith.LOGGER.warn("More than one Overworld dimension world created; cowardly ignoring '{}' in favor of '{}'", world.getRegistryKey().getValue(), OVERWORLD_STATE.getWorldId());

common/src/main/java/com/terraformersmc/biolith/impl/config/BiolithState.java

@@ -27,7 +27,7 @@ private static <E> Codec<LinkedHashSet<E>> getLinkedHashSetCodec(Codec<E> entryC
         return entryCodec.listOf().xmap(LinkedHashSet::new, lhs -> lhs.stream().toList());
     }
 
-    public static Codec<BiolithState> getCodec(PersistentState.Context context) {
+    public static Codec<BiolithState> getCodec(ServerWorld world) {
         return RecordCodecBuilder.create(
                 (instance) -> instance.group(
                                 Codec.unboundedMap(RegistryKey.createCodec(RegistryKeys.BIOME), getLinkedHashSetCodec(RegistryKey.createCodec(RegistryKeys.BIOME))).optionalFieldOf("biome_replacements", Map.of())
@@ -37,32 +37,32 @@ public static Codec<BiolithState> getCodec(PersistentState.Context context) {
                         )
                         .apply(instance, (replacements, biomeReplacementsList) -> {
                             if (!replacements.isEmpty()) {
-                                return unmarshall_v1(context, replacements);
+                                return unmarshall_v1(world, replacements);
                             } else if (!biomeReplacementsList.isEmpty()) {
-                                return unmarshall_v0(context, biomeReplacementsList);
+                                return unmarshall_v0(world, biomeReplacementsList);
                             } else {
-                                return new BiolithState(context);
+                                return new BiolithState(world);
                             }
                         }));
     }
 
-    public static PersistentStateType<BiolithState> getPersistentStateType(String name) {
+    public static PersistentStateType<BiolithState> getPersistentStateType(ServerWorld world) {
         return new PersistentStateType<>(
-                Biolith.MOD_ID + "_" + name + "_state",
-                BiolithState::new,
-                BiolithState::getCodec,
+                Biolith.MOD_ID + "_state__" + world.getRegistryKey().getValue().toUnderscoreSeparatedString(),
+                () -> new BiolithState(world),
+                BiolithState.getCodec(world),
                 null
         );
     }
 
-    public BiolithState(PersistentState.Context context) {
-        this.world = context.getWorldOrThrow();
+    public BiolithState(ServerWorld world) {
+        this.world = world;
     }
 
     // Legacy unmarshaller for upgrading from v0 to v1
     // Each map was stored as a flat ordered list with the key in position 0.
-    private static BiolithState unmarshall_v0(PersistentState.Context context, List<LinkedHashSet<RegistryKey<Biome>>> biomeReplacementsList) {
-        BiolithState state = new BiolithState(context);
+    private static BiolithState unmarshall_v0(ServerWorld world, List<LinkedHashSet<RegistryKey<Biome>>> biomeReplacementsList) {
+        BiolithState state = new BiolithState(world);
 
         state.biomeReplacements.clear();
         biomeReplacementsList.forEach(list -> {
@@ -76,8 +76,8 @@ private static BiolithState unmarshall_v0(PersistentState.Context context, List<
         return state;
     }
 
-    private static BiolithState unmarshall_v1(PersistentState.Context context, Map<RegistryKey<Biome>, LinkedHashSet<RegistryKey<Biome>>> replacements) {
-        BiolithState state = new BiolithState(context);
+    private static BiolithState unmarshall_v1(ServerWorld world, Map<RegistryKey<Biome>, LinkedHashSet<RegistryKey<Biome>>> replacements) {
+        BiolithState state = new BiolithState(world);
 
         state.biomeReplacements.clear();
         state.biomeReplacements.putAll(replacements);

fabric/src/main/java/com/terraformersmc/biolith/impl/compat/TerraBlenderCompatFabric.java

@@ -66,7 +66,7 @@ public void registerSurfaceRules() {
                     MaterialRules.MaterialRule rule = biolithRules.get(ruleOwner);
                     if (rule != null) {
                         if (namespace.equals("minecraft")) {
-                            Biolith.LOGGER.warn("Unable to modify surface rules of vanilla biomes via TerraBlender; dropping: {}", ruleOwner);
+                            SurfaceRuleManager.addToDefaultSurfaceRulesAtStage(terrablenderRuleCategory, SurfaceRuleManager.RuleStage.BEFORE_BEDROCK, 0, rule);
                             continue;
                         }
                         try {

fabric/src/main/resources/fabric.mod.json

@@ -42,6 +42,6 @@
     "depends": {
         "fabricloader": ">=0.15.3",
         "fabric-api": "*",
-        "minecraft": ">=1.21.9 <1.22"
+        "minecraft": ">1.21.10 <1.22"
     }
 }

forge/src/main/java/com/terraformersmc/biolith/impl/compat/TerraBlenderCompatForge.java

@@ -66,7 +66,7 @@ public void registerSurfaceRules() {
                     MaterialRules.MaterialRule rule = biolithRules.get(ruleOwner);
                     if (rule != null) {
                         if (namespace.equals("minecraft")) {
-                            Biolith.LOGGER.warn("Unable to modify surface rules of vanilla biomes via TerraBlender; dropping: {}", ruleOwner);
+                            SurfaceRuleManager.addToDefaultSurfaceRulesAtStage(terrablenderRuleCategory, SurfaceRuleManager.RuleStage.BEFORE_BEDROCK, 0, rule);
                             continue;
                         }
                         try {

forge/src/main/resources/META-INF/mods.toml

@@ -29,6 +29,6 @@ side = "BOTH"
 [[dependencies.biolith]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.21.9,1.22)"
+versionRange = "[1.21.11,1.22)"
 ordering = "NONE"
 side = "BOTH"

gradle.properties

@@ -7,15 +7,16 @@ archives_base_name=biolith
 mod_version=dev
 maven_group=com.terraformersmc
 loom.ignoreDependencyLoomVersionValidation=true
-enabled_platforms=fabric,forge,neoforge
+#enabled_platforms=fabric,forge,neoforge
+enabled_platforms=fabric
 
 # Common
-minecraft_version=1.21.9
-yarn_mappings=1.21.9+build.1
+minecraft_version=25w43a
+yarn_mappings=25w43a+build.3
 
 # Fabric
-fabric_api_version=0.134.0+1.21.9
-fabric_loader_version=0.17.2
+fabric_api_version=0.136.1+1.21.11
+fabric_loader_version=0.17.3
 
 # Forge
 forge_version=1.21.9-59.0.0
@@ -56,12 +57,12 @@ default_release_type=alpha
 # CurseForge Metadata
 curseforge_slug=biolith
 curseforge_id=852512
-curseforge_game_versions=1.21.9
+curseforge_game_versions=1.21.11-snapshot
 
 # Modrinth Metadata
 modrinth_slug=biolith
 modrinth_id=iGEl6Crx
-modrinth_game_versions=1.21.9, 1.21.10-rc1
+modrinth_game_versions=25w43a
 modrinth_mod_loaders=
 
 # Discord Emotes

neoforge/src/main/java/com/terraformersmc/biolith/impl/compat/TerraBlenderCompatNeoForge.java

@@ -66,7 +66,7 @@ public void registerSurfaceRules() {
                     MaterialRules.MaterialRule rule = biolithRules.get(ruleOwner);
                     if (rule != null) {
                         if (namespace.equals("minecraft")) {
-                            Biolith.LOGGER.warn("Unable to modify surface rules of vanilla biomes via TerraBlender; dropping: {}", ruleOwner);
+                            SurfaceRuleManager.addToDefaultSurfaceRulesAtStage(terrablenderRuleCategory, SurfaceRuleManager.RuleStage.BEFORE_BEDROCK, 0, rule);
                             continue;
                         }
                         try {

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -29,6 +29,6 @@ side = "BOTH"
 [[dependencies.biolith]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.21.9,1.22)"
+versionRange = "[1.21.11,1.22)"
 ordering = "NONE"
 side = "BOTH"

settings.gradle

@@ -19,5 +19,5 @@ pluginManagement {
 rootProject.name = "biolith"
 include("common")
 include("fabric")
-include("forge")
-include("neoforge")
+//include("forge")
+//include("neoforge")