From 43688dd80b6690b94eec71dccfa18915c6ff2ae2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 11 Mar 2013 16:10:46 +1100
Subject: [PATCH] Feed in the original ClassReader to ensure the constant pool
 is not excessively mangled.

---
 src/main/java/net/md_5/specialsource/JarRemapper.java          | 2 +-
 src/main/java/net/md_5/specialsource/RemapperPreprocessor.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/md_5/specialsource/JarRemapper.java b/src/main/java/net/md_5/specialsource/JarRemapper.java
index f70ab30..70c2373 100644
--- a/src/main/java/net/md_5/specialsource/JarRemapper.java
+++ b/src/main/java/net/md_5/specialsource/JarRemapper.java
@@ -173,7 +173,7 @@ public class JarRemapper extends Remapper {
             }
         }
 
-        ClassWriter wr = new ClassWriter(0);
+        ClassWriter wr = new ClassWriter(reader, 0);
         RemappingClassAdapter mapper = new RemappingClassAdapter(wr, this);
         reader.accept(mapper, ClassReader.EXPAND_FRAMES); // TODO: EXPAND_FRAMES necessary?
 
diff --git a/src/main/java/net/md_5/specialsource/RemapperPreprocessor.java b/src/main/java/net/md_5/specialsource/RemapperPreprocessor.java
index 5887f16..a309036 100644
--- a/src/main/java/net/md_5/specialsource/RemapperPreprocessor.java
+++ b/src/main/java/net/md_5/specialsource/RemapperPreprocessor.java
@@ -143,7 +143,7 @@ public class RemapperPreprocessor {
                 }
             }
 
-            ClassWriter cw = new ClassWriter(0);
+            ClassWriter cw = new ClassWriter(classReader, 0);
             classNode.accept(cw);
             bytecode = cw.toByteArray();
         }