Add spotless.

MightyPirates · Aug 19, 2023 · ae7a296 · ae7a296
1 parent 80d1cbf
commit ae7a296
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 32 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     idea
     eclipse
     alias(libs.plugins.forgegradle)
+    alias(libs.plugins.spotless)
 }
 
 fun getGitRef(): String {
@@ -106,6 +107,17 @@ tasks {
     }
 }
 
+spotless {
+    java {
+        target("src/*/java/li/cil/**/*.java")
+
+        endWithNewline()
+        trimTrailingWhitespace()
+        removeUnusedImports()
+        indentWithSpaces()
+    }
+}
+
 idea {
     module {
         for (exclude in arrayOf("out", "logs")) {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,13 @@
+[versions]
+minecraft = "1.20.1"
+forge = "47.1.0"
+
+[plugins]
+forgegradle = { id = "net.minecraftforge.gradle", version = "[6.0,6.2)" }
+spotless = { id = "com.diffplug.spotless", version = "6.20.0" }
+
+[libraries]
+minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
+forge = { group = "net.minecraftforge", name = "forge", version = "1.20.1-47.1.0" }
+
+"jei" = { group = "curse.maven", name = "jei-238222", version = "4690097" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,33 +1,16 @@
 pluginManagement {
     repositories {
+        exclusiveContent {
+            forRepository { maven("https://maven.minecraftforge.net") }
+            filter { includeGroupByRegex("net\\.minecraftforge.*") }
+        }
         gradlePluginPortal()
-        maven { url = uri("https://maven.minecraftforge.net/") }
     }
 }
 
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
 }
 
-dependencyResolutionManagement {
-    versionCatalogs {
-        create("libs") {
-            val minecraftVersion = "1.20.1"
-            val forgeVersion = "47.1.0"
-
-            plugin("forgegradle", "net.minecraftforge.gradle").version("[6.0,6.2)")
-            plugin("spotless", "com.diffplug.spotless").version("6.20.0")
-
-            version("minecraft", minecraftVersion)
-            library("minecraft", "com.mojang", "minecraft").versionRef("minecraft")
-
-            version("forge", forgeVersion)
-            library("forge", "net.minecraftforge", "forge").version("$minecraftVersion-$forgeVersion")
-
-            library("jei", "curse.maven", "jei-238222").version("4690097")
-        }
-    }
-}
-
 val modId: String by settings
 rootProject.name = modId
diff --git a/src/main/java/li/cil/bedrockores/client/render/package-info.java b/src/main/java/li/cil/bedrockores/client/render/package-info.java
@@ -4,4 +4,4 @@
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/li/cil/bedrockores/common/block/entity/package-info.java b/src/main/java/li/cil/bedrockores/common/block/entity/package-info.java
@@ -4,4 +4,4 @@
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/li/cil/bedrockores/common/block/package-info.java b/src/main/java/li/cil/bedrockores/common/block/package-info.java
@@ -4,4 +4,4 @@
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/li/cil/bedrockores/common/command/package-info.java b/src/main/java/li/cil/bedrockores/common/command/package-info.java
@@ -4,4 +4,4 @@
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/li/cil/bedrockores/common/config/package-info.java b/src/main/java/li/cil/bedrockores/common/config/package-info.java
@@ -4,4 +4,4 @@
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/li/cil/bedrockores/common/item/package-info.java b/src/main/java/li/cil/bedrockores/common/item/package-info.java
@@ -4,4 +4,4 @@
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/li/cil/bedrockores/common/network/message/package-info.java b/src/main/java/li/cil/bedrockores/common/network/message/package-info.java
@@ -4,4 +4,4 @@
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/li/cil/bedrockores/common/network/package-info.java b/src/main/java/li/cil/bedrockores/common/network/package-info.java
@@ -4,4 +4,4 @@
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/li/cil/bedrockores/common/package-info.java b/src/main/java/li/cil/bedrockores/common/package-info.java
@@ -4,4 +4,4 @@
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/li/cil/bedrockores/common/sound/package-info.java b/src/main/java/li/cil/bedrockores/common/sound/package-info.java
@@ -4,4 +4,4 @@
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/li/cil/bedrockores/common/world/package-info.java b/src/main/java/li/cil/bedrockores/common/world/package-info.java
@@ -4,4 +4,4 @@
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;