spotless apply

Author: vfyjxf

src/main/java/net/neoforged/moddevgradle/dsl/ModdingVersionSettings.java

@@ -1,14 +1,13 @@
 package net.neoforged.moddevgradle.dsl;
 
+import java.util.HashSet;
+import java.util.Set;
+import javax.inject.Inject;
 import net.neoforged.moddevgradle.internal.utils.ExtensionUtils;
 import org.gradle.api.Project;
 import org.gradle.api.tasks.SourceSet;
 import org.jetbrains.annotations.Nullable;
 
-import javax.inject.Inject;
-import java.util.HashSet;
-import java.util.Set;
-
 public abstract class ModdingVersionSettings {
     @Nullable
     private String version;
@@ -88,5 +87,4 @@ public boolean isSplitDist() {
     public void setSplitDist(boolean enable) {
         this.splitDist = enable;
     }
-
 }

src/main/java/net/neoforged/moddevgradle/internal/ModDevArtifactsWorkflow.java

@@ -190,7 +190,7 @@ public static ModDevArtifactsWorkflow create(Project project,
         });
 
         var splitMergedJar = tasks.register("splitMergedJar", SplitMergedJar.class, task -> {
-            if (!splitDist){
+            if (!splitDist) {
                 throw new IllegalStateException("Can't request split dist result when splitDist is disabled!");
             }
             task.getClientResourcesJar().set(createArtifacts.flatMap(CreateMinecraftArtifacts::getResourcesArtifact));
@@ -206,7 +206,7 @@ public static ModDevArtifactsWorkflow create(Project project,
 
         });
 
-        if(splitDist){
+        if (splitDist) {
             ideIntegration.runTaskOnProjectSync(splitMergedJar);
         }
 
@@ -243,7 +243,7 @@ public static ModDevArtifactsWorkflow create(Project project,
             config.setDescription("The compile-time dependencies to develop a mod, including Minecraft and modding platform classes.");
             config.setCanBeResolved(false);
             config.setCanBeConsumed(false);
-            if (!splitDist){
+            if (!splitDist) {
                 config.getDependencies().addLater(minecraftClassesDependency);
             } else {
                 config.getDependencies().addLater(splitMergedJar.map(task -> project.files(task.getCommonJar())).map(dependencyFactory::create));
@@ -258,7 +258,7 @@ public static ModDevArtifactsWorkflow create(Project project,
             config.setDescription("The extra client compile-time dependencies to develop a mod, including Minecraft and modding platform classes.");
             config.setCanBeResolved(false);
             config.setCanBeConsumed(false);
-            if (splitDist){
+            if (splitDist) {
                 config.getDependencies().addLater(splitMergedJar.map(task -> project.files(task.getClientJar())).map(dependencyFactory::create));
             }
         });
@@ -290,12 +290,12 @@ public static ModDevArtifactsWorkflow create(Project project,
             result.addToSourceSet(sourceSets, !splitDist);
         }
 
-        if (splitDist){
+        if (splitDist) {
             SourceSetContainer sourceSets = ExtensionUtils.getSourceSets(project);
             var main = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
             SourceSet client = sourceSets.create("client");
             client.setCompileClasspath(client.getCompileClasspath().plus(main.getOutput()));
-            result.addToSourceSet(client,true);
+            result.addToSourceSet(client, true);
         }
 
         return result;

src/main/java/net/neoforged/moddevgradle/internal/RunUtils.java

@@ -255,7 +255,7 @@ public static Provider<Map<String, ModFolder>> buildModFolders(Project project,
                             outputFolderResolver.accept(sourceSet, modFolder.getFolders());
                         }
 
-                        if (isClient){
+                        if (isClient) {
                             var clientSourceSets = mod.getModClientSourceSets().get();
                             for (int i = 0; i < clientSourceSets.size(); ++i) {
                                 var sourceSet = clientSourceSets.get(i);

src/main/java/net/neoforged/nfrtgradle/SplitMergedJar.java

@@ -1,14 +1,5 @@
 package net.neoforged.nfrtgradle;
 
-import org.gradle.api.DefaultTask;
-import org.gradle.api.file.RegularFileProperty;
-import org.gradle.api.tasks.InputFile;
-import org.gradle.api.tasks.Optional;
-import org.gradle.api.tasks.OutputFile;
-import org.gradle.api.tasks.TaskAction;
-import org.jetbrains.annotations.Nullable;
-
-import javax.inject.Inject;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
@@ -17,6 +8,14 @@
 import java.util.jar.JarFile;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
+import javax.inject.Inject;
+import org.gradle.api.DefaultTask;
+import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.tasks.InputFile;
+import org.gradle.api.tasks.Optional;
+import org.gradle.api.tasks.OutputFile;
+import org.gradle.api.tasks.TaskAction;
+import org.jetbrains.annotations.Nullable;
 
 public abstract class SplitMergedJar extends DefaultTask {
     @Inject
@@ -48,32 +47,27 @@ public void splitMergedJar() throws IOException {
                 var clientResources = new JarFile(getClientResourcesJar().get().getAsFile());
                 var merged = new ZipInputStream(new BufferedInputStream(Files.newInputStream(getMergedJar().get().getAsFile().toPath())));
                 var common = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(getCommonJar().get().getAsFile().toPath())));
-                var client = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(getClientJar().get().getAsFile().toPath())))
-        ) {
+                var client = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(getClientJar().get().getAsFile().toPath())))) {
 
             var manifest = clientResources.getManifest();
 
             if (getCommonSourcesJar().isPresent() && getClientSourcesJar().isPresent()) {
                 try (
                         var commonSources = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(getCommonSourcesJar().get().getAsFile().toPath())));
-                        var clientSources = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(getClientSourcesJar().get().getAsFile().toPath())))
-                ) {
+                        var clientSources = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(getClientSourcesJar().get().getAsFile().toPath())))) {
                     spiltHelper(manifest, merged, common, client, commonSources, clientSources);
                 }
             } else {
                 spiltHelper(manifest, merged, common, client, null, null);
             }
 
-
         }
-
     }
 
     private static void spiltHelper(
             java.util.jar.Manifest manifest,
             ZipInputStream merged, ZipOutputStream common, ZipOutputStream client,
-            @Nullable ZipOutputStream commonSources, @Nullable ZipOutputStream clientSources
-    ) throws IOException {
+            @Nullable ZipOutputStream commonSources, @Nullable ZipOutputStream clientSources) throws IOException {
         var sourceDistName = new Attributes.Name("Minecraft-Dist");
         for (var entry = merged.getNextEntry(); entry != null; entry = merged.getNextEntry()) {
             if (entry.isDirectory()) {
@@ -112,5 +106,4 @@ private static void spiltHelper(
             }
         }
     }
-
 }