Initial introduction of spotless.

Author: Fox2Code

build.gradle

@@ -6,26 +6,27 @@ import java.util.zip.ZipOutputStream
 
 buildscript {
     ext {
+        spotlessVersion = (project['spotless.version'] as String)
         jvmDowngraderVersion = (project['jvm-downgrader.version'] as String)
         debugCompiler = false
     }
-    dependencies {
-        // classpath("xyz.wagyourtail.jvmdowngrader:jvmdowngrader-java-api:$jvmDowngraderVersion")
-    }
 }
 
 plugins {
     id 'java-base'
+    id 'com.diffplug.spotless' version "$spotlessVersion" apply false
     id 'xyz.wagyourtail.jvmdowngrader' version "$jvmDowngraderVersion" apply false
 }
 
 group 'com.fox2code'
 version project['foxloader.version']
 
 tasks.register('publishToMavenLocal', Task)
+tasks.register('spotlessApply', Task)
 
 subprojects {
     apply plugin: 'java-library'
+    apply plugin: 'com.diffplug.spotless'
 
     version project['foxloader.version']
 
@@ -99,6 +100,12 @@ subprojects {
         withJavadocJar()
     }
 
+    spotless {
+        java {
+            formatAnnotations()
+        }
+    }
+
     javadoc {
         failOnError false
     }
@@ -111,6 +118,8 @@ subprojects {
     }
 
     afterEvaluate {
+        rootProject.tasks.spotlessApply.dependsOn(spotlessApply)
+
         tasks.withType(JavaCompile.class).configureEach {
             if (debugCompiler) {
                 options.compilerArgs.addAll(['--release', '8'])

gradle.properties

@@ -17,6 +17,9 @@ reindev.slimSHA256Sum=2fd437b85e4fb7e8f7d4bdf70cf2f5d5691386bd27b477074686c8f2e0
 reindev.version=2.9
 reindev.version.allowFrom=2.9
 
+# https://plugins.gradle.org/plugin/com.diffplug.spotless
+spotless.version=7.0.4
+
 # https://modrinth.com/mod/spark/versions
 #Spark properties
 spark.dependency=maven.modrinth:spark:1.10.138-fabric

loader/src/main/java/com/fox2code/foxloader/client/gui/GuiModListContainer.java

@@ -37,8 +37,7 @@ protected boolean isSelected(int i) {
         return this.selected == i;
     }
 
-    @NotNull
-    public ModContainer getSelectedModContainer() {
+    @NotNull public ModContainer getSelectedModContainer() {
         return this.mods[this.selected];
     }
 

loader/src/main/java/com/fox2code/foxloader/client/gui/GuiModMenuContainer.java

@@ -71,8 +71,7 @@ protected int getContentHeight() {
         return this.slotHeight * this.mods.length;
     }
 
-    @NotNull
-    public ModContainer getSelectedModContainer() {
+    @NotNull public ModContainer getSelectedModContainer() {
         return this.mods[this.selected];
     }
 

loader/src/main/java/com/fox2code/foxloader/energy/FoxPowerBlock.java

@@ -14,8 +14,7 @@ public interface FoxPowerBlock {
      * @param blockFace the blockFace to get a FoxPowerInterface from
      * @return the {@link FoxPowerInterface} for this block
      */
-    @Nullable
-    default FoxPowerInterface getPowerInterfaceForFace(BlockAccess blockAccess, int x, int y, int z, int blockFace) {
+    @Nullable default FoxPowerInterface getPowerInterfaceForFace(BlockAccess blockAccess, int x, int y, int z, int blockFace) {
         return this.getIntrinsicPowerInterface(blockAccess, x, y, z);
     }
 
@@ -28,8 +27,7 @@ default FoxPowerInterface getPowerInterfaceForFace(BlockAccess blockAccess, int
      * @param z the z block pos coordinate
      * @return the {@link FoxPowerInterface} for this block
      */
-    @Nullable
-    FoxPowerInterface getIntrinsicPowerInterface(BlockAccess blockAccess, int x, int y, int z);
+    @Nullable FoxPowerInterface getIntrinsicPowerInterface(BlockAccess blockAccess, int x, int y, int z);
 
     /**
      * Called to notify a block a new neighboring power block has updated its power interface.

loader/src/main/java/com/fox2code/foxloader/energy/FoxPowerInterface.java

@@ -32,6 +32,5 @@ public abstract class FoxPowerInterface {
      */
     public abstract int getCableSinkPriority();
 
-    @NotNull
-    public abstract FoxPowerType getFoxPowerType();
+    @NotNull public abstract FoxPowerType getFoxPowerType();
 }

loader/src/main/java/com/fox2code/foxloader/energy/FoxPowerItem.java

@@ -18,6 +18,5 @@ public interface FoxPowerItem {
 
     long sendFoxPower(ItemStack itemStack, long amount);
 
-    @NotNull
-    FoxPowerType getFoxPowerType();
+    @NotNull FoxPowerType getFoxPowerType();
 }

loader/src/main/java/com/fox2code/foxloader/event/network/PlayerConnectEvent.java

@@ -30,18 +30,15 @@ public PlayerConnectEvent(NetworkManager networkManager, String username, boolea
         this.cancelMessage = "Event cancelled";
     }
 
-    @NotNull
-    public NetworkManager getNetworkManager() {
+    @NotNull public NetworkManager getNetworkManager() {
         return this.networkManager;
     }
 
-    @Nullable
-    public ClientHello getClientHello() {
+    @Nullable public ClientHello getClientHello() {
         return this.clientHello;
     }
 
-    @NotNull
-    public String getUsername() {
+    @NotNull public String getUsername() {
         return this.username;
     }
 
@@ -52,8 +49,7 @@ public boolean isIncompatibleClient() {
         return this.incompatibleClient;
     }
 
-    @NotNull
-    public String getCancelMessage() {
+    @NotNull public String getCancelMessage() {
         return this.cancelMessage;
     }
 

loader/src/main/java/com/fox2code/foxloader/event/player/PlayerChatEvent.java

@@ -16,13 +16,11 @@ public PlayerChatEvent(EntityPlayer entityPlayer, String chatMessage) {
         this.formattedMessage = "<" + entityPlayer.username + "> " + chatMessage;
     }
 
-    @NotNull
-    public String getChatMessage() {
+    @NotNull public String getChatMessage() {
         return this.chatMessage;
     }
 
-    @NotNull
-    public String getFormattedMessage() {
+    @NotNull public String getFormattedMessage() {
         return this.formattedMessage;
     }
 

loader/src/main/java/com/fox2code/foxloader/event/player/PlayerEvent.java

@@ -13,8 +13,7 @@ protected PlayerEvent(EntityPlayer entityPlayer) {
         this.entityPlayer = Objects.requireNonNull(entityPlayer, "entityPlayer");
     }
 
-    @NotNull
-    public final EntityPlayer getEntityPlayer() {
+    @NotNull public final EntityPlayer getEntityPlayer() {
         return this.entityPlayer;
     }
 }