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 ad61356..51a5535 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 @@ -4,7 +4,6 @@ import java.util.*; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; -import io.github.legacymoddingmc.unimixins.common.config.ConfigUtil; import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -18,13 +17,6 @@ public class AllCore implements IFMLLoadingPlugin { private static List embeddedCorePluginInstances = new ArrayList<>(); static { - ConfigUtil.load(AllConfig.class); - if(AllConfig.enableIntegrityChecks) { - SanityCheck.doSanityCheck(); - } else { - LOGGER.debug("Skipping sanity check because integrity checks are disabled in the config."); - } - try { for(String s : IOUtils.toString(AllCore.class.getResource("/META-INF/unimixins-all.EmbeddedFMLCorePlugins.txt")).split(" ")) { Class cls = Class.forName(s); diff --git a/module-all/src/main/java/io/github/legacymoddingmc/unimixins/all/SanityCheck.java b/module-all/src/main/java/io/github/legacymoddingmc/unimixins/all/SanityCheck.java deleted file mode 100644 index c8aeca9..0000000 --- a/module-all/src/main/java/io/github/legacymoddingmc/unimixins/all/SanityCheck.java +++ /dev/null @@ -1,126 +0,0 @@ -package io.github.legacymoddingmc.unimixins.all; - -import net.minecraft.launchwrapper.Launch; - -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static io.github.legacymoddingmc.unimixins.all.AllCore.LOGGER; - -public class SanityCheck { - - private static List CONCERNING_JAR_PREFIXES = Arrays.asList( - "gtnhmixins-", - "gasstation-", - "mixinbooterlegacy-", - "spongemixins-", - "mixingasm-" - ); - - private static final Pattern LETTER = Pattern.compile("[a-z]"); - - static void doSanityCheck() { - List warnings = new ArrayList<>(); - - checkConcerningJars(warnings); - checkMixinContainer(warnings); - checkMixinHasInitialized(warnings); - - if(!warnings.isEmpty()) { - // Any throwables we throw here will get caught, so all we can do is warn. - LOGGER.warn("======================================================================================="); - LOGGER.warn("WARNING / WARNING / WARNING / WARNING / WARNING / WARNING / WARNING / WARNING / WARNING"); - LOGGER.warn("======================================================================================="); - for(String w : warnings) { - LOGGER.error(" - " + w); - } - LOGGER.error("The game will almost certainly crash!"); - LOGGER.fatal("======================================================================================"); - throw new Error(String.join("; ", warnings)); // Attention grabbing stack trace - } - } - - private static void checkMixinHasInitialized(List warnings) { - if(!Launch.blackboard.containsKey("mixin.initialised")) { - warnings.add("Mixin has not been initialized! If this is a dev environment, make sure org.spongepowered.asm.launch.MixinTweaker was added via the --tweakClass program argument."); - } - } - - private static void checkMixinContainer(List warnings) { - String mixinCoreJarName = getJarName(SanityCheck.class.getResource("/io/github/legacymoddingmc/unimixins/mixin/MixinCore.class")); - String mixinTweakerJarName = getJarName(SanityCheck.class.getResource("/org/spongepowered/asm/launch/MixinTweaker.class")); - - LOGGER.debug("Name of jar containing MixinCore: " + mixinCoreJarName); - LOGGER.debug("Name of jar containing MixinTweaker: " + mixinTweakerJarName); - - if(!mixinCoreJarName.equals(mixinTweakerJarName)) { - boolean isSuspectedToBeDueToNaming = - mixinCoreJarName != null && mixinTweakerJarName != null - && mixinCoreJarName.compareToIgnoreCase(mixinTweakerJarName) > 0; - warnings.add("A different version of Mixin (the one inside " + stringOr(mixinTweakerJarName, "unknown") + ") is getting loaded instead of UniMixins's one (inside " + stringOr(mixinCoreJarName, "unknown") + ")!" + (isSuspectedToBeDueToNaming ? " This is probably because because UniMixins's jar name comes later alphabetically. Try renaming it to come first (for example, by adding a '!' character at the beginning of the file name.)" : "")); - } - } - - private static String stringOr(String s, String alternative) { - return s == null ? alternative : s; - } - - private static String getJarName(URL url) { - if(url != null) { - String urlStr = url.toString(); - if (urlStr.contains("!/")) { - int exclamationIdx = urlStr.indexOf("!/"); - String preExclamationSubstring = urlStr.substring(0, exclamationIdx); - int lastSlash = preExclamationSubstring.lastIndexOf('/'); - if (lastSlash != -1) { - return preExclamationSubstring.substring(lastSlash + 1); - } - } - } - return null; - } - - private static void checkConcerningJars(List warnings) { - List concerningJars = getConcerningJars(); - if(!concerningJars.isEmpty()) { - warnings.add("Detected incompatible jars: " + concerningJars); - } - } - - private static List getConcerningJars() { - List concerningJars = new ArrayList<>(); - - for(URL url : Launch.classLoader.getSources()) { - String path = url.getPath(); - if(path.endsWith(".jar")) { - String[] components = path.split("/"); - String name = components[components.length - 1].toLowerCase(); - Matcher matcher = LETTER.matcher(name); - if(matcher.find()) { - int firstLetterIndex = matcher.start(); - name = name.substring(firstLetterIndex); - if (anyPrefixesMatch(name, CONCERNING_JAR_PREFIXES)) { - concerningJars.add(name); - } - } - } - } - - return concerningJars; - } - - private static boolean anyPrefixesMatch(String s, Collection prefixes) { - for(String p : prefixes) { - if(s.startsWith(p)) { - return true; - } - } - return false; - } - -} diff --git a/module-all/src/main/java/io/github/legacymoddingmc/unimixins/all/AllConfig.java b/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/sanitycheck/SanityCheckConfig.java similarity index 76% rename from module-all/src/main/java/io/github/legacymoddingmc/unimixins/all/AllConfig.java rename to module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/sanitycheck/SanityCheckConfig.java index 9a3bc7c..cc05b3b 100644 --- a/module-all/src/main/java/io/github/legacymoddingmc/unimixins/all/AllConfig.java +++ b/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/sanitycheck/SanityCheckConfig.java @@ -1,8 +1,8 @@ -package io.github.legacymoddingmc.unimixins.all; +package io.github.legacymoddingmc.unimixins.common.sanitycheck; import io.github.legacymoddingmc.unimixins.common.config.AnnotatedProperties; -public class AllConfig { +public class SanityCheckConfig { @AnnotatedProperties.ConfigString(def = "true", com = "Throw an error if an invalid combination of modules is detected. Only disable this if you know what you're doing.", cat = "_common") public static boolean enableIntegrityChecks; } diff --git a/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/sanitycheck/SanityCheckHelper.java b/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/sanitycheck/SanityCheckHelper.java new file mode 100644 index 0000000..1307773 --- /dev/null +++ b/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/sanitycheck/SanityCheckHelper.java @@ -0,0 +1,102 @@ +package io.github.legacymoddingmc.unimixins.common.sanitycheck; + +import io.github.legacymoddingmc.unimixins.common.config.ConfigUtil; +import net.minecraft.launchwrapper.Launch; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class SanityCheckHelper { + + private static final Logger LOGGER = LogManager.getLogger("unimixins"); + + private static final Pattern LETTER = Pattern.compile("[a-z]"); + + static { + ConfigUtil.load(SanityCheckConfig.class); + } + + public static boolean isEnabled() { + if(!SanityCheckConfig.enableIntegrityChecks && !Launch.blackboard.containsKey("unimixins.warnedAboutDisabledIntegrityChecks")) { + LOGGER.debug("Skipping sanity checks because integrity checks are disabled in the config."); + // only warn once + Launch.blackboard.put("unimixins.warnedAboutDisabledIntegrityChecks", "true"); + } + return SanityCheckConfig.enableIntegrityChecks; + } + + public static void showBigWarning(String warning) { + showBigWarning(Arrays.asList(warning)); + } + + public static void showBigWarning(List... warningses) { + List allWarnings = new ArrayList<>(); + for(List l : warningses) { + allWarnings.addAll(l); + } + + if(!allWarnings.isEmpty()) { + // Any throwables we throw here will get caught, so all we can do is warn. + LOGGER.warn("======================================================================================="); + LOGGER.warn("WARNING / WARNING / WARNING / WARNING / WARNING / WARNING / WARNING / WARNING / WARNING"); + LOGGER.warn("======================================================================================="); + for(String w : allWarnings) { + LOGGER.error(" - " + w); + } + LOGGER.error("The game will almost certainly crash!"); + LOGGER.fatal("======================================================================================"); + throw new Error(String.join("; ", allWarnings)); // Attention grabbing stack trace + } + } + + public static void warnIfJarPrefixesExist(List concerningPrefixes) { + showBigWarning(checkIfJarPrefixesExist(concerningPrefixes)); + } + + public static List checkIfJarPrefixesExist(List concerningPrefixes) { + List concerningJars = getJarsMatchingPrefix(concerningPrefixes); + if(!concerningJars.isEmpty()) { + return Arrays.asList("Detected incompatible jars: " + concerningJars); + } + return Arrays.asList(); + } + + private static List getJarsMatchingPrefix(List concerningPrefixes) { + List matches = new ArrayList<>(); + + for(URL url : Launch.classLoader.getSources()) { + String path = url.getPath(); + if(path.endsWith(".jar")) { + String[] components = path.split("/"); + String name = components[components.length - 1].toLowerCase(); + Matcher matcher = LETTER.matcher(name); + if(matcher.find()) { + int firstLetterIndex = matcher.start(); + name = name.substring(firstLetterIndex); + if (anyPrefixesMatch(name, concerningPrefixes)) { + matches.add(name); + } + } + } + } + + return matches; + } + + private static boolean anyPrefixesMatch(String s, Collection prefixes) { + for(String p : prefixes) { + if(s.startsWith(p)) { + return true; + } + } + return false; + } + +} 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 deleted file mode 100644 index 72fa991..0000000 --- a/module-gasstation/src/main/java/io/github/legacymoddingmc/unimixins/gasstation/GasStationConfig.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.github.legacymoddingmc.unimixins.gasstation; - -import io.github.legacymoddingmc.unimixins.common.config.AnnotatedProperties; - -public class GasStationConfig { - @AnnotatedProperties.ConfigString(def = "true", com = "Throw an error if an invalid combination of modules is detected. Only disable this if you know what you're doing.", cat = "_common") - public static boolean enableIntegrityChecks; -} 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 a442b87..ee71177 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,10 +1,11 @@ package io.github.legacymoddingmc.unimixins.gasstation; -import io.github.legacymoddingmc.unimixins.common.config.ConfigUtil; +import io.github.legacymoddingmc.unimixins.common.sanitycheck.SanityCheckHelper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class GasStationModule { @@ -12,11 +13,9 @@ public class GasStationModule { private static final Logger LOGGER = LogManager.getLogger("unimixin-gasstation"); public static void init() { - ConfigUtil.load(GasStationConfig.class); - if(GasStationConfig.enableIntegrityChecks) { + if(SanityCheckHelper.isEnabled()) { + SanityCheckHelper.warnIfJarPrefixesExist(Arrays.asList("gasstation-", "mixinbooterlegacy-", "spongemixins-", "mixingasm-")); checkComponentIntegrity(); - } else { - LOGGER.debug("Skipping integrity checks because they are disabled in the config."); } } 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 deleted file mode 100644 index 4f9c753..0000000 --- a/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsConfig.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.github.legacymoddingmc.unimixins.gtnhmixins; - -import io.github.legacymoddingmc.unimixins.common.config.AnnotatedProperties; - -public class GTNHMixinsConfig { - @AnnotatedProperties.ConfigString(def = "true", com = "Throw an error if an invalid combination of modules is detected. Only disable this if you know what you're doing.", cat = "_common") - public static boolean enableIntegrityChecks; -} 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 5c12925..ff1273c 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,10 +1,11 @@ package io.github.legacymoddingmc.unimixins.gtnhmixins; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import cpw.mods.fml.common.versioning.ComparableVersion; -import io.github.legacymoddingmc.unimixins.common.config.ConfigUtil; +import io.github.legacymoddingmc.unimixins.common.sanitycheck.SanityCheckHelper; import net.minecraft.launchwrapper.Launch; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -14,11 +15,9 @@ public class GTNHMixinsModule { private static final Logger LOGGER = LogManager.getLogger("unimixin-gtnhmixins"); public static void init() { - ConfigUtil.load(GTNHMixinsConfig.class); - if(GTNHMixinsConfig.enableIntegrityChecks) { + if(SanityCheckHelper.isEnabled()) { + SanityCheckHelper.warnIfJarPrefixesExist(Arrays.asList("gasstation-", "mixinbooterlegacy-", "spongemixins-")); checkComponentIntegrity(); - } else { - LOGGER.debug("Skipping integrity checks because they are disabled in the config."); } registerASMRemapPackage("com.gtnewhorizon.mixinextras"); } @@ -29,7 +28,7 @@ public class GTNHMixinsModule { if(mixinVersion != null && new ComparableVersion(mixinVersion).compareTo(new ComparableVersion(requiredVersion)) >= 0) { LOGGER.debug("Initializing MixinExtras"); return true; - } else if(!GTNHMixinsConfig.enableIntegrityChecks){ + } else if(!SanityCheckHelper.isEnabled()){ LOGGER.warn("Skipping MixinExtras because Mixin version (" + mixinVersion + ") is lower than the required (" + requiredVersion + ")"); return false; } else { diff --git a/module-mixin/build.gradle b/module-mixin/build.gradle index bdeaee3..4c22645 100644 --- a/module-mixin/build.gradle +++ b/module-mixin/build.gradle @@ -16,6 +16,9 @@ configurations.archives.artifacts.clear() dependencies { compileOnly("org.spongepowered:mixin:0.8.5") + compileOnly(project(":module-common")) { + transitive = false + } } apply plugin: "com.github.johnrengelman.shadow" @@ -33,6 +36,12 @@ flavors.each { configurations.create("shadowBridge$_flavor") configurations.create("shadowSources$_flavor") + dependencies { + add("shadow$_flavor", project(":module-common"), { + transitive = false + }) + } + if (mixinFlavor == "fabric" || mixinFlavor == "spongepowered" || mixinFlavor == "unimix" || mixinFlavor == "gtnh") { // Fabric / SpongePowered / UniMix / GTNH @@ -167,6 +176,8 @@ flavors.each { exclude "mcmod.info" } + relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.mixin.repackage.common' + dependsOn "mixinJar$_flavor" dependsOn "bridgeJar$_flavor" dependsOn "mixinJar$_flavor" @@ -209,6 +220,8 @@ flavors.each { version = versionBase + "+" + mixinFlavorClassifier classifier = '' configurations = [project.configurations."shadow$_flavor"] + + relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.mixin.repackage.common' } jar.dependsOn("shadowJar$_flavor") diff --git a/module-mixin/src/main/java/io/github/legacymoddingmc/unimixins/mixin/MixinCore.java b/module-mixin/src/main/java/io/github/legacymoddingmc/unimixins/mixin/MixinCore.java index 273d43a..896b20e 100644 --- a/module-mixin/src/main/java/io/github/legacymoddingmc/unimixins/mixin/MixinCore.java +++ b/module-mixin/src/main/java/io/github/legacymoddingmc/unimixins/mixin/MixinCore.java @@ -1,6 +1,10 @@ package io.github.legacymoddingmc.unimixins.mixin; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin;; +import cpw.mods.fml.relauncher.IFMLLoadingPlugin; +import io.github.legacymoddingmc.unimixins.common.sanitycheck.SanityCheckHelper; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.util.*; /** @@ -10,6 +14,18 @@ import java.util.*; @IFMLLoadingPlugin.MCVersion("1.7.10") public class MixinCore implements IFMLLoadingPlugin { + public static final Logger LOGGER = LogManager.getLogger("unimixins"); + + static { + if(SanityCheckHelper.isEnabled()) { + SanityCheckHelper.showBigWarning( + MixinSanityCheck.checkMixinHasInitialized(), + MixinSanityCheck.checkMixinContainer(), + SanityCheckHelper.checkIfJarPrefixesExist(Arrays.asList("gasstation-", "mixinbooterlegacy-", "spongemixins-")) + ); + } + } + @Override public String[] getASMTransformerClass() { return new String[0]; diff --git a/module-mixin/src/main/java/io/github/legacymoddingmc/unimixins/mixin/MixinSanityCheck.java b/module-mixin/src/main/java/io/github/legacymoddingmc/unimixins/mixin/MixinSanityCheck.java new file mode 100644 index 0000000..b5460b4 --- /dev/null +++ b/module-mixin/src/main/java/io/github/legacymoddingmc/unimixins/mixin/MixinSanityCheck.java @@ -0,0 +1,54 @@ +package io.github.legacymoddingmc.unimixins.mixin; + +import net.minecraft.launchwrapper.Launch; + +import java.net.URL; +import java.util.Arrays; +import java.util.List; + +import static io.github.legacymoddingmc.unimixins.mixin.MixinCore.LOGGER; + +public class MixinSanityCheck { + + static List checkMixinHasInitialized() { + if(!Launch.blackboard.containsKey("mixin.initialised")) { + return Arrays.asList("Mixin has not been initialized! If this is a dev environment, make sure org.spongepowered.asm.launch.MixinTweaker was added via the --tweakClass program argument."); + } + return Arrays.asList(); + } + + static List checkMixinContainer() { + String mixinCoreJarName = getJarName(MixinSanityCheck.class.getResource("/io/github/legacymoddingmc/unimixins/mixin/MixinCore.class")); + String mixinTweakerJarName = getJarName(MixinSanityCheck.class.getResource("/org/spongepowered/asm/launch/MixinTweaker.class")); + + LOGGER.debug("Name of jar containing MixinCore: " + mixinCoreJarName); + LOGGER.debug("Name of jar containing MixinTweaker: " + mixinTweakerJarName); + + if(!mixinCoreJarName.equals(mixinTweakerJarName)) { + boolean isSuspectedToBeDueToNaming = + mixinCoreJarName != null && mixinTweakerJarName != null + && mixinCoreJarName.compareToIgnoreCase(mixinTweakerJarName) > 0; + return Arrays.asList("A different version of Mixin (the one inside " + stringOr(mixinTweakerJarName, "unknown") + ") is getting loaded instead of UniMixins's one (inside " + stringOr(mixinCoreJarName, "unknown") + ")!" + (isSuspectedToBeDueToNaming ? " This is probably because because UniMixins's jar name comes later alphabetically. Try renaming it to come first (for example, by adding a '!' character at the beginning of the file name.)" : "")); + } + return Arrays.asList(); + } + + private static String stringOr(String s, String alternative) { + return s == null ? alternative : s; + } + + private static String getJarName(URL url) { + if(url != null) { + String urlStr = url.toString(); + if (urlStr.contains("!/")) { + int exclamationIdx = urlStr.indexOf("!/"); + String preExclamationSubstring = urlStr.substring(0, exclamationIdx); + int lastSlash = preExclamationSubstring.lastIndexOf('/'); + if (lastSlash != -1) { + return preExclamationSubstring.substring(lastSlash + 1); + } + } + } + return null; + } +} diff --git a/module-mixinbooterlegacy/build.gradle b/module-mixinbooterlegacy/build.gradle index 043ec0b..f62c57b 100644 --- a/module-mixinbooterlegacy/build.gradle +++ b/module-mixinbooterlegacy/build.gradle @@ -10,11 +10,18 @@ repositories { dependencies { compileOnly('org.spongepowered:mixin:0.8.5-gasstation_7') + shadow(project(":module-common")) { + transitive = false + } } archivesBaseName = archivesBaseName.replace("-1.7.10", "-mixinbooterlegacy-1.7.10") -jar { +apply plugin: "com.github.johnrengelman.shadow" + +shadowJar { + relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.mixinbooterlegacy.repackage.common' + manifest { attributes ( 'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker', diff --git a/module-mixinbooterlegacy/src/main/java/io/github/legacymoddingmc/unimixins/mixinbooterlegacy/MixinBooterLegacyModule.java b/module-mixinbooterlegacy/src/main/java/io/github/legacymoddingmc/unimixins/mixinbooterlegacy/MixinBooterLegacyModule.java new file mode 100644 index 0000000..5f776d2 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/legacymoddingmc/unimixins/mixinbooterlegacy/MixinBooterLegacyModule.java @@ -0,0 +1,13 @@ +package io.github.legacymoddingmc.unimixins.mixinbooterlegacy; + +import io.github.legacymoddingmc.unimixins.common.sanitycheck.SanityCheckHelper; + +import java.util.Arrays; + +public class MixinBooterLegacyModule { + public static void init() { + if(SanityCheckHelper.isEnabled()) { + SanityCheckHelper.warnIfJarPrefixesExist(Arrays.asList("mixinbooterlegacy-")); + } + } +} diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/MixinBooterLegacyPlugin.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/MixinBooterLegacyPlugin.java index 9e0f236..710ac3c 100644 --- a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/MixinBooterLegacyPlugin.java +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/MixinBooterLegacyPlugin.java @@ -1,13 +1,13 @@ package io.github.tox1cozz.mixinbooterlegacy; import com.google.common.util.concurrent.Runnables; -import cpw.mods.fml.common.DummyModContainer; import cpw.mods.fml.common.Mod; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.Name; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.SortingIndex; import io.github.tox1cozz.mixinextras.MixinExtrasBootstrap; +import io.github.legacymoddingmc.unimixins.mixinbooterlegacy.MixinBooterLegacyModule; import net.minecraft.launchwrapper.Launch; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -26,6 +26,7 @@ public final class MixinBooterLegacyPlugin implements IFMLLoadingPlugin { static { LOGGER.info("MixinBootstrap Initializing..."); + MixinBooterLegacyModule.init(); // Initialize MixinExtras MixinExtrasBootstrap.init(); Mixins.addConfiguration("mixin.mixinbooterlegacy.json"); diff --git a/module-mixingasm/build.gradle b/module-mixingasm/build.gradle index 0c18335..eb1d426 100644 --- a/module-mixingasm/build.gradle +++ b/module-mixingasm/build.gradle @@ -1,11 +1,18 @@ dependencies { compile project(":module-mixin") compile files(tasks.getByPath(":module-mixin:shadowJarUnimix").getOutputs().getFiles().getSingleFile()) + shadow(project(":module-common")) { + transitive = false + } } archivesBaseName = archivesBaseName.replace("-1.7.10", "-mixingasm-1.7.10") -jar { +apply plugin: "com.github.johnrengelman.shadow" + +shadowJar { + relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.mixingasm.repackage.common' + manifest { attributes ( 'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker', diff --git a/module-mixingasm/src/main/java/io/github/legacymoddingmc/unimixins/mixingasm/MixingasmModule.java b/module-mixingasm/src/main/java/io/github/legacymoddingmc/unimixins/mixingasm/MixingasmModule.java new file mode 100644 index 0000000..805d64b --- /dev/null +++ b/module-mixingasm/src/main/java/io/github/legacymoddingmc/unimixins/mixingasm/MixingasmModule.java @@ -0,0 +1,13 @@ +package io.github.legacymoddingmc.unimixins.mixingasm; + +import io.github.legacymoddingmc.unimixins.common.sanitycheck.SanityCheckHelper; + +import java.util.Arrays; + +public class MixingasmModule { + public static void init() { + if(SanityCheckHelper.isEnabled()) { + SanityCheckHelper.warnIfJarPrefixesExist(Arrays.asList("mixingasm-")); + } + } +} diff --git a/module-mixingasm/src/main/java/makamys/mixingasm/Mixingasm.java b/module-mixingasm/src/main/java/makamys/mixingasm/Mixingasm.java index 912bd89..944fbea 100644 --- a/module-mixingasm/src/main/java/makamys/mixingasm/Mixingasm.java +++ b/module-mixingasm/src/main/java/makamys/mixingasm/Mixingasm.java @@ -10,6 +10,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import cpw.mods.fml.common.versioning.ComparableVersion; +import io.github.legacymoddingmc.unimixins.mixingasm.MixingasmModule; import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -28,6 +29,7 @@ public class Mixingasm { public static final Logger LOGGER = LogManager.getLogger(MODID); public static void run() { + MixingasmModule.init(); List badTransformers = getBadTransformers(); LOGGER.debug("Excluding transformers: " + badTransformers); for(String badTransformer : badTransformers) {