From f0d25bd2995cda0064929f625e750ec8e27f6783 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 21 Jun 2016 15:22:11 +0100 Subject: [PATCH] Clean this up, correct version --- .../asm/launch/MixinBootstrap.java | 10 ++--- .../launch/platform/MixinPlatformManager.java | 2 + .../launchwrapper/LaunchClassLoaderUtil.java | 38 ------------------- 3 files changed, 6 insertions(+), 44 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index fefc9c8a..2407da88 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -24,16 +24,13 @@ */ package org.spongepowered.asm.launch; -import java.util.Arrays; import java.util.List; -import java.util.TreeMap; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.spongepowered.asm.launch.platform.MixinPlatformManager; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; -import org.spongepowered.asm.util.PrettyPrinter; import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; @@ -65,7 +62,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.6"; + public static final String VERSION = "0.5.11"; // Consts private static final String LAUNCH_PACKAGE = "org.spongepowered.asm.launch."; @@ -170,10 +167,11 @@ public abstract class MixinBootstrap { throw new IllegalStateException("MixinBootstrap.doInit() called before MixinBootstrap.preInit()"); } - for (String platformProviderClass : MixinBootstrap.getPlatform().getPhaseProviderClasses()) { + MixinBootstrap.getPlatform().getPhaseProviderClasses(); +// for (String platformProviderClass : MixinBootstrap.getPlatform().getPhaseProviderClasses()) { // System.err.printf("Registering %s\n", platformProviderClass); // MixinEnvironment.registerPhaseProvider(platformProviderClass); - } +// } if (MixinBootstrap.initState) { MixinBootstrap.getPlatform().prepare(args); diff --git a/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformManager.java b/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformManager.java index bdec4790..efde7e32 100644 --- a/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformManager.java +++ b/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformManager.java @@ -224,6 +224,7 @@ public class MixinPlatformManager { * * @param level compatibility level as a string */ + @SuppressWarnings("deprecation") final void setCompatibilityLevel(String level) { try { CompatibilityLevel value = CompatibilityLevel.valueOf(level.toUpperCase()); @@ -242,6 +243,7 @@ public class MixinPlatformManager { * * @param config config resource name, does not require a leading / */ + @SuppressWarnings("deprecation") final void addConfig(String config) { if (config.endsWith(".json")) { MixinPlatformManager.logger.debug("Registering mixin config: {}", config); diff --git a/src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java b/src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java index 072a07c5..8e916132 100644 --- a/src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java +++ b/src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java @@ -30,7 +30,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.Vector; import net.minecraft.launchwrapper.LaunchClassLoader; @@ -42,15 +41,6 @@ import net.minecraft.launchwrapper.LaunchClassLoader; */ public final class LaunchClassLoaderUtil { - /** - * Class load state - */ - public enum LoadedType { - UNLOADED, - LOADED, - TRANSFORMED - } - /** * ClassLoader -> util mapping */ @@ -61,8 +51,6 @@ public final class LaunchClassLoaderUtil { */ private final LaunchClassLoader classLoader; - private final Set parentLoadedClassNames = new HashSet(); - // Reflected fields private Map> cachedClasses; private final Set invalidClasses; @@ -125,12 +113,6 @@ public final class LaunchClassLoaderUtil { return true; } -// if (this.parentLoadedClassNames.contains(name)) { -// return true; -// } -// -// this.readLoadedClassesFromParent(); -// return this.parentLoadedClassNames.contains(name); return false; } @@ -185,26 +167,6 @@ public final class LaunchClassLoaderUtil { return Collections.emptySet(); } - private void readLoadedClassesFromParent() { - if (this.classLoader == null) { - return; - } - - ClassLoader parent = this.classLoader.getClass().getClassLoader(); - try { - Field fdClasses = ClassLoader.class.getDeclaredField("classes"); - fdClasses.setAccessible(true); - - @SuppressWarnings("unchecked") - Vector> classes = (Vector>) fdClasses.get(parent); - for (Class c : classes) { - this.parentLoadedClassNames.add(c.getName()); - } - } catch (Exception ex) { - // boo - } - } - @SuppressWarnings("unchecked") private static T getField(LaunchClassLoader classLoader, String fieldName) { try {