diff --git a/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java index 10f66f6..8563fb5 100644 --- a/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java +++ b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java @@ -1,13 +1,10 @@ package io.github.legacymoddingmc.unimixins.compat; -import java.lang.reflect.Field; import java.util.Map; -import java.util.Set; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; import net.minecraft.launchwrapper.Launch; -import net.minecraft.launchwrapper.LaunchClassLoader; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -25,28 +22,9 @@ public class CompatCore implements IFMLLoadingPlugin { @Override public String[] getASMTransformerClass() { - applyLWJGL3ifyCompatibilityHack(); return new String[] {}; } - /** LWJGL3ify excludes transformation of its core package, which prevents us from remapping its - * LwjglRedirectTransformer. However, the exclusion appears to be unnecessary, since its transformers already - * have checks that prevent ClassCircularityErrors. - */ - private static void applyLWJGL3ifyCompatibilityHack() { - try { - Field transformerExceptionsF = LaunchClassLoader.class.getDeclaredField("transformerExceptions"); - transformerExceptionsF.setAccessible(true); - Set transformerExceptions = (Set)transformerExceptionsF.get(Launch.classLoader); - final String lwjgl3ifyCorePackage = "me.eigenraven.lwjgl3ify.core"; - if(transformerExceptions.contains(lwjgl3ifyCorePackage)) { - LOGGER.info("Removing '" + lwjgl3ifyCorePackage + "' transformer exclusion to apply LWJGL3ify compatibility hack."); - transformerExceptions.remove(lwjgl3ifyCorePackage); - } - } catch(Exception e){ - LOGGER.debug("Encountered exception while trying to apply LWJGL3ify compatibility hack: " + e); - } - } private static String relativeClassName(String relName) { String name = CompatCore.class.getName(); name = name.substring(0, name.lastIndexOf('.') + 1);