Enable Forge and NeoForge modules, update Minecraft requirements

juliand665 · Oct 30, 2024 · a3388f7 · a3388f7
1 parent e19ce57
commit a3388f7
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,4 @@ minecraft_version = 1.21.2
 minecraft_version_min = 1.21.2
 minecraft_version_max = 1.21.2
 
-enabled_platforms=fabric,quilt
+enabled_platforms=fabric,forge,neoforge,quilt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
-minecraft = "1.21.2-rc1"
+minecraft = "1.21.3"
 
 # Platform libraries
 
 fabric_loader = "0.15.10"
 fabric_api = "0.102.2+1.21.2"
 
-forge = "1.21-51.0.33"
+forge = "1.21.3-53.0.7"
 
-neoforge = "21.0.143"
+neoforge = "21.3.0-beta"
 
 quilt_loader = "0.25.0"
 

diff --git a/platforms/fabric/src/main/resources/fabric.mod.json b/platforms/fabric/src/main/resources/fabric.mod.json
@@ -70,7 +70,7 @@
     },
     "depends": {
         "fabricloader": ">=0.15.10",
-        "minecraft": ">=1.21.2-alpha.24.33.a",
+        "minecraft": ">=1.21.2",
         "mixinextras": ">=0.3.2",
         "fabric-resource-loader-v0": "*",
         "fabric-lifecycle-events-v1": "*"

diff --git a/platforms/forge/src/main/java/net/lostluma/dynamic_fps/impl/forge/DynamicFPSForgeMod.java b/platforms/forge/src/main/java/net/lostluma/dynamic_fps/impl/forge/DynamicFPSForgeMod.java
@@ -20,14 +20,14 @@
 public class DynamicFPSForgeMod {
 	private static final List<Platform.StartTickEvent> TICK_EVENT_LISTENERS = new ArrayList<>();
 
-    public DynamicFPSForgeMod() {
+    public DynamicFPSForgeMod(FMLJavaModLoadingContext context) {
 		if (FMLLoader.getDist().isDedicatedServer()) {
 			return;
 		}
 
 		DynamicFPSMod.init();
 
-		ModLoadingContext.get().registerExtensionPoint(
+		context.registerExtensionPoint(
 			ConfigScreenHandler.ConfigScreenFactory.class,
 			() -> new ConfigScreenHandler.ConfigScreenFactory(
 				(minecraft, screen) -> DynamicFPSMod.getConfigScreen(screen)
@@ -37,7 +37,7 @@ public DynamicFPSForgeMod() {
 		MinecraftForge.EVENT_BUS.addListener(this::onClientTick);
 		// MinecraftForge.EVENT_BUS.addListener(this::renderGuiOverlay);
 
-		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::registerKeyMappings);
+		context.getModEventBus().addListener(this::registerKeyMappings);
     }
 
 	/*

diff --git a/platforms/forge/src/main/resources/META-INF/mods.toml b/platforms/forge/src/main/resources/META-INF/mods.toml
@@ -85,6 +85,6 @@ file="META-INF/accesstransformer.cfg"
 [[dependencies.dynamic_fps]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.21.0,)"
+versionRange = "[1.21.2,)"
 ordering = "NONE"
 side = "CLIENT"
diff --git a/platforms/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/platforms/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -85,6 +85,6 @@ file="META-INF/accesstransformer.cfg"
 [[dependencies.dynamic_fps]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.21.0,)"
+versionRange = "[1.21.2,)"
 ordering = "NONE"
 side = "CLIENT"
diff --git a/platforms/quilt/src/main/resources/quilt.mod.json b/platforms/quilt/src/main/resources/quilt.mod.json
@@ -81,7 +81,7 @@
             },
             {
                 "id": "minecraft",
-                "versions": ">=1.21.2-alpha.24.33.a"
+                "versions": ">=1.21.2"
             },
             {
                 "id": "mixinextras",

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -17,7 +17,7 @@ includeBuild("build-logic")
 
 include(":platforms:common")
 include(":platforms:fabric")
-// include(":platforms:forge")
-// include(":platforms:neoforge")
+include(":platforms:forge")
+include(":platforms:neoforge")
 include(":platforms:quilt")
 include(":platforms:textile")