Merge pull request #2 from EpimorphicPioneers/spotless

使用spotless来格式化项目

build.gradle

@@ -5,6 +5,7 @@ plugins {
     alias libs.plugins.architectury.loom
     alias libs.plugins.machete // automatic jar compressing on build
     alias libs.plugins.shadow
+    alias libs.plugins.spotless
 }
 
 apply plugin: "dev.architectury.loom"
@@ -36,6 +37,7 @@ apply from: "$rootDir/gradle/scripts/dependencies.gradle"
 apply from: "$rootDir/gradle/scripts/resources.gradle"
 apply from: "$rootDir/gradle/scripts/jars.gradle"
 apply from: "$rootDir/gradle/scripts/publishing.gradle"
+apply from: "$rootDir/gradle/scripts/spotless.gradle"
 
 tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
@@ -44,4 +46,6 @@ tasks.withType(JavaCompile) {
 machete {
     // disable machete locally for faster builds
     enabled = false
-}
+}
+
+tasks.build.dependsOn(tasks.spotlessCheck)

gradle/scripts/architectury_loom.gradle

@@ -53,4 +53,4 @@ loom {
             }
         }
     }
-}
+}

gradle/scripts/capabilities.gradle

@@ -8,4 +8,4 @@ configurations {
 //            capability("io.github.llamalad7:mixinextras-forge:${this.forge.versions.mixinextras.get()}")
 //        }
 //    }
-}
+}

gradle/scripts/jars.gradle

@@ -29,4 +29,4 @@ remapSlimJar {
 
 tasks.remapJar.dependsOn('remapSlimJar')
 
-archivesBaseName = "${project.name}-${libs.versions.minecraft.get()}"
+archivesBaseName = "${project.name}-${libs.versions.minecraft.get()}"

gradle/scripts/repositories.gradle

@@ -45,4 +45,4 @@ repositories {
     maven { url = "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes
     maven { url 'https://jitpack.io' } // Mixin Extras, Fabric ASM
     maven { url = "https://server.cjsah.net:1002/maven/" }
-}
+}

gradle/scripts/resources.gradle

@@ -30,4 +30,4 @@ processResources {
     filesMatching("META-INF/mods.toml") {
         expand properties
     }
-}
+}

gradle/scripts/spotless.gradle

@@ -0,0 +1,23 @@
+spotless {
+    encoding 'UTF-8'
+    format 'misc', {
+        target '.gitignore', '*.gradle', 'gradle/scripts/*.gradle'
+
+        trimTrailingWhitespace()
+        indentWithSpaces(4)
+        endWithNewline()
+    }
+    java {
+        target 'src/*/java/**/*.java'
+
+        importOrder()
+        removeUnusedImports()
+
+        palantirJavaFormat().style("GOOGLE")
+        indentWithTabs(2)
+        indentWithSpaces(4)
+
+        cleanthat()
+        formatAnnotations()
+    }
+}

settings.gradle

@@ -43,6 +43,7 @@ dependencyResolutionManagement {
         def mixinextrasVersion = "0.3.2"
         def shimmerVersion = "0.2.2"
         def monomorphismLibVersion = "1.0.10-build.17"
+        def spotlessVersion = "7.0.0.BETA1"
 
         forge {
             version("forgeShortVersion", forgeVersion)
@@ -114,6 +115,9 @@ dependencyResolutionManagement {
 
             def machete = version("machete", macheteVersion)
             plugin("machete", "io.github.p03w.machete").versionRef(machete)
+
+            def spotless = version("spotless", spotlessVersion)
+            plugin("spotless", "com.diffplug.spotless").versionRef(spotless)
         }
     }
 }

src/main/java/com/example/examplemod/ExampleGTAddon.java

@@ -11,8 +11,5 @@ public ExampleGTAddon() {
     }
 
     @Override
-    public void initializeAddon() {
-
-    }
-
+    public void initializeAddon() {}
 }

src/main/java/com/example/examplemod/ExampleMod.java

@@ -80,5 +80,4 @@ public static MORegistrate registrate() {
     public static INetworking network() {
         return instance.getNetwork();
     }
-
 }

src/main/java/com/example/examplemod/client/ClientProxy.java

@@ -10,5 +10,4 @@ public class ClientProxy extends CommonProxy implements IClientProxyBase {
     public ClientProxy() {
         super();
     }
-
 }

src/main/java/com/example/examplemod/common/CommonProxy.java

@@ -10,12 +10,8 @@ public CommonProxy() {
     }
 
     @Override
-    public void registerEventHandlers() {
-
-    }
+    public void registerEventHandlers() {}
 
     @Override
-    public void registerCapabilities() {
-
-    }
+    public void registerCapabilities() {}
 }

src/main/java/com/example/examplemod/config/ExampleConfigHolder.java

@@ -4,15 +4,15 @@
 import dev.toma.configuration.Configuration;
 import dev.toma.configuration.config.Config;
 import dev.toma.configuration.config.format.ConfigFormats;
+
 @Config(id = ExampleMod.MODID)
 public class ExampleConfigHolder {
     public static ExampleConfigHolder INSTANCE;
 
     public static void init() {
         if (INSTANCE == null) {
-            INSTANCE = Configuration.registerConfig(ExampleConfigHolder.class, ConfigFormats.yaml()).getConfigInstance();
+            INSTANCE = Configuration.registerConfig(ExampleConfigHolder.class, ConfigFormats.yaml())
+                    .getConfigInstance();
         }
     }
-
-
 }

src/main/java/com/example/examplemod/data/ExampleLangHandler.java

@@ -4,9 +4,9 @@
 
 public class ExampleLangHandler {
 
-    private ExampleLangHandler() {/**/}
-
-    public static void init(MOLangProvider provider) {
-
+    private ExampleLangHandler() {
+        /**/
     }
+
+    public static void init(MOLangProvider provider) {}
 }