Use Optionals

Phoenix-Starlight · Jan 11, 2024 · 8c7b7c4 · 8c7b7c4
1 parent c678ebb
commit 8c7b7c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java b/fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java
@@ -38,13 +38,11 @@ public boolean isDedicatedServer() {
         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() {
-        if(verString == null) {
-            ModContainer mfModContainer = FabricLoader.getInstance().getModContainer("modernfix").get();
-            verString = mfModContainer.getMetadata().getVersion().getFriendlyString();
-        }
         return verString;
     }
 

diff --git a/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java b/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java
@@ -68,17 +68,11 @@ public boolean 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() {
-        if(verString == null) {
-            try {
-                verString = ModernFixMixinPlugin.class.getPackage().getImplementationVersion();
-                Objects.requireNonNull(verString);
-            } catch(Throwable e) {
-                verString = "[unknown]";
-            }
-        }
         return verString;
     }