Update to 1.21.11.

- Update to 1.21.11
- Update for Moderner Beta v4 (breaks v3)
- Re-enable NeoForge builds
- MinecraftForge is not available yet

Author: gniftygnome

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id 'dev.architectury.loom' version '1.11-SNAPSHOT' apply(false)
+    id 'dev.architectury.loom' version '1.13-SNAPSHOT' apply(false)
 }
 
 architectury {

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

@@ -6,7 +6,7 @@
 import com.terraformersmc.biolith.impl.biome.BiomeCoordinator;
 import com.terraformersmc.biolith.impl.biome.DimensionBiomePlacement;
 import com.terraformersmc.biolith.impl.commands.BiolithDescribeCommand;
-import mod.bluestaggo.modernerbeta.world.biome.ModernBetaBiomeSource;
+import mod.bluestaggo.modernerbeta.level.biome.ModernBetaBiomeSource;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.world.ServerWorld;

fabric/src/main/java/com/terraformersmc/biolith/impl/mixin/MixinMBBiomeSource.java

@@ -6,10 +6,10 @@
 import com.mojang.datafixers.util.Pair;
 import com.terraformersmc.biolith.impl.biome.BiomeCoordinator;
 import com.terraformersmc.biolith.impl.biome.DimensionBiomePlacement;
-import mod.bluestaggo.modernerbeta.api.world.biome.BiomeProvider;
-import mod.bluestaggo.modernerbeta.api.world.biome.BiomeResolverBlock;
-import mod.bluestaggo.modernerbeta.api.world.cavebiome.CaveBiomeProvider;
-import mod.bluestaggo.modernerbeta.world.biome.ModernBetaBiomeSource;
+import mod.bluestaggo.modernerbeta.api.level.biome.BiomeProvider;
+import mod.bluestaggo.modernerbeta.api.level.biome.BiomeResolverBlock;
+import mod.bluestaggo.modernerbeta.api.level.cavebiome.CaveBiomeProvider;
+import mod.bluestaggo.modernerbeta.level.biome.ModernBetaBiomeSource;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.source.BiomeSource;
@@ -34,7 +34,7 @@ public abstract class MixinMBBiomeSource extends BiomeSource {
     @WrapOperation(method = {"getBiome", "getOceanBiome", "getDeepOceanBiome", "getCaveBiome", "getBiomeForSpawn", "getBiomeForHeightGen"},
             at = @At(
                     value = "INVOKE",
-                    target = "Lmod/bluestaggo/modernerbeta/api/world/biome/BiomeProvider;getBiome(III)Lnet/minecraft/registry/entry/RegistryEntry;"
+                    target = "Lmod/bluestaggo/modernerbeta/api/level/biome/BiomeProvider;getBiome(III)Lnet/minecraft/registry/entry/RegistryEntry;"
             )
     )
     @SuppressWarnings("unused")
@@ -47,7 +47,7 @@ public abstract class MixinMBBiomeSource extends BiomeSource {
     @WrapOperation(method = {"getCaveBiome"},
             at = @At(
                     value = "INVOKE",
-                    target = "Lmod/bluestaggo/modernerbeta/api/world/cavebiome/CaveBiomeProvider;getBiome(III)Lnet/minecraft/registry/entry/RegistryEntry;"
+                    target = "Lmod/bluestaggo/modernerbeta/api/level/cavebiome/CaveBiomeProvider;getBiome(III)Lnet/minecraft/registry/entry/RegistryEntry;"
             )
     )
     @SuppressWarnings("unused")
@@ -65,7 +65,7 @@ public abstract class MixinMBBiomeSource extends BiomeSource {
     @WrapOperation(method = {"getBiomeForSpawn", "getBiomeForSurfaceGen"},
             at = @At(
                     value = "INVOKE",
-                    target = "Lmod/bluestaggo/modernerbeta/api/world/biome/BiomeResolverBlock;getBiomeBlock(III)Lnet/minecraft/registry/entry/RegistryEntry;"
+                    target = "Lmod/bluestaggo/modernerbeta/api/level/biome/BiomeResolverBlock;getBiomeBlock(III)Lnet/minecraft/registry/entry/RegistryEntry;"
             )
     )
     @SuppressWarnings("unused")

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

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

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

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

gradle.properties

@@ -8,21 +8,21 @@ mod_version=dev
 maven_group=com.terraformersmc
 loom.ignoreDependencyLoomVersionValidation=true
 #enabled_platforms=fabric,forge,neoforge
-enabled_platforms=fabric
+enabled_platforms=fabric,neoforge
 
 # Common
-minecraft_version=25w43a
-yarn_mappings=25w43a+build.3
+minecraft_version=1.21.11
+yarn_mappings=1.21.11+build.1
 
 # Fabric
-fabric_api_version=0.136.1+1.21.11
+fabric_api_version=0.139.4+1.21.11
 fabric_loader_version=0.17.3
 
 # Forge
 forge_version=1.21.9-59.0.0
 
 # NeoForge
-neoforge_version=21.9.7-beta
+neoforge_version=21.11.0-beta
 
 ##
 ## Dependencies
@@ -32,13 +32,13 @@ neoforge_version=21.9.7-beta
 mixinextras_version=0.5.0
 
 # Moderner Beta for our integration
-moderner_beta_version=3.2.0+1.21.9
+moderner_beta_version=4.0.0+1.21.11
 
 # TerraBlender so we can use its API to access its region data
-terrablender_version=1.21.9-6.0.0.4
+terrablender_version=1.21.10-21.10.0.0
 
 # Terraform API for simplex noise implementation
-terraform_surfaces_api_version=15.0.0
+terraform_surfaces_api_version=16.0.0-alpha.1
 
 ##
 ## Ferry configuration
@@ -57,12 +57,12 @@ default_release_type=alpha
 # CurseForge Metadata
 curseforge_slug=biolith
 curseforge_id=852512
-curseforge_game_versions=1.21.11-snapshot
+curseforge_game_versions=1.21.11
 
 # Modrinth Metadata
 modrinth_slug=biolith
 modrinth_id=iGEl6Crx
-modrinth_game_versions=25w43a
+modrinth_game_versions=1.21.11
 modrinth_mod_loaders=
 
 # Discord Emotes

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

@@ -6,7 +6,7 @@
 import com.terraformersmc.biolith.impl.biome.BiomeCoordinator;
 import com.terraformersmc.biolith.impl.biome.DimensionBiomePlacement;
 import com.terraformersmc.biolith.impl.commands.BiolithDescribeCommand;
-import mod.bluestaggo.modernerbeta.world.biome.ModernBetaBiomeSource;
+import mod.bluestaggo.modernerbeta.level.biome.ModernBetaBiomeSource;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.world.ServerWorld;

neoforge/src/main/java/com/terraformersmc/biolith/impl/mixin/MixinMBBiomeSource.java

@@ -6,10 +6,10 @@
 import com.mojang.datafixers.util.Pair;
 import com.terraformersmc.biolith.impl.biome.BiomeCoordinator;
 import com.terraformersmc.biolith.impl.biome.DimensionBiomePlacement;
-import mod.bluestaggo.modernerbeta.api.world.biome.BiomeProvider;
-import mod.bluestaggo.modernerbeta.api.world.biome.BiomeResolverBlock;
-import mod.bluestaggo.modernerbeta.api.world.cavebiome.CaveBiomeProvider;
-import mod.bluestaggo.modernerbeta.world.biome.ModernBetaBiomeSource;
+import mod.bluestaggo.modernerbeta.api.level.biome.BiomeProvider;
+import mod.bluestaggo.modernerbeta.api.level.biome.BiomeResolverBlock;
+import mod.bluestaggo.modernerbeta.api.level.cavebiome.CaveBiomeProvider;
+import mod.bluestaggo.modernerbeta.level.biome.ModernBetaBiomeSource;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.source.BiomeSource;
@@ -34,7 +34,7 @@ public abstract class MixinMBBiomeSource extends BiomeSource {
     @WrapOperation(method = {"getBiome", "getOceanBiome", "getDeepOceanBiome", "getCaveBiome", "getBiomeForSpawn", "getBiomeForHeightGen"},
             at = @At(
                     value = "INVOKE",
-                    target = "Lmod/bluestaggo/modernerbeta/api/world/biome/BiomeProvider;getBiome(III)Lnet/minecraft/registry/entry/RegistryEntry;"
+                    target = "Lmod/bluestaggo/modernerbeta/api/level/biome/BiomeProvider;getBiome(III)Lnet/minecraft/registry/entry/RegistryEntry;"
             )
     )
     @SuppressWarnings("unused")
@@ -47,7 +47,7 @@ public abstract class MixinMBBiomeSource extends BiomeSource {
     @WrapOperation(method = {"getCaveBiome"},
             at = @At(
                     value = "INVOKE",
-                    target = "Lmod/bluestaggo/modernerbeta/api/world/cavebiome/CaveBiomeProvider;getBiome(III)Lnet/minecraft/registry/entry/RegistryEntry;"
+                    target = "Lmod/bluestaggo/modernerbeta/api/level/cavebiome/CaveBiomeProvider;getBiome(III)Lnet/minecraft/registry/entry/RegistryEntry;"
             )
     )
     @SuppressWarnings("unused")
@@ -65,7 +65,7 @@ public abstract class MixinMBBiomeSource extends BiomeSource {
     @WrapOperation(method = {"getBiomeForSpawn", "getBiomeForSurfaceGen"},
             at = @At(
                     value = "INVOKE",
-                    target = "Lmod/bluestaggo/modernerbeta/api/world/biome/BiomeResolverBlock;getBiomeBlock(III)Lnet/minecraft/registry/entry/RegistryEntry;"
+                    target = "Lmod/bluestaggo/modernerbeta/api/level/biome/BiomeResolverBlock;getBiomeBlock(III)Lnet/minecraft/registry/entry/RegistryEntry;"
             )
     )
     @SuppressWarnings("unused")

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

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

settings.gradle

@@ -20,4 +20,4 @@ rootProject.name = "biolith"
 include("common")
 include("fabric")
 //include("forge")
-//include("neoforge")
+include("neoforge")