Enable Forge module, replace unsafe platform service implementation

Using (Neo)Forge's ModList too early can lead to a crash,
so switch to the LoadingModList instead as that is already available.

Signed-off-by: Lilly Rose Berner <lilly@lostluma.net>

Author: LostLuma

gradle.properties

@@ -18,4 +18,4 @@ minecraft_version = 1.21.5
 minecraft_version_min = 1.21.5
 minecraft_version_max = 1.21.5
 
-enabled_platforms=fabric,neoforge,quilt
+enabled_platforms=fabric,forge,neoforge,quilt

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ minecraft = "1.21.5"
 fabric_loader = "0.15.10"
 fabric_api = "0.118.2+1.21.5"
 
-forge = "1.21.3-53.0.7"
+forge = "1.21.5-55.0.3"
 
 neoforge = "21.5.2-beta"
 

platforms/forge/src/main/java/net/lostluma/dynamic_fps/impl/forge/service/ForgeModCompat.java

@@ -1,6 +1,7 @@
 package net.lostluma.dynamic_fps.impl.forge.service;
 
 import dynamic_fps.impl.service.ModCompat;
+import dynamic_fps.impl.service.Platform;
 import net.minecraftforge.fml.ModList;
 
 public class ForgeModCompat implements ModCompat {
@@ -11,6 +12,6 @@ public boolean isDisabled() {
 
 	@Override
 	public boolean disableOverlayOptimization() {
-		return ModList.get().isLoaded("rrls");
+		return Platform.getInstance().isModLoaded("rrls");
 	}
 }

platforms/forge/src/main/java/net/lostluma/dynamic_fps/impl/forge/service/ForgePlatform.java

@@ -8,6 +8,7 @@
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.FMLPaths;
+import net.minecraftforge.fml.loading.LoadingModList;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -38,7 +39,7 @@ public boolean isDevelopmentEnvironment() {
 
 	@Override
 	public boolean isModLoaded(String modId) {
-		return ModList.get().isLoaded(modId);
+		return LoadingModList.get().getModFileById(modId) != null;
 	}
 
 	@Override

platforms/neoforge/src/main/java/net/lostluma/dynamic_fps/impl/neoforge/service/NeoForgeModCompat.java

@@ -2,6 +2,7 @@
 
 import com.electronwill.nightconfig.core.CommentedConfig;
 import dynamic_fps.impl.service.ModCompat;
+import dynamic_fps.impl.service.Platform;
 import net.neoforged.fml.ModList;
 import net.neoforged.neoforgespi.language.IModInfo;
 
@@ -19,7 +20,7 @@ public boolean isDisabled() {
 
 	@Override
 	public boolean disableOverlayOptimization() {
-		return disableOverlayOptimization || ModList.get().isLoaded("rrls");
+		return disableOverlayOptimization || Platform.getInstance().isModLoaded("rrls");
 	}
 
 	private static void parseModMetadata(IModInfo modInfo) {

platforms/neoforge/src/main/java/net/lostluma/dynamic_fps/impl/neoforge/service/NeoForgePlatform.java

@@ -7,6 +7,7 @@
 import net.neoforged.fml.ModList;
 import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.fml.loading.FMLPaths;
+import net.neoforged.fml.loading.LoadingModList;
 import net.neoforged.neoforge.client.event.ClientTickEvent;
 import net.neoforged.neoforge.common.NeoForge;
 
@@ -39,7 +40,7 @@ public boolean isDevelopmentEnvironment() {
 
 	@Override
 	public boolean isModLoaded(String modId) {
-		return ModList.get().isLoaded(modId);
+		return LoadingModList.get().getModFileById(modId) != null;
 	}
 
 	@Override

settings.gradle.kts

@@ -17,7 +17,7 @@ includeBuild("build-logic")
 
 include(":platforms:common")
 include(":platforms:fabric")
-// include(":platforms:forge")
+include(":platforms:forge")
 include(":platforms:neoforge")
 include(":platforms:quilt")
 include(":platforms:textile")