Add support for testing the platform

Fix issues with patch baking due to bugs in DP2
Add roundtrip testing for platform module

build.gradle

@@ -78,6 +78,10 @@ subprojects.forEach { Project subProject ->
         }
     }
 
+    subProject.tasks.withType(ProcessResources).configureEach {
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
+
     //Wire up our custom repositories.
     subProject.repositories.mavenLocal()
     subProject.repositories.maven { MavenArtifactRepository repository ->

gradle.properties

@@ -22,7 +22,7 @@ maven_artifact_version=3.8.5
 ivy_artifact_version=2.5.1
 httpclient_version=4.5.13
 srgutils_version=0.4.13
-diffpatch_version=2.0.0.34
+diffpatch_version=2.0.0.35
 jarjar_version=0.4.1
 jetbrains_annotations_version=23.0.0
 gradle_idea_extension_version=1.1.6
@@ -37,4 +37,4 @@ spock_version=2.1
 spock_groovy_version=3.0
 mockito_version=4.11.0
 jimfs_version=1.2
-trainingwheels_version=1.0.48
+trainingwheels_version=1.0.49

platform/build.gradle

@@ -1,4 +1,5 @@
 plugins {
+    id 'groovy'
     id 'java-gradle-plugin'
 }
 

platform/src/main/java/net/neoforged/gradle/platform/extensions/DynamicProjectExtension.java

@@ -142,7 +142,7 @@ public void neoform(final String neoFormVersion) {
 
         final NeoFormRuntimeExtension neoFormRuntimeExtension = project.getExtensions().getByType(NeoFormRuntimeExtension.class);
         final NeoFormRuntimeDefinition runtimeDefinition = neoFormRuntimeExtension.create(builder -> {
-            builder.withNeoFormVersion(neoFormVersion).withDistributionType(DistributionType.CLIENT);
+            builder.withNeoFormVersion(neoFormVersion).withDistributionType(DistributionType.JOINED);
 
             NeoFormRuntimeUtils.configureDefaultRuntimeSpecBuilder(project, builder);
         });
@@ -439,7 +439,8 @@ public void runtime(final String neoFormVersion, Directory patches, Directory re
                 });
 
                 profile.getLibraries().add(Library.fromOutput(signUniversalJar, project, "net.neoforged", "neoforge", project.getVersion().toString(), "universal"));
-
+
+                //TODO: Abstract this away to some kind of DSL property
                 profile.getIcon().set(project.provider(() -> {
                     final File icon = new File(project.getRootProject().getProjectDir(), "docs/assets/neoforged.ico");
                     if (!icon.exists()) {
@@ -818,6 +819,8 @@ private void configureRunType(final Project project, final RunType runType, fina
     }
 
     private static void configureInstallerTokens(final TokenizedTask tokenizedTask, final RuntimeDevRuntimeDefinition runtimeDefinition, final Collection<Configuration> ignoreConfigurations, final Configuration pluginLayerLibraries, final Configuration gameLayerLibraries) {
+        //TODO: This should be moved to a DSL configurable model.
+
         tokenizedTask.token("TASK", "forgeserver");
         tokenizedTask.token("MAVEN_PATH", String.format("%s/%s/%s", tokenizedTask.getProject().getGroup().toString().replace('.', '/'), tokenizedTask.getProject().getName(), tokenizedTask.getProject().getVersion()));
         tokenizedTask.token("FORGE_VERSION", tokenizedTask.getProject().getVersion());
@@ -928,7 +931,7 @@ private void configureUserdevRunType(final RunType runType, Configuration module
     }
 
     private static String createCoordinate(final Project project, final String classifier) {
-        return Artifact.from(project, classifier, "jar").toString();
+        return Objects.toString(Artifact.from(project, classifier, "jar"));
     }
 
     @NotNull

platform/src/main/java/net/neoforged/gradle/platform/runtime/runtime/specification/RuntimeDevRuntimeSpecification.java

@@ -57,10 +57,19 @@ public String getMinecraftVersion() {
     }
 
     public Directory getPatchesDirectory() {
+        if (!patchesDirectory.getAsFile().exists()) {
+            //Ensure the directory exists
+            patchesDirectory.getAsFile().mkdirs();
+        }
+
         return patchesDirectory;
     }
 
     public Directory getRejectsDirectory() {
+        if (!rejectsDirectory.getAsFile().exists()) {
+            //Ensure the directory exists
+            rejectsDirectory.getAsFile().mkdirs();
+        }
         return rejectsDirectory;
     }
 

platform/src/main/java/net/neoforged/gradle/platform/runtime/runtime/tasks/GenerateSourcePatches.java

@@ -36,8 +36,8 @@ public void doTask() throws Exception {
         Path base = getBase().get().getAsFile().toPath();
         Path modified = getModified().get().getAsFile().toPath();
         Path output = getOutput().get().getAsFile().toPath();
-        getProject().getLogger().info("Base: {}", base);
-        getProject().getLogger().info("Modified: {}", modified);
+        getLogger().info("Base: {}", base);
+        getLogger().info("Modified: {}", modified);
 
         DiffOperation.Builder builder = DiffOperation.builder()
                 .logTo(getLogger()::lifecycle)

platform/src/main/java/net/neoforged/gradle/platform/tasks/CreateClasspathFiles.java

@@ -22,10 +22,10 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+//TODO: This task crashes a run when the input template file is not present.
 @CacheableTask
 public abstract class CreateClasspathFiles extends DefaultRuntime implements TokenizedTask {
-
-
+
     public CreateClasspathFiles() {
         getTemplate().set(getProject().getRootProject().file("server_files/args.txt"));
         getOutputFileName().convention("args.txt");
@@ -71,7 +71,7 @@ public void doTask() throws Exception {
             copySpec.into(getOutputDirectory().get().getAsFile());
         });
     }
-    
+
     @InputFile
     @PathSensitive(PathSensitivity.NONE)
     public abstract RegularFileProperty getTemplate();

platform/src/main/java/net/neoforged/gradle/platform/tasks/CreateLegacyInstaller.java

@@ -57,7 +57,8 @@ public CreateLegacyInstaller() {
             spec.into("data");
             spec.rename(name -> "server.lzma");
         });
-
+
+        //TODO: Handle this better. They are hardcoded and if they don't exists it will fail.
         getUrlIcon().fileValue(getProject().getRootProject().file("src/main/resources/url.png"));
         getInstallerLogo().fileValue(getProject().getRootProject().file("src/main/resources/neoforged_logo.png"));
         from(getData(), spec -> {

test-utils/src/main/groovy/net/neoforged/gradle/utils/test/extensions/FileExtensions.groovy

@@ -2,6 +2,11 @@ package net.neoforged.gradle.utils.test.extensions
 
 import groovy.transform.CompileStatic
 
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
+
 /**
  * Extensions for the [File] class.
  */
@@ -13,4 +18,22 @@ class FileExtensions {
     static String getPropertiesPath(final File self) {
         return self.absolutePath.replace("\\", "\\\\")
     }
+
+    static File getZipEntry(final File self, final String path) {
+        final ZipFile zipFile = new ZipFile(self)
+        final ZipEntry entry = zipFile.getEntry(path)
+        if (entry == null) {
+            throw new IllegalArgumentException("Entry not found: $path")
+        }
+
+        final File tempFile = File.createTempFile("zipEntry", ".tmp")
+        final InputStream zipInputStream = zipFile.getInputStream(entry)
+        final OutputStream tempOutputStream = new FileOutputStream(tempFile)
+        tempOutputStream << zipInputStream
+        tempOutputStream.close()
+        zipInputStream.close()
+        zipFile.close()
+
+        return tempFile;
+    }
 }