From 4cf5f39fe514c0c165e4eef9f5fcaec103362973 Mon Sep 17 00:00:00 2001
From: FalsePattern <30945458+FalsePattern@users.noreply.github.com>
Date: Tue, 23 Aug 2022 21:05:30 +0200
Subject: [PATCH] externalize devenv check

---
 .../java/com/falsepattern/lib/internal/FalsePatternLib.java  | 5 -----
 src/main/java/com/falsepattern/lib/internal/Share.java       | 4 ++++
 .../lib/internal/impl/dependencies/DependencyLoaderImpl.java | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java b/src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java
index b11e78a..a7a426d 100644
--- a/src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java
+++ b/src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java
@@ -21,9 +21,7 @@
 package com.falsepattern.lib.internal;
 
 import com.falsepattern.lib.internal.proxy.CommonProxy;
-import lombok.Getter;
 
-import net.minecraft.launchwrapper.Launch;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLConstructionEvent;
@@ -46,9 +44,6 @@ public class FalsePatternLib {
     public static final String UPDATE_URL = "https://falsepattern.com/mc/versions.json";
     public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(Tags.MODID);
 
-    @Getter
-    private static final boolean developerEnvironment = (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
-
     @SidedProxy(clientSide = Tags.GROUPNAME + ".internal.proxy.ClientProxy",
                 serverSide = Tags.GROUPNAME + ".internal.proxy.CommonProxy")
     private static CommonProxy proxy;
diff --git a/src/main/java/com/falsepattern/lib/internal/Share.java b/src/main/java/com/falsepattern/lib/internal/Share.java
index 3a2d201..6532ada 100644
--- a/src/main/java/com/falsepattern/lib/internal/Share.java
+++ b/src/main/java/com/falsepattern/lib/internal/Share.java
@@ -26,7 +26,11 @@ import lombok.NoArgsConstructor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import net.minecraft.launchwrapper.Launch;
+
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class Share {
     public static final Logger LOG = LogManager.getLogger(Tags.MODNAME);
+
+    public static final boolean DEV_ENV = (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
 }
diff --git a/src/main/java/com/falsepattern/lib/internal/impl/dependencies/DependencyLoaderImpl.java b/src/main/java/com/falsepattern/lib/internal/impl/dependencies/DependencyLoaderImpl.java
index 053c1b3..6bd5d0a 100644
--- a/src/main/java/com/falsepattern/lib/internal/impl/dependencies/DependencyLoaderImpl.java
+++ b/src/main/java/com/falsepattern/lib/internal/impl/dependencies/DependencyLoaderImpl.java
@@ -23,8 +23,8 @@ package com.falsepattern.lib.internal.impl.dependencies;
 import com.falsepattern.lib.dependencies.DependencyLoader;
 import com.falsepattern.lib.dependencies.Library;
 import com.falsepattern.lib.dependencies.Version;
-import com.falsepattern.lib.internal.FalsePatternLib;
 import com.falsepattern.lib.internal.Internet;
+import com.falsepattern.lib.internal.Share;
 import com.falsepattern.lib.internal.Tags;
 import com.falsepattern.lib.internal.config.LibraryConfig;
 import com.falsepattern.lib.util.FileUtil;
@@ -215,7 +215,7 @@ public class DependencyLoaderImpl {
         }
 
         private void setupLibraryNames() {
-            suffix = FalsePatternLib.isDeveloperEnvironment() ? devSuffix : regularSuffix;
+            suffix = Share.DEV_ENV ? devSuffix : regularSuffix;
             artifactLogName = String.format("%s:%s:%s%s", groupId, artifactId, preferredVersion,
                                             suffix != null ? "-" + suffix : "");
             log.info("Adding library {}, requested by mod {}", artifactLogName, loadingModId);