From 56b2f4c65100aded179fefa1fa2f8ce7ab91fb96 Mon Sep 17 00:00:00 2001 From: makamys Date: Thu, 16 Feb 2023 03:04:55 +0100 Subject: [PATCH] Use common config parser in all modules --- module-all/build.gradle | 21 ++++++++++++++++--- .../unimixins/all/AllConfig.java | 8 +++++++ .../unimixins/all/AllCore.java | 17 +++------------ .../unimixins/common/AnnotatedProperties.java | 4 +++- .../unimixins/common/ConfigUtil.java | 18 ++++++++++++++++ .../unimixins/compat/CompatCore.java | 5 ++--- module-gasstation/build.gradle | 14 ++++++++++++- .../gasstation/GasStationConfig.java | 8 +++++++ .../gasstation/GasStationModule.java | 21 +++---------------- module-gtnhmixins/build.gradle | 4 ++++ .../gtnhmixins/GTNHMixinsConfig.java | 8 +++++++ .../gtnhmixins/GTNHMixinsModule.java | 21 ++++--------------- 12 files changed, 92 insertions(+), 57 deletions(-) create mode 100644 module-all/src/main/java/io/github/legacymoddingmc/unimixins/all/AllConfig.java create mode 100644 module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/ConfigUtil.java create mode 100644 module-gasstation/src/main/java/io/github/legacymoddingmc/unimixins/gasstation/GasStationConfig.java create mode 100644 module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsConfig.java diff --git a/module-all/build.gradle b/module-all/build.gradle index 543db6e..2892811 100644 --- a/module-all/build.gradle +++ b/module-all/build.gradle @@ -86,10 +86,20 @@ org.spongepowered.tools.obfuscation.MixinObfuscationProcessorTargets } } -jar { +dependencies { + shadow(project(":module-common")) { + transitive = false + } +} + +shadowJar { dependsOn tasks.createMergedMcmodInfo dependsOn tasks.createEmbeddedCorePluginsFile dependsOn tasks.createMergedAnnotationProcessorConfig + + configurations = [project.configurations.shadow] + classifier = '' + relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.all.repackage.common' moduleNames.each { def name = it @@ -137,8 +147,13 @@ jar { } } +jar { + enabled = false + dependsOn shadowJar +} + task sourcesJar(type: ShadowJar) { - dependsOn jar + dependsOn shadowJar classifier = 'sources' @@ -152,7 +167,7 @@ task sourcesJar(type: ShadowJar) { } } - from(zipTree(tasks.jar.getOutputs().getFiles().getSingleFile())) { + from(zipTree(tasks.shadowJar.getOutputs().getFiles().getSingleFile())) { include "CREDITS" include "META-INF/licenses/**" } diff --git a/module-all/src/main/java/io/github/legacymoddingmc/unimixins/all/AllConfig.java b/module-all/src/main/java/io/github/legacymoddingmc/unimixins/all/AllConfig.java new file mode 100644 index 0000000..2afdff9 --- /dev/null +++ b/module-all/src/main/java/io/github/legacymoddingmc/unimixins/all/AllConfig.java @@ -0,0 +1,8 @@ +package io.github.legacymoddingmc.unimixins.all; + +import io.github.legacymoddingmc.unimixins.common.AnnotatedProperties; + +public class AllConfig { + @AnnotatedProperties.ConfigString(def = "false", com = "Don't throw an error if an invalid combination of modules is detected. For advanced users.", cat = "_common") + public static boolean disableIntegrityChecks; +} diff --git a/module-all/src/main/java/io/github/legacymoddingmc/unimixins/all/AllCore.java b/module-all/src/main/java/io/github/legacymoddingmc/unimixins/all/AllCore.java index ca2c12d..7989d3c 100644 --- a/module-all/src/main/java/io/github/legacymoddingmc/unimixins/all/AllCore.java +++ b/module-all/src/main/java/io/github/legacymoddingmc/unimixins/all/AllCore.java @@ -1,6 +1,5 @@ package io.github.legacymoddingmc.unimixins.all; -import java.io.File; import java.net.URL; import java.util.*; import java.util.regex.Matcher; @@ -8,8 +7,8 @@ import java.util.regex.Pattern; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; +import io.github.legacymoddingmc.unimixins.common.ConfigUtil; import net.minecraft.launchwrapper.Launch; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -33,7 +32,8 @@ public class AllCore implements IFMLLoadingPlugin { private static final Pattern LETTER = Pattern.compile("[a-z]"); static { - if(isIntegrityCheckEnabled()) { + ConfigUtil.load(AllConfig.class); + if(!AllConfig.disableIntegrityChecks) { doSanityCheck(); } @@ -90,17 +90,6 @@ public class AllCore implements IFMLLoadingPlugin { return false; } - private static boolean isIntegrityCheckEnabled() { - // I'm scared to load Forge classes this early so we're doing this - File file = new File(Launch.minecraftHome, "config/unimixins.cfg"); - if(file.exists()) { - try { - return !FileUtils.readFileToString(file).contains("B:disableIntegrityChecks=true"); - } catch(Exception e){} - } - return true; - } - public AllCore() { LOGGER.info("Instantiating AllCore"); diff --git a/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/AnnotatedProperties.java b/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/AnnotatedProperties.java index abccb19..18ac83f 100644 --- a/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/AnnotatedProperties.java +++ b/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/AnnotatedProperties.java @@ -86,8 +86,10 @@ public class AnnotatedProperties { } else { prop = line; - PropertyToken token = new PropertyToken(comment, prop); + PropertyToken token = new PropertyToken(new ArrayList<>(comment), prop); tokens.put(token.key, token); + + comment.clear(); } } } catch (Exception e) { diff --git a/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/ConfigUtil.java b/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/ConfigUtil.java new file mode 100644 index 0000000..878e32f --- /dev/null +++ b/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/ConfigUtil.java @@ -0,0 +1,18 @@ +package io.github.legacymoddingmc.unimixins.common; + +import net.minecraft.launchwrapper.Launch; + +import java.io.File; + +public class ConfigUtil { + + public static void load(Class cls) { + File oldConfigFile = new File("config/unimixins.cfg"); + if(oldConfigFile.exists()) { + oldConfigFile.delete(); + } + + AnnotatedProperties.load(new File(Launch.minecraftHome, "config/unimixins.properties"), cls); + } + +} 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 99215ad..bd9f00a 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 @@ -1,11 +1,10 @@ package io.github.legacymoddingmc.unimixins.compat; -import java.io.File; import java.util.*; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; -import io.github.legacymoddingmc.unimixins.common.AnnotatedProperties; +import io.github.legacymoddingmc.unimixins.common.ConfigUtil; import net.minecraft.launchwrapper.Launch; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -19,7 +18,7 @@ public class CompatCore implements IFMLLoadingPlugin { public CompatCore() { LOGGER.info("Instantiating CompatCore"); - AnnotatedProperties.load(new File(Launch.minecraftHome, "config/unimixins.properties"), CompatConfig.class); + ConfigUtil.load(CompatConfig.class); if(CompatConfig.enableRemapper) { // We register the transformer this way to register it as early as possible. diff --git a/module-gasstation/build.gradle b/module-gasstation/build.gradle index 8fda384..55e1d4a 100644 --- a/module-gasstation/build.gradle +++ b/module-gasstation/build.gradle @@ -1,11 +1,18 @@ dependencies { compileOnly('org.spongepowered:mixin:0.8.5-gasstation_7') compileOnly project(':module-mixinbooterlegacy') + shadow(project(":module-common")) { + transitive = false + } } archivesBaseName = archivesBaseName.replace("-1.7.10", "-gasstation-1.7.10") -jar { +shadowJar { + configurations = [project.configurations.shadow] + classifier = '' + relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.gasstation.repackage.common' + manifest { attributes ( 'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker', @@ -17,6 +24,11 @@ jar { } } +jar { + enabled = false + dependsOn shadowJar +} + ext.uniVersion = version ext.extraVersion = "0.5.1" ext.mcversion = "1.7.10" diff --git a/module-gasstation/src/main/java/io/github/legacymoddingmc/unimixins/gasstation/GasStationConfig.java b/module-gasstation/src/main/java/io/github/legacymoddingmc/unimixins/gasstation/GasStationConfig.java new file mode 100644 index 0000000..e10bacb --- /dev/null +++ b/module-gasstation/src/main/java/io/github/legacymoddingmc/unimixins/gasstation/GasStationConfig.java @@ -0,0 +1,8 @@ +package io.github.legacymoddingmc.unimixins.gasstation; + +import io.github.legacymoddingmc.unimixins.common.AnnotatedProperties; + +public class GasStationConfig { + @AnnotatedProperties.ConfigString(def = "false", com = "Don't throw an error if an invalid combination of modules is detected. For advanced users.", cat = "_common") + public static boolean disableIntegrityChecks; +} diff --git a/module-gasstation/src/main/java/io/github/legacymoddingmc/unimixins/gasstation/GasStationModule.java b/module-gasstation/src/main/java/io/github/legacymoddingmc/unimixins/gasstation/GasStationModule.java index 022c88e..cd28fff 100644 --- a/module-gasstation/src/main/java/io/github/legacymoddingmc/unimixins/gasstation/GasStationModule.java +++ b/module-gasstation/src/main/java/io/github/legacymoddingmc/unimixins/gasstation/GasStationModule.java @@ -1,12 +1,9 @@ package io.github.legacymoddingmc.unimixins.gasstation; -import cpw.mods.fml.common.versioning.ComparableVersion; -import net.minecraft.launchwrapper.Launch; -import net.minecraftforge.common.config.Configuration; +import io.github.legacymoddingmc.unimixins.common.ConfigUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.io.File; import java.util.ArrayList; import java.util.List; @@ -15,24 +12,12 @@ public class GasStationModule { private static final Logger LOGGER = LogManager.getLogger("unimixin-gasstation"); public static void init() { - if(!skipIntegrityChecks()) { + ConfigUtil.load(GasStationConfig.class); + if(!GasStationConfig.disableIntegrityChecks) { checkComponentIntegrity(); } } - private static boolean skipIntegrityChecks() { - Configuration config = new Configuration(new File(Launch.minecraftHome, "config/unimixins.cfg")); - config.load(); - - boolean disableIntegrityChecks = config.getBoolean("disableIntegrityChecks", "general", false, "Don't throw an error if an invalid combination of modules is detected. For advanced users."); - - if(config.hasChanged()) { - config.save(); - } - - return disableIntegrityChecks; - } - // Logic copied from FalsePatternLib for interoperability private static void checkComponentIntegrity() { List missingComponents = new ArrayList<>(); diff --git a/module-gtnhmixins/build.gradle b/module-gtnhmixins/build.gradle index 89a14b1..591baa7 100644 --- a/module-gtnhmixins/build.gradle +++ b/module-gtnhmixins/build.gradle @@ -2,6 +2,9 @@ dependencies { compileOnly('org.spongepowered:mixin:0.8.5') compileOnly('com.github.LlamaLad7:MixinExtras:0.1.1') shadow('com.github.LlamaLad7:MixinExtras:0.1.1') + shadow(project(":module-common")) { + transitive = false + } } archivesBaseName = archivesBaseName.replace("-1.7.10", "-gtnhmixins-1.7.10") @@ -14,6 +17,7 @@ shadowJar { relocate 'com.llamalad7.mixinextras', 'com.gtnewhorizon.mixinextras' relocate 'org.objectweb.asm', 'org.spongepowered.asm.lib' + relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.gtnhmixins.repackage.common' manifest { attributes ( diff --git a/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsConfig.java b/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsConfig.java new file mode 100644 index 0000000..42cb72b --- /dev/null +++ b/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsConfig.java @@ -0,0 +1,8 @@ +package io.github.legacymoddingmc.unimixins.gtnhmixins; + +import io.github.legacymoddingmc.unimixins.common.AnnotatedProperties; + +public class GTNHMixinsConfig { + @AnnotatedProperties.ConfigString(def = "false", com = "Don't throw an error if an invalid combination of modules is detected. For advanced users.", cat = "_common") + public static boolean disableIntegrityChecks; +} diff --git a/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsModule.java b/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsModule.java index 651e958..ec44eff 100644 --- a/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsModule.java +++ b/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsModule.java @@ -1,12 +1,11 @@ package io.github.legacymoddingmc.unimixins.gtnhmixins; -import java.io.File; import java.util.ArrayList; import java.util.List; import cpw.mods.fml.common.versioning.ComparableVersion; +import io.github.legacymoddingmc.unimixins.common.ConfigUtil; import net.minecraft.launchwrapper.Launch; -import net.minecraftforge.common.config.Configuration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -15,7 +14,8 @@ public class GTNHMixinsModule { private static final Logger LOGGER = LogManager.getLogger("unimixin-gtnhmixins"); public static void init() { - if(!skipIntegrityChecks()) { + ConfigUtil.load(GTNHMixinsConfig.class); + if(!GTNHMixinsConfig.disableIntegrityChecks) { checkComponentIntegrity(); } registerASMRemapPackage("com.gtnewhorizon.mixinextras"); @@ -27,7 +27,7 @@ public class GTNHMixinsModule { if(mixinVersion != null && new ComparableVersion(mixinVersion).compareTo(new ComparableVersion(requiredVersion)) >= 0) { LOGGER.debug("Intializing MixinExtras"); return true; - } else if(skipIntegrityChecks()){ + } else if(GTNHMixinsConfig.disableIntegrityChecks){ LOGGER.warn("Skipping MixinExtras because Mixin version (" + mixinVersion + ") is lower than the required (" + requiredVersion + ")"); return false; } else { @@ -43,19 +43,6 @@ public class GTNHMixinsModule { } } - private static boolean skipIntegrityChecks() { - Configuration config = new Configuration(new File(Launch.minecraftHome, "config/unimixins.cfg")); - config.load(); - - boolean disableIntegrityChecks = config.getBoolean("disableIntegrityChecks", "general", false, "Don't throw an error if an invalid combination of modules is detected. For advanced users."); - - if(config.hasChanged()) { - config.save(); - } - - return disableIntegrityChecks; - } - private static void checkComponentIntegrity() { List missingComponents = new ArrayList<>();