From b852a1787d8842045a5609349b855d962dfaafbc Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Tue, 21 Apr 2020 21:11:31 +0200 Subject: [PATCH] Downgrade pre-1.12 back to Mixin 0.7.10 --- .../com/replaymod/core/ReplayModMixinConfigPlugin.java | 7 ++++++- versions/common.gradle | 8 +++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/replaymod/core/ReplayModMixinConfigPlugin.java b/src/main/java/com/replaymod/core/ReplayModMixinConfigPlugin.java index beff8bec..08259e21 100644 --- a/src/main/java/com/replaymod/core/ReplayModMixinConfigPlugin.java +++ b/src/main/java/com/replaymod/core/ReplayModMixinConfigPlugin.java @@ -2,7 +2,6 @@ package com.replaymod.core; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.objectweb.asm.tree.ClassNode; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; @@ -16,6 +15,12 @@ import java.io.InputStream; //$$ import net.minecraft.launchwrapper.Launch; //#endif +//#if MC>=11200 +import org.objectweb.asm.tree.ClassNode; +//#else +//$$ import org.spongepowered.asm.lib.tree.ClassNode; +//#endif + public class ReplayModMixinConfigPlugin implements IMixinConfigPlugin { static boolean hasClass(String name) throws IOException { //#if MC>=11400 diff --git a/versions/common.gradle b/versions/common.gradle index a8ce54a5..f4f59b91 100644 --- a/versions/common.gradle +++ b/versions/common.gradle @@ -248,9 +248,11 @@ dependencies { } if (!FABRIC) { - annotationProcessor 'org.spongepowered:mixin:0.8' - compileOnly 'org.spongepowered:mixin:0.8' - shade('org.spongepowered:mixin:0.8') { + // Mixin 0.8 is no longer compatible with MC 1.11.2 or older + def mixinVersion = mcVersion >= 11200 ? '0.8' : '0.7.10-SNAPSHOT' + annotationProcessor "org.spongepowered:mixin:$mixinVersion" + compileOnly "org.spongepowered:mixin:$mixinVersion" + shade("org.spongepowered:mixin:$mixinVersion") { transitive = false // deps should all be bundled with MC }