Update to 24w40a.

- Update to 24w40a
- Exclude Forge and NeoForge until they're available

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

@@ -40,12 +40,12 @@ public static void setRegistryManager(CombinedDynamicRegistries<ServerDynamicReg
         return registryManager;
     }
 
-    public static Optional<RegistryWrapper.Impl<Biome>> getBiomeLookup() {
+    public static Optional<Registry<Biome>> getBiomeLookup() {
         if (registryManager == null) {
             return Optional.empty();
         }
 
-        return registryManager.getOptionalWrapper(RegistryKeys.BIOME);
+        return registryManager.getOptional(RegistryKeys.BIOME);
     }
 
     public static RegistryEntryLookup<Biome> getBiomeLookupOrThrow() {

common/src/main/java/com/terraformersmc/biolith/impl/mixin/MixinDataPackContents.java

@@ -3,7 +3,10 @@
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.terraformersmc.biolith.impl.data.BiomePlacementLoader;
 import com.terraformersmc.biolith.impl.data.SurfaceGenerationLoader;
-import net.minecraft.registry.DynamicRegistryManager;
+import net.minecraft.registry.CombinedDynamicRegistries;
+import net.minecraft.registry.Registry;
+import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.registry.ServerDynamicRegistryType;
 import net.minecraft.resource.ResourceReloader;
 import net.minecraft.resource.featuretoggle.FeatureSet;
 import net.minecraft.server.DataPackContents;
@@ -25,7 +28,7 @@ public abstract class MixinDataPackContents {
     private SurfaceGenerationLoader surfaceGenerationLoader;
 
     @Inject(method = "<init>", at = @At("TAIL"))
-    private void biolith$addDataPackContents(DynamicRegistryManager.Immutable dynamicRegistryManager, FeatureSet enabledFeatures, CommandManager.RegistrationEnvironment environment, int functionPermissionLevel, CallbackInfo ci) {
+    private void biolith$addDataPackContents(CombinedDynamicRegistries<ServerDynamicRegistryType> dynamicRegistries, RegistryWrapper.WrapperLookup registries, FeatureSet enabledFeatures, CommandManager.RegistrationEnvironment environment, List<Registry.PendingTagLoad<?>> pendingTagLoads, int functionPermissionLevel, CallbackInfo ci) {
         biomePlacementLoader = new BiomePlacementLoader();
         surfaceGenerationLoader = new SurfaceGenerationLoader();
     }

common/src/main/java/com/terraformersmc/biolith/impl/mixin/MixinTheEndBiomeSource.java

@@ -62,7 +62,7 @@ public abstract class MixinTheEndBiomeSource extends BiomeSource {
                     DynamicRegistryManager.Immutable registryManager = BiomeCoordinator.getRegistryManager();
                     Objects.requireNonNull(registryManager);
 
-                    biolith$biomeLookup = registryManager.getWrapperOrThrow(RegistryKeys.BIOME);
+                    biolith$biomeLookup = registryManager.getOrThrow(RegistryKeys.BIOME);
                 }
 
                 // Generate vanilla parameters list.

gradle.properties

@@ -6,15 +6,16 @@ org.gradle.daemon=false
 archives_base_name=biolith
 mod_version=dev
 maven_group=com.terraformersmc
-enabled_platforms=fabric,forge,neoforge
+#enabled_platforms=fabric,forge,neoforge
+enabled_platforms=fabric
 
 # Common
-minecraft_version=1.21
-yarn_mappings=1.21+build.7
+minecraft_version=24w40a
+yarn_mappings=24w40a+build.3
 
 # Fabric
-fabric_api_version=0.100.4+1.21
-fabric_loader_version=0.15.11
+fabric_api_version=0.105.2+1.21.2
+fabric_loader_version=0.16.5
 
 # Forge
 forge_version=1.21-51.0.21
@@ -27,7 +28,7 @@ neoforge_version=21.0.53-beta
 ##
 
 # MixinExtras so we can mixin more kindly on Forge
-mixinextras_version=0.3.6
+mixinextras_version=0.4.1
 
 # TerraBlender so we can use its API to access its region data
 terrablender_version=1.21-4.0.0.1

settings.gradle

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