Remove MixinExtras from GTNHMixin

drori200 · Oct 14, 2023 · 81e2fa1 · 81e2fa1
1 parent 618bd0d
commit 81e2fa1
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 24 deletions.
diff --git a/module-gtnhmixins/build.gradle b/module-gtnhmixins/build.gradle
@@ -1,7 +1,5 @@
 dependencies {
 	compileOnly('org.spongepowered:mixin:0.8.5')
-	compileOnly("com.github.LlamaLad7:MixinExtras:$mixinExtrasVersion")
-	shadow("com.github.LlamaLad7:MixinExtras:$mixinExtrasVersion")
 	shadow(project(":module-common")) {
 		transitive = false
 	}
@@ -15,7 +13,6 @@ shadowJar {
 	classifier = ''
 	configurations = [project.configurations.shadow]
 
-	relocate 'com.llamalad7.mixinextras', 'com.gtnewhorizon.mixinextras'
 	relocate 'org.objectweb.asm', 'org.spongepowered.asm.lib'
 	relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.gtnhmixins.repackage.common'
 

diff --git a/module-gtnhmixins/gradle.properties b/module-gtnhmixins/gradle.properties
@@ -1,2 +1 @@
-mixinExtrasVersion=0.1.1
 extraVersion=2.1.13
diff --git a/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/core/GTNHMixinsCore.java b/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/core/GTNHMixinsCore.java
@@ -4,7 +4,6 @@
 import com.google.common.util.concurrent.Runnables;
 import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader;
 import com.gtnewhorizon.gtnhmixins.Reflection;
-import com.llamalad7.mixinextras.MixinExtrasBootstrap;
 
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 import net.minecraft.launchwrapper.Launch;
@@ -45,9 +44,6 @@ public class GTNHMixinsCore implements IFMLLoadingPlugin {
         LOGGER.info("Initializing GTNHMixins Core");
 
         GTNHMixinsModule.init();
-        if(GTNHMixinsModule.isMixinExtrasEnabled()) {
-            MixinExtrasBootstrap.init();
-        }
     }
 
     @Override

diff --git a/...mixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsModule.java b/...mixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsModule.java
@@ -4,9 +4,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import io.github.legacymoddingmc.unimixins.common.abstraction.ComparableVersion;
 import io.github.legacymoddingmc.unimixins.common.sanitycheck.SanityCheckHelper;
-import net.minecraft.launchwrapper.Launch;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -21,20 +19,6 @@ public static void init() {
         }
         registerASMRemapPackage("com.gtnewhorizon.mixinextras");
     }
-
-    public static boolean isMixinExtrasEnabled() {
-        String requiredVersion = "0.8.5";
-        String mixinVersion = (String)Launch.blackboard.get("mixin.initialised");
-        if(mixinVersion != null && new ComparableVersion(mixinVersion).compareTo(new ComparableVersion(requiredVersion)) >= 0) {
-            LOGGER.debug("Initializing MixinExtras");
-            return true;
-        } else if(!SanityCheckHelper.isEnabled()){
-            LOGGER.warn("Skipping MixinExtras because Mixin version (" + mixinVersion + ") is lower than the required (" + requiredVersion + ")");
-            return false;
-        } else {
-            throw new RuntimeException("Cannot load MixinExtras because Mixin version (" + mixinVersion + ") is lower than the required (" + requiredVersion + ")");
-        }
-    }
 
     private static void registerASMRemapPackage(String pkg) {
         try {