mixin: Update to Mixin 0.8.7

Author: Johni0702

mixin/build.gradle.kts

@@ -11,8 +11,8 @@ plugins {
     id("essential.build-logic")
 }
 
-val patchesVersion = "0.1.0"
-val mixinVersion = "0.8.4"
+val patchesVersion = "0.2.0"
+val mixinVersion = "0.8.7"
 val asmVersion = "5.2"
 
 version = "$patchesVersion+mixin.$mixinVersion"

mixin/src/main/java/gg/essential/mixincompat/cleanroom/MixinConfigCompat.java

@@ -4,6 +4,7 @@
 import gg.essential.CompatShadow;
 import org.spongepowered.asm.launch.GlobalProperties;
 import org.spongepowered.asm.mixin.MixinEnvironment;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigSource;
 import org.spongepowered.asm.mixin.transformer.Config;
 
 import java.util.Collections;
@@ -13,14 +14,14 @@
 public class MixinConfigCompat {
     // See GlobalPropertiesKeysCompat
     // https://github.com/CleanroomMC/MixinBooter-UniMix/blob/9d4b487ed32501137645cdf0da484b076f0bfaf4/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java#L1400
-    static Config create(String configFile, MixinEnvironment outer) {
+    static Config create(String configFile, MixinEnvironment outer, IMixinConfigSource source) {
         Set<String> disabledMixinConfigs = GlobalProperties.get(GlobalPropertiesKeysCompat.CLEANROOM_DISABLE_MIXIN_CONFIGS, Collections.emptySet());
         if (disabledMixinConfigs.contains(configFile)) {
             return null;
         }
-        return create$original(configFile, outer);
+        return create$original(configFile, outer, source);
     }
 
     @CompatShadow(original = "create")
-    static Config create$original(String configFile, MixinEnvironment outer) { throw new LinkageError(); }
+    static Config create$original(String configFile, MixinEnvironment outer, IMixinConfigSource source) { throw new LinkageError(); }
 }

mixin/src/main/java/gg/essential/mixincompat/fixes/FixNPE_PR678.java

@@ -0,0 +1,18 @@
+package gg.essential.mixincompat.fixes;
+
+import gg.essential.CompatMixin;
+import gg.essential.CompatShadow;
+import org.spongepowered.asm.mixin.Mixins;
+
+@CompatMixin(Mixins.class)
+public class FixNPE_PR678 {
+    //
+    // Fixes regression in 0.8.6, see https://github.com/SpongePowered/Mixin/pull/678
+    // Planned to be fixed upstream in 0.8.8.
+    //
+    public static void addConfiguration(String configFile) {
+        Mixins.addConfiguration(configFile, null);
+    }
+    @CompatShadow(original = "addConfiguration")
+    public static void addConfiguration$broken(String configFile) { throw new LinkageError(); }
+}

mixin/src/main/java/gg/essential/mixincompat/fixes/ReEnableClassReaderExpandedFrames.java

@@ -0,0 +1,23 @@
+package gg.essential.mixincompat.fixes;
+
+import gg.essential.CompatMixin;
+import gg.essential.CompatShadow;
+import org.spongepowered.asm.mixin.MixinEnvironment;
+import org.spongepowered.asm.mixin.Mixins;
+
+@CompatMixin(MixinEnvironment.Option.class)
+public class ReEnableClassReaderExpandedFrames {
+    //
+    // Re-enables EXPAND_FRAMES by default because different Locals are generated without it, breaking existing mixins.
+    // See https://github.com/SpongePowered/Mixin/issues/671
+    //
+    private boolean getLocalBooleanValue(boolean defaultValue) {
+        //noinspection ConstantValue
+        if ((Object) this == MixinEnvironment.Option.CLASSREADER_EXPAND_FRAMES) {
+            defaultValue = true;
+        }
+        return getLocalBooleanValue$org(defaultValue);
+    }
+    @CompatShadow(original = "getLocalBooleanValue")
+    private boolean getLocalBooleanValue$org(boolean defaultValue) { throw new LinkageError(); }
+}