#88: Fix excluding packages in TSRG files

Closes #84
md-5 · Jul 13, 2024 · c8cfc2a · c8cfc2a
1 parent 3f7472b
commit c8cfc2a
Showing 1 changed file with 28 additions and 10 deletions.
diff --git a/src/main/java/net/md_5/specialsource/JarMapping.java b/src/main/java/net/md_5/specialsource/JarMapping.java
@@ -453,7 +453,17 @@ private void parseCsrgLine(String line, MappingTransformer inputTransformer, Map
             String oldClassName = inputTransformer.transformClassName(tokens[0]);
             String newClassName = outputTransformer.transformClassName(tokens[1]);
 
+            if (reverse) {
+                String temp = newClassName;
+                newClassName = oldClassName;
+                oldClassName = temp;
+            }
+
             if (oldClassName.endsWith("/")) {
+                if (isExcludedPackage(oldClassName)) {
+                    SpecialSource.log("Ignored PK: " + oldClassName + " " + newClassName);
+                    return;
+                }
 
                 // package names always either 1) suffixed with '/', or 2) equal to '.' to signify default package
                 if (!newClassName.equals(".") && !newClassName.endsWith("/")) {
@@ -465,18 +475,16 @@ private void parseCsrgLine(String line, MappingTransformer inputTransformer, Map
                 }
 
                 // Special case: mapping an entire hierarchy of classes
-                if (reverse) {
-                    packages.put(newClassName, oldClassName);
-                } else {
-                    packages.put(oldClassName, newClassName);
-                }
+                packages.put(oldClassName, newClassName);
             } else {
-                if (reverse) {
-                    classes.put(newClassName, oldClassName);
-                } else {
-                    classes.put(oldClassName, newClassName);
-                }
                 currentClass = tokens[0];
+
+                if (isExcludedPackage(oldClassName)) {
+                    SpecialSource.log("Ignored CL: " + oldClassName + " " + newClassName);
+                    return;
+                }
+
+                classes.put(oldClassName, newClassName);
             }
         } else if (tokens.length == 3) {
             String oldClassName = inputTransformer.transformClassName(tokens[0]);
@@ -495,6 +503,11 @@ private void parseCsrgLine(String line, MappingTransformer inputTransformer, Map
                 oldFieldName = temp;
             }
 
+            if (isExcludedPackage(oldClassName)) {
+                SpecialSource.log("Ignored FD: " + oldClassName + "/" + oldFieldName + " -> " + newFieldName);
+                return;
+            }
+
             fields.put(oldClassName + "/" + oldFieldName, newFieldName);
         } else if (tokens.length == 4) {
             String oldClassName = inputTransformer.transformClassName(tokens[0]);
@@ -515,6 +528,11 @@ private void parseCsrgLine(String line, MappingTransformer inputTransformer, Map
                 oldMethodName = temp;
             }
 
+            if (isExcludedPackage(oldClassName)) {
+                SpecialSource.log("Ignored MD: " + oldClassName + "/" + oldMethodName + " -> " + newMethodName);
+                return;
+            }
+
             methods.put(oldClassName + "/" + oldMethodName + " " + oldMethodDescriptor, newMethodName);
         } else {
             throw new IOException("Invalid csrg file line, token count " + tokens.length + " unexpected in " + line);