Skip to content

Commit 4cf5f39

Browse files
committed
externalize devenv check
1 parent f1004e4 commit 4cf5f39

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
package com.falsepattern.lib.internal;
2222

2323
import com.falsepattern.lib.internal.proxy.CommonProxy;
24-
import lombok.Getter;
2524

26-
import net.minecraft.launchwrapper.Launch;
2725
import cpw.mods.fml.common.Mod;
2826
import cpw.mods.fml.common.SidedProxy;
2927
import cpw.mods.fml.common.event.FMLConstructionEvent;
@@ -46,9 +44,6 @@ public class FalsePatternLib {
4644
public static final String UPDATE_URL = "https://falsepattern.com/mc/versions.json";
4745
public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(Tags.MODID);
4846

49-
@Getter
50-
private static final boolean developerEnvironment = (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
51-
5247
@SidedProxy(clientSide = Tags.GROUPNAME + ".internal.proxy.ClientProxy",
5348
serverSide = Tags.GROUPNAME + ".internal.proxy.CommonProxy")
5449
private static CommonProxy proxy;

src/main/java/com/falsepattern/lib/internal/Share.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@
2626
import org.apache.logging.log4j.LogManager;
2727
import org.apache.logging.log4j.Logger;
2828

29+
import net.minecraft.launchwrapper.Launch;
30+
2931
@NoArgsConstructor(access = AccessLevel.PRIVATE)
3032
public final class Share {
3133
public static final Logger LOG = LogManager.getLogger(Tags.MODNAME);
34+
35+
public static final boolean DEV_ENV = (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
3236
}

src/main/java/com/falsepattern/lib/internal/impl/dependencies/DependencyLoaderImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import com.falsepattern.lib.dependencies.DependencyLoader;
2424
import com.falsepattern.lib.dependencies.Library;
2525
import com.falsepattern.lib.dependencies.Version;
26-
import com.falsepattern.lib.internal.FalsePatternLib;
2726
import com.falsepattern.lib.internal.Internet;
27+
import com.falsepattern.lib.internal.Share;
2828
import com.falsepattern.lib.internal.Tags;
2929
import com.falsepattern.lib.internal.config.LibraryConfig;
3030
import com.falsepattern.lib.util.FileUtil;
@@ -215,7 +215,7 @@ private void crashCouldNotDownload() {
215215
}
216216

217217
private void setupLibraryNames() {
218-
suffix = FalsePatternLib.isDeveloperEnvironment() ? devSuffix : regularSuffix;
218+
suffix = Share.DEV_ENV ? devSuffix : regularSuffix;
219219
artifactLogName = String.format("%s:%s:%s%s", groupId, artifactId, preferredVersion,
220220
suffix != null ? "-" + suffix : "");
221221
log.info("Adding library {}, requested by mod {}", artifactLogName, loadingModId);

0 commit comments

Comments
 (0)