From bafbf3bbbaa09b4c9baec473c6c676318072e0e4 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 25 Jun 2023 11:49:39 +0100 Subject: [PATCH] Random code cleanup --- .../java/techreborn/TechRebornClient.java | 8 +---- .../java/techreborn/client/ClientGuiType.java | 17 ++-------- .../java/techreborn/client/GuiFactory.java | 4 +-- .../java/techreborn/client/gui/GuiAESU.java | 2 +- .../client/gui/GuiAlloyFurnace.java | 2 +- .../client/gui/GuiAlloySmelter.java | 2 +- .../client/gui/GuiAssemblingMachine.java | 2 +- .../client/gui/GuiAutoCrafting.java | 6 +--- .../java/techreborn/client/gui/GuiBatbox.java | 2 +- .../client/gui/GuiBlockBreaker.java | 2 +- .../techreborn/client/gui/GuiBlockPlacer.java | 2 +- .../techreborn/client/gui/GuiCentrifuge.java | 2 +- .../techreborn/client/gui/GuiChargeBench.java | 2 +- .../client/gui/GuiChemicalReactor.java | 2 +- .../techreborn/client/gui/GuiChunkLoader.java | 2 +- .../techreborn/client/gui/GuiCompressor.java | 2 +- .../client/gui/GuiDieselGenerator.java | 2 +- .../client/gui/GuiElectricFurnace.java | 2 +- .../techreborn/client/gui/GuiElevator.java | 2 +- .../techreborn/client/gui/GuiExtractor.java | 2 +- .../client/gui/GuiFishingStation.java | 2 +- .../techreborn/client/gui/GuiGasTurbine.java | 2 +- .../techreborn/client/gui/GuiGenerator.java | 2 +- .../techreborn/client/gui/GuiGrinder.java | 2 +- .../java/techreborn/client/gui/GuiIDSU.java | 2 +- .../client/gui/GuiIndustrialElectrolyzer.java | 2 +- .../techreborn/client/gui/GuiIronFurnace.java | 2 +- .../java/techreborn/client/gui/GuiLESU.java | 2 +- .../techreborn/client/gui/GuiLaunchpad.java | 2 +- .../java/techreborn/client/gui/GuiMFE.java | 2 +- .../java/techreborn/client/gui/GuiMFSU.java | 2 +- .../java/techreborn/client/gui/GuiManual.java | 4 +-- .../client/gui/GuiMatterFabricator.java | 2 +- .../client/gui/GuiPlasmaGenerator.java | 2 +- .../client/gui/GuiPlayerDetector.java | 2 +- .../techreborn/client/gui/GuiRecycler.java | 2 +- .../client/gui/GuiRollingMachine.java | 2 +- .../client/gui/GuiScrapboxinator.java | 2 +- .../client/gui/GuiSemifluidGenerator.java | 2 +- .../java/techreborn/client/gui/GuiSolar.java | 2 +- .../client/gui/GuiSolidCanningMachine.java | 2 +- .../techreborn/client/gui/GuiStorageUnit.java | 2 +- .../techreborn/client/gui/GuiTankUnit.java | 2 +- .../client/gui/GuiThermalGenerator.java | 2 +- .../techreborn/client/gui/GuiWireMill.java | 2 +- src/main/java/techreborn/TechReborn.java | 3 -- .../api/generator/GeneratorRecipeHelper.java | 2 +- .../blockentity/cable/CableBlockEntity.java | 2 +- .../blockentity/cable/CableTickManager.java | 4 +-- .../cable/OfferedEnergyStorage.java | 12 +------ .../advanced/DragonEggSyphonBlockEntity.java | 2 +- .../basic/SolidFuelGeneratorBlockEntity.java | 4 +-- .../machine/GenericMachineBlockEntity.java | 10 +++--- .../iron/AbstractIronMachineBlockEntity.java | 4 +-- .../machine/misc/ChargeOMatBlockEntity.java | 2 +- .../machine/misc/DrainBlockEntity.java | 2 +- .../FluidReplicatorBlockEntity.java | 2 +- .../FusionControlComputerBlockEntity.java | 6 ++-- .../IndustrialGrinderBlockEntity.java | 2 +- .../IndustrialSawmillBlockEntity.java | 2 +- .../tier0/block/AbstractBlockBlockEntity.java | 4 +-- .../tier0/block/BlockProcessorUtils.java | 5 ++- .../blockbreaker/BlockBreakerProcessor.java | 12 +++---- .../blockplacer/BlockPlacerProcessor.java | 10 +++--- .../tier1/AutoCraftingTableBlockEntity.java | 4 +-- .../tier1/ElectricFurnaceBlockEntity.java | 6 ++-- .../tier1/RollingMachineBlockEntity.java | 6 ++-- .../machine/tier3/ChunkLoaderBlockEntity.java | 2 +- .../tier3/MatterFabricatorBlockEntity.java | 2 +- .../energy/EnergyStorageBlockEntity.java | 6 ++-- .../storage/energy/lesu/LesuNetwork.java | 2 +- .../fluid/TankUnitBaseBlockEntity.java | 2 +- .../item/StorageUnitBaseBlockEntity.java | 2 +- .../transformers/TransformerBlockEntity.java | 14 ++++---- .../blocks/GenericMachineBlock.java | 2 +- .../blocks/machine/tier1/ResinBasinBlock.java | 5 ++- .../techreborn/blocks/misc/BlockAlarm.java | 15 ++++---- .../techreborn/blocks/misc/BlockNuke.java | 2 +- .../blocks/misc/BlockRubberLog.java | 6 ++-- .../storage/energy/EnergyStorageBlock.java | 6 ++-- .../storage/energy/LSUStorageBlock.java | 8 ++--- .../blocks/transformers/BlockTransformer.java | 4 +-- .../techreborn/entities/EntityNukePrimed.java | 2 +- .../java/techreborn/init/TRBlockEntities.java | 2 -- src/main/java/techreborn/init/TRContent.java | 34 +++++++++---------- .../items/tool/basic/ElectricTreetapItem.java | 2 +- .../items/tool/vanilla/TRAxeItem.java | 2 +- .../items/tool/vanilla/TRHoeItem.java | 2 +- .../items/tool/vanilla/TRPickaxeItem.java | 2 +- .../items/tool/vanilla/TRSpadeItem.java | 2 +- .../items/tool/vanilla/TRSwordItem.java | 2 +- .../java/techreborn/utils/TagRemapper.java | 6 ++-- src/main/java/techreborn/world/OreDepth.java | 2 +- 93 files changed, 158 insertions(+), 203 deletions(-) diff --git a/src/client/java/techreborn/TechRebornClient.java b/src/client/java/techreborn/TechRebornClient.java index c27f14d62..f54845f29 100644 --- a/src/client/java/techreborn/TechRebornClient.java +++ b/src/client/java/techreborn/TechRebornClient.java @@ -242,13 +242,7 @@ public class TechRebornClient implements ClientModInitializer { } - private static class UnbakedDynamicModel implements UnbakedModel { - private final Supplier supplier; - - public UnbakedDynamicModel(Supplier supplier) { - this.supplier = supplier; - } - + private record UnbakedDynamicModel(Supplier supplier) implements UnbakedModel { @Override public Collection getModelDependencies() { return Collections.emptyList(); diff --git a/src/client/java/techreborn/client/ClientGuiType.java b/src/client/java/techreborn/client/ClientGuiType.java index a6f35ed93..8ce29ff27 100644 --- a/src/client/java/techreborn/client/ClientGuiType.java +++ b/src/client/java/techreborn/client/ClientGuiType.java @@ -136,7 +136,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -public class ClientGuiType { +@SuppressWarnings("unused") +public record ClientGuiType(GuiType guiType, GuiFactory guiFactory) { public static final Map> TYPES = new HashMap<>(); public static final ClientGuiType AESU = register(GuiType.AESU, GuiAESU::new); @@ -203,23 +204,11 @@ public class ClientGuiType { } } - private final GuiType guiType; - private final GuiFactory guiFactory; - public ClientGuiType(GuiType guiType, GuiFactory guiFactory) { this.guiType = Objects.requireNonNull(guiType); this.guiFactory = Objects.requireNonNull(guiFactory); - HandledScreens.register(guiType.getScreenHandlerType(), getGuiFactory()); - + HandledScreens.register(guiType.getScreenHandlerType(), guiFactory()); TYPES.put(guiType.getIdentifier(), this); } - - public GuiType getGuiType() { - return guiType; - } - - public GuiFactory getGuiFactory() { - return guiFactory; - } } diff --git a/src/client/java/techreborn/client/GuiFactory.java b/src/client/java/techreborn/client/GuiFactory.java index 9246f0a58..c057ef3c4 100644 --- a/src/client/java/techreborn/client/GuiFactory.java +++ b/src/client/java/techreborn/client/GuiFactory.java @@ -33,10 +33,10 @@ import net.minecraft.text.Text; import reborncore.common.screen.BuiltScreenHandler; public interface GuiFactory extends HandledScreens.Provider> { - HandledScreen create(int syncId, PlayerEntity playerEntity, T blockEntity); + HandledScreen create(int syncId, PlayerEntity playerEntity, T blockEntity); @Override - default HandledScreen create(BuiltScreenHandler builtScreenHandler, PlayerInventory playerInventory, Text text) { + default HandledScreen create(BuiltScreenHandler builtScreenHandler, PlayerInventory playerInventory, Text text) { PlayerEntity playerEntity = playerInventory.player; //noinspection unchecked T blockEntity = (T) builtScreenHandler.getBlockEntity(); diff --git a/src/client/java/techreborn/client/gui/GuiAESU.java b/src/client/java/techreborn/client/gui/GuiAESU.java index 5805da55d..6c4dfa4a3 100644 --- a/src/client/java/techreborn/client/gui/GuiAESU.java +++ b/src/client/java/techreborn/client/gui/GuiAESU.java @@ -39,7 +39,7 @@ import techreborn.packets.ServerboundPackets; public class GuiAESU extends GuiBase { - AdjustableSUBlockEntity blockEntity; + final AdjustableSUBlockEntity blockEntity; public GuiAESU(int syncID, final PlayerEntity player, final AdjustableSUBlockEntity aesu) { super(player, aesu, aesu.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiAlloyFurnace.java b/src/client/java/techreborn/client/gui/GuiAlloyFurnace.java index 206b79369..2fc85101b 100644 --- a/src/client/java/techreborn/client/gui/GuiAlloyFurnace.java +++ b/src/client/java/techreborn/client/gui/GuiAlloyFurnace.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.iron.IronAlloyFurnaceBlockEntity; public class GuiAlloyFurnace extends GuiBase { - IronAlloyFurnaceBlockEntity blockEntity; + final IronAlloyFurnaceBlockEntity blockEntity; public GuiAlloyFurnace(int syncID, PlayerEntity player, IronAlloyFurnaceBlockEntity alloyFurnace) { super(player, alloyFurnace, alloyFurnace.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiAlloySmelter.java b/src/client/java/techreborn/client/gui/GuiAlloySmelter.java index d2a0f1cf0..9dcab9701 100644 --- a/src/client/java/techreborn/client/gui/GuiAlloySmelter.java +++ b/src/client/java/techreborn/client/gui/GuiAlloySmelter.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.AlloySmelterBlockEntity; public class GuiAlloySmelter extends GuiBase { - AlloySmelterBlockEntity blockEntity; + final AlloySmelterBlockEntity blockEntity; public GuiAlloySmelter(int syncID, final PlayerEntity player, final AlloySmelterBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiAssemblingMachine.java b/src/client/java/techreborn/client/gui/GuiAssemblingMachine.java index a852d258f..8bb4e94dd 100644 --- a/src/client/java/techreborn/client/gui/GuiAssemblingMachine.java +++ b/src/client/java/techreborn/client/gui/GuiAssemblingMachine.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.AssemblingMachineBlockEntity; public class GuiAssemblingMachine extends GuiBase { - AssemblingMachineBlockEntity blockEntity; + final AssemblingMachineBlockEntity blockEntity; public GuiAssemblingMachine(int syncID, final PlayerEntity player, final AssemblingMachineBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiAutoCrafting.java b/src/client/java/techreborn/client/gui/GuiAutoCrafting.java index 44f3494a8..1821b52b8 100644 --- a/src/client/java/techreborn/client/gui/GuiAutoCrafting.java +++ b/src/client/java/techreborn/client/gui/GuiAutoCrafting.java @@ -28,7 +28,6 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.recipe.CraftingRecipe; -import net.minecraft.util.Identifier; import reborncore.client.ClientNetworkManager; import reborncore.client.gui.GuiBase; import reborncore.client.gui.GuiBuilder; @@ -40,10 +39,7 @@ import techreborn.packets.ServerboundPackets; * Created by modmuss50 on 20/06/2017. */ public class GuiAutoCrafting extends GuiBase { - - static final Identifier RECIPE_BOOK_TEXTURE = new Identifier("textures/gui/recipe_book.png"); - boolean showGui = true; - AutoCraftingTableBlockEntity blockEntityAutoCraftingTable; + final AutoCraftingTableBlockEntity blockEntityAutoCraftingTable; public GuiAutoCrafting(int syncID, PlayerEntity player, AutoCraftingTableBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiBatbox.java b/src/client/java/techreborn/client/gui/GuiBatbox.java index 9222fbc6d..27cba02c7 100644 --- a/src/client/java/techreborn/client/gui/GuiBatbox.java +++ b/src/client/java/techreborn/client/gui/GuiBatbox.java @@ -35,7 +35,7 @@ import techreborn.blockentity.storage.energy.LowVoltageSUBlockEntity; public class GuiBatbox extends GuiBase { - LowVoltageSUBlockEntity blockEntity; + final LowVoltageSUBlockEntity blockEntity; public GuiBatbox(int syncID, final PlayerEntity player, final LowVoltageSUBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiBlockBreaker.java b/src/client/java/techreborn/client/gui/GuiBlockBreaker.java index f58e224c3..93c9b76c8 100644 --- a/src/client/java/techreborn/client/gui/GuiBlockBreaker.java +++ b/src/client/java/techreborn/client/gui/GuiBlockBreaker.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier0.block.blockbreaker.BlockBreakerProce public class GuiBlockBreaker extends GuiBase { - BlockBreakerBlockEntity blockEntity; + final BlockBreakerBlockEntity blockEntity; public GuiBlockBreaker(int syncID, final PlayerEntity player, final BlockBreakerBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiBlockPlacer.java b/src/client/java/techreborn/client/gui/GuiBlockPlacer.java index 7862c3ac1..fd0ac46b5 100644 --- a/src/client/java/techreborn/client/gui/GuiBlockPlacer.java +++ b/src/client/java/techreborn/client/gui/GuiBlockPlacer.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier0.block.blockplacer.BlockPlacerProcess public class GuiBlockPlacer extends GuiBase { - BlockPlacerBlockEntity blockEntity; + final BlockPlacerBlockEntity blockEntity; public GuiBlockPlacer(int syncID, final PlayerEntity player, final BlockPlacerBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiCentrifuge.java b/src/client/java/techreborn/client/gui/GuiCentrifuge.java index a8661e6c0..9bdc47ff4 100644 --- a/src/client/java/techreborn/client/gui/GuiCentrifuge.java +++ b/src/client/java/techreborn/client/gui/GuiCentrifuge.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier3.IndustrialCentrifugeBlockEntity; public class GuiCentrifuge extends GuiBase { - IndustrialCentrifugeBlockEntity blockEntity; + final IndustrialCentrifugeBlockEntity blockEntity; public GuiCentrifuge(int syncID, final PlayerEntity player, final IndustrialCentrifugeBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiChargeBench.java b/src/client/java/techreborn/client/gui/GuiChargeBench.java index 716595d6a..6032f442a 100644 --- a/src/client/java/techreborn/client/gui/GuiChargeBench.java +++ b/src/client/java/techreborn/client/gui/GuiChargeBench.java @@ -32,7 +32,7 @@ import techreborn.blockentity.machine.misc.ChargeOMatBlockEntity; public class GuiChargeBench extends GuiBase { - ChargeOMatBlockEntity blockEntity; + final ChargeOMatBlockEntity blockEntity; public GuiChargeBench(int syncID, final PlayerEntity player, final ChargeOMatBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiChemicalReactor.java b/src/client/java/techreborn/client/gui/GuiChemicalReactor.java index f49745096..4c2d42205 100644 --- a/src/client/java/techreborn/client/gui/GuiChemicalReactor.java +++ b/src/client/java/techreborn/client/gui/GuiChemicalReactor.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.ChemicalReactorBlockEntity; public class GuiChemicalReactor extends GuiBase { - ChemicalReactorBlockEntity blockEntity; + final ChemicalReactorBlockEntity blockEntity; public GuiChemicalReactor(int syncID, final PlayerEntity player, final ChemicalReactorBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiChunkLoader.java b/src/client/java/techreborn/client/gui/GuiChunkLoader.java index 8d1dbda48..0e4ef7517 100644 --- a/src/client/java/techreborn/client/gui/GuiChunkLoader.java +++ b/src/client/java/techreborn/client/gui/GuiChunkLoader.java @@ -39,7 +39,7 @@ import techreborn.packets.ServerboundPackets; public class GuiChunkLoader extends GuiBase { - ChunkLoaderBlockEntity blockEntity; + final ChunkLoaderBlockEntity blockEntity; public GuiChunkLoader(int syncID, PlayerEntity player, ChunkLoaderBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiCompressor.java b/src/client/java/techreborn/client/gui/GuiCompressor.java index 6101228b2..6db3d689d 100644 --- a/src/client/java/techreborn/client/gui/GuiCompressor.java +++ b/src/client/java/techreborn/client/gui/GuiCompressor.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.CompressorBlockEntity; public class GuiCompressor extends GuiBase { - CompressorBlockEntity blockEntity; + final CompressorBlockEntity blockEntity; public GuiCompressor(int syncID, final PlayerEntity player, final CompressorBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiDieselGenerator.java b/src/client/java/techreborn/client/gui/GuiDieselGenerator.java index 6d2556e31..2f3ce41bd 100644 --- a/src/client/java/techreborn/client/gui/GuiDieselGenerator.java +++ b/src/client/java/techreborn/client/gui/GuiDieselGenerator.java @@ -33,7 +33,7 @@ import techreborn.blockentity.generator.advanced.DieselGeneratorBlockEntity; public class GuiDieselGenerator extends GuiBase { - DieselGeneratorBlockEntity blockEntity; + final DieselGeneratorBlockEntity blockEntity; public GuiDieselGenerator(int syncID, final PlayerEntity player, final DieselGeneratorBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiElectricFurnace.java b/src/client/java/techreborn/client/gui/GuiElectricFurnace.java index 8778a79e8..822ace944 100644 --- a/src/client/java/techreborn/client/gui/GuiElectricFurnace.java +++ b/src/client/java/techreborn/client/gui/GuiElectricFurnace.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.ElectricFurnaceBlockEntity; public class GuiElectricFurnace extends GuiBase { - ElectricFurnaceBlockEntity blockEntity; + final ElectricFurnaceBlockEntity blockEntity; public GuiElectricFurnace(int syncID, final PlayerEntity player, final ElectricFurnaceBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiElevator.java b/src/client/java/techreborn/client/gui/GuiElevator.java index 021d16b63..f8ff48661 100644 --- a/src/client/java/techreborn/client/gui/GuiElevator.java +++ b/src/client/java/techreborn/client/gui/GuiElevator.java @@ -32,7 +32,7 @@ import techreborn.blockentity.machine.tier1.ElevatorBlockEntity; public class GuiElevator extends GuiBase { - ElevatorBlockEntity blockEntity; + final ElevatorBlockEntity blockEntity; public GuiElevator(int syncID, final PlayerEntity player, final ElevatorBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiExtractor.java b/src/client/java/techreborn/client/gui/GuiExtractor.java index 72fdab719..45ae12e06 100644 --- a/src/client/java/techreborn/client/gui/GuiExtractor.java +++ b/src/client/java/techreborn/client/gui/GuiExtractor.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.ExtractorBlockEntity; public class GuiExtractor extends GuiBase { - ExtractorBlockEntity blockEntity; + final ExtractorBlockEntity blockEntity; public GuiExtractor(int syncID, final PlayerEntity player, final ExtractorBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiFishingStation.java b/src/client/java/techreborn/client/gui/GuiFishingStation.java index 4ecfc4373..21ffe3641 100644 --- a/src/client/java/techreborn/client/gui/GuiFishingStation.java +++ b/src/client/java/techreborn/client/gui/GuiFishingStation.java @@ -32,7 +32,7 @@ import techreborn.blockentity.machine.tier2.FishingStationBlockEntity; public class GuiFishingStation extends GuiBase { - FishingStationBlockEntity blockEntity; + final FishingStationBlockEntity blockEntity; public GuiFishingStation(int syncID, final PlayerEntity player, final FishingStationBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiGasTurbine.java b/src/client/java/techreborn/client/gui/GuiGasTurbine.java index ecd1943f4..2607e2e7c 100644 --- a/src/client/java/techreborn/client/gui/GuiGasTurbine.java +++ b/src/client/java/techreborn/client/gui/GuiGasTurbine.java @@ -33,7 +33,7 @@ import techreborn.blockentity.generator.advanced.GasTurbineBlockEntity; public class GuiGasTurbine extends GuiBase { - GasTurbineBlockEntity blockEntity; + final GasTurbineBlockEntity blockEntity; public GuiGasTurbine(int syncID, final PlayerEntity player, final GasTurbineBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiGenerator.java b/src/client/java/techreborn/client/gui/GuiGenerator.java index 05a2a922d..cdd2bc98d 100644 --- a/src/client/java/techreborn/client/gui/GuiGenerator.java +++ b/src/client/java/techreborn/client/gui/GuiGenerator.java @@ -32,7 +32,7 @@ import techreborn.blockentity.generator.basic.SolidFuelGeneratorBlockEntity; public class GuiGenerator extends GuiBase { - SolidFuelGeneratorBlockEntity blockEntity; + final SolidFuelGeneratorBlockEntity blockEntity; public GuiGenerator(int syncID, final PlayerEntity player, final SolidFuelGeneratorBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiGrinder.java b/src/client/java/techreborn/client/gui/GuiGrinder.java index 6e96a00f9..350f4bf43 100644 --- a/src/client/java/techreborn/client/gui/GuiGrinder.java +++ b/src/client/java/techreborn/client/gui/GuiGrinder.java @@ -32,7 +32,7 @@ import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.GrinderBlockEntity; public class GuiGrinder extends GuiBase { - GrinderBlockEntity blockEntity; + final GrinderBlockEntity blockEntity; public GuiGrinder(int syncID, final PlayerEntity player, final GrinderBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiIDSU.java b/src/client/java/techreborn/client/gui/GuiIDSU.java index f442399f6..367cc4ff2 100644 --- a/src/client/java/techreborn/client/gui/GuiIDSU.java +++ b/src/client/java/techreborn/client/gui/GuiIDSU.java @@ -35,7 +35,7 @@ import techreborn.blockentity.storage.energy.idsu.InterdimensionalSUBlockEntity; public class GuiIDSU extends GuiBase { - InterdimensionalSUBlockEntity idsu; + final InterdimensionalSUBlockEntity idsu; public GuiIDSU(int syncID, PlayerEntity player, InterdimensionalSUBlockEntity blockEntityIDSU) { super(player, blockEntityIDSU, blockEntityIDSU.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java b/src/client/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java index f3b3cc338..d0a52e3c7 100644 --- a/src/client/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java +++ b/src/client/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.IndustrialElectrolyzerBlockEntity; public class GuiIndustrialElectrolyzer extends GuiBase { - IndustrialElectrolyzerBlockEntity blockEntity; + final IndustrialElectrolyzerBlockEntity blockEntity; public GuiIndustrialElectrolyzer(int syncID, final PlayerEntity player, final IndustrialElectrolyzerBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiIronFurnace.java b/src/client/java/techreborn/client/gui/GuiIronFurnace.java index 73abed89a..f4dba0b0c 100644 --- a/src/client/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/client/java/techreborn/client/gui/GuiIronFurnace.java @@ -42,7 +42,7 @@ import techreborn.utils.PlayerUtils; import java.util.Objects; public class GuiIronFurnace extends GuiBase { - IronFurnaceBlockEntity blockEntity; + final IronFurnaceBlockEntity blockEntity; private static final Identifier EXP_BUTTON_TEXTURE = new Identifier("minecraft", "textures/item/experience_bottle.png"); public GuiIronFurnace(int syncID, PlayerEntity player, IronFurnaceBlockEntity furnace) { diff --git a/src/client/java/techreborn/client/gui/GuiLESU.java b/src/client/java/techreborn/client/gui/GuiLESU.java index fd9af87f4..7b2002c46 100644 --- a/src/client/java/techreborn/client/gui/GuiLESU.java +++ b/src/client/java/techreborn/client/gui/GuiLESU.java @@ -35,7 +35,7 @@ import techreborn.blockentity.storage.energy.lesu.LapotronicSUBlockEntity; public class GuiLESU extends GuiBase { - LapotronicSUBlockEntity blockEntity; + final LapotronicSUBlockEntity blockEntity; public GuiLESU(int syncID, final PlayerEntity player, final LapotronicSUBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiLaunchpad.java b/src/client/java/techreborn/client/gui/GuiLaunchpad.java index 5cb6b38e0..82ea4be17 100644 --- a/src/client/java/techreborn/client/gui/GuiLaunchpad.java +++ b/src/client/java/techreborn/client/gui/GuiLaunchpad.java @@ -36,7 +36,7 @@ import techreborn.packets.ServerboundPackets; public class GuiLaunchpad extends GuiBase { - LaunchpadBlockEntity blockEntity; + final LaunchpadBlockEntity blockEntity; public GuiLaunchpad(int syncID, final PlayerEntity player, final LaunchpadBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiMFE.java b/src/client/java/techreborn/client/gui/GuiMFE.java index fde622617..ed6539cbd 100644 --- a/src/client/java/techreborn/client/gui/GuiMFE.java +++ b/src/client/java/techreborn/client/gui/GuiMFE.java @@ -35,7 +35,7 @@ import techreborn.blockentity.storage.energy.MediumVoltageSUBlockEntity; public class GuiMFE extends GuiBase { - MediumVoltageSUBlockEntity mfe; + final MediumVoltageSUBlockEntity mfe; public GuiMFE(int syncID, final PlayerEntity player, final MediumVoltageSUBlockEntity mfe) { super(player, mfe, mfe.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiMFSU.java b/src/client/java/techreborn/client/gui/GuiMFSU.java index 83df7fe31..0b17c783c 100644 --- a/src/client/java/techreborn/client/gui/GuiMFSU.java +++ b/src/client/java/techreborn/client/gui/GuiMFSU.java @@ -35,7 +35,7 @@ import techreborn.blockentity.storage.energy.HighVoltageSUBlockEntity; public class GuiMFSU extends GuiBase { - HighVoltageSUBlockEntity mfsu; + final HighVoltageSUBlockEntity mfsu; public GuiMFSU(int syncID, final PlayerEntity player, final HighVoltageSUBlockEntity mfsu) { super(player, mfsu, mfsu.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiManual.java b/src/client/java/techreborn/client/gui/GuiManual.java index ad274b88d..b53a42dd9 100644 --- a/src/client/java/techreborn/client/gui/GuiManual.java +++ b/src/client/java/techreborn/client/gui/GuiManual.java @@ -38,8 +38,8 @@ import techreborn.packets.ServerboundPackets; public class GuiManual extends Screen { private static final Identifier MANUAL_TEXTURE = new Identifier("techreborn", "textures/gui/manual.png"); - int guiWidth = 207; - int guiHeight = 195; + final int guiWidth = 207; + final int guiHeight = 195; private static final Text text1 = Text.translatable("techreborn.manual.wiki"); private static final Text text2 = Text.translatable("techreborn.manual.discord"); private static final Text text3 = Text.translatable("techreborn.manual.refund"); diff --git a/src/client/java/techreborn/client/gui/GuiMatterFabricator.java b/src/client/java/techreborn/client/gui/GuiMatterFabricator.java index 00ae8a862..ada001026 100644 --- a/src/client/java/techreborn/client/gui/GuiMatterFabricator.java +++ b/src/client/java/techreborn/client/gui/GuiMatterFabricator.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier3.MatterFabricatorBlockEntity; public class GuiMatterFabricator extends GuiBase { - MatterFabricatorBlockEntity blockEntity; + final MatterFabricatorBlockEntity blockEntity; public GuiMatterFabricator(int syncID, final PlayerEntity player, final MatterFabricatorBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiPlasmaGenerator.java b/src/client/java/techreborn/client/gui/GuiPlasmaGenerator.java index 51a3639f5..bb9b42b1a 100644 --- a/src/client/java/techreborn/client/gui/GuiPlasmaGenerator.java +++ b/src/client/java/techreborn/client/gui/GuiPlasmaGenerator.java @@ -36,7 +36,7 @@ import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity; */ public class GuiPlasmaGenerator extends GuiBase { - PlasmaGeneratorBlockEntity blockEntity; + final PlasmaGeneratorBlockEntity blockEntity; public GuiPlasmaGenerator(int syncID, final PlayerEntity player, final PlasmaGeneratorBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiPlayerDetector.java b/src/client/java/techreborn/client/gui/GuiPlayerDetector.java index c5baab9e6..affb13e23 100644 --- a/src/client/java/techreborn/client/gui/GuiPlayerDetector.java +++ b/src/client/java/techreborn/client/gui/GuiPlayerDetector.java @@ -36,7 +36,7 @@ import techreborn.packets.ServerboundPackets; public class GuiPlayerDetector extends GuiBase { - PlayerDetectorBlockEntity blockEntity; + final PlayerDetectorBlockEntity blockEntity; public GuiPlayerDetector(int syncID, final PlayerEntity player, final PlayerDetectorBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiRecycler.java b/src/client/java/techreborn/client/gui/GuiRecycler.java index 2df0f21cf..99459b1b7 100644 --- a/src/client/java/techreborn/client/gui/GuiRecycler.java +++ b/src/client/java/techreborn/client/gui/GuiRecycler.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.RecyclerBlockEntity; public class GuiRecycler extends GuiBase { - RecyclerBlockEntity blockEntity; + final RecyclerBlockEntity blockEntity; public GuiRecycler(int syncID, final PlayerEntity player, final RecyclerBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiRollingMachine.java b/src/client/java/techreborn/client/gui/GuiRollingMachine.java index 69ade3336..6941e093e 100644 --- a/src/client/java/techreborn/client/gui/GuiRollingMachine.java +++ b/src/client/java/techreborn/client/gui/GuiRollingMachine.java @@ -35,7 +35,7 @@ import techreborn.packets.ServerboundPackets; public class GuiRollingMachine extends GuiBase { - RollingMachineBlockEntity rollingMachine; + final RollingMachineBlockEntity rollingMachine; public GuiRollingMachine(int syncID, final PlayerEntity player, final RollingMachineBlockEntity blockEntityRollingmachine) { super(player, blockEntityRollingmachine, blockEntityRollingmachine.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiScrapboxinator.java b/src/client/java/techreborn/client/gui/GuiScrapboxinator.java index a02a3d7bc..f1359b039 100644 --- a/src/client/java/techreborn/client/gui/GuiScrapboxinator.java +++ b/src/client/java/techreborn/client/gui/GuiScrapboxinator.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.ScrapboxinatorBlockEntity; public class GuiScrapboxinator extends GuiBase { - ScrapboxinatorBlockEntity blockEntity; + final ScrapboxinatorBlockEntity blockEntity; public GuiScrapboxinator(int syncID, final PlayerEntity player, final ScrapboxinatorBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiSemifluidGenerator.java b/src/client/java/techreborn/client/gui/GuiSemifluidGenerator.java index 5dcc5d16b..ddf886a8f 100644 --- a/src/client/java/techreborn/client/gui/GuiSemifluidGenerator.java +++ b/src/client/java/techreborn/client/gui/GuiSemifluidGenerator.java @@ -33,7 +33,7 @@ import techreborn.blockentity.generator.advanced.SemiFluidGeneratorBlockEntity; public class GuiSemifluidGenerator extends GuiBase { - SemiFluidGeneratorBlockEntity blockEntity; + final SemiFluidGeneratorBlockEntity blockEntity; public GuiSemifluidGenerator(int syncID, final PlayerEntity player, final SemiFluidGeneratorBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiSolar.java b/src/client/java/techreborn/client/gui/GuiSolar.java index 539c221e1..0e265e70d 100644 --- a/src/client/java/techreborn/client/gui/GuiSolar.java +++ b/src/client/java/techreborn/client/gui/GuiSolar.java @@ -33,7 +33,7 @@ import techreborn.blockentity.generator.SolarPanelBlockEntity; public class GuiSolar extends GuiBase { - SolarPanelBlockEntity blockEntity; + final SolarPanelBlockEntity blockEntity; public GuiSolar(int syncID, PlayerEntity player, SolarPanelBlockEntity panel) { super(player, panel, panel.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiSolidCanningMachine.java b/src/client/java/techreborn/client/gui/GuiSolidCanningMachine.java index e7491ed72..cd9f51584 100644 --- a/src/client/java/techreborn/client/gui/GuiSolidCanningMachine.java +++ b/src/client/java/techreborn/client/gui/GuiSolidCanningMachine.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.SolidCanningMachineBlockEntity; public class GuiSolidCanningMachine extends GuiBase { - SolidCanningMachineBlockEntity blockEntity; + final SolidCanningMachineBlockEntity blockEntity; public GuiSolidCanningMachine(int syncID, final PlayerEntity player, final SolidCanningMachineBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiStorageUnit.java b/src/client/java/techreborn/client/gui/GuiStorageUnit.java index 9cf1c3ae1..f56d85080 100644 --- a/src/client/java/techreborn/client/gui/GuiStorageUnit.java +++ b/src/client/java/techreborn/client/gui/GuiStorageUnit.java @@ -35,7 +35,7 @@ import techreborn.packets.ServerboundPackets; public class GuiStorageUnit extends GuiBase { - StorageUnitBaseBlockEntity storageEntity; + final StorageUnitBaseBlockEntity storageEntity; public GuiStorageUnit(int syncID, final PlayerEntity player, final StorageUnitBaseBlockEntity storageEntity) { super(player, storageEntity, storageEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiTankUnit.java b/src/client/java/techreborn/client/gui/GuiTankUnit.java index 359838b99..35b86421b 100644 --- a/src/client/java/techreborn/client/gui/GuiTankUnit.java +++ b/src/client/java/techreborn/client/gui/GuiTankUnit.java @@ -35,7 +35,7 @@ import techreborn.blockentity.storage.fluid.TankUnitBaseBlockEntity; public class GuiTankUnit extends GuiBase { - TankUnitBaseBlockEntity tankEntity; + final TankUnitBaseBlockEntity tankEntity; public GuiTankUnit(int syncID, final PlayerEntity player, final TankUnitBaseBlockEntity tankEntity) { super(player, tankEntity, tankEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiThermalGenerator.java b/src/client/java/techreborn/client/gui/GuiThermalGenerator.java index 53d2e19ac..0487cc7e3 100644 --- a/src/client/java/techreborn/client/gui/GuiThermalGenerator.java +++ b/src/client/java/techreborn/client/gui/GuiThermalGenerator.java @@ -33,7 +33,7 @@ import techreborn.blockentity.generator.advanced.ThermalGeneratorBlockEntity; public class GuiThermalGenerator extends GuiBase { - ThermalGeneratorBlockEntity blockEntity; + final ThermalGeneratorBlockEntity blockEntity; public GuiThermalGenerator(int syncID, final PlayerEntity player, final ThermalGeneratorBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/client/java/techreborn/client/gui/GuiWireMill.java b/src/client/java/techreborn/client/gui/GuiWireMill.java index 40161d207..862f2078a 100644 --- a/src/client/java/techreborn/client/gui/GuiWireMill.java +++ b/src/client/java/techreborn/client/gui/GuiWireMill.java @@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.WireMillBlockEntity; public class GuiWireMill extends GuiBase { - WireMillBlockEntity blockEntity; + final WireMillBlockEntity blockEntity; public GuiWireMill(int syncID, final PlayerEntity player, final WireMillBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index 36a7036d8..6d7ebe171 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -55,14 +55,11 @@ import techreborn.utils.PoweredCraftingHandler; import techreborn.world.WorldGenerator; public class TechReborn implements ModInitializer { - public static final String MOD_ID = "techreborn"; public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); - public static TechReborn INSTANCE; @Override public void onInitialize() { - INSTANCE = this; new Configuration(TechRebornConfig.class, "techreborn"); // Done to force the class to load diff --git a/src/main/java/techreborn/api/generator/GeneratorRecipeHelper.java b/src/main/java/techreborn/api/generator/GeneratorRecipeHelper.java index bbd0b726f..f8121dbd0 100644 --- a/src/main/java/techreborn/api/generator/GeneratorRecipeHelper.java +++ b/src/main/java/techreborn/api/generator/GeneratorRecipeHelper.java @@ -37,7 +37,7 @@ public class GeneratorRecipeHelper { * value of the {@link EFluidGenerator} enum is linked to an object holding a set of * {@link FluidGeneratorRecipe}. */ - public static EnumMap fluidRecipes = new EnumMap<>( + public static final EnumMap fluidRecipes = new EnumMap<>( EFluidGenerator.class); /** diff --git a/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java b/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java index a30fec2ab..576635ee8 100644 --- a/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java +++ b/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java @@ -133,7 +133,7 @@ public class CableBlockEntity extends BlockEntity return energyContainer.getSideStorage(side); } - public BlockState getCover() { + public @Nullable BlockState getCover() { return cover; } diff --git a/src/main/java/techreborn/blockentity/cable/CableTickManager.java b/src/main/java/techreborn/blockentity/cable/CableTickManager.java index e34b6c867..d789893b8 100644 --- a/src/main/java/techreborn/blockentity/cable/CableTickManager.java +++ b/src/main/java/techreborn/blockentity/cable/CableTickManager.java @@ -148,7 +148,7 @@ class CableTickManager { // Limit max amount to the cable transfer rate. long targetMaxAmount = Math.min(remainingAmount / remainingTargets, cableType.transferRate); - long localTransferred = operation.transfer(target.storage.storage, targetMaxAmount, transaction); + long localTransferred = operation.transfer(target.storage.storage(), targetMaxAmount, transaction); if (localTransferred > 0) { transferredAmount += localTransferred; // Block duplicate operations. @@ -171,7 +171,7 @@ class CableTickManager { SortableStorage(TransferOperation operation, OfferedEnergyStorage storage) { this.storage = storage; try (Transaction tx = Transaction.openOuter()) { - this.simulationResult = operation.transfer(storage.storage, Long.MAX_VALUE, tx); + this.simulationResult = operation.transfer(storage.storage(), Long.MAX_VALUE, tx); } } } diff --git a/src/main/java/techreborn/blockentity/cable/OfferedEnergyStorage.java b/src/main/java/techreborn/blockentity/cable/OfferedEnergyStorage.java index c3a485840..906a536a8 100644 --- a/src/main/java/techreborn/blockentity/cable/OfferedEnergyStorage.java +++ b/src/main/java/techreborn/blockentity/cable/OfferedEnergyStorage.java @@ -30,17 +30,7 @@ import team.reborn.energy.api.EnergyStorage; /** * {@link EnergyStorage} adjacent to an energy cable, with some additional info. */ -class OfferedEnergyStorage { - final CableBlockEntity sourceCable; - final Direction direction; - final EnergyStorage storage; - - OfferedEnergyStorage(CableBlockEntity sourceCable, Direction direction, EnergyStorage storage) { - this.sourceCable = sourceCable; - this.direction = direction; - this.storage = storage; - } - +record OfferedEnergyStorage(CableBlockEntity sourceCable, Direction direction, EnergyStorage storage) { void afterTransfer() { // Block insertions from this side. sourceCable.blockedSides |= 1 << direction.ordinal(); diff --git a/src/main/java/techreborn/blockentity/generator/advanced/DragonEggSyphonBlockEntity.java b/src/main/java/techreborn/blockentity/generator/advanced/DragonEggSyphonBlockEntity.java index ceeccfc75..5537baaec 100644 --- a/src/main/java/techreborn/blockentity/generator/advanced/DragonEggSyphonBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/advanced/DragonEggSyphonBlockEntity.java @@ -45,7 +45,7 @@ import techreborn.init.TRContent; public class DragonEggSyphonBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider { - public RebornInventory inventory = new RebornInventory<>(3, "DragonEggSyphonBlockEntity", 64, this); + public final RebornInventory inventory = new RebornInventory<>(3, "DragonEggSyphonBlockEntity", 64, this); private long lastOutput = 0; public DragonEggSyphonBlockEntity(BlockPos pos, BlockState state) { diff --git a/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java index 630bbeebe..bb0047dcd 100644 --- a/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java @@ -54,8 +54,8 @@ import java.util.Map; public class SolidFuelGeneratorBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { - public RebornInventory inventory = new RebornInventory<>(2, "SolidFuelGeneratorBlockEntity", 64, this); - public int fuelSlot = 0; + public final RebornInventory inventory = new RebornInventory<>(2, "SolidFuelGeneratorBlockEntity", 64, this); + public final int fuelSlot = 0; public int burnTime; public int totalBurnTime = 0; public boolean isBurning; diff --git a/src/main/java/techreborn/blockentity/machine/GenericMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/GenericMachineBlockEntity.java index 05df28f05..2190eeddc 100644 --- a/src/main/java/techreborn/blockentity/machine/GenericMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/GenericMachineBlockEntity.java @@ -49,11 +49,11 @@ import reborncore.common.util.RebornInventory; public abstract class GenericMachineBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, IRecipeCrafterProvider { - public String name; - public int maxInput; - public int maxEnergy; - public Block toolDrop; - public int energySlot; + public final String name; + public final int maxInput; + public final int maxEnergy; + public final Block toolDrop; + public final int energySlot; public RebornInventory inventory; public RecipeCrafter crafter; diff --git a/src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java index 82cb617da..7c0ab0fb1 100644 --- a/src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java @@ -47,8 +47,8 @@ public abstract class AbstractIronMachineBlockEntity extends MachineBaseBlockEnt public int burnTime; public int totalBurnTime; public int progress; - int fuelSlot; - Block toolDrop; + final int fuelSlot; + final Block toolDrop; public AbstractIronMachineBlockEntity(BlockEntityType blockEntityTypeIn, BlockPos pos, BlockState state, int fuelSlot, Block toolDrop) { super(blockEntityTypeIn, pos, state); diff --git a/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java b/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java index 16da837b2..c2a776eaf 100644 --- a/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java @@ -46,7 +46,7 @@ import techreborn.init.TRContent; public class ChargeOMatBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { - public RebornInventory inventory = new RebornInventory<>(6, "ChargeOMatBlockEntity", 64, this); + public final RebornInventory inventory = new RebornInventory<>(6, "ChargeOMatBlockEntity", 64, this); public ChargeOMatBlockEntity(BlockPos pos, BlockState state) { super(TRBlockEntities.CHARGE_O_MAT, pos, state); diff --git a/src/main/java/techreborn/blockentity/machine/misc/DrainBlockEntity.java b/src/main/java/techreborn/blockentity/machine/misc/DrainBlockEntity.java index 793059d6a..382bdb295 100644 --- a/src/main/java/techreborn/blockentity/machine/misc/DrainBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/misc/DrainBlockEntity.java @@ -45,7 +45,7 @@ import techreborn.init.TRContent; public class DrainBlockEntity extends MachineBaseBlockEntity implements IToolDrop { - protected Tank internalTank = new Tank("tank", FluidValue.BUCKET, this); + protected final Tank internalTank = new Tank("tank", FluidValue.BUCKET, this); public DrainBlockEntity(BlockPos pos, BlockState state) { super(TRBlockEntities.DRAIN, pos, state); diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java index db14397b0..55035331c 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java @@ -55,7 +55,7 @@ import techreborn.init.TRContent; public class FluidReplicatorBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public static final FluidValue TANK_CAPACITY = FluidValue.BUCKET.multiply(16); - public Tank tank; + public final Tank tank; int ticksSinceLastChange; public FluidReplicatorBlockEntity(BlockPos pos, BlockState state) { diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java index 78bd7e088..68d8aaaa7 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java @@ -59,9 +59,9 @@ public class FusionControlComputerBlockEntity extends GenericMachineBlockEntity public int neededPower = 0; public int size = 6; public int state = -1; - int topStackSlot = 0; - int bottomStackSlot = 1; - int outputStackSlot = 2; + final int topStackSlot = 0; + final int bottomStackSlot = 1; + final int outputStackSlot = 2; FusionReactorRecipe currentRecipe = null; Identifier currentRecipeID = null; boolean hasStartedCrafting = false; diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java index 412615c31..5ce58d13d 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java @@ -51,7 +51,7 @@ import techreborn.init.TRContent; public class IndustrialGrinderBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public static final FluidValue TANK_CAPACITY = FluidValue.BUCKET.multiply(16); - public Tank tank; + public final Tank tank; int ticksSinceLastChange; public IndustrialGrinderBlockEntity(BlockPos pos, BlockState state) { diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java index 09e96bda8..8782a813f 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java @@ -51,7 +51,7 @@ import techreborn.init.TRContent; public class IndustrialSawmillBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public static final FluidValue TANK_CAPACITY = FluidValue.BUCKET.multiply(16); - public Tank tank; + public final Tank tank; int ticksSinceLastChange; public IndustrialSawmillBlockEntity(BlockPos pos, BlockState state) { diff --git a/src/main/java/techreborn/blockentity/machine/tier0/block/AbstractBlockBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier0/block/AbstractBlockBlockEntity.java index 17fb65785..7b2d89bc4 100644 --- a/src/main/java/techreborn/blockentity/machine/tier0/block/AbstractBlockBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier0/block/AbstractBlockBlockEntity.java @@ -41,8 +41,8 @@ import reborncore.common.screen.builder.ScreenHandlerBuilder; import techreborn.blockentity.machine.GenericMachineBlockEntity; public class AbstractBlockBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider, BlockProcessable { - private final int ENERGY_SLOT = 0; - private final int INPUT_SLOT = 1; + private static final int ENERGY_SLOT = 0; + private static final int INPUT_SLOT = 1; protected BlockProcessor processor; diff --git a/src/main/java/techreborn/blockentity/machine/tier0/block/BlockProcessorUtils.java b/src/main/java/techreborn/blockentity/machine/tier0/block/BlockProcessorUtils.java index 6c4d77820..11255de78 100644 --- a/src/main/java/techreborn/blockentity/machine/tier0/block/BlockProcessorUtils.java +++ b/src/main/java/techreborn/blockentity/machine/tier0/block/BlockProcessorUtils.java @@ -38,7 +38,7 @@ import reborncore.common.blockentity.MachineBaseBlockEntity; * @author SimonFlapse */ public class BlockProcessorUtils { - private BlockProcessorUtils() {}; + private BlockProcessorUtils() {} /** * Get the hardness to break of a block @@ -48,8 +48,7 @@ public class BlockProcessorUtils { * @return the hardness to break of the supplied {@link BlockState} */ public static float getHardness(World world, BlockState blockInFront, BlockPos positionInFront) { - float hardness = blockInFront.getHardness(world, positionInFront); - return hardness; + return blockInFront.getHardness(world, positionInFront); } diff --git a/src/main/java/techreborn/blockentity/machine/tier0/block/blockbreaker/BlockBreakerProcessor.java b/src/main/java/techreborn/blockentity/machine/tier0/block/blockbreaker/BlockBreakerProcessor.java index 74e89b4d7..453247926 100644 --- a/src/main/java/techreborn/blockentity/machine/tier0/block/blockbreaker/BlockBreakerProcessor.java +++ b/src/main/java/techreborn/blockentity/machine/tier0/block/blockbreaker/BlockBreakerProcessor.java @@ -58,14 +58,14 @@ import java.util.UUID; */ public class BlockBreakerProcessor extends BlockBreakerNbt implements BlockProcessor { - private UUID processorId = UUID.randomUUID(); - private BlockProcessable processable; + private final UUID processorId = UUID.randomUUID(); + private final BlockProcessable processable; - private int outputSlot; - private int fakeInputSlot; + private final int outputSlot; + private final int fakeInputSlot; - private int baseBreakTime; - private int baseCostToBreak; + private final int baseBreakTime; + private final int baseCostToBreak; public BlockBreakerProcessor(BlockProcessable processable, int outputSlot, int fakeInputSlot, int baseBreakTime, int baseCostToBreak) { this.processable = processable; diff --git a/src/main/java/techreborn/blockentity/machine/tier0/block/blockplacer/BlockPlacerProcessor.java b/src/main/java/techreborn/blockentity/machine/tier0/block/blockplacer/BlockPlacerProcessor.java index 68b695f15..27e75fe9a 100644 --- a/src/main/java/techreborn/blockentity/machine/tier0/block/blockplacer/BlockPlacerProcessor.java +++ b/src/main/java/techreborn/blockentity/machine/tier0/block/blockplacer/BlockPlacerProcessor.java @@ -48,13 +48,13 @@ import techreborn.blockentity.machine.tier0.block.ProcessingStatus; */ public class BlockPlacerProcessor extends BlockPlacerNbt implements BlockProcessor { - private BlockProcessable processable; + private final BlockProcessable processable; - private int inputSlot; - private int fakeOutputSlot; + private final int inputSlot; + private final int fakeOutputSlot; - private int basePlaceTime; - private int baseCostToPlace; + private final int basePlaceTime; + private final int baseCostToPlace; public BlockPlacerProcessor(BlockProcessable processable, int inputSlot, int fakeOutputSlot, int basePlaceTime, int baseCostToPlace) { this.processable = processable; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java index 724d3ae07..f1eb32c63 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java @@ -71,13 +71,13 @@ public class AutoCraftingTableBlockEntity extends PowerAcceptorBlockEntity public static final int CRAFTING_WIDTH = 3; public static final int CRAFTING_AREA = CRAFTING_HEIGHT*CRAFTING_WIDTH; - public RebornInventory inventory = new RebornInventory<>(CRAFTING_AREA+2, "AutoCraftingTableBlockEntity", 64, this); + public final RebornInventory inventory = new RebornInventory<>(CRAFTING_AREA+2, "AutoCraftingTableBlockEntity", 64, this); private final int OUTPUT_SLOT = CRAFTING_AREA; // first slot is indexed by 0, so this is the last non crafting slot private final int EXTRA_OUTPUT_SLOT = CRAFTING_AREA + 1; public int progress; public int maxProgress = 120; - public int euTick = 10; + public final int euTick = 10; public int balanceSlot = 0; CraftingInventory inventoryCrafting = null; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java index ad5b26bd7..6588cfd1f 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java @@ -54,9 +54,9 @@ import java.util.Optional; public class ElectricFurnaceBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { - public RebornInventory inventory = new RebornInventory<>(3, "ElectricFurnaceBlockEntity", 64, this); - int inputSlot = 0; - int outputSlot = 1; + public final RebornInventory inventory = new RebornInventory<>(3, "ElectricFurnaceBlockEntity", 64, this); + final int inputSlot = 0; + final int outputSlot = 1; int ticksSinceLastChange; private SmeltingRecipe currentRecipe; private int cookTime; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java index 9500bb52f..c22085284 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java @@ -36,7 +36,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; import org.apache.commons.lang3.tuple.Pair; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; @@ -67,13 +66,12 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity public int[] craftingSlots = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8}; private CraftingInventory craftCache; - public RebornInventory inventory = new RebornInventory<>(12, "RollingMachineBlockEntity", 64, this); + public final RebornInventory inventory = new RebornInventory<>(12, "RollingMachineBlockEntity", 64, this); public boolean isRunning; public int tickTime; // Only synced to the client public int currentRecipeTime; - @NotNull - public ItemStack currentRecipeOutput; + public ItemStack currentRecipeOutput = ItemStack.EMPTY; public RollingMachineRecipe currentRecipe; private final int outputSlot; public boolean locked = false; diff --git a/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java index e1f68b80b..e15822290 100644 --- a/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java @@ -49,7 +49,7 @@ import techreborn.init.TRContent; public class ChunkLoaderBlockEntity extends MachineBaseBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { - public RebornInventory inventory = new RebornInventory<>(0, "ChunkLoaderBlockEntity", 64, this); + public final RebornInventory inventory = new RebornInventory<>(0, "ChunkLoaderBlockEntity", 64, this); private int radius; private String ownerUdid; diff --git a/src/main/java/techreborn/blockentity/machine/tier3/MatterFabricatorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier3/MatterFabricatorBlockEntity.java index d54bf7392..1544f6b68 100644 --- a/src/main/java/techreborn/blockentity/machine/tier3/MatterFabricatorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier3/MatterFabricatorBlockEntity.java @@ -47,7 +47,7 @@ import techreborn.init.TRContent; public class MatterFabricatorBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { - public RebornInventory inventory = new RebornInventory<>(12, "MatterFabricatorBlockEntity", 64, this); + public final RebornInventory inventory = new RebornInventory<>(12, "MatterFabricatorBlockEntity", 64, this); private int amplifier = 0; public MatterFabricatorBlockEntity(BlockPos pos, BlockState state) { diff --git a/src/main/java/techreborn/blockentity/storage/energy/EnergyStorageBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/EnergyStorageBlockEntity.java index 198fe76e9..360df2c7d 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/EnergyStorageBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/EnergyStorageBlockEntity.java @@ -46,9 +46,9 @@ import techreborn.blocks.storage.energy.EnergyStorageBlock; */ public class EnergyStorageBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider { - public RebornInventory inventory; - public String name; - public Block wrenchDrop; + public final RebornInventory inventory; + public final String name; + public final Block wrenchDrop; public int maxInput; public int maxOutput; public int maxStorage; diff --git a/src/main/java/techreborn/blockentity/storage/energy/lesu/LesuNetwork.java b/src/main/java/techreborn/blockentity/storage/energy/lesu/LesuNetwork.java index 370ed7d42..80de606fc 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/lesu/LesuNetwork.java +++ b/src/main/java/techreborn/blockentity/storage/energy/lesu/LesuNetwork.java @@ -28,7 +28,7 @@ import java.util.ArrayList; public class LesuNetwork { - public ArrayList storages = new ArrayList<>(); + public final ArrayList storages = new ArrayList<>(); public LapotronicSUBlockEntity master; diff --git a/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java b/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java index 54a3230b3..3e6f7bc9c 100644 --- a/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java @@ -55,7 +55,7 @@ public class TankUnitBaseBlockEntity extends MachineBaseBlockEntity implements I protected Tank tank; private long serverMaxCapacity = -1; - protected RebornInventory inventory = new RebornInventory<>(2, "TankInventory", 64, this); + protected final RebornInventory inventory = new RebornInventory<>(2, "TankInventory", 64, this); private TRContent.TankUnit type; diff --git a/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java b/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java index 175879972..4d5ce60e9 100644 --- a/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java @@ -67,7 +67,7 @@ public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity implement // Client sync variables for GUI, what and how much stored public int storedAmount = 0; - protected RebornInventory inventory; + protected final RebornInventory inventory; private int maxCapacity; private int serverCapacity = -1; diff --git a/src/main/java/techreborn/blockentity/transformers/TransformerBlockEntity.java b/src/main/java/techreborn/blockentity/transformers/TransformerBlockEntity.java index b881dcfa9..8bdf17367 100644 --- a/src/main/java/techreborn/blockentity/transformers/TransformerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/transformers/TransformerBlockEntity.java @@ -50,13 +50,13 @@ import java.util.List; */ public class TransformerBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, IListInfoProvider { - public String name; - public Block wrenchDrop; - public RcEnergyTier inputTier; - public RcEnergyTier outputTier; - public int maxInput; - public int maxOutput; - public int maxStorage; + public final String name; + public final Block wrenchDrop; + public final RcEnergyTier inputTier; + public final RcEnergyTier outputTier; + public final int maxInput; + public final int maxOutput; + public final int maxStorage; public TransformerBlockEntity(BlockEntityType blockEntityType, BlockPos pos, BlockState state, String name, Block wrenchDrop, RcEnergyTier tier) { super(blockEntityType, pos, state); diff --git a/src/main/java/techreborn/blocks/GenericMachineBlock.java b/src/main/java/techreborn/blocks/GenericMachineBlock.java index f20759879..8e98d397c 100644 --- a/src/main/java/techreborn/blocks/GenericMachineBlock.java +++ b/src/main/java/techreborn/blocks/GenericMachineBlock.java @@ -39,7 +39,7 @@ import java.util.function.BiFunction; public class GenericMachineBlock extends BlockMachineBase { private final IMachineGuiHandler gui; - BiFunction blockEntityClass; + final BiFunction blockEntityClass; public GenericMachineBlock(IMachineGuiHandler gui, BiFunction blockEntityClass) { super(TRBlockSettings.genericMachine()); diff --git a/src/main/java/techreborn/blocks/machine/tier1/ResinBasinBlock.java b/src/main/java/techreborn/blocks/machine/tier1/ResinBasinBlock.java index 2915d67cd..901bfe493 100644 --- a/src/main/java/techreborn/blocks/machine/tier1/ResinBasinBlock.java +++ b/src/main/java/techreborn/blocks/machine/tier1/ResinBasinBlock.java @@ -60,7 +60,7 @@ public class ResinBasinBlock extends BaseBlockEntityProvider { public static final BooleanProperty POURING = BooleanProperty.of("pouring"); public static final BooleanProperty FULL = BooleanProperty.of("full"); protected static final VoxelShape SHAPE = Block.createCuboidShape(0d,0d, 0d, 16d, 8d, 16d); - BiFunction blockEntityClass; + final BiFunction blockEntityClass; public ResinBasinBlock(BiFunction blockEntityClass) { super(TRBlockSettings.resinBasin()); @@ -93,9 +93,8 @@ public class ResinBasinBlock extends BaseBlockEntityProvider { @SuppressWarnings("deprecation") @Override public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - if (world == null || world.isClient() || player == null || pos == null || !(world.getBlockEntity(pos) instanceof ResinBasinBlockEntity)) + if (world == null || world.isClient() || player == null || pos == null || !(world.getBlockEntity(pos) instanceof ResinBasinBlockEntity basin)) return ActionResult.PASS; - ResinBasinBlockEntity basin = (ResinBasinBlockEntity)world.getBlockEntity(pos); ItemStack sap = basin.empty(); if (sap.isEmpty()) return ActionResult.PASS; diff --git a/src/main/java/techreborn/blocks/misc/BlockAlarm.java b/src/main/java/techreborn/blocks/misc/BlockAlarm.java index 11cab5ce1..bfd8d294d 100644 --- a/src/main/java/techreborn/blocks/misc/BlockAlarm.java +++ b/src/main/java/techreborn/blocks/misc/BlockAlarm.java @@ -68,15 +68,14 @@ public class BlockAlarm extends BaseBlockEntityProvider { private VoxelShape[] GenCuboidShapes(double depth, double width) { double culling = (16.0D - width) / 2; - VoxelShape[] shapes = { - Block.createCuboidShape(culling, 16.0 - depth, culling, 16.0 - culling, 16.0D, 16.0 - culling), - Block.createCuboidShape(culling, 0.0D, culling, 16.0D - culling, depth, 16.0 - culling), - Block.createCuboidShape(culling, culling, 16.0 - depth, 16.0 - culling, 16.0 - culling, 16.0D), - Block.createCuboidShape(culling, culling, 0.0D, 16.0 - culling, 16.0 - culling, depth), - Block.createCuboidShape(16.0 - depth, culling, culling, 16.0D, 16.0 - culling, 16.0 - culling), - Block.createCuboidShape(0.0D, culling, culling, depth, 16.0 - culling, 16.0 - culling) + return new VoxelShape[]{ + createCuboidShape(culling, 16.0 - depth, culling, 16.0 - culling, 16.0D, 16.0 - culling), + createCuboidShape(culling, 0.0D, culling, 16.0D - culling, depth, 16.0 - culling), + createCuboidShape(culling, culling, 16.0 - depth, 16.0 - culling, 16.0 - culling, 16.0D), + createCuboidShape(culling, culling, 0.0D, 16.0 - culling, 16.0 - culling, depth), + createCuboidShape(16.0 - depth, culling, culling, 16.0D, 16.0 - culling, 16.0 - culling), + createCuboidShape(0.0D, culling, culling, depth, 16.0 - culling, 16.0 - culling) }; - return shapes; } public static boolean isActive(BlockState state) { diff --git a/src/main/java/techreborn/blocks/misc/BlockNuke.java b/src/main/java/techreborn/blocks/misc/BlockNuke.java index 5d5f8b2a8..487597c33 100644 --- a/src/main/java/techreborn/blocks/misc/BlockNuke.java +++ b/src/main/java/techreborn/blocks/misc/BlockNuke.java @@ -46,7 +46,7 @@ import techreborn.init.TRBlockSettings; * Created by Mark on 13/03/2016. */ public class BlockNuke extends BaseBlock { - public static BooleanProperty OVERLAY = BooleanProperty.of("overlay"); + public static final BooleanProperty OVERLAY = BooleanProperty.of("overlay"); public BlockNuke() { super(TRBlockSettings.nuke()); diff --git a/src/main/java/techreborn/blocks/misc/BlockRubberLog.java b/src/main/java/techreborn/blocks/misc/BlockRubberLog.java index 25c0ee4b0..f51f04a4d 100644 --- a/src/main/java/techreborn/blocks/misc/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/misc/BlockRubberLog.java @@ -61,9 +61,9 @@ import techreborn.items.tool.basic.ElectricTreetapItem; */ public class BlockRubberLog extends PillarBlock { - public static DirectionProperty SAP_SIDE = Properties.HORIZONTAL_FACING; - public static BooleanProperty HAS_SAP = BooleanProperty.of("hassap"); - public static BooleanProperty SHOULD_SAP = BooleanProperty.of("shouldsap"); + public static final DirectionProperty SAP_SIDE = Properties.HORIZONTAL_FACING; + public static final BooleanProperty HAS_SAP = BooleanProperty.of("hassap"); + public static final BooleanProperty SHOULD_SAP = BooleanProperty.of("shouldsap"); public BlockRubberLog() { super(TRBlockSettings.rubberLog()); diff --git a/src/main/java/techreborn/blocks/storage/energy/EnergyStorageBlock.java b/src/main/java/techreborn/blocks/storage/energy/EnergyStorageBlock.java index 204078ab4..31437b468 100644 --- a/src/main/java/techreborn/blocks/storage/energy/EnergyStorageBlock.java +++ b/src/main/java/techreborn/blocks/storage/energy/EnergyStorageBlock.java @@ -54,9 +54,9 @@ import techreborn.init.TRBlockSettings; * Created by Rushmead */ public abstract class EnergyStorageBlock extends BaseBlockEntityProvider { - public static DirectionProperty FACING = Properties.FACING; - public String name; - public IMachineGuiHandler gui; + public static final DirectionProperty FACING = Properties.FACING; + public final String name; + public final IMachineGuiHandler gui; public EnergyStorageBlock(String name, IMachineGuiHandler gui) { super(TRBlockSettings.energyStorage()); diff --git a/src/main/java/techreborn/blocks/storage/energy/LSUStorageBlock.java b/src/main/java/techreborn/blocks/storage/energy/LSUStorageBlock.java index e7c5ae04e..553f86672 100644 --- a/src/main/java/techreborn/blocks/storage/energy/LSUStorageBlock.java +++ b/src/main/java/techreborn/blocks/storage/energy/LSUStorageBlock.java @@ -58,9 +58,7 @@ public class LSUStorageBlock extends BaseBlockEntityProvider { return; } if (worldIn.getBlockEntity(pos) instanceof LSUStorageBlockEntity blockEntity) { - if (blockEntity != null) { - blockEntity.removeFromNetwork(); - } + blockEntity.removeFromNetwork(); } super.onStateReplaced(state, worldIn, pos, newState, isMoving); } @@ -74,9 +72,7 @@ public class LSUStorageBlock extends BaseBlockEntityProvider { public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity player, ItemStack itemstack) { super.onPlaced(world, pos, state, player, itemstack); if (world.getBlockEntity(pos) instanceof LSUStorageBlockEntity blockEntity) { - if (blockEntity != null) { - blockEntity.rebuildNetwork(); - } + blockEntity.rebuildNetwork(); } } diff --git a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java index 7cb75c4cc..7c2ad450e 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java @@ -50,8 +50,8 @@ import techreborn.init.TRBlockSettings; */ public abstract class BlockTransformer extends BaseBlockEntityProvider { - public static DirectionProperty FACING = Properties.FACING; - public String name; + public static final DirectionProperty FACING = Properties.FACING; + public final String name; public BlockTransformer(String name) { super(TRBlockSettings.transformer()); diff --git a/src/main/java/techreborn/entities/EntityNukePrimed.java b/src/main/java/techreborn/entities/EntityNukePrimed.java index e4eb314ef..e21b7bac8 100644 --- a/src/main/java/techreborn/entities/EntityNukePrimed.java +++ b/src/main/java/techreborn/entities/EntityNukePrimed.java @@ -52,7 +52,7 @@ public class EntityNukePrimed extends TntEntity { setFuse(TechRebornConfig.nukeFuseTime); } - public EntityNukePrimed(World world, double x, double y, double z, LivingEntity owner) { + public EntityNukePrimed(World world, double x, double y, double z, @Nullable LivingEntity owner) { this(TRContent.ENTITY_NUKE, world); this.setPosition(x, y, z); diff --git a/src/main/java/techreborn/init/TRBlockEntities.java b/src/main/java/techreborn/init/TRBlockEntities.java index f9f5e84e6..d552c1dc8 100644 --- a/src/main/java/techreborn/init/TRBlockEntities.java +++ b/src/main/java/techreborn/init/TRBlockEntities.java @@ -81,10 +81,8 @@ import java.util.List; import java.util.function.BiFunction; public class TRBlockEntities { - private static final List> TYPES = new ArrayList<>(); - public static final BlockEntityType STORAGE_UNIT = register(StorageUnitBaseBlockEntity::new, "storage_unit", TRContent.StorageUnit.values()); public static final BlockEntityType TANK_UNIT = register(TankUnitBaseBlockEntity::new, "tank_unit", TRContent.TankUnit.values()); public static final BlockEntityType DRAIN = register(DrainBlockEntity::new, "drain", TRContent.Machine.DRAIN); diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index dc7eece9a..d27aa8b12 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -109,9 +109,9 @@ import java.util.stream.Stream; public class TRContent { - public static Marker DATAGEN = MarkerFactory.getMarker("datagen"); - public static BlockSetType RUBBER_WOOD_SET_TYPE = BlockSetTypeRegistry.registerWood(new Identifier(TechReborn.MOD_ID, "rubber_wood")); - public static WoodType RUBBER_WOOD_TYPE = WoodTypeRegistry.register(new Identifier(TechReborn.MOD_ID, "rubber_wood"), RUBBER_WOOD_SET_TYPE); + public static final Marker DATAGEN = MarkerFactory.getMarker("datagen"); + public static final BlockSetType RUBBER_WOOD_SET_TYPE = BlockSetTypeRegistry.registerWood(new Identifier(TechReborn.MOD_ID, "rubber_wood")); + public static final WoodType RUBBER_WOOD_TYPE = WoodTypeRegistry.register(new Identifier(TechReborn.MOD_ID, "rubber_wood"), RUBBER_WOOD_SET_TYPE); // Misc Blocks public static Block COMPUTER_CUBE; @@ -313,11 +313,11 @@ public class TRContent { public final Block block; // Generation of EU during Day - public int generationRateD; + public final int generationRateD; // Generation of EU during Night - public int generationRateN; + public final int generationRateN; // Internal EU storage of solar panel - public int internalCapacity; + public final int internalCapacity; public final RcEnergyTier powerTier; SolarPanels(RcEnergyTier tier, int generationRateD, int generationRateN) { @@ -352,7 +352,7 @@ public class TRContent { public final Item upgrader; // How many items it can hold - public int capacity; + public final int capacity; StorageUnit(int capacity, boolean upgradable) { @@ -409,7 +409,7 @@ public class TRContent { public final Block block; // How many blocks it can hold - public FluidValue capacity; + public final FluidValue capacity; TankUnit(int capacity) { @@ -464,12 +464,12 @@ public class TRContent { public final String name; public final CableBlock block; - public int transferRate; - public int defaultTransferRate; - public double cableThickness; - public boolean canKill; - public boolean defaultCanKill; - public RcEnergyTier tier; + public final int transferRate; + public final int defaultTransferRate; + public final double cableThickness; + public final boolean canKill; + public final boolean defaultCanKill; + public final RcEnergyTier tier; Cables(int transferRate, double cableThickness, boolean canKill, RcEnergyTier tier) { @@ -1577,8 +1577,8 @@ public class TRContent { blockEntity.muffle(); }); - public String name; - public Item item; + public final String name; + public final Item item; Upgrades(IUpgrade upgrade) { name = this.toString().toLowerCase(Locale.ROOT); @@ -1592,7 +1592,7 @@ public class TRContent { } } - public static EntityType ENTITY_NUKE = FabricEntityTypeBuilder.create() + public static final EntityType ENTITY_NUKE = FabricEntityTypeBuilder.create() .entityFactory((EntityType.EntityFactory) EntityNukePrimed::new) .dimensions(EntityDimensions.fixed(1f, 1f)) .trackRangeChunks(10) diff --git a/src/main/java/techreborn/items/tool/basic/ElectricTreetapItem.java b/src/main/java/techreborn/items/tool/basic/ElectricTreetapItem.java index 8739f96ce..d50b2340d 100644 --- a/src/main/java/techreborn/items/tool/basic/ElectricTreetapItem.java +++ b/src/main/java/techreborn/items/tool/basic/ElectricTreetapItem.java @@ -35,7 +35,7 @@ import techreborn.config.TechRebornConfig; * Created by modmuss50 on 05/11/2016. */ public class ElectricTreetapItem extends Item implements RcEnergyItem { - public RcEnergyTier tier = RcEnergyTier.MEDIUM; + public final RcEnergyTier tier = RcEnergyTier.MEDIUM; public ElectricTreetapItem() { super(new Item.Settings().maxCount(1).maxDamage(-1)); diff --git a/src/main/java/techreborn/items/tool/vanilla/TRAxeItem.java b/src/main/java/techreborn/items/tool/vanilla/TRAxeItem.java index d99c43f33..310ec48bb 100644 --- a/src/main/java/techreborn/items/tool/vanilla/TRAxeItem.java +++ b/src/main/java/techreborn/items/tool/vanilla/TRAxeItem.java @@ -32,7 +32,7 @@ import reborncore.common.util.ItemUtils; public class TRAxeItem extends AxeItem { - String repairOreDict; + final String repairOreDict; public TRAxeItem(ToolMaterial material) { this(material, ""); diff --git a/src/main/java/techreborn/items/tool/vanilla/TRHoeItem.java b/src/main/java/techreborn/items/tool/vanilla/TRHoeItem.java index 9c1fe5e46..36d004a54 100644 --- a/src/main/java/techreborn/items/tool/vanilla/TRHoeItem.java +++ b/src/main/java/techreborn/items/tool/vanilla/TRHoeItem.java @@ -32,7 +32,7 @@ import reborncore.common.util.ItemUtils; public class TRHoeItem extends HoeItem { - String repairOreDict; + final String repairOreDict; public TRHoeItem(ToolMaterial material) { this(material, ""); diff --git a/src/main/java/techreborn/items/tool/vanilla/TRPickaxeItem.java b/src/main/java/techreborn/items/tool/vanilla/TRPickaxeItem.java index 18dba3514..65201f596 100644 --- a/src/main/java/techreborn/items/tool/vanilla/TRPickaxeItem.java +++ b/src/main/java/techreborn/items/tool/vanilla/TRPickaxeItem.java @@ -32,7 +32,7 @@ import reborncore.common.util.ItemUtils; public class TRPickaxeItem extends PickaxeItem { - String repairOreDict; + final String repairOreDict; public TRPickaxeItem(ToolMaterial material) { this(material, ""); diff --git a/src/main/java/techreborn/items/tool/vanilla/TRSpadeItem.java b/src/main/java/techreborn/items/tool/vanilla/TRSpadeItem.java index 0564c1b59..c487e1d89 100644 --- a/src/main/java/techreborn/items/tool/vanilla/TRSpadeItem.java +++ b/src/main/java/techreborn/items/tool/vanilla/TRSpadeItem.java @@ -32,7 +32,7 @@ import reborncore.common.util.ItemUtils; public class TRSpadeItem extends ShovelItem { - String repairOreDict; + final String repairOreDict; public TRSpadeItem(ToolMaterial material) { this(material, ""); diff --git a/src/main/java/techreborn/items/tool/vanilla/TRSwordItem.java b/src/main/java/techreborn/items/tool/vanilla/TRSwordItem.java index ab3166275..bc8d00395 100644 --- a/src/main/java/techreborn/items/tool/vanilla/TRSwordItem.java +++ b/src/main/java/techreborn/items/tool/vanilla/TRSwordItem.java @@ -32,7 +32,7 @@ import reborncore.common.util.ItemUtils; public class TRSwordItem extends SwordItem { - String repairOreDict; + final String repairOreDict; public TRSwordItem(ToolMaterial material) { this(material, ""); diff --git a/src/main/java/techreborn/utils/TagRemapper.java b/src/main/java/techreborn/utils/TagRemapper.java index 22b9027c8..ef02d2d35 100644 --- a/src/main/java/techreborn/utils/TagRemapper.java +++ b/src/main/java/techreborn/utils/TagRemapper.java @@ -87,10 +87,10 @@ public class TagRemapper { } private static class TagRename { - Path parent; + final Path parent; - String oldName; - String newName; + final String oldName; + final String newName; public TagRename(Path tag) { this.parent = tag.getParent(); diff --git a/src/main/java/techreborn/world/OreDepth.java b/src/main/java/techreborn/world/OreDepth.java index e40ec6e4b..678d22ff8 100644 --- a/src/main/java/techreborn/world/OreDepth.java +++ b/src/main/java/techreborn/world/OreDepth.java @@ -52,7 +52,7 @@ public record OreDepth(Identifier identifier, int minY, int maxY, TargetDimensio TargetDimension.CODEC.fieldOf("dimension").forGetter(OreDepth::dimension) ).apply(instance, OreDepth::new) ); - public static Codec> LIST_CODEC = Codec.list(OreDepth.CODEC); + public static final Codec> LIST_CODEC = Codec.list(OreDepth.CODEC); public static List create(MinecraftServer server) {