Fix patches which add files

Author: Lassebq

gradle.properties

@@ -3,5 +3,5 @@ fernflower_version=3488141
 rdi_version=c4d6594
 jansi_version=2.4.0
 json_version=20220924
-diffpatch_version=c639936cdbed7e28c7833316161dcb7fae80d0b6
+diffpatch_version=cde1224
 mapping_io_version=0.3.0

src/main/java/org/mcphackers/mcp/tasks/TaskApplyPatch.java

@@ -34,7 +34,6 @@ public static void patch(Task task, Path base, Path out, Path patches) throws IO
 				.patchesPath(patches)
 				.outputPath(out)
 				.mode(PatchMode.OFFSET)
-				.filter(p -> p.endsWith(".java"))
 				.build();
 		boolean success = patchOperation.doPatch();
 		patchOperation.getSummary().print(new PrintStream(logger), false);

src/main/java/org/mcphackers/mcp/tasks/TaskDecompile.java

@@ -110,10 +110,8 @@ protected Stage[] setStages() {
 						Files.delete(p);
 					}
 				}
-				// Create Minecraft dir
-				Files.createDirectories(ffOut.getParent());
-				FileUtil.compress(ffOut, MCPPaths.get(mcp, SOURCE_JAR, side));
 				Files.createDirectories(srcPath);
+				FileUtil.compress(ffOut, MCPPaths.get(mcp, SOURCE_JAR, side));
 				if(mcp.getOptions().getBooleanParameter(TaskParameter.OUTPUT_SRC)) {
 					FileUtil.deletePackages(ffOut, mcp.getOptions().getStringArrayParameter(TaskParameter.IGNORED_PACKAGES));
 					FileUtil.copyDirectory(ffOut, srcPath);

src/main/java/org/mcphackers/mcp/tasks/TaskReobfuscate.java

@@ -90,10 +90,11 @@ private void reobfuscate() throws IOException {
 				if(entry.isDirectory()) {
 					return false;
 				}
-				String className = entry.getName().replace(".class", "");
+				String obfClassName = entry.getName().replace(".class", "");
 				// Force inner classes to compare outer class hash
-				int index;
-				if((index = className.indexOf('$')) != -1) {
+				String className = obfClassName;
+				int index = className.indexOf('$');
+				if(index != -1) {
 					className = className.substring(0, index);
 				}
 				String deobfName = reversedNames.get(className);
@@ -102,10 +103,11 @@ private void reobfuscate() throws IOException {
 				}
 				String hash			= originalHashes.get(deobfName);
 				String hashModified = recompHashes.get(deobfName);
-				if(hash == null) {
-					return true;
+				boolean extract = (hash == null) || !hash.equals(hashModified);
+				if(extract) {
+					System.out.println(reversedNames.get(obfClassName) + " : " + obfClassName);
 				}
-				else return !hash.equals(hashModified);
+				return extract;
 			});
 		}
 	}
@@ -158,9 +160,6 @@ private void modifyClassMappings(Mappings mappings, List<String> classNames, boo
 
 	private static Map<String, String> getPackageMappings(Map<String, String> classMappings) {
 		Map<String, String> packageMappings = new HashMap<>();
-		for(Entry<String, String> entry : classMappings.entrySet()) {
-			System.out.println(entry.getKey() + " : " + entry.getValue());
-		}
 		for(Entry<String, String> entry : classMappings.entrySet()) {
 			int i1 = entry.getKey().indexOf('/');
 			int i2 = entry.getValue().indexOf('/');