Fix unpackSourcePatches and generate binary patches (#199)

Co-authored-by: Marc Hermans <[email protected]>
neoforged · Jun 7, 2024 · 9c04626 · 9c04626
1 parent 281a603
commit 9c04626
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/common/src/main/java/net/neoforged/gradle/common/caching/CentralCacheService.java b/common/src/main/java/net/neoforged/gradle/common/caching/CentralCacheService.java
@@ -282,11 +282,13 @@ public void hash(TaskInputs inputs) throws IOException {
             });
 
             for (File file : inputs.getFiles()) {
-                debugLog(task, "Hashing task input file: " + file.getAbsolutePath());
-                hasher.putString(file.getName());
-                final HashCode code = hashFunction.hashFile(file);
-                debugLog(task, "Hashing task input file hash: " + code);
-                hasher.putHash(code);
+                for (Path path : Files.walk(file.toPath()).filter(Files::isRegularFile).toList()) {
+                    debugLog(task, "Hashing task input file: " + path.toAbsolutePath());
+                    hasher.putString(path.getFileName().toString());
+                    final HashCode code = hashFunction.hashFile(path.toFile());
+                    debugLog(task, "Hashing task input file hash: " + code);
+                    hasher.putHash(code);
+                }
             }
         }
 

diff --git a/platform/src/main/java/net/neoforged/gradle/platform/extensions/DynamicProjectExtension.java b/platform/src/main/java/net/neoforged/gradle/platform/extensions/DynamicProjectExtension.java
@@ -250,7 +250,7 @@ public void runtime(final String neoFormVersion, Directory patches, Directory re
             });
 
             final TaskProvider<? extends UnpackZip> unpackZip = project.getTasks().register("unpackSourcePatches", UnpackZip.class, task -> {
-                task.getInput().from(createPatches.flatMap(WithOutput::getOutput));
+                task.getInput().from(project.zipTree(createPatches.flatMap(WithOutput::getOutput)));
                 task.getUnpackingTarget().set(patches);
 
                 CommonRuntimeExtension.configureCommonRuntimeTaskParameters(task, runtimeDefinition, workingDirectory);