R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidy up version detection (#352)

Browse Source
This commit is contained in:
Fury_Phoenix 2024-01-25 12:19:37 -08:00 committed by GitHub
parent 94ca6ccdd6
commit c749fc1aeb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java
View File

@ -38,13 +38,11 @@ public class ModernFixPlatformHooksImpl implements ModernFixPlatformHooks {
return FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER; return FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER;
} }
private static String verString; private static final String verString = FabricLoader.getInstance().getModContainer("modernfix")
.map(mfModContainer -> mfModContainer.getMetadata().getVersion().getFriendlyString())
.orElse("[unknown]");
public String getVersionString() { public String getVersionString() {
if(verString == null) {
ModContainer mfModContainer = FabricLoader.getInstance().getModContainer("modernfix").get();
verString = mfModContainer.getMetadata().getVersion().getFriendlyString();
}
return verString; return verString;
} }

13
forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java
View File

@ -54,7 +54,6 @@ import java.net.URLClassLoader;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
@ -68,17 +67,11 @@ public class ModernFixPlatformHooksImpl implements ModernFixPlatformHooks {
return FMLLoader.getDist().isDedicatedServer(); return FMLLoader.getDist().isDedicatedServer();
} }
private static String verString; private static final String verString = Optional.ofNullable(
ModernFixMixinPlugin.class.getPackage().getImplementationVersion())
.orElse("[unknown]");
public String getVersionString() { public String getVersionString() {
if(verString == null) {
try {
verString = ModernFixMixinPlugin.class.getPackage().getImplementationVersion();
Objects.requireNonNull(verString);
} catch(Throwable e) {
verString = "[unknown]";
}
}
return verString; return verString;
} }