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 5877fd1..8fa3dfa 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,5 +1,7 @@ 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; @@ -9,6 +11,8 @@ 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); @@ -19,6 +23,9 @@ 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 + "]"); @@ -68,6 +75,8 @@ 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 109c11a..339485a 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,4 +9,6 @@ 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 b9a951c..c12a4d5 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,6 +46,9 @@ public class CompatCore implements IFMLLoadingPlugin { if(IgnoreDuplicateJarsTransformer.wantsToRun()) { classes.add("io.github.legacymoddingmc.unimixins.compat.asm.IgnoreDuplicateJarsTransformer"); } + if(CompatConfig.fixClasspathModDiscovery) { + classes.add("io.github.legacymoddingmc.unimixins.compat.asm.FixClasspathModDiscoveryTransformer"); + } return classes.toArray(new String[0]); } diff --git a/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/asm/ClasspathModDiscoveryFixerTransformer.java b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/FixClasspathModDiscoveryTransformer.java similarity index 84% rename from module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/asm/ClasspathModDiscoveryFixerTransformer.java rename to module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/FixClasspathModDiscoveryTransformer.java index aab0125..0e6ee71 100644 --- a/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/asm/ClasspathModDiscoveryFixerTransformer.java +++ b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/FixClasspathModDiscoveryTransformer.java @@ -1,6 +1,6 @@ -package io.github.legacymoddingmc.unimixins.devcompat.asm; +package io.github.legacymoddingmc.unimixins.compat.asm; -import static io.github.legacymoddingmc.unimixins.devcompat.DevCompatCore.LOGGER; +import static io.github.legacymoddingmc.unimixins.compat.CompatCore.LOGGER; import static org.objectweb.asm.Opcodes.INVOKESTATIC; import net.minecraft.launchwrapper.IClassTransformer; @@ -17,7 +17,7 @@ import java.util.*; *

Fixes classpath mods not getting loaded in dev env when running via the runClient Gradle task.

*/ -public class ClasspathModDiscoveryFixerTransformer implements IClassTransformer { +public class FixClasspathModDiscoveryTransformer implements IClassTransformer { @Override public byte[] transform(String name, String transformedName, byte[] basicClass) { @@ -33,7 +33,7 @@ public class ClasspathModDiscoveryFixerTransformer implements IClassTransformer } private byte[] doTransformModDiscoverer(byte[] bytes) { - LOGGER.info("ClasspathModDiscoveryFixerTransformer: Transforming ModDiscoverer#findClasspathMods to ignore reparseable coremods."); + LOGGER.info("FixClasspathModDiscoveryTransformer: Transforming ModDiscoverer#findClasspathMods to ignore reparseable coremods."); try { ClassNode classNode = new ClassNode(); @@ -48,7 +48,7 @@ public class ClasspathModDiscoveryFixerTransformer implements IClassTransformer if(i.getOpcode() == INVOKESTATIC) { MethodInsnNode mi = (MethodInsnNode)i; if(mi.owner.equals("cpw/mods/fml/relauncher/CoreModManager") && mi.name.equals("getReparseableCoremods") && mi.desc.equals("()Ljava/util/List;")) { - m.instructions.insertBefore(mi, new MethodInsnNode(INVOKESTATIC, "io/github/legacymoddingmc/unimixins/devcompat/asm/ClasspathModDiscoveryFixerTransformer$Hooks", "redirectGetReparseableCoremods", mi.desc)); + m.instructions.insertBefore(mi, new MethodInsnNode(INVOKESTATIC, "io/github/legacymoddingmc/unimixins/compat/asm/FixClasspathModDiscoveryTransformer$Hooks", "redirectGetReparseableCoremods", mi.desc)); it.remove(); break; } diff --git a/module-devcompat/LICENSE b/module-devcompat/LICENSE deleted file mode 100644 index 68a49da..0000000 --- a/module-devcompat/LICENSE +++ /dev/null @@ -1,24 +0,0 @@ -This is free and unencumbered software released into the public domain. - -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. - -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -For more information, please refer to diff --git a/module-devcompat/build.gradle b/module-devcompat/build.gradle deleted file mode 100644 index ed8fcf0..0000000 --- a/module-devcompat/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -dependencies { - compileOnly('org.spongepowered:mixin:0.8.5') -} - -archivesBaseName = archivesBaseName.replace("-1.7.10", "-devcompat-1.7.10") - -jar { - manifest { - attributes ( - 'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker', - 'FMLCorePluginContainsFMLMod': true, - 'ForceLoadAsMod': true, - 'FMLCorePlugin': 'io.github.legacymoddingmc.unimixins.devcompat.DevCompatCore' - ) - } -} - -// Obfuscation is unnecessary since this module does not reference Minecraft classes -reobf.enabled = false diff --git a/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/DevCompatCore.java b/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/DevCompatCore.java deleted file mode 100644 index 728dbfc..0000000 --- a/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/DevCompatCore.java +++ /dev/null @@ -1,53 +0,0 @@ -package io.github.legacymoddingmc.unimixins.devcompat; - -import java.util.Map; - -import cpw.mods.fml.relauncher.IFMLLoadingPlugin; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -@MCVersion("1.7.10") -public class DevCompatCore implements IFMLLoadingPlugin { - - public static final Logger LOGGER = LogManager.getLogger("unimixins"); - - public DevCompatCore() { - LOGGER.info("Instantiating DevCompatCore"); - } - - @Override - public String[] getASMTransformerClass() { - return new String[] {relativeClassName("asm.ClasspathModDiscoveryFixerTransformer")}; - } - - private static String relativeClassName(String relName) { - String name = DevCompatCore.class.getName(); - name = name.substring(0, name.lastIndexOf('.') + 1); - name += relName; - return name; - } - - @Override - public String getModContainerClass() { - return null; - } - - @Override - public String getSetupClass() { - return null; - } - - @Override - public void injectData(Map data) { - - } - - @Override - public String getAccessTransformerClass() { - return null; - } - - - -} diff --git a/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/DevCompatModule.java b/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/DevCompatModule.java deleted file mode 100644 index 4bd851f..0000000 --- a/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/DevCompatModule.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.github.legacymoddingmc.unimixins.devcompat; - -import cpw.mods.fml.common.Mod; - -/** - * This is only here to help Forge detect the mod. - */ -@Mod(modid = "unimixins-devcompat", version = "@VERSION@", acceptableRemoteVersions = "*") -@net.minecraftforge.fml.common.Mod(modid = "unimixins-devcompat", version = "@VERSION@", acceptableRemoteVersions = "*") -public class DevCompatModule { -} diff --git a/module-devcompat/src/main/resources/mcmod.info b/module-devcompat/src/main/resources/mcmod.info deleted file mode 100644 index a331090..0000000 --- a/module-devcompat/src/main/resources/mcmod.info +++ /dev/null @@ -1,17 +0,0 @@ -[ - { - "modid": "unimixins-devcompat", - "name": "UniMixins: Dev Compatibility", - "description": "UniMixins module that applies compatibility tweaks for dev environments.", - "version": "${version}", - "mcversion": "${minecraft_version}", - "url": "${project_url}", - "updateUrl": "", - "authorList": [ - "makamys" - ], - "credits": "", - "logoFile": "", - "screenshots": [] - } -] diff --git a/settings.gradle b/settings.gradle index a3696c9..12fae7c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,5 @@ include 'module-mixin' include 'module-compat' -include 'module-devcompat' include 'module-mixingasm' include 'module-spongemixins' include 'module-mixinbooterlegacy'