From ee81c389fab260bd36f6a04cdf7f8452d09fc06f Mon Sep 17 00:00:00 2001 From: makamys Date: Sat, 21 Oct 2023 05:58:15 +0200 Subject: [PATCH] Oops, FML's deobf property isn't set yet. Just use a jvm arg then. --- .../common/config/AnnotatedProperties.java | 16 +--------------- .../unimixins/compat/CompatConfig.java | 2 -- .../unimixins/compat/CompatCore.java | 2 +- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/config/AnnotatedProperties.java b/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/config/AnnotatedProperties.java index 8fa3dfa..5989aa1 100644 --- a/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/config/AnnotatedProperties.java +++ b/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/config/AnnotatedProperties.java @@ -1,7 +1,5 @@ package io.github.legacymoddingmc.unimixins.common.config; -import net.minecraft.launchwrapper.Launch; - import java.io.*; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -11,8 +9,6 @@ import java.lang.reflect.Field; import java.util.*; public class AnnotatedProperties { - public static final boolean DEV_ENVIRONMENT = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - public static void load(File file, Class cls) { PropertyCollection properties = PropertyCollection.fromFile(file); @@ -23,9 +19,6 @@ public class AnnotatedProperties { List comment = new ArrayList<>(Arrays.asList(ann.com().split("\n"))); String def = ann.def(); String cat = ann.cat(); - boolean devOnly = ann.devOnly(); - - if(devOnly && !DEV_ENVIRONMENT) continue; comment.removeIf(s -> s.startsWith("[default:")); comment.add("[default: " + def + "]"); @@ -40,12 +33,7 @@ public class AnnotatedProperties { prop.setComment(comment); } - String configFileValue = prop.getValue(); - String jvmFlagValue = System.getProperty("unimixins.config." + key); - - String value = jvmFlagValue != null ? jvmFlagValue : configFileValue; - - setFieldValue(f, value); + setFieldValue(f, prop.getValue()); properties.put(key, prop); } @@ -75,8 +63,6 @@ public class AnnotatedProperties { String com() default ""; /** Category (the property name gets prefixed with this) */ String cat(); - /** If true, the config will only appear in dev environments */ - boolean devOnly() default false; } } diff --git a/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatConfig.java b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatConfig.java index 339485a..109c11a 100644 --- a/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatConfig.java +++ b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatConfig.java @@ -9,6 +9,4 @@ public class CompatConfig { public static boolean enhanceCrashReports; @AnnotatedProperties.ConfigString(def = "true", com = "Provide the deprecated `com.gtnewhorizons.mixinextras` relocation of MixinExtras 0.1.1. May be required by some older mods.", cat = "compat") public static boolean enableLegacyGTNHMixinExtrasPackage; - @AnnotatedProperties.ConfigString(def = "false", com = "Fix Forge mods not being discovered if they are inside classpath mods using the Mixin tweaker. Only needed in dev environments, and not needed if using UniMix or GTNH's Mixin fork.", cat = "compat.dev", devOnly = true) - public static boolean fixClasspathModDiscovery; } diff --git a/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java index c12a4d5..c3f4eef 100644 --- a/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java +++ b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java @@ -46,7 +46,7 @@ public class CompatCore implements IFMLLoadingPlugin { if(IgnoreDuplicateJarsTransformer.wantsToRun()) { classes.add("io.github.legacymoddingmc.unimixins.compat.asm.IgnoreDuplicateJarsTransformer"); } - if(CompatConfig.fixClasspathModDiscovery) { + if(Boolean.parseBoolean(System.getProperty("unimixins.compat.fixClasspathModDiscovery", "false"))) { classes.add("io.github.legacymoddingmc.unimixins.compat.asm.FixClasspathModDiscoveryTransformer"); } return classes.toArray(new String[0]);