Skip to content

Commit f898449

Browse files
committed
NeoForge 21.0.0-beta
1 parent 69af93c commit f898449

File tree

7 files changed

+25
-8
lines changed

7 files changed

+25
-8
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ minecraft_version_min = 1.21.0
99
maven_group = juliand665
1010
archives_base_name = dynamic-fps
1111

12-
enabled_platforms=fabric
12+
enabled_platforms=fabric,neoforge
1313
# enabled_platforms=fabric,forge,neoforge,quilt

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fabric_api = "0.100.1+1.21"
88

99
forge = "1.20.4-49.0.30"
1010

11-
neoforge = "20.5.20-beta"
11+
neoforge = "21.0.0-beta"
1212

1313
quilt_loader = "0.25.0"
1414
quilt_standard_libraries = "8.0.0-alpha.12+1.20.4"
@@ -49,4 +49,4 @@ mixinextras_forge = { module = "io.github.llamalad7:mixinextras-forge", version.
4949
shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
5050

5151
architectury = { id = "architectury-plugin", version = "3.4.155" }
52-
architectury_loom = { id = "dev.architectury.loom", version = "1.6.394" }
52+
architectury_loom = { id = "dev.architectury.loom", version = "1.6.397" }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public static void onConfigChanged() {
104104
}
105105

106106
public static Screen getConfigScreen(Screen parent) {
107-
if (!Platform.getInstance().isModLoaded("cloth-config")) {
107+
if (!Platform.getInstance().isModLoaded("cloth-config", "cloth_config")) {
108108
return new FallbackConfigScreen(parent);
109109
} else {
110110
return ClothConfig.genConfigScreen(parent);

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import dynamic_fps.impl.util.Version;
44

55
import java.nio.file.Path;
6+
import java.util.Arrays;
67
import java.util.Optional;
78

89
public interface Platform {
@@ -17,6 +18,10 @@ public interface Platform {
1718

1819
void registerStartTickEvent(StartTickEvent event);
1920

21+
default boolean isModLoaded(String ...modId) {
22+
return Arrays.stream(modId).anyMatch(this::isModLoaded);
23+
}
24+
2025
@FunctionalInterface
2126
interface StartTickEvent {
2227
void onStartTick();

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import dynamic_fps.impl.Constants;
44
import dynamic_fps.impl.service.Platform;
5+
import dynamic_fps.impl.util.Version;
56
import net.neoforged.fml.ModContainer;
67
import net.neoforged.fml.ModList;
78
import net.neoforged.fml.loading.FMLLoader;
@@ -42,9 +43,20 @@ public boolean isModLoaded(String modId) {
4243
}
4344

4445
@Override
45-
public Optional<String> getModVersion(String modId) {
46+
public Optional<Version> getModVersion(String modId) {
4647
Optional<? extends ModContainer> optional = ModList.get().getModContainerById(modId);
47-
return optional.map(modContainer -> modContainer.getModInfo().getVersion().toString());
48+
49+
if (optional.isEmpty()) {
50+
return Optional.empty();
51+
}
52+
53+
String raw = optional.get().getModInfo().getVersion().toString();
54+
55+
try {
56+
return Optional.of(Version.of(raw));
57+
} catch (Version.VersionParseException e) {
58+
throw new RuntimeException(e);
59+
}
4860
}
4961

5062
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ file="META-INF/accesstransformer.cfg"
7676
[[dependencies.dynamic_fps]]
7777
modId = "minecraft"
7878
mandatory = true
79-
versionRange = "[1.20.5,)"
79+
versionRange = "[1.21.0,)"
8080
ordering = "NONE"
8181
side = "CLIENT"
8282

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ rootProject.name = "dynamic-fps"
1717
include(":platforms:common")
1818
include(":platforms:fabric")
1919
// include(":platforms:forge")
20-
// include(":platforms:neoforge")
20+
include(":platforms:neoforge")
2121
// include(":platforms:quilt")

0 commit comments

Comments
 (0)