Skip to content

Commit 8831f4e

Browse files
committed
Code reformat
1 parent 18f8f58 commit 8831f4e

File tree

102 files changed

+320
-360
lines changed

Some content is hidden

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

102 files changed

+320
-360
lines changed

src/main/java/igentuman/nc/block/BarrelBlock.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import java.util.List;
4141

4242
import static igentuman.nc.util.StackUtils.isMultiTool;
43+
import static igentuman.nc.util.TextUtils.formatLiquid;
4344
import static net.minecraft.world.item.Items.BUCKET;
4445

4546
public class BarrelBlock extends Block implements EntityBlock {
@@ -215,11 +216,6 @@ public void appendHoverText(ItemStack stack, @javax.annotation.Nullable BlockGet
215216
list.add(Component.translatable("tooltip.nc.use_multitool").withStyle(ChatFormatting.YELLOW));
216217
}
217218

218-
public String formatLiquid(int val)
219-
{
220-
return TextUtils.numberFormat(val/1000)+" B";
221-
}
222-
223219
public boolean registered() {
224220
return BarrelBlocks.registered().containsKey(code());
225221
}

src/main/java/igentuman/nc/block/entity/energy/NCEnergy.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ public class NCEnergy extends NuclearCraftBE {
2727
protected String name;
2828
public static String NAME;
2929
public final CustomEnergyStorage energyStorage = createEnergy();
30-
public LazyOptional<IEnergyStorage> getEnergy() {
31-
return energy;
32-
}
3330
protected final LazyOptional<IEnergyStorage> energy = LazyOptional.of(() -> energyStorage);
3431

3532
protected void sendOutPower() {
@@ -58,6 +55,11 @@ protected void sendOutPower() {
5855
}
5956
}
6057

58+
public LazyOptional<IEnergyStorage> getEnergy() {
59+
return energy;
60+
}
61+
62+
6163
protected int getEnergyMaxStorage() {
6264
return 100;
6365
}

src/main/java/igentuman/nc/block/entity/energy/RTGBE.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import net.minecraft.world.level.block.state.BlockState;
88

99
public class RTGBE extends NCEnergy {
10+
1011
public RTGBE(BlockPos pPos, BlockState pBlockState) {
1112
super(pPos, pBlockState, getName(pBlockState));
1213
}

src/main/java/igentuman/nc/block/entity/energy/solar/AbstractSolarPanel.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import net.minecraft.world.level.block.state.BlockState;
77

88
public class AbstractSolarPanel extends NCEnergy {
9+
910
public AbstractSolarPanel(BlockPos pPos, BlockState pBlockState, String name) {
1011
super(pPos, pBlockState, name);
1112
}

src/main/java/igentuman/nc/block/entity/energy/solar/AdvancedSolarBE.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
import net.minecraft.world.level.block.state.BlockState;
55

66
public class AdvancedSolarBE extends AbstractSolarPanel {
7-
public static String NAME = "solar_panel/advanced";
7+
8+
public static final String NAME = "solar_panel/advanced";
9+
810
public AdvancedSolarBE(BlockPos pPos, BlockState pBlockState) {
911
super(pPos, pBlockState, NAME);
1012
}

src/main/java/igentuman/nc/block/entity/energy/solar/BasicSolarBE.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
import net.minecraft.world.level.block.state.BlockState;
55

66
public class BasicSolarBE extends AbstractSolarPanel {
7-
public static String NAME = "solar_panel/basic";
7+
8+
public static final String NAME = "solar_panel/basic";
9+
810
public BasicSolarBE(BlockPos pPos, BlockState pBlockState) {
911
super(pPos, pBlockState, NAME);
1012
}

src/main/java/igentuman/nc/block/entity/energy/solar/DuSolarBE.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
import net.minecraft.world.level.block.state.BlockState;
55

66
public class DuSolarBE extends AbstractSolarPanel {
7-
public static String NAME = "solar_panel/du";
7+
8+
public static final String NAME = "solar_panel/du";
9+
810
public DuSolarBE(BlockPos pPos, BlockState pBlockState) {
911
super(pPos, pBlockState, NAME);
1012
}

src/main/java/igentuman/nc/block/entity/energy/solar/EliteSolarBE.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
import net.minecraft.world.level.block.state.BlockState;
55

66
public class EliteSolarBE extends AbstractSolarPanel {
7-
public static String NAME = "solar_panel/elite";
7+
8+
public static final String NAME = "solar_panel/elite";
9+
810
public EliteSolarBE(BlockPos pPos, BlockState pBlockState) {
911
super(pPos, pBlockState, NAME);
1012
}

src/main/java/igentuman/nc/block/entity/fission/FissionControllerBE.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060

6161
public class FissionControllerBE extends MultiblockControllerBE {
6262

63-
public static String NAME = "fission_reactor_controller";
63+
public static final String NAME = "fission_reactor_controller";
6464
public final SidedContentHandler contentHandler;
6565
public final CustomEnergyStorage energyStorage;
6666
protected final LazyOptional<IEnergyStorage> energy;

src/main/java/igentuman/nc/block/entity/fission/FissionPortBE.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131

3232
public class FissionPortBE extends NuclearCraftBE implements MultiblockAttachable {
3333

34-
public static String NAME = "fission_reactor_port";
34+
public static final String NAME = "fission_reactor_port";
35+
3536
@NBTField
3637
public byte analogSignal = 0;
3738
@NBTField

0 commit comments

Comments
 (0)