externalize devenv check

This commit is contained in:
FalsePattern committed 2022-08-23 21:05:30 +02:00
1 parent f1004e4e75
commit 4cf5f39fe5
3 files changed
+6 -7

No files matched your search

@@ -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;
@@ -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");
}
@@ -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);