From e1fc02b5b91e4527d9f98dcbba0c217ea847e6b0 Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 29 Jul 2012 23:30:37 -0400 Subject: [PATCH] Add in "transform excluded" classes that we still need to take loading responsibility for --- .../fml/relauncher/RelaunchClassLoader.java | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/fml/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java b/fml/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java index 4fb073916e..7c7354bf46 100644 --- a/fml/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java +++ b/fml/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java @@ -14,9 +14,13 @@ import java.util.Map; public class RelaunchClassLoader extends URLClassLoader { - private static String[] excludedPackages = { + private static String[] excludedPackages = { "java.", "sun.", "javax.", - "cpw.mods.fml.relauncher", "net.minecraftforge.classloading", + "cpw.mods.fml.relauncher.", "net.minecraftforge.classloading." + }; + + private static String[] transformerExclusions = + { "org.objectweb.asm.", "com.google.common." }; private List sources; @@ -24,7 +28,7 @@ public class RelaunchClassLoader extends URLClassLoader private List transformers; private Map cachedClasses; - + public RelaunchClassLoader(URL[] sources) { super(sources, null); @@ -57,11 +61,22 @@ public class RelaunchClassLoader extends URLClassLoader return parent.loadClass(name); } } - + if (cachedClasses.containsKey(name)) { return cachedClasses.get(name); } + + for (String st : transformerExclusions) + { + if (name.startsWith(st)) + { + Class cl = super.findClass(name); + cachedClasses.put(name, cl); + return cl; + } + } + try { byte[] basicClass = readFully(findResource(name.replace('.', '/').concat(".class")).openStream()); @@ -96,8 +111,8 @@ public class RelaunchClassLoader extends URLClassLoader { return sources; } - - + + private byte[] readFully(InputStream stream) { try @@ -108,7 +123,7 @@ public class RelaunchClassLoader extends URLClassLoader { bos.write(r); } - + return bos.toByteArray(); } catch (Throwable t)