Force exceptions to use / instead of . Aparently FF decompiles them correctly, but it causes duplications later down the line.

Author: LexManos

src/main/java/de/oceanlabs/mcp/mcinjector/GenerateMapClassAdapter.java

@@ -39,21 +39,21 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
         {
             return super.visitMethod(access, name, desc, signature, exceptions);
         }
-        
+
         log.log(Level.FINE, "  Name: " + name + " Desc: " + desc + " Sig: " + signature);
         String clsSig = this.className + "." + name + desc;
-        
+
 
         // abstract and native methods don't have a Code attribute
         //if ((access & Opcodes.ACC_ABSTRACT) != 0 || (access & Opcodes.ACC_NATIVE) != 0)
         //{
         //    return super.visitMethod(access, name, desc, signature, exceptions);
         //}
-        
+
         List<String> names = new ArrayList<String>();
         List<Type> types = new ArrayList<Type>();
         int idx = 0;
-        
+
         if ((access & Opcodes.ACC_STATIC) == 0)
         {
             idx = 1;
@@ -62,7 +62,7 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
         }
 
         types.addAll(Arrays.asList(Type.getArgumentTypes(desc)));
-        
+
         //Skip anything with no params
         if (types.size() == 0)
         {
@@ -79,15 +79,15 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
             generateUnique(idx, clsSig, name, names, types);
         }
 
-        if (names.size() > idx)    
+        if (names.size() > idx)
         {
             mci.setParams(clsSig, StringUtil.joinString(names.subList(idx, names.size()), ","));
         }
         else
         {
             mci.setParams(clsSig, "");
         }
-        
+
         return super.visitMethod(access, name, desc, signature, exceptions);
     }
 
@@ -112,7 +112,7 @@ private void generateUnique(int idx, String clsSig, String methodName, List<Stri
             for (int x = idx, y = x; x < types.size(); x++, y++)
             {
                 String desc = types.get(x).getDescriptor();
-                String name = String.format("p_%s_%d_", funcId, y); 
+                String name = String.format("p_%s_%d_", funcId, y);
                 names.add(name);
                 log.fine("      Naming argument " + x + " (" + y + ") -> " + name + " " + desc);
                 if (desc.equals("J") || desc.equals("D")) y++;

src/main/java/de/oceanlabs/mcp/mcinjector/MCInjectorImpl.java

@@ -352,8 +352,9 @@ public List<String> getExceptions(String signature)
         String curMap = this.mappings.getProperty(signature);
         if (curMap == null) return new ArrayList<String>();
         List<String> splitMap = StringUtil.splitString(curMap, "|", -1);
-        if (splitMap.get(0).equals("")) return new ArrayList<String>();
-        return  StringUtil.splitString(splitMap.get(0), ",");
+        String exceptions = splitMap.get(0).replace('.', '/'); //Just in case the map is messed up, classes can not have .'s
+        if (exceptions.equals("")) return new ArrayList<String>();
+        return  StringUtil.splitString(exceptions, ",");
     }
 
     public List<String> getParams(String signature)