Spotless plugin install/run

Initial work on porting registrations to AE2 standard
pedroksl · Aug 21, 2024 · d41ccf1 · d41ccf1
1 parent 3b8c551
commit d41ccf1
Show file tree

Hide file tree

Showing 70 changed files with 4,534 additions and 4,094 deletions.
diff --git a/aae.importorder b/aae.importorder
@@ -0,0 +1,9 @@
+0=java
+2=org
+1=com
+5=net
+3=it
+6=cpw
+7=appeng
+9=me
+10=de
diff --git a/build.gradle b/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'net.neoforged.moddev' version '1.0.17'
+    id 'com.diffplug.spotless'
 }
 
 tasks.named('wrapper', Wrapper).configure {
@@ -165,3 +166,32 @@ idea {
         downloadJavadoc = true
     }
 }
+
+spotless {
+//    kotlinGradle {
+//        target("*.kts")
+//        diktat()
+//        indentWithTabs(1)
+//        endWithNewline()
+//    }
+
+    java {
+        target("/src/**/java/**/*.java")
+        endWithNewline()
+        indentWithTabs(1)
+        removeUnusedImports()
+        palantirJavaFormat()
+        importOrderFile(file("aae.importorder"))
+        toggleOffOn()
+
+        bumpThisNumberIfACustomStepChanges(1)
+    }
+
+    json {
+        target("src/**/resources/**/*.json")
+        targetExclude("src/generated/resources/**")
+        biome()
+        indentWithTabs(1)
+        endWithNewline()
+    }
+}
diff --git a/settings.gradle b/settings.gradle
@@ -4,6 +4,9 @@ pluginManagement {
         gradlePluginPortal()
         maven { url = 'https://maven.neoforged.net/releases' }
     }
