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

Author: P3pp3rF1y

build.gradle

@@ -3,10 +3,10 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'net.neoforged.moddev' version '1.0.14'
-    id "org.sonarqube" version "5.0.0.4638"
     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"
 }
 
 idea {
@@ -24,7 +24,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()
@@ -256,9 +256,5 @@ tasks.modrinth {
     onlyIf { !project.ext.changelog.isEmpty() }
 }
 
-sonar {
-    properties {
-        property "sonar.projectKey", "xreliquary:Reliquary"
-        property "sonar.organization", "p3pp3rf1y-github"
-    }
-}
+def sharedCodeQualityScript = file('../gradle/code-quality.gradle')
+apply from: sharedCodeQualityScript.exists() ? sharedCodeQualityScript : 'https://raw.githubusercontent.com/P3pp3rF1y/MultiWorkspace/1.21.x/gradle/code-quality.gradle'

settings.gradle

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

src/main/java/reliquary/Reliquary.java

@@ -29,8 +29,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/IPedestal.java

@@ -8,6 +8,7 @@
 import net.neoforged.neoforge.fluids.capability.IFluidHandler;
 
 import javax.annotation.Nullable;
+
 import java.util.List;
 import java.util.Optional;
 

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

@@ -1,6 +1,7 @@
 // Auto generated package-info by MCP
 
-@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
 package reliquary.api.client;
 
 import net.minecraft.MethodsReturnNonnullByDefault;

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

@@ -1,7 +1,8 @@
 
 // Auto generated package-info by MCP
 
-@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
 package reliquary.api;
 
 import net.minecraft.MethodsReturnNonnullByDefault;

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

@@ -33,6 +33,7 @@
 import reliquary.util.BlockEntityHelper;
 
 import javax.annotation.Nullable;
+
 import java.util.function.Consumer;
 
 public class AlkahestryAltarBlock extends Block implements EntityBlock, ICreativeTabItemGenerator {
@@ -80,14 +81,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.getDayTime() >= 12000 || !level.canSeeSkyFromBelowWater(pos.above()) || rand.nextInt(3) != 0) {
+		if (Boolean.FALSE.equals(state.getValue(ACTIVE)) || level.getDayTime() >= 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 ItemInteractionResult useItemOn(ItemStack heldItem, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult p_316140_) {
+	protected ItemInteractionResult useItemOn(ItemStack heldItem, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand,
+			BlockHitResult p_316140_) {
 		if (Boolean.TRUE.equals(state.getValue(ACTIVE))) {
 			return ItemInteractionResult.CONSUME;
 		}
@@ -118,9 +122,11 @@ protected ItemInteractionResult useItemOn(ItemStack heldItem, BlockState state,
 	}
 
 	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.random.nextGaussian() / 8));
+		level.playSound(null, pos, SoundEvents.LAVA_EXTINGUISH, SoundSource.BLOCKS, 0.3F,
+				0.5F + 0.5F * altar.getRedstoneCount() + (float) (level.random.nextGaussian() / 8));
 		for (int particles = level.random.nextInt(3); particles < 3 + altar.getRedstoneCount() * 4 + altar.getRedstoneCount(); particles++) {
-			level.addParticle(DustParticleOptions.REDSTONE, pos.getX() + 0.5D + level.random.nextGaussian() / 5, pos.getY() + 1.2D, pos.getZ() + 0.5D + level.random.nextGaussian() / 5, 1D, 0D, 0D);
+			level.addParticle(DustParticleOptions.REDSTONE, pos.getX() + 0.5D + level.random.nextGaussian() / 5, pos.getY() + 1.2D,
+					pos.getZ() + 0.5D + level.random.nextGaussian() / 5, 1D, 0D, 0D);
 		}
 	}
 

src/main/java/reliquary/block/ApothecaryCauldronBlock.java

@@ -31,32 +31,18 @@
 import reliquary.util.WorldHelper;
 
 import javax.annotation.Nullable;
+
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
 public class ApothecaryCauldronBlock extends Block implements EntityBlock, ICreativeTabItemGenerator {
 
 	public static final IntegerProperty LEVEL = IntegerProperty.create("level", 0, 3);
 	private static final VoxelShape INSIDE = box(2.0D, 4.0D, 2.0D, 14.0D, 16.0D, 14.0D);
-	private static final VoxelShape SHAPE = Stream.of(
-			Block.box(1, 1, 1, 15, 2, 15),
-			Block.box(2, 0, 2, 4, 1, 4),
-			Block.box(12, 0, 2, 14, 1, 4),
-			Block.box(12, 0, 12, 14, 1, 14),
-			Block.box(2, 0, 12, 4, 1, 14),
-			Block.box(0, 2, 0, 16, 13, 2),
-			Block.box(0, 2, 14, 16, 13, 16),
-			Block.box(14, 2, 2, 16, 13, 14),
-			Block.box(0, 2, 2, 2, 13, 14),
-			Block.box(1, 13, 2, 2, 14, 14),
-			Block.box(1, 13, 1, 15, 14, 2),
-			Block.box(1, 13, 14, 15, 14, 15),
-			Block.box(14, 13, 2, 15, 14, 14),
-			Block.box(0, 14, 2, 2, 16, 14),
-			Block.box(0, 14, 0, 16, 16, 2),
-			Block.box(14, 14, 2, 16, 16, 14),
-			Block.box(0, 14, 14, 16, 16, 16)
-	).reduce((v1, v2) -> Shapes.join(v1, v2, BooleanOp.OR)).get();
+	private static final VoxelShape SHAPE = Stream.of(box(1, 1, 1, 15, 2, 15), box(2, 0, 2, 4, 1, 4), box(12, 0, 2, 14, 1, 4), box(12, 0, 12, 14, 1, 14),
+			box(2, 0, 12, 4, 1, 14), box(0, 2, 0, 16, 13, 2), box(0, 2, 14, 16, 13, 16), box(14, 2, 2, 16, 13, 14), box(0, 2, 2, 2, 13, 14),
+			box(1, 13, 2, 2, 14, 14), box(1, 13, 1, 15, 14, 2), box(1, 13, 14, 15, 14, 15), box(14, 13, 2, 15, 14, 14), box(0, 14, 2, 2, 16, 14),
+			box(0, 14, 0, 16, 16, 2), box(14, 14, 2, 16, 16, 14), box(0, 14, 14, 16, 16, 16)).reduce((v1, v2) -> Shapes.join(v1, v2, BooleanOp.OR)).get();
 
 	public ApothecaryCauldronBlock() {
 		super(Properties.of().mapColor(MapColor.METAL).strength(1.5F, 5.0F).noOcclusion());
@@ -97,7 +83,8 @@ public void entityInside(BlockState state, Level level, BlockPos pos, Entity ent
 	}
 
 	@Override
-	protected ItemInteractionResult useItemOn(ItemStack heldItem, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) {
+	protected ItemInteractionResult useItemOn(ItemStack heldItem, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand,
+			BlockHitResult hitResult) {
 		if (level.isClientSide) {
 			return !heldItem.isEmpty() ? ItemInteractionResult.SUCCESS : ItemInteractionResult.CONSUME;
 		} else {
@@ -122,18 +109,16 @@ public void handlePrecipitation(BlockState state, Level level, BlockPos pos, Bio
 	}
 
 	/**
-	 * If this returns true, then comparators facing away from this block will
-	 * use the value from getComparatorInputOverride instead of the actual
-	 * redstone signal strength.
+	 * If this returns true, then comparators facing away from this block will use the value from getComparatorInputOverride instead of the actual redstone
+	 * signal strength.
 	 */
 	@Override
 	public boolean hasAnalogOutputSignal(BlockState state) {
 		return true;
 	}
 
 	/**
-	 * If hasComparatorInputOverride returns true, the return value from this is
-	 * used instead of the redstone signal strength when this block inputs to a
+	 * If hasComparatorInputOverride returns true, the return value from this is used instead of the redstone signal strength when this block inputs to a
 	 * comparator.
 	 */
 	@Override

src/main/java/reliquary/block/ApothecaryMortarBlock.java

@@ -32,20 +32,15 @@
 import reliquary.util.WorldHelper;
 
 import javax.annotation.Nullable;
+
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
 public class ApothecaryMortarBlock extends Block implements EntityBlock, ICreativeTabItemGenerator {
 	public static final DirectionProperty FACING = DirectionProperty.create("facing", Direction.Plane.HORIZONTAL);
-	private static final VoxelShape MORTAR_SHAPE = Stream.of(
-			Block.box(6, 1.5, 6, 10, 2.5, 10),
-			Block.box(5, 2.5, 5, 11, 3.5, 11),
-			Block.box(5, 0, 5, 11, 1.5, 11),
-			Block.box(4, 3.5, 5, 5, 6.5, 11),
-			Block.box(11, 3.5, 5, 12, 6.5, 11),
-			Block.box(5, 3.5, 11, 11, 6.5, 12),
-			Block.box(5, 3.5, 4, 11, 6.5, 5)
-	).reduce((v1, v2) -> Shapes.join(v1, v2, BooleanOp.OR)).get();
+	private static final VoxelShape MORTAR_SHAPE = Stream.of(box(6, 1.5, 6, 10, 2.5, 10), box(5, 2.5, 5, 11, 3.5, 11), box(5, 0, 5, 11, 1.5, 11),
+			box(4, 3.5, 5, 5, 6.5, 11), box(11, 3.5, 5, 12, 6.5, 11), box(5, 3.5, 11, 11, 6.5, 12), box(5, 3.5, 4, 11, 6.5, 5))
+			.reduce((v1, v2) -> Shapes.join(v1, v2, BooleanOp.OR)).get();
 
 	public ApothecaryMortarBlock() {
 		super(Properties.of().mapColor(MapColor.STONE).strength(1.5F, 2.0F));
@@ -80,7 +75,8 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
 	protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) {
 		return level.getBlockEntity(pos, ModBlocks.APOTHECARY_MORTAR_TILE_TYPE.get()).map(mortar -> {
 			if (player.isCrouching()) {
-				InventoryHelper.executeOnItemHandlerAt(level, pos, state, mortar, itemHandler -> InventoryHelper.tryRemovingLastStack(itemHandler, level, mortar.getBlockPos()));
+				InventoryHelper.executeOnItemHandlerAt(level, pos, state, mortar,
+						itemHandler -> InventoryHelper.tryRemovingLastStack(itemHandler, level, mortar.getBlockPos()));
 				return InteractionResult.SUCCESS;
 			}
 
@@ -94,9 +90,10 @@ protected InteractionResult useWithoutItem(BlockState state, Level level, BlockP
 	}
 
 	@Override
-	protected ItemInteractionResult useItemOn(ItemStack heldItem, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) {
+	protected ItemInteractionResult useItemOn(ItemStack heldItem, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand,
+			BlockHitResult hitResult) {
 		return level.getBlockEntity(pos, ModBlocks.APOTHECARY_MORTAR_TILE_TYPE.get()).map(mortar -> {
-			//if we're in cooldown prevent player from insta inserting essence that they just got from mortar
+			// if we're in cooldown prevent player from insta inserting essence that they just got from mortar
 			if (mortar.isInCooldown(level) && heldItem.getItem() == ModItems.POTION_ESSENCE.get()) {
 				return ItemInteractionResult.FAIL;
 			}
@@ -114,7 +111,8 @@ protected ItemInteractionResult useItemOn(ItemStack heldItem, BlockState state,
 
 			if (!putItemInSlot) {
 				if (mortar.usePestle(level)) {
-					level.playSound(null, pos, soundType.getStepSound(), SoundSource.BLOCKS, (soundType.getVolume() + 1.0F) / 2.0F, soundType.getPitch() * 0.8F);
+					level.playSound(null, pos, soundType.getStepSound(), SoundSource.BLOCKS, (soundType.getVolume() + 1.0F) / 2.0F,
+							soundType.getPitch() * 0.8F);
 					return ItemInteractionResult.CONSUME;
 				} else {
 					return ItemInteractionResult.FAIL;

src/main/java/reliquary/block/FertileLilyPadBlock.java

@@ -35,7 +35,7 @@ public class FertileLilyPadBlock extends BushBlock implements ICreativeTabItemGe
 	public static final MapCodec<FertileLilyPadBlock> CODEC = simpleCodec(FertileLilyPadBlock::new);
 	private static final Map<ResourceKey<Level>, Long> currentDimensionTicks = new HashMap<>();
 	private static final Map<ResourceKey<Level>, Set<BlockPos>> dimensionPositionsTicked = new HashMap<>();
-	private static final VoxelShape AABB = Block.box(1.0D, 0.0D, 1.0D, 15.0D, 1.5D, 15.0D);
+	private static final VoxelShape AABB = box(1.0D, 0.0D, 1.0D, 15.0D, 1.5D, 15.0D);
 
 	public FertileLilyPadBlock() {
 		super(Properties.of().mapColor(MapColor.PLANT));
@@ -74,7 +74,8 @@ public void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource
 
 	@Override
 	public void animateTick(BlockState state, Level level, BlockPos pos, RandomSource rand) {
-		level.addParticle(ColorParticleOption.create(ParticleTypes.ENTITY_EFFECT, 0.0F, 0.9F, 0.5F), pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY(), pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0D, 0D, 0D);
+		level.addParticle(ColorParticleOption.create(ParticleTypes.ENTITY_EFFECT, 0.0F, 0.9F, 0.5F), pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY(),
+				pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0D, 0D, 0D);
 	}
 
 	private int secondsBetweenGrowthTicks() {
@@ -123,7 +124,8 @@ private boolean isGrowable(Block cropBlock) {
 			return true;
 		}
 
-		return cropBlock instanceof SpecialPlantable || cropBlock instanceof BonemealableBlock || cropBlock.asItem().builtInRegistryHolder().is(Tags.Items.CROPS);
+		return cropBlock instanceof SpecialPlantable || cropBlock instanceof BonemealableBlock
+				|| cropBlock.asItem().builtInRegistryHolder().is(Tags.Items.CROPS);
 	}
 
 	private int getNumberOfPotencySteps() {