(re-add) Remove tweaker duplicates

simon816 · May 1, 2019 · 18cacd9 · 18cacd9
1 parent d101e75
commit 18cacd9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'eclipse'
 sourceCompatibility = '1.6'
 targetCompatibility = '1.6'
 
-version = '0.6.3'
+version = '0.7.0'
 
 repositories {
     mavenCentral()

diff --git a/src/main/java/com/simon816/sponge/bootstrap/Bootstrap.java b/src/main/java/com/simon816/sponge/bootstrap/Bootstrap.java
@@ -207,6 +207,11 @@ public static class PostFMLTweaker extends SimpleTweaker {
 
         @Override
         public void injectIntoClassLoader(LaunchClassLoader classLoader) {
+            // Mixin system already loaded early so don't load twice
+            @SuppressWarnings("unchecked")
+            List<String> tweakClasses = (List<String>) Launch.blackboard.get("TweakClasses");
+            while (tweakClasses.remove("org.spongepowered.asm.launch.MixinTweaker")) {
+            }
             // Fix location of jar file
             try {
                 Field fPlugins = CoreModManager.class.getDeclaredField("loadPlugins");