NeoForge 21.0.0-beta

Author: LostLuma

gradle.properties

@@ -9,5 +9,5 @@ minecraft_version_min = 1.21.0
 maven_group = juliand665
 archives_base_name = dynamic-fps
 
-enabled_platforms=fabric
+enabled_platforms=fabric,neoforge
 # enabled_platforms=fabric,forge,neoforge,quilt

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ fabric_api = "0.100.1+1.21"
 
 forge = "1.20.4-49.0.30"
 
-neoforge = "20.5.20-beta"
+neoforge = "21.0.0-beta"
 
 quilt_loader = "0.25.0"
 quilt_standard_libraries = "8.0.0-alpha.12+1.20.4"
@@ -49,4 +49,4 @@ mixinextras_forge = { module = "io.github.llamalad7:mixinextras-forge", version.
 shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
 
 architectury = { id = "architectury-plugin", version = "3.4.155" }
-architectury_loom = { id = "dev.architectury.loom", version = "1.6.394" }
+architectury_loom = { id = "dev.architectury.loom", version = "1.6.397" }

platforms/common/src/main/java/dynamic_fps/impl/DynamicFPSMod.java

@@ -104,7 +104,7 @@ public static void onConfigChanged() {
 	}
 
 	public static Screen getConfigScreen(Screen parent) {
-		if (!Platform.getInstance().isModLoaded("cloth-config")) {
+		if (!Platform.getInstance().isModLoaded("cloth-config", "cloth_config")) {
 			return new FallbackConfigScreen(parent);
 		} else {
 			return ClothConfig.genConfigScreen(parent);

platforms/common/src/main/java/dynamic_fps/impl/service/Platform.java

@@ -3,6 +3,7 @@
 import dynamic_fps.impl.util.Version;
 
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.Optional;
 
 public interface Platform {
@@ -17,6 +18,10 @@ public interface Platform {
 
 	void registerStartTickEvent(StartTickEvent event);
 
+	default boolean isModLoaded(String ...modId) {
+		return Arrays.stream(modId).anyMatch(this::isModLoaded);
+	}
+
 	@FunctionalInterface
 	interface StartTickEvent {
 		void onStartTick();

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

@@ -2,6 +2,7 @@
 
 import dynamic_fps.impl.Constants;
 import dynamic_fps.impl.service.Platform;
+import dynamic_fps.impl.util.Version;
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.ModList;
 import net.neoforged.fml.loading.FMLLoader;
@@ -42,9 +43,20 @@ public boolean isModLoaded(String modId) {
 	}
 
 	@Override
-	public Optional<String> getModVersion(String modId) {
+	public Optional<Version> getModVersion(String modId) {
 		Optional<? extends ModContainer> optional = ModList.get().getModContainerById(modId);
-		return optional.map(modContainer -> modContainer.getModInfo().getVersion().toString());
+
+		if (optional.isEmpty()) {
+			return Optional.empty();
+		}
+
+		String raw = optional.get().getModInfo().getVersion().toString();
+
+		try {
+			return Optional.of(Version.of(raw));
+		} catch (Version.VersionParseException e) {
+			throw new RuntimeException(e);
+		}
 	}
 
 	@Override

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

@@ -76,7 +76,7 @@ file="META-INF/accesstransformer.cfg"
 [[dependencies.dynamic_fps]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20.5,)"
+versionRange = "[1.21.0,)"
 ordering = "NONE"
 side = "CLIENT"
 

settings.gradle

@@ -17,5 +17,5 @@ rootProject.name = "dynamic-fps"
 include(":platforms:common")
 include(":platforms:fabric")
 // include(":platforms:forge")
-// include(":platforms:neoforge")
+include(":platforms:neoforge")
 // include(":platforms:quilt")