Mixin 0.8

Author: clienthax

build.gradle

@@ -29,7 +29,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.dimdev:mixin:0.7.11-SNAPSHOT") {
+    implementation("org.spongepowered:mixin:0.8") {
         exclude module: "asm-commons"
         exclude module: "asm-tree"
         exclude module: "launchwrapper"

src/main/java/org/dimdev/vanillafix/ModCompatibilityMixinPlugin.java

@@ -1,7 +1,7 @@
 package org.dimdev.vanillafix;
 
 import net.minecraft.launchwrapper.Launch;
-import org.spongepowered.asm.lib.tree.ClassNode;
+import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
 

src/main/java/org/dimdev/vanillafix/modsupport/mixins/MixinLoader.java

@@ -12,7 +12,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.transformer.MixinTransformer;
+import org.spongepowered.asm.mixin.transformer.MixinProcessor;
 import org.spongepowered.asm.mixin.transformer.Proxy;
 
 import java.lang.reflect.Field;
@@ -22,8 +22,8 @@
 
 @Mixin(Loader.class)
 public class MixinLoader {
-    @Shadow private List<ModContainer> mods;
-    @Shadow private ModClassLoader modClassLoader;
+    @Shadow(remap = false) private List<ModContainer> mods;
+    @Shadow(remap = false) private ModClassLoader modClassLoader;
 
     /**
      * @reason Load all mods now and load mod support mixin configs. This can't be done later
@@ -44,17 +44,25 @@ private void beforeConstructingMods(List<String> injectedModContainers, Callback
         if (VanillaFixLoadingPlugin.config.textureFixes) Mixins.addConfiguration("mixins.vanillafix.textures.modsupport.json");
         Proxy mixinProxy = (Proxy) Launch.classLoader.getTransformers().stream().filter(transformer -> transformer instanceof Proxy).findFirst().get();
         try {
+            //This will very likely break on the next major mixin release.
+            Class mixinTransformerClass = Class.forName("org.spongepowered.asm.mixin.transformer.MixinTransformer");
+
             Field transformerField = Proxy.class.getDeclaredField("transformer");
             transformerField.setAccessible(true);
-            MixinTransformer transformer = (MixinTransformer) transformerField.get(mixinProxy);
+            Object transformer = transformerField.get(mixinProxy);
+
+            //Get MixinProcessor from MixinTransformer
+            Field processorField = mixinTransformerClass.getDeclaredField("processor");
+            processorField.setAccessible(true);
+            Object processor = processorField.get(transformer);
 
-            Method selectConfigsMethod = MixinTransformer.class.getDeclaredMethod("selectConfigs", MixinEnvironment.class);
+            Method selectConfigsMethod = MixinProcessor.class.getDeclaredMethod("selectConfigs", MixinEnvironment.class);
             selectConfigsMethod.setAccessible(true);
-            selectConfigsMethod.invoke(transformer, MixinEnvironment.getCurrentEnvironment());
+            selectConfigsMethod.invoke(processor, MixinEnvironment.getCurrentEnvironment());
 
-            Method prepareConfigsMethod = MixinTransformer.class.getDeclaredMethod("prepareConfigs", MixinEnvironment.class);
+            Method prepareConfigsMethod = MixinProcessor.class.getDeclaredMethod("prepareConfigs", MixinEnvironment.class);
             prepareConfigsMethod.setAccessible(true);
-            prepareConfigsMethod.invoke(transformer, MixinEnvironment.getCurrentEnvironment());
+            prepareConfigsMethod.invoke(processor, MixinEnvironment.getCurrentEnvironment());
         } catch (ReflectiveOperationException e) {
             throw new RuntimeException(e);
         }

src/main/java/org/dimdev/vanillafix/profiler/mixins/client/MixinMinecraft.java

@@ -11,7 +11,7 @@
 import net.minecraft.util.text.TextComponentTranslation;
 import org.dimdev.vanillafix.profiler.IPatchedMinecraftServer;
 import org.lwjgl.input.Keyboard;
-import org.spongepowered.asm.lib.Opcodes;
+import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;