Enable MinecraftForge build.

* Bump dependencies
- Enable MinecraftForge build
* Follow some of the forges' API changes

Author: gniftygnome

build.gradle

@@ -16,6 +16,7 @@ subprojects {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
         mappings loom.layered {
             it.mappings("net.fabricmc:yarn:${rootProject.yarn_mappings}:v2")
+            it.mappings("dev.architectury:yarn-mappings-patch-forge:1.21.9+build.6")
             it.mappings("dev.architectury:yarn-mappings-patch-neoforge:1.21+build.4")
         }
     }

forge/src/main/java/com/terraformersmc/biolith/impl/BiolithInit.java

@@ -3,7 +3,6 @@
 import com.terraformersmc.biolith.impl.biome.BiomeCoordinator;
 import com.terraformersmc.biolith.impl.data.BiomePlacementLoader;
 import com.terraformersmc.biolith.impl.data.SurfaceGenerationLoader;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.AddReloadListenerEvent;
 import net.minecraftforge.event.server.ServerAboutToStartEvent;
 import net.minecraftforge.event.server.ServerStoppedEvent;
@@ -15,12 +14,12 @@ public BiolithInit() {
         Biolith.LOGGER.info("Biolith for Forge is initializing...");
 
         // Watch for server events so we can maintain our status data.
-        MinecraftForge.EVENT_BUS.addListener((ServerAboutToStartEvent event) -> BiomeCoordinator.handleServerStarting(event.getServer()));
-        MinecraftForge.EVENT_BUS.addListener((ServerStoppedEvent event) -> BiomeCoordinator.handleServerStopped(event.getServer()));
+        ServerAboutToStartEvent.BUS.addListener(event -> BiomeCoordinator.handleServerStarting(event.getServer()));
+        ServerStoppedEvent.BUS.addListener(event -> BiomeCoordinator.handleServerStopped(event.getServer()));
 
         // Implement our resource reloaders The Forge Way (tm).
-        MinecraftForge.EVENT_BUS.addListener((AddReloadListenerEvent event) -> event.addListener(new BiomePlacementLoader()));
-        MinecraftForge.EVENT_BUS.addListener((AddReloadListenerEvent event) -> event.addListener(new SurfaceGenerationLoader()));
+        AddReloadListenerEvent.BUS.addListener(event -> event.addListener(new BiomePlacementLoader()));
+        AddReloadListenerEvent.BUS.addListener(event -> event.addListener(new SurfaceGenerationLoader()));
 
         // Call loader-agnostic init.
         Biolith.init();

forge/src/main/java/com/terraformersmc/biolith/impl/platform/ForgePlatformHelper.java

@@ -8,7 +8,6 @@
 import net.minecraft.command.CommandRegistryAccess;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.loading.FMLLoader;
@@ -47,6 +46,6 @@ public TerraBlenderCompat getTerraBlenderCompat() {
 
     @Override
     public void registerCommandRegistrationCallback(TriFunction<CommandDispatcher<ServerCommandSource>, CommandRegistryAccess, CommandManager.RegistrationEnvironment, LiteralCommandNode<ServerCommandSource>> callback) {
-        MinecraftForge.EVENT_BUS.addListener((RegisterCommandsEvent event) -> callback.apply(event.getDispatcher(), event.getBuildContext(), event.getCommandSelection()));
+        RegisterCommandsEvent.BUS.addListener(event -> callback.apply(event.getDispatcher(), event.getBuildContext(), event.getCommandSelection()));
     }
 }

gradle.properties

@@ -7,22 +7,21 @@ archives_base_name=biolith
 mod_version=dev
 maven_group=com.terraformersmc
 loom.ignoreDependencyLoomVersionValidation=true
-#enabled_platforms=fabric,forge,neoforge
-enabled_platforms=fabric,neoforge
+enabled_platforms=fabric,forge,neoforge
 
 # Common
 minecraft_version=1.21.9
 yarn_mappings=1.21.9+build.1
 
 # Fabric
-fabric_api_version=0.133.14+1.21.9
+fabric_api_version=0.134.0+1.21.9
 fabric_loader_version=0.17.2
 
 # Forge
-forge_version=1.21.5-55.0.23
+forge_version=1.21.9-59.0.0
 
 # NeoForge
-neoforge_version=21.9.2-beta
+neoforge_version=21.9.7-beta
 
 ##
 ## Dependencies
@@ -35,7 +34,7 @@ mixinextras_version=0.5.0
 moderner_beta_version=3.2.0+1.21.9
 
 # TerraBlender so we can use its API to access its region data
-terrablender_version=1.21.8-6.0.0.3
+terrablender_version=1.21.9-6.0.0.4
 
 # Terraform API for simplex noise implementation
 terraform_surfaces_api_version=15.0.0
@@ -62,7 +61,7 @@ curseforge_game_versions=1.21.9
 # Modrinth Metadata
 modrinth_slug=biolith
 modrinth_id=iGEl6Crx
-modrinth_game_versions=1.21.9
+modrinth_game_versions=1.21.9, 1.21.10-rc1
 modrinth_mod_loaders=
 
 # Discord Emotes

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

@@ -1,7 +1,7 @@
 package com.terraformersmc.biolith.impl.mixin;
 
 import com.google.common.collect.ImmutableMap;
-import net.neoforged.fml.loading.LoadingModList;
+import net.neoforged.fml.loading.FMLLoader;
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
@@ -15,8 +15,8 @@ public class BiolithNeoForgeMixinConfigPlugin implements IMixinConfigPlugin {
     private static final Supplier<Boolean> TRUE = () -> true;
 
     private static final Map<String, Supplier<Boolean>> CONDITIONS = ImmutableMap.of(
-            "com.terraformersmc.biolith.impl.mixin.MixinMBBiomeSource", () -> LoadingModList.get().getModFileById("moderner_beta") != null,
-            "com.terraformersmc.biolith.impl.mixin.MixinTBTheEndBiomeSource", () -> LoadingModList.get().getModFileById("terrablender") != null
+            "com.terraformersmc.biolith.impl.mixin.MixinMBBiomeSource", () -> FMLLoader.getCurrent().getLoadingModList().getModFileById("moderner_beta") != null,
+            "com.terraformersmc.biolith.impl.mixin.MixinTBTheEndBiomeSource", () -> FMLLoader.getCurrent().getLoadingModList().getModFileById("terrablender") != null
     );
 
     @Override

settings.gradle

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