Skip to content

Commit 09fc3d0

Browse files
PlatinPythonPlatinPython
committed
Switch to using Spotless. Reformatting.
1 parent 3e7835a commit 09fc3d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1587
-960
lines changed

‎build.gradle

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
id 'net.neoforged.gradle' version '[6.0.18,6.2)'
55
id 'org.parchmentmc.librarian.forgegradle' version '1.+'
66
id 'org.spongepowered.mixin' version '0.7.+'
7+
id 'com.diffplug.spotless' version '6.25.0'
78
}
89

910
version = "${minecraft_version}-${mod_version}"
@@ -101,4 +102,6 @@ jar.finalizedBy('reobfJar')
101102

102103
tasks.withType(JavaCompile).configureEach {
103104
options.encoding = 'UTF-8'
104-
}
105+
}
106+
107+
apply from: rootProject.file('codeformat/spotless-rules.gradle')

‎codeformat/formatter-config.xml

+401
Large diffs are not rendered by default.

‎codeformat/spotless-rules.gradle

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
spotless {
2+
java {
3+
endWithNewline()
4+
indentWithSpaces()
5+
trimTrailingWhitespace()
6+
removeUnusedImports()
7+
toggleOffOn()
8+
eclipse().configFile rootProject.file('codeformat/formatter-config.xml')
9+
}
10+
}

‎src/main/java/platinpython/rgbblocks/RGBBlocks.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,9 @@ public RGBBlocks() {
4545
public void setup(final FMLCommonSetupEvent event) {
4646
PacketHandler.register();
4747

48-
event.enqueueWork(() -> DispenserBlock.registerBehavior(
49-
ItemRegistry.PAINT_BUCKET.get(),
50-
new DispensePaintbucketBehaviour()
51-
));
48+
event.enqueueWork(
49+
() -> DispenserBlock.registerBehavior(ItemRegistry.PAINT_BUCKET.get(), new DispensePaintbucketBehaviour())
50+
);
5251
}
5352

5453
public void enqueueIMC(final InterModEnqueueEvent event) {
@@ -59,8 +58,9 @@ public void enqueueIMC(final InterModEnqueueEvent event) {
5958

6059
@SubscribeEvent
6160
public void replaceMappings(MissingMappingsEvent event) {
62-
for (MissingMappingsEvent.Mapping<Item> mapping : event.getAllMappings(
63-
ForgeRegistries.ITEMS.getRegistryKey())) {
61+
for (
62+
MissingMappingsEvent.Mapping<Item> mapping : event.getAllMappings(ForgeRegistries.ITEMS.getRegistryKey())
63+
) {
6464
if (mapping.getKey().toString().equals("rgbblocks:bucket_of_paint")) {
6565
mapping.remap(ItemRegistry.PAINT_BUCKET.get());
6666
}

‎src/main/java/platinpython/rgbblocks/block/RGBBlock.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,13 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
2828
}
2929

3030
@Override
31-
public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos,
32-
Player player) {
31+
public ItemStack getCloneItemStack(
32+
BlockState state,
33+
HitResult target,
34+
BlockGetter world,
35+
BlockPos pos,
36+
Player player
37+
) {
3338
return RGBBlockUtils.getCloneItemStack(state, target, world, pos, player);
3439
}
3540
}

‎src/main/java/platinpython/rgbblocks/block/RGBBlockUtils.java

+150-130
Large diffs are not rendered by default.

‎src/main/java/platinpython/rgbblocks/block/RGBCarpetBlock.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,13 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
3030
}
3131

3232
@Override
33-
public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos,
34-
Player player) {
33+
public ItemStack getCloneItemStack(
34+
BlockState state,
35+
HitResult target,
36+
BlockGetter world,
37+
BlockPos pos,
38+
Player player
39+
) {
3540
return RGBBlockUtils.getCloneItemStack(state, target, world, pos, player);
3641
}
3742
}

‎src/main/java/platinpython/rgbblocks/block/RGBConcretePowderBlock.java

+20-16
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,26 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
3636
}
3737

3838
@Override
39-
public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos,
40-
Player player) {
39+
public ItemStack getCloneItemStack(
40+
BlockState state,
41+
HitResult target,
42+
BlockGetter world,
43+
BlockPos pos,
44+
Player player
45+
) {
4146
return RGBBlockUtils.getCloneItemStack(state, target, world, pos, player);
4247
}
4348

4449
@Override
4550
public void tick(BlockState state, ServerLevel worldIn, BlockPos pos, RandomSource rand) {
4651
if (worldIn.isEmptyBlock(pos.below()) || isFree(worldIn.getBlockState(pos.below())) && pos.getY() >= 0) {
4752
BlockEntity tileEntity = worldIn.getBlockEntity(pos);
48-
RGBFallingBlockEntity fallingBlockEntity = new RGBFallingBlockEntity(worldIn, (double) pos.getX() + 0.5D,
49-
pos.getY(), (double) pos.getZ() + 0.5D,
50-
state.hasProperty(
51-
BlockStateProperties.WATERLOGGED) ?
52-
state.setValue(
53-
BlockStateProperties.WATERLOGGED,
54-
Boolean.valueOf(false)
55-
) :
56-
state,
57-
tileEntity instanceof RGBTileEntity ?
58-
((RGBTileEntity) tileEntity).getColor() :
59-
0
53+
RGBFallingBlockEntity fallingBlockEntity = new RGBFallingBlockEntity(
54+
worldIn, (double) pos.getX() + 0.5D, pos.getY(), (double) pos.getZ() + 0.5D,
55+
state.hasProperty(BlockStateProperties.WATERLOGGED)
56+
? state.setValue(BlockStateProperties.WATERLOGGED, Boolean.valueOf(false))
57+
: state,
58+
tileEntity instanceof RGBTileEntity ? ((RGBTileEntity) tileEntity).getColor() : 0
6059
);
6160
worldIn.setBlock(pos, state.getFluidState().createLegacyBlock(), 3);
6261
worldIn.addFreshEntity(fallingBlockEntity);
@@ -74,8 +73,13 @@ public void onRemove(BlockState state, Level worldIn, BlockPos pos, BlockState n
7473
}
7574

7675
@Override
77-
public void onLand(Level world, BlockPos blockPos, BlockState blockBlockState, BlockState entityBlockState,
78-
FallingBlockEntity entity) {
76+
public void onLand(
77+
Level world,
78+
BlockPos blockPos,
79+
BlockState blockBlockState,
80+
BlockState entityBlockState,
81+
FallingBlockEntity entity
82+
) {
7983
super.onLand(world, blockPos, blockBlockState, entityBlockState, entity);
8084
if (entity instanceof RGBFallingBlockEntity) {
8185
RGBTileEntity tileEntity = new RGBTileEntity(blockPos, entityBlockState);

‎src/main/java/platinpython/rgbblocks/block/RGBIronBarsBlock.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,13 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
2828
}
2929

3030
@Override
31-
public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos,
32-
Player player) {
31+
public ItemStack getCloneItemStack(
32+
BlockState state,
33+
HitResult target,
34+
BlockGetter world,
35+
BlockPos pos,
36+
Player player
37+
) {
3338
return RGBBlockUtils.getCloneItemStack(state, target, world, pos, player);
3439
}
3540
}

‎src/main/java/platinpython/rgbblocks/block/RGBRedstoneLampBlock.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,13 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
3030
}
3131

3232
@Override
33-
public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos,
34-
Player player) {
33+
public ItemStack getCloneItemStack(
34+
BlockState state,
35+
HitResult target,
36+
BlockGetter world,
37+
BlockPos pos,
38+
Player player
39+
) {
3540
return RGBBlockUtils.getCloneItemStack(state, target, world, pos, player);
3641
}
3742
}

‎src/main/java/platinpython/rgbblocks/block/RGBSlabBlock.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,13 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
2929
}
3030

3131
@Override
32-
public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos,
33-
Player player) {
32+
public ItemStack getCloneItemStack(
33+
BlockState state,
34+
HitResult target,
35+
BlockGetter world,
36+
BlockPos pos,
37+
Player player
38+
) {
3439
return RGBBlockUtils.getCloneItemStack(state, target, world, pos, player);
3540
}
3641
}

‎src/main/java/platinpython/rgbblocks/block/RGBStairsBlock.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,13 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
3030
}
3131

