Fix injection logic not taking into accounts that trees might need to…

… be offset by a prefix. (#156)
neoforged · Apr 28, 2024 · b15b5af · b15b5af
1 parent f4baaba
commit b15b5af
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 75 deletions.
diff --git a/README.md b/README.md
@@ -44,13 +44,13 @@ plugins {
 
 dependencies {
   // For depending on a Minecraft JAR-file with both client- and server-classes
-  implementation "net.minecraft:neoform_joined:<neoform-version>'
+  implementation "net.minecraft:neoform_joined:<neoform-version>"
   
   // For depending on the Minecraft client JAR-file
-  implementation "net.minecraft:neoform_client:<neoform-version>'
+  implementation "net.minecraft:neoform_client:<neoform-version>"
   
   // For depending on the Minecraft dedicated server JAR-file
-  implementation "net.minecraft:neoform_server:<neoform-version>'
+  implementation "net.minecraft:neoform_server:<neoform-version>"
 }
 ```
 

diff --git a/common/src/main/java/net/neoforged/gradle/common/runtime/tasks/DefaultRuntime.java b/common/src/main/java/net/neoforged/gradle/common/runtime/tasks/DefaultRuntime.java
@@ -49,8 +49,8 @@ public DefaultRuntime() {
                 Map.Entry::getKey,
                 entry -> getNeoFormArchive()
                         .getAsFileTree()
-                        .matching(archive -> archive.include(entry.getValue())
-        )))));
+                        .matching(archive -> archive.include(entry.getValue()))
+        ))));
 
         getOutputDirectory().finalizeValueOnRead();
     }

diff --git a/common/src/main/java/net/neoforged/gradle/common/tasks/ObfuscatedDependencyMarker.java b/common/src/main/java/net/neoforged/gradle/common/tasks/ObfuscatedDependencyMarker.java
diff --git a/...rc/main/java/net/neoforged/gradle/neoform/runtime/extensions/NeoFormRuntimeExtension.java b/...rc/main/java/net/neoforged/gradle/neoform/runtime/extensions/NeoFormRuntimeExtension.java
@@ -128,6 +128,7 @@ private static TaskProvider<? extends WithOutput> createBuiltIn(final NeoFormRun
                                                             }
                                                         })
                                                 );
+                                                fileTreeSource.getTreePrefix().set(task.getSymbolicDataSources().map(data -> data.get("inject")));
                                                 return fileTreeSource;
                                             })
                                     );

diff --git a/...rm/src/main/java/net/neoforged/gradle/neoform/runtime/tasks/InjectFromFileTreeSource.java b/...rm/src/main/java/net/neoforged/gradle/neoform/runtime/tasks/InjectFromFileTreeSource.java
@@ -3,13 +3,14 @@
 import net.neoforged.gradle.util.ZipBuildingFileTreeVisitor;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.FileTree;
-import org.gradle.api.tasks.InputFiles;
-import org.gradle.api.tasks.PathSensitive;
-import org.gradle.api.tasks.PathSensitivity;
+import org.gradle.api.file.FileVisitDetails;
+import org.gradle.api.provider.Property;
+import org.gradle.api.tasks.*;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 /**
@@ -22,10 +23,15 @@ public abstract class InjectFromFileTreeSource extends AbstractInjectSource {
     @PathSensitive(PathSensitivity.NONE)
     public abstract ConfigurableFileCollection getFiles();
 
+    @Optional
+    @Input
+    public abstract Property<String> getTreePrefix();
+
     @Override
     public byte @Nullable [] tryReadFile(String path) throws IOException {
+        final String lookupPath = buildTreePrefix() + path;
         final FileTree matching = getFiles().getAsFileTree().matching(createFilter())
-                .matching(pattern -> pattern.include(path));
+                .matching(pattern -> pattern.include(lookupPath));
         if (matching.isEmpty()) {
             return null;
         }
@@ -39,6 +45,42 @@ public void copyTo(ZipOutputStream out) throws IOException {
         }
 
         final FileTree source = getFiles().getAsFileTree().matching(createFilter());
-        source.visit(new ZipBuildingFileTreeVisitor(out));
+        source.visit(new ZipBuildingFileTreeVisitor(out) {
+            @Override
+            protected ZipEntry createDirectory(FileVisitDetails fileVisitDetails) {
+                String path = fileVisitDetails.getRelativePath().getPathString();
+                if (path.startsWith(buildTreePrefix())) {
+                    path = path.substring(buildTreePrefix().length());
+                }
+
+                if (!path.endsWith("/")) {
+                    path += "/";
+                }
+
+                return new ZipEntry(path);
+            }
+
+            @Override
+            protected ZipEntry createFile(FileVisitDetails fileVisitDetails) {
+                String path = fileVisitDetails.getRelativePath().getPathString();
+                if (path.startsWith(buildTreePrefix())) {
+                    path = path.substring(buildTreePrefix().length());
+                }
+
+                return new ZipEntry(path);
+            }
+        });
+    }
+
+    private String buildTreePrefix() {
+        if (getTreePrefix().isPresent()) {
+            final String prefix = getTreePrefix().get();
+            if (!prefix.endsWith("/")) {
+                return prefix + "/";
+            }
+            return prefix;
+        }
+
+        return "";
     }
 }
diff --git a/utils/src/main/java/net/neoforged/gradle/util/ZipBuildingFileTreeVisitor.java b/utils/src/main/java/net/neoforged/gradle/util/ZipBuildingFileTreeVisitor.java
@@ -24,7 +24,7 @@ public ZipBuildingFileTreeVisitor(ZipOutputStream outputZipStream) {
     @Override
     public void visitDir(FileVisitDetails fileVisitDetails) {
         try {
-            final ZipEntry directoryEntry = new ZipEntry(fileVisitDetails.getRelativePath().getPathString() + "/");
+            final ZipEntry directoryEntry = createDirectory(fileVisitDetails);
             outputZipStream.putNextEntry(directoryEntry);
             outputZipStream.closeEntry();
         } catch (IOException zip) {
@@ -33,16 +33,24 @@ public void visitDir(FileVisitDetails fileVisitDetails) {
             }
         }
     }
+
+    protected ZipEntry createDirectory(FileVisitDetails fileVisitDetails) {
+        return new ZipEntry(fileVisitDetails.getRelativePath().getPathString() + "/");
+    }
 
     @Override
     public void visitFile(FileVisitDetails fileVisitDetails) {
         try {
-            final ZipEntry fileEntry = new ZipEntry(fileVisitDetails.getRelativePath().getPathString());
+            final ZipEntry fileEntry = createFile(fileVisitDetails);
             outputZipStream.putNextEntry(fileEntry);
             fileVisitDetails.copyTo(outputZipStream);
             outputZipStream.closeEntry();
         } catch (IOException e) {
             throw new RuntimeException("Could not create zip file: " + fileVisitDetails.getRelativePath().getPathString(), e);
         }
     }
+
+    protected ZipEntry createFile(FileVisitDetails fileVisitDetails) {
+        return new ZipEntry(fileVisitDetails.getRelativePath().getPathString());
+    }
 }