v0.3

MCPHackers · Mar 6, 2022 · cdeada6 · cdeada6
1 parent ac9a11d
commit cdeada6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/src/main/java/org/mcphackers/mcp/MCP.java b/src/main/java/org/mcphackers/mcp/MCP.java
@@ -16,7 +16,7 @@
 
 public class MCP {
 
-	public static final String VERSION = "v0.2";
+	public static final String VERSION = "v0.3";
 	public static EnumMode mode = null;
 	public static EnumMode helpCommand = null;
 	public static MCPLogger logger;

diff --git a/src/main/java/org/mcphackers/mcp/tools/FileUtil.java b/src/main/java/org/mcphackers/mcp/tools/FileUtil.java
@@ -179,7 +179,6 @@ public static void copyDirectory(Path sourceFolder, Path targetFolder) throws IO
 		copyDirectory(sourceFolder, targetFolder, new String[] {});
 	}
 
-	//FIXME: Path separators are broken on Linux
 	public static void compress(Path sourceDir, Path target) throws IOException {
 		final ZipOutputStream outputStream = new ZipOutputStream(new FileOutputStream(target.toFile()));
 		Files.walkFileTree(sourceDir, new SimpleFileVisitor<Path>() {

diff --git a/src/main/java/org/mcphackers/mcp/tools/mappings/MappingUtil.java b/src/main/java/org/mcphackers/mcp/tools/mappings/MappingUtil.java
@@ -73,9 +73,7 @@ public void visit(int version, int access, String name, String signature, String
 									if (kind == MappedElementKind.CLASS) {
 										String dstName = ((Function<String, String>)getDstName).apply(name);
 										if(dstName != null) {
-											if (mappingTree.visitClass(name)) {
-												mappingTree.visitDstName(MappedElementKind.CLASS, 0, dstName);
-											}
+											modifyClass(mappingTree, name, dstName);
 										}
 									}
 									super.visit(version, access, name, signature, superName, interfaces);
@@ -86,10 +84,7 @@ public FieldVisitor visitField(int access, String name, String descriptor, Strin
 									if (kind == MappedElementKind.FIELD) {
 										String dstName = ((TriFunction<String, String, String, String>)getDstName).apply(currentClass, name, descriptor);
 										if(dstName != null) {
-											mappingTree.visitClass(currentClass);
-											if (mappingTree.visitField(name, descriptor)) {
-												mappingTree.visitDstName(MappedElementKind.FIELD, 0, dstName);
-											}
+											modifyField(mappingTree, currentClass, name, descriptor, dstName);
 										}
 									}
 									return super.visitField(access, name, descriptor, signature, value);
@@ -100,10 +95,7 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str
 									if (kind == MappedElementKind.METHOD) {
 										String dstName = ((TriFunction<String, String, String, String>)getDstName).apply(currentClass, name, descriptor);
 										if(dstName != null) {
-											mappingTree.visitClass(currentClass);
-											if (mappingTree.visitMethod(name, descriptor)) {
-												mappingTree.visitDstName(MappedElementKind.METHOD, 0, dstName);
-											}
+											modifyMethod(mappingTree, currentClass, name, descriptor, dstName);
 										}
 									}
 									return super.visitMethod(access, name, descriptor, signature, exceptions);
@@ -119,6 +111,26 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str
 		} while (!mappingTree.visitEnd());
 	}
 
+	public static void modifyClass(MemoryMappingTree mappingTree, String name, String dstName) {
+		if (mappingTree.visitClass(name)) {
+			mappingTree.visitDstName(MappedElementKind.CLASS, 0, dstName);
+		}
+	}
+
+	public static void modifyMethod(MemoryMappingTree mappingTree, String className, String name, String descriptor, String dstName) {
+		if (mappingTree.visitClass(className))
+		if (mappingTree.visitMethod(name, descriptor)) {
+			mappingTree.visitDstName(MappedElementKind.METHOD, 0, dstName);
+		}
+	}
+
+	public static void modifyField(MemoryMappingTree mappingTree, String className, String name, String descriptor, String dstName) {
+		if (mappingTree.visitClass(className))
+		if (mappingTree.visitField(name, descriptor)) {
+			mappingTree.visitDstName(MappedElementKind.FIELD, 0, dstName);
+		}
+	}
+
 	public static void remap(Path mappings, Path input, Path output, Path[] cp, String srcNamespace, String dstNamespace) throws IOException {
 		TinyRemapper remapper = null;