From 3c5a61e01137d2704e2a117d2680f12741ecae79 Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Wed, 17 Jul 2013 18:18:57 +1000 Subject: [PATCH] Fixed a few mapping bugs Added version files --- codechicken/lib/asm/ClassHeirachyManager.java | 9 +++++++-- codechicken/lib/asm/ObfMapping.java | 2 +- mcversion.txt | 1 + version.txt | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 mcversion.txt create mode 100644 version.txt diff --git a/codechicken/lib/asm/ClassHeirachyManager.java b/codechicken/lib/asm/ClassHeirachyManager.java index e3c890d..6a2d6b7 100644 --- a/codechicken/lib/asm/ClassHeirachyManager.java +++ b/codechicken/lib/asm/ClassHeirachyManager.java @@ -18,6 +18,11 @@ public class ClassHeirachyManager implements IClassTransformer public static HashMap> superclasses = new HashMap>(); private static LaunchClassLoader cl = (LaunchClassLoader)ClassHeirachyManager.class.getClassLoader(); + static + { + cl.addTransformerExclusion("codechicken.lib.asm"); + } + /** * Returns true if clazz extends, either directly or indirectly, superclass. * @param clazz The class in question @@ -93,7 +98,7 @@ public class ClassHeirachyManager implements IClassTransformer { if (bytes == null) return null; if(!knownClasses.contains(name)) - { + { ClassNode node = ASMHelper.createClassNode(bytes); knownClasses.add(name); @@ -111,7 +116,7 @@ public class ClassHeirachyManager implements IClassTransformer if(supers == null) superclasses.put(name, supers = new ArrayList()); supers.add(superclass); - supers.add(new ObfMapping(superclass).toRuntime().javaClass()); + supers.add(new ObfMapping(superclass.replace('.', '/')).toRuntime().javaClass()); } public static String getSuperClass(String c) diff --git a/codechicken/lib/asm/ObfMapping.java b/codechicken/lib/asm/ObfMapping.java index 8ebe831..e2c02ad 100644 --- a/codechicken/lib/asm/ObfMapping.java +++ b/codechicken/lib/asm/ObfMapping.java @@ -46,7 +46,7 @@ public class ObfMapping public ObfMapping(String owner) { - this(owner, null, null); + this(owner, "", ""); } public ObfMapping(String owner, String name, String desc) diff --git a/mcversion.txt b/mcversion.txt new file mode 100644 index 0000000..308b6fa --- /dev/null +++ b/mcversion.txt @@ -0,0 +1 @@ +1.6.2 \ No newline at end of file diff --git a/version.txt b/version.txt new file mode 100644 index 0000000..afaf360 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +1.0.0 \ No newline at end of file