diff --git a/liteloader/build.gradle b/liteloader/build.gradle index 58bbfffe..bcb73e2f 100644 --- a/liteloader/build.gradle +++ b/liteloader/build.gradle @@ -19,7 +19,7 @@ buildscript { dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT' classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.0' - classpath 'org.spongepowered:mixingradle:0.1-SNAPSHOT' + classpath 'org.spongepowered:mixingradle:0.3-SNAPSHOT' } } @@ -68,7 +68,7 @@ repositories { } dependencies { - compile 'org.spongepowered:mixin:0.4.11-SNAPSHOT' + compile 'org.spongepowered:mixin:0.4.14-SNAPSHOT' compile 'com.google.guava:guava:17.0' compile 'com.google.code.gson:gson:2.2.4' } @@ -86,7 +86,7 @@ sourceSets { } client { compileClasspath += main.compileClasspath + main.output - //refMap = "mixins.liteloader.client.refmap.json" + refMap = "mixins.liteloader.client.refmap.json" } debug { compileClasspath += client.compileClasspath + client.output @@ -119,12 +119,12 @@ afterEvaluate { logger.lifecycle ' Copyright (C) 2011-2016 Adam Mummery-Smith' logger.lifecycle ' Running in {} mode', (project.isReleaseBuild ? "RELEASE" : "SNAPSHOT") logger.lifecycle '=================================================' - + allprojects { makeEclipseCleanRunClient { arguments = "" jvmArguments = "-Dliteloader.debug=true -Dmixin.debug.verbose=true -Dmixin.debug.verify=true" } - + } // hacks for run configs def mc = plugins.getPlugin 'net.minecraftforge.gradle.tweaker-client' mc.replacer.putReplacement '{RUN_CLIENT_MAIN}', project.startClass diff --git a/liteloader/src/debug/java/com/mumfrey/liteloader/debug/Start.java b/liteloader/src/debug/java/com/mumfrey/liteloader/debug/Start.java index 7e3240d3..4d7d94a3 100644 --- a/liteloader/src/debug/java/com/mumfrey/liteloader/debug/Start.java +++ b/liteloader/src/debug/java/com/mumfrey/liteloader/debug/Start.java @@ -164,18 +164,18 @@ public abstract class Start { Set args = qualifiedArgs.get(qualifier); + if (args != null && !Start.MULTI_VALUE_ARGS.contains(qualifier)) + { + return; + } + if (args == null) { - args = new HashSet(); + args = new HashSet(); qualifiedArgs.put(qualifier, args); } - - if (!Start.MULTI_VALUE_ARGS.contains(qualifier)) - { - args.clear(); - } - args.add(arg); + } private static String getArg(Map> qualifiedArgs, String arg) diff --git a/liteloader/src/main/java/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java b/liteloader/src/main/java/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java index d94a0172..84dd8e1b 100644 --- a/liteloader/src/main/java/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java +++ b/liteloader/src/main/java/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java @@ -650,6 +650,8 @@ public class LiteLoaderEnumerator implements LoaderEnumerator private void addMixinsFrom(MixinContainer container) { + try { + container.injectIntoClassPath(this.classLoader, true); for (String config : container.getMixinConfigs()) { if (config.endsWith(".json")) @@ -670,6 +672,10 @@ public class LiteLoaderEnumerator implements LoaderEnumerator } } } + } catch (MalformedURLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } /**