From c749fc1aeb22898a400d2f2829a86098d0a1b0cd Mon Sep 17 00:00:00 2001
From: Fury_Phoenix <64714532+Phoenix-Starlight@users.noreply.github.com>
Date: Thu, 25 Jan 2024 12:19:37 -0800
Subject: [PATCH] Tidy up version detection (#352)

---
 .../platform/fabric/ModernFixPlatformHooksImpl.java |  8 +++-----
 .../platform/forge/ModernFixPlatformHooksImpl.java  | 13 +++----------
 2 files changed, 6 insertions(+), 15 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
index c7a51e0f..fafe752a 100644
--- 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 class ModernFixPlatformHooksImpl implements ModernFixPlatformHooks {
         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
index fb896bf5..25aa714c 100644
--- a/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java
+++ b/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java
@@ -54,7 +54,6 @@ import java.net.URLClassLoader;
 import java.nio.file.Path;
 import java.util.Enumeration;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -68,17 +67,11 @@ public class ModernFixPlatformHooksImpl implements ModernFixPlatformHooks {
         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;
     }