3232
@Override
33-
public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos,
34-
Player player) {
33+
public ItemStack getCloneItemStack(
34+
BlockState state,
35+
HitResult target,
36+
BlockGetter world,
37+
BlockPos pos,
38+
Player player
39+
) {
3540
return RGBBlockUtils.getCloneItemStack(state, target, world, pos, player);
3641
}
3742
}

‎src/main/java/platinpython/rgbblocks/client/colorhandlers/RGBBlockColor.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@
88
import platinpython.rgbblocks.tileentity.RGBTileEntity;
99

1010
public class RGBBlockColor implements BlockColor {
11-
public int getColor(BlockState blockState, BlockAndTintGetter blockDisplayReader, BlockPos blockPos,
12-
int tintindex) {
11+
public int getColor(
12+
BlockState blockState,
13+
BlockAndTintGetter blockDisplayReader,
14+
BlockPos blockPos,
15+
int tintindex
16+
) {
1317
if (blockDisplayReader == null) {
1418
return -1;
1519
}

‎src/main/java/platinpython/rgbblocks/client/gui/ScreenUtils.java

+11-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,17 @@ public static void fillGradient(PoseStack pPoseStack, int x1, int y1, int x2, in
2121
RenderSystem.disableBlend();
2222
}
2323

24-
private static void fillGradient(Matrix4f matrix4f, BufferBuilder builder, int x1, int y1, int x2, int y2, int z,
25-
int colorA, int colorB) {
24+
private static void fillGradient(
25+
Matrix4f matrix4f,
26+
BufferBuilder builder,
27+
int x1,
28+
int y1,
29+
int x2,
30+
int y2,
31+
int z,
32+
int colorA,
33+
int colorB
34+
) {
2635
int alphaA = colorA >> 24 & 0xFF;
2736
int redA = colorA >> 16 & 0xFF;
2837
int greenA = colorA >> 8 & 0xFF;

0 commit comments

Comments
 (0)