+    plugins {
+        id("com.diffplug.spotless") version "6.25.0"
+    }
 }
 
 plugins {

diff --git a/src/main/java/net/pedroksl/advanced_ae/AAEConfig.java b/src/main/java/net/pedroksl/advanced_ae/AAEConfig.java
@@ -8,13 +8,12 @@
 @EventBusSubscriber(modid = AdvancedAE.MOD_ID, bus = EventBusSubscriber.Bus.MOD)
 public class AAEConfig {
 
-	private static final ModConfigSpec.Builder BUILDER = new ModConfigSpec.Builder();
+    private static final ModConfigSpec.Builder BUILDER = new ModConfigSpec.Builder();
 
-	public static final ModConfigSpec SPEC = BUILDER.build();
+    public static final ModConfigSpec SPEC = BUILDER.build();
 
-	@SubscribeEvent
-	static void onLoad(final ModConfigEvent event) {
-		if (event.getConfig().getSpec() == SPEC) {
-		}
-	}
+    @SubscribeEvent
+    static void onLoad(final ModConfigEvent event) {
+        if (event.getConfig().getSpec() == SPEC) {}
+    }
 }
diff --git a/src/main/java/net/pedroksl/advanced_ae/AdvancedAE.java b/src/main/java/net/pedroksl/advanced_ae/AdvancedAE.java
@@ -1,6 +1,12 @@
 package net.pedroksl.advanced_ae;
 
 import com.mojang.logging.LogUtils;
+
+import net.pedroksl.advanced_ae.common.definitions.AAEBlockEntities;
+import net.pedroksl.advanced_ae.common.definitions.AAEBlocks;
+import net.pedroksl.advanced_ae.common.definitions.AAEItems;
+import org.slf4j.Logger;
+
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.neoforged.bus.api.IEventBus;
@@ -12,10 +18,9 @@
 import net.neoforged.fml.loading.FMLEnvironment;
 import net.neoforged.neoforge.registries.RegisterEvent;
 import net.pedroksl.advanced_ae.client.AAEClientRegistryHandler;
-import net.pedroksl.advanced_ae.common.AAESingletons;
 import net.pedroksl.advanced_ae.common.AAERegistryHandler;
+import net.pedroksl.advanced_ae.common.AAESingletons;
 import net.pedroksl.advanced_ae.network.AAENetworkHandler;
-import org.slf4j.Logger;
 
 // The value here should match an entry in the META-INF/neoforge.mods.toml file
 @Mod(AdvancedAE.MOD_ID)
@@ -31,6 +36,11 @@ public AdvancedAE(IEventBus eventBus, ModContainer container) {
 		if (!container.getModId().equals(MOD_ID)) {
 			throw new IllegalArgumentException("Invalid ID: " + MOD_ID);
 		}
+
+		AAEItems.DR.register(eventBus);
+		AAEBlocks.DR.register(eventBus);
+		AAEBlockEntities.DR.register(eventBus);
+
 		container.registerConfig(ModConfig.Type.COMMON, AAEConfig.SPEC);
 
 		eventBus.addListener((RegisterEvent e) -> {

diff --git a/src/main/java/net/pedroksl/advanced_ae/client/AAEClientRegistryHandler.java b/src/main/java/net/pedroksl/advanced_ae/client/AAEClientRegistryHandler.java
@@ -1,6 +1,5 @@
 package net.pedroksl.advanced_ae.client;
 
-import appeng.init.client.InitScreens;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.client.event.ModelEvent;
 import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent;
@@ -13,26 +12,33 @@
 import net.pedroksl.advanced_ae.gui.patternencoder.AdvPatternEncoderContainer;
 import net.pedroksl.advanced_ae.gui.patternencoder.AdvPatternEncoderGui;
 
-public class AAEClientRegistryHandler {
-	public static final AAEClientRegistryHandler INSTANCE = new AAEClientRegistryHandler();
+import appeng.init.client.InitScreens;
 
-	@SubscribeEvent
-	public void registerGui(RegisterMenuScreensEvent event) {
-		InitScreens.register(event, AdvPatternProviderContainer.TYPE, AdvPatternProviderGui::new, "/screens/adv_pattern_provider.json");
-		InitScreens.register(event, SmallAdvPatternProviderContainer.TYPE, SmallAdvPatternProviderGui::new, "/screens/small_adv_pattern_provider.json");
-		InitScreens.register(event, AdvPatternEncoderContainer.TYPE, AdvPatternEncoderGui::new, "/screens/adv_pattern_encoder.json");
-	}
+public class AAEClientRegistryHandler {
+    public static final AAEClientRegistryHandler INSTANCE = new AAEClientRegistryHandler();
 
-	@SubscribeEvent
-	public void registerColorHandler(RegisterColorHandlersEvent.Item event) {
-	}
+    @SubscribeEvent
+    public void registerGui(RegisterMenuScreensEvent event) {
+        InitScreens.register(
+                event,
+                AdvPatternProviderContainer.TYPE,
+                AdvPatternProviderGui::new,
+                "/screens/adv_pattern_provider.json");
+        InitScreens.register(
+                event,
+                SmallAdvPatternProviderContainer.TYPE,
+                SmallAdvPatternProviderGui::new,
+                "/screens/small_adv_pattern_provider.json");
+        InitScreens.register(
+                event, AdvPatternEncoderContainer.TYPE, AdvPatternEncoderGui::new, "/screens/adv_pattern_encoder.json");
+    }
 
-	@SubscribeEvent
-	public void registerModels(ModelEvent.RegisterGeometryLoaders event) {
+    @SubscribeEvent
+    public void registerColorHandler(RegisterColorHandlersEvent.Item event) {}
 
-	}
+    @SubscribeEvent
+    public void registerModels(ModelEvent.RegisterGeometryLoaders event) {}
 
-	@SubscribeEvent
-	public void registerHotKey(RegisterKeyMappingsEvent e) {
-	}
+    @SubscribeEvent
+    public void registerHotKey(RegisterKeyMappingsEvent e) {}
 }
diff --git a/src/main/java/net/pedroksl/advanced_ae/client/AAESemantics.java b/src/main/java/net/pedroksl/advanced_ae/client/AAESemantics.java
@@ -5,17 +5,16 @@
 
 public class AAESemantics {
 
-	public final static SlotSemantic OUTPUT_SLOT = SlotSemantics.register("OutputSlot", false);
-	public final static SlotSemantic EX_2 = SlotSemantics.register("EX_2", false);
-	public final static SlotSemantic EX_3 = SlotSemantics.register("EX_3", false);
-	public final static SlotSemantic EX_4 = SlotSemantics.register("EX_4", false);
-	public final static SlotSemantic EX_5 = SlotSemantics.register("EX_5", false);
-	public final static SlotSemantic EX_6 = SlotSemantics.register("EX_6", false);
-	public final static SlotSemantic EX_7 = SlotSemantics.register("EX_7", false);
-	public final static SlotSemantic EX_8 = SlotSemantics.register("EX_8", false);
-	public final static SlotSemantic EX_9 = SlotSemantics.register("EX_9", false);
-	public final static SlotSemantic EX_10 = SlotSemantics.register("EX_10", false);
-	public final static SlotSemantic EX_11 = SlotSemantics.register("EX_11", false);
-	public final static SlotSemantic EX_12 = SlotSemantics.register("EX_12", false);
-
+    public static final SlotSemantic OUTPUT_SLOT = SlotSemantics.register("OutputSlot", false);
+    public static final SlotSemantic EX_2 = SlotSemantics.register("EX_2", false);
+    public static final SlotSemantic EX_3 = SlotSemantics.register("EX_3", false);
+    public static final SlotSemantic EX_4 = SlotSemantics.register("EX_4", false);
+    public static final SlotSemantic EX_5 = SlotSemantics.register("EX_5", false);
+    public static final SlotSemantic EX_6 = SlotSemantics.register("EX_6", false);
+    public static final SlotSemantic EX_7 = SlotSemantics.register("EX_7", false);
+    public static final SlotSemantic EX_8 = SlotSemantics.register("EX_8", false);
+    public static final SlotSemantic EX_9 = SlotSemantics.register("EX_9", false);
+    public static final SlotSemantic EX_10 = SlotSemantics.register("EX_10", false);
+    public static final SlotSemantic EX_11 = SlotSemantics.register("EX_11", false);
+    public static final SlotSemantic EX_12 = SlotSemantics.register("EX_12", false);
 }
-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+=java
+=org
+=com
+=net
+=it
+=cpw
+=appeng
+=me
+=de