chore: 🔧 spotless / pmd setup and a bit of cleanup

Author: P3pp3rF1y

build.gradle

@@ -3,12 +3,15 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'net.neoforged.moddev' version '2.0.141'
-    id "org.sonarqube" version "7.0.1.6134"
     id "net.darkhax.curseforgegradle" version "1.1.15"
     id "com.modrinth.minotaur" version "2.+"
     id "com.diffplug.spotless" version "7.0.4"
+    id "org.openrewrite.rewrite" version "7.35.0"
 }
 
+def sharedCodeQualityScript = file('../gradle/code-quality.gradle')
+apply from: sharedCodeQualityScript.exists() ? sharedCodeQualityScript : 'https://raw.githubusercontent.com/P3pp3rF1y/MultiWorkspace/26.1/gradle/code-quality.gradle'
+
 idea {
     module {
         downloadJavadoc = true
@@ -24,7 +27,7 @@ spotless {
         target spotlessFiles == null ? "src/*/java/**/*.java" : spotlessFiles.toString().split(/\s*,\s*/).findAll { it.endsWith(".java") }
 
         eclipse().configFile "$projectDir/codeformat/eclipse-java-format.xml"
-        importOrder "", "javax", "java"
+        importOrder "", "javax", "java", "\\#"
         removeUnusedImports()
         trimTrailingWhitespace()
         endWithNewline()
@@ -255,10 +258,3 @@ tasks.modrinth {
     dependsOn(tasks.generateChangelog)
     onlyIf { !project.ext.changelog.isEmpty() }
 }
-
-sonar {
-    properties {
-        property "sonar.projectKey", "xreliquary:Reliquary"
-        property "sonar.organization", "p3pp3rf1y-github"
-    }
-}

settings.gradle

@@ -8,4 +8,4 @@ pluginManagement {
 
 plugins {
     id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
-}
+}

src/disabledcompats/java/reliquary/compat/accessories/AccessoriesCompat.java

@@ -31,14 +31,8 @@ public boolean canEquipFromUse(ItemStack stack, SlotReference reference) {
 	};
 
 	private void addPlayerInventoryHandlers() {
-		PlayerInventoryProvider.get().addPlayerInventoryHandler(
-				Compatibility.ModIds.ACCESSORIES,
-				this::getAccessoriesSlotTags,
-				AccessoriesCompat::getSize,
-				AccessoriesCompat::getStackInSlot,
-				AccessoriesCompat::setStackInSlot,
-				true
-		);
+		PlayerInventoryProvider.get().addPlayerInventoryHandler(Compatibility.ModIds.ACCESSORIES, this::getAccessoriesSlotTags, AccessoriesCompat::getSize,
+				AccessoriesCompat::getStackInSlot, AccessoriesCompat::setStackInSlot, true);
 	}
 
 	public AccessoriesCompat(IEventBus modBus) {
@@ -70,14 +64,13 @@ public static void setStackInSlot(LivingEntity entity, String slotName, int slot
 	}
 
 	private static int getSize(LivingEntity entity, String slotName) {
-		return AccessoriesCapability.getOptionally(entity)
-				.map(cap -> {
-					AccessoriesContainer container = cap.getContainers().get(slotName);
-					if (container == null) {
-						return 0;
-					}
-					return container.getSize();
-				}).orElse(0);
+		return AccessoriesCapability.getOptionally(entity).map(cap -> {
+			AccessoriesContainer container = cap.getContainers().get(slotName);
+			if (container == null) {
+				return 0;
+			}
+			return container.getSize();
+		}).orElse(0);
 	}
 
 	private Set<String> getAccessoriesSlotTags(Player player) {
@@ -86,9 +79,8 @@ private Set<String> getAccessoriesSlotTags(Player player) {
 			lastTagsRefresh = gameTime;
 			containerNames.clear();
 
-			containerNames.addAll(AccessoriesCapability.getOptionally(player)
-					.map(capability -> capability.getContainers().keySet()
-					).orElse(Collections.emptySet()));
+			containerNames
+					.addAll(AccessoriesCapability.getOptionally(player).map(capability -> capability.getContainers().keySet()).orElse(Collections.emptySet()));
 		}
 		return containerNames;
 	}

src/disabledcompats/java/reliquary/compat/accessories/AccessoryMobCharmBeltRenderer.java

@@ -31,13 +31,15 @@ public AccessoryMobCharmBeltRenderer() {
 	}
 
 	@Override
-	public <S extends LivingEntityRenderState> void render(AccessoryRenderState accessoryState, S entityState, EntityModel<S> model, PoseStack poseStack, SubmitNodeCollector collector) {
+	public <S extends LivingEntityRenderState> void render(AccessoryRenderState accessoryState, S entityState, EntityModel<S> model, PoseStack poseStack,
+			SubmitNodeCollector collector) {
 		if (entityState instanceof HumanoidRenderState humanoidRenderState) {
 			beltModel.setupAnim(humanoidRenderState);
 		}
 		beltModel.setAllVisible(false);
 		beltModel.body.visible = true;
 		AtlasManager atlasManager = Minecraft.getInstance().getAtlasManager();
-		collector.submitModelPart(beltModel.body, poseStack, ON_BODY_TEXTURE.renderType(RenderTypes::entityCutoutNoCull), entityState.lightCoords, OverlayTexture.NO_OVERLAY, atlasManager.get(ON_BODY_TEXTURE));
+		collector.submitModelPart(beltModel.body, poseStack, ON_BODY_TEXTURE.renderType(RenderTypes::entityCutoutNoCull), entityState.lightCoords,
+				OverlayTexture.NO_OVERLAY, atlasManager.get(ON_BODY_TEXTURE));
 	}
 }

src/disabledcompats/java/reliquary/compat/accessories/package-info.java

@@ -1,6 +1,7 @@
 // Auto generated package-info by MCP
 
-@ParametersAreNonnullByDefault @NullMarked
+@ParametersAreNonnullByDefault
+@NullMarked
 package reliquary.compat.accessories;
 
 import org.jspecify.annotations.NullMarked;

src/main/java/reliquary/Reliquary.java

@@ -15,7 +15,6 @@
 import net.neoforged.neoforge.common.NeoForgeMod;
 import net.neoforged.neoforge.event.OnDatapackSyncEvent;
 import reliquary.client.init.ModParticles;
-import reliquary.crafting.InfernalTearValueRecipe;
 import reliquary.crafting.AlkahestryRecipeRegistry;
 import reliquary.data.DataGenerators;
 import reliquary.handler.ClientEventHandler;
@@ -31,8 +30,7 @@ public class Reliquary {
 	public static final String MOD_ID = "reliquary";
 	private static String networkProtocolVersion;
 
-
-	@SuppressWarnings("java:S1118") //needs to be public for mod to work
+	@SuppressWarnings("java:S1118") // needs to be public for mod to work
 	public Reliquary(IEventBus modBus, Dist dist, ModContainer container) {
 		networkProtocolVersion = container.getModInfo().getVersion().toString();
 		NeoForgeMod.enableMilkFluid();

src/main/java/reliquary/api/client/IPedestalItemRenderer.java

@@ -5,5 +5,6 @@
 import reliquary.client.render.PedestalRenderer;
 
 public interface IPedestalItemRenderer {
-	void submitRender(SubmitNodeCollector submitNodeCollector, PedestalRenderer.PedestalRenderState renderState, Object itemData, float partialTicks, PoseStack poseStack, int packedLight, int packedOverlay);
+	void submitRender(SubmitNodeCollector submitNodeCollector, PedestalRenderer.PedestalRenderState renderState, Object itemData, float partialTicks,
+			PoseStack poseStack, int packedLight, int packedOverlay);
 }

src/main/java/reliquary/api/client/package-info.java

@@ -1,6 +1,7 @@
 // Auto generated package-info by MCP
 
-@ParametersAreNonnullByDefault @NullMarked
+@ParametersAreNonnullByDefault
+@NullMarked
 package reliquary.api.client;
 
 import org.jspecify.annotations.NullMarked;

src/main/java/reliquary/api/package-info.java

@@ -1,7 +1,8 @@
 
 // Auto generated package-info by MCP
 
-@ParametersAreNonnullByDefault @NullMarked
+@ParametersAreNonnullByDefault
+@NullMarked
 package reliquary.api;
 
 import org.jspecify.annotations.NullMarked;

src/main/java/reliquary/block/AlkahestryAltarBlock.java

@@ -80,14 +80,17 @@ public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, Block
 
 	@Override
 	public void animateTick(BlockState state, Level level, BlockPos pos, RandomSource rand) {
-		if (Boolean.FALSE.equals(state.getValue(ACTIVE)) || level.getLevelData().getGameTime() % 24000 >= 12000 || !level.canSeeSkyFromBelowWater(pos.above()) || rand.nextInt(3) != 0) {
+		if (Boolean.FALSE.equals(state.getValue(ACTIVE)) || level.getLevelData().getGameTime() % 24000 >= 12000 || !level.canSeeSkyFromBelowWater(pos.above())
+				|| rand.nextInt(3) != 0) {
 			return;
 		}
-		level.addParticle(ColorParticleOption.create(ParticleTypes.ENTITY_EFFECT, 0.9F, 0.9F, 0.0F), pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 1.1D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0D, 0D, 0D);
+		level.addParticle(ColorParticleOption.create(ParticleTypes.ENTITY_EFFECT, 0.9F, 0.9F, 0.0F), pos.getX() + 0.5D + rand.nextGaussian() / 8,
+				pos.getY() + 1.1D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0D, 0D, 0D);
 	}
 
 	@Override
-	protected InteractionResult useItemOn(ItemStack heldItem, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult p_316140_) {
+	protected InteractionResult useItemOn(ItemStack heldItem, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand,
+			BlockHitResult p_316140_) {
 		if (Boolean.TRUE.equals(state.getValue(ACTIVE))) {
 			return InteractionResult.CONSUME;
 		}
@@ -120,9 +123,11 @@ protected InteractionResult useItemOn(ItemStack heldItem, BlockState state, Leve
 	}
 
 	private void playSoundAndSpawnParticles(Level level, BlockPos pos, AlkahestryAltarBlockEntity altar) {
-		level.playSound(null, pos, SoundEvents.LAVA_EXTINGUISH, SoundSource.BLOCKS, 0.3F, 0.5F + 0.5F * altar.getRedstoneCount() + (float) (level.getRandom().nextGaussian() / 8));
+		level.playSound(null, pos, SoundEvents.LAVA_EXTINGUISH, SoundSource.BLOCKS, 0.3F,
+				0.5F + 0.5F * altar.getRedstoneCount() + (float) (level.getRandom().nextGaussian() / 8));
 		for (int particles = level.getRandom().nextInt(3); particles < 3 + altar.getRedstoneCount() * 4 + altar.getRedstoneCount(); particles++) {
-			level.addParticle(DustParticleOptions.REDSTONE, pos.getX() + 0.5D + level.getRandom().nextGaussian() / 5, pos.getY() + 1.2D, pos.getZ() + 0.5D + level.getRandom().nextGaussian() / 5, 1D, 0D, 0D);
+			level.addParticle(DustParticleOptions.REDSTONE, pos.getX() + 0.5D + level.getRandom().nextGaussian() / 5, pos.getY() + 1.2D,
+					pos.getZ() + 0.5D + level.getRandom().nextGaussian() / 5, 1D, 0D, 0D);
 		}
 	}