maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Random code cleanup

Browse source
This commit is contained in:
modmuss50 2023-06-25 11:49:39 +01:00
parent 4a1d6b3bb1
commit bafbf3bbba
93 changed files with 158 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/client/java/techreborn/TechRebornClient.java
View file

@ -242,13 +242,7 @@ public class TechRebornClient implements ClientModInitializer {
} }
private static class UnbakedDynamicModel implements UnbakedModel { private record UnbakedDynamicModel(Supplier<BaseDynamicFluidBakedModel> supplier) implements UnbakedModel {
private final Supplier<BaseDynamicFluidBakedModel> supplier;
public UnbakedDynamicModel(Supplier<BaseDynamicFluidBakedModel> supplier) {
this.supplier = supplier;
}
@Override @Override
public Collection<Identifier> getModelDependencies() { public Collection<Identifier> getModelDependencies() {
return Collections.emptyList(); return Collections.emptyList();

17
src/client/java/techreborn/client/ClientGuiType.java
View file

@ -136,7 +136,8 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
public class ClientGuiType<T extends BlockEntity> { @SuppressWarnings("unused")
public record ClientGuiType<T extends BlockEntity>(GuiType<T> guiType, GuiFactory<T> guiFactory) {
public static final Map<Identifier, ClientGuiType<?>> TYPES = new HashMap<>(); public static final Map<Identifier, ClientGuiType<?>> TYPES = new HashMap<>();
public static final ClientGuiType<AdjustableSUBlockEntity> AESU = register(GuiType.AESU, GuiAESU::new); public static final ClientGuiType<AdjustableSUBlockEntity> AESU = register(GuiType.AESU, GuiAESU::new);
@ -203,23 +204,11 @@ public class ClientGuiType<T extends BlockEntity> {
} }
} }
private final GuiType<T> guiType;
private final GuiFactory<T> guiFactory;
public ClientGuiType(GuiType<T> guiType, GuiFactory<T> guiFactory) { public ClientGuiType(GuiType<T> guiType, GuiFactory<T> guiFactory) {
this.guiType = Objects.requireNonNull(guiType); this.guiType = Objects.requireNonNull(guiType);
this.guiFactory = Objects.requireNonNull(guiFactory); this.guiFactory = Objects.requireNonNull(guiFactory);
HandledScreens.register(guiType.getScreenHandlerType(), getGuiFactory()); HandledScreens.register(guiType.getScreenHandlerType(), guiFactory());
TYPES.put(guiType.getIdentifier(), this); TYPES.put(guiType.getIdentifier(), this);
} }
public GuiType<T> getGuiType() {
return guiType;
}
public GuiFactory<T> getGuiFactory() {
return guiFactory;
}
} }

4
src/client/java/techreborn/client/GuiFactory.java
View file

@ -33,10 +33,10 @@ import net.minecraft.text.Text;
import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.screen.BuiltScreenHandler;
public interface GuiFactory<T extends BlockEntity> extends HandledScreens.Provider<BuiltScreenHandler, HandledScreen<BuiltScreenHandler>> { public interface GuiFactory<T extends BlockEntity> extends HandledScreens.Provider<BuiltScreenHandler, HandledScreen<BuiltScreenHandler>> {
HandledScreen<?> create(int syncId, PlayerEntity playerEntity, T blockEntity); HandledScreen<BuiltScreenHandler> create(int syncId, PlayerEntity playerEntity, T blockEntity);
@Override @Override
default HandledScreen create(BuiltScreenHandler builtScreenHandler, PlayerInventory playerInventory, Text text) { default HandledScreen<BuiltScreenHandler> create(BuiltScreenHandler builtScreenHandler, PlayerInventory playerInventory, Text text) {
PlayerEntity playerEntity = playerInventory.player; PlayerEntity playerEntity = playerInventory.player;
//noinspection unchecked //noinspection unchecked
T blockEntity = (T) builtScreenHandler.getBlockEntity(); T blockEntity = (T) builtScreenHandler.getBlockEntity();

2
src/client/java/techreborn/client/gui/GuiAESU.java
View file

@ -39,7 +39,7 @@ import techreborn.packets.ServerboundPackets;
public class GuiAESU extends GuiBase<BuiltScreenHandler> { public class GuiAESU extends GuiBase<BuiltScreenHandler> {
AdjustableSUBlockEntity blockEntity; final AdjustableSUBlockEntity blockEntity;
public GuiAESU(int syncID, final PlayerEntity player, final AdjustableSUBlockEntity aesu) { public GuiAESU(int syncID, final PlayerEntity player, final AdjustableSUBlockEntity aesu) {
super(player, aesu, aesu.createScreenHandler(syncID, player)); super(player, aesu, aesu.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiAlloyFurnace.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.iron.IronAlloyFurnaceBlockEntity;
public class GuiAlloyFurnace extends GuiBase<BuiltScreenHandler> { public class GuiAlloyFurnace extends GuiBase<BuiltScreenHandler> {
IronAlloyFurnaceBlockEntity blockEntity; final IronAlloyFurnaceBlockEntity blockEntity;
public GuiAlloyFurnace(int syncID, PlayerEntity player, IronAlloyFurnaceBlockEntity alloyFurnace) { public GuiAlloyFurnace(int syncID, PlayerEntity player, IronAlloyFurnaceBlockEntity alloyFurnace) {
super(player, alloyFurnace, alloyFurnace.createScreenHandler(syncID, player)); super(player, alloyFurnace, alloyFurnace.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiAlloySmelter.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.AlloySmelterBlockEntity;
public class GuiAlloySmelter extends GuiBase<BuiltScreenHandler> { public class GuiAlloySmelter extends GuiBase<BuiltScreenHandler> {
AlloySmelterBlockEntity blockEntity; final AlloySmelterBlockEntity blockEntity;
public GuiAlloySmelter(int syncID, final PlayerEntity player, final AlloySmelterBlockEntity blockEntity) { public GuiAlloySmelter(int syncID, final PlayerEntity player, final AlloySmelterBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiAssemblingMachine.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.AssemblingMachineBlockEntity;
public class GuiAssemblingMachine extends GuiBase<BuiltScreenHandler> { public class GuiAssemblingMachine extends GuiBase<BuiltScreenHandler> {
AssemblingMachineBlockEntity blockEntity; final AssemblingMachineBlockEntity blockEntity;
public GuiAssemblingMachine(int syncID, final PlayerEntity player, final AssemblingMachineBlockEntity blockEntity) { public GuiAssemblingMachine(int syncID, final PlayerEntity player, final AssemblingMachineBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

6
src/client/java/techreborn/client/gui/GuiAutoCrafting.java
View file

@ -28,7 +28,6 @@ import net.minecraft.client.gui.DrawContext;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.recipe.CraftingRecipe; import net.minecraft.recipe.CraftingRecipe;
import net.minecraft.util.Identifier;
import reborncore.client.ClientNetworkManager; import reborncore.client.ClientNetworkManager;
import reborncore.client.gui.GuiBase; import reborncore.client.gui.GuiBase;
import reborncore.client.gui.GuiBuilder; import reborncore.client.gui.GuiBuilder;
@ -40,10 +39,7 @@ import techreborn.packets.ServerboundPackets;
* Created by modmuss50 on 20/06/2017. * Created by modmuss50 on 20/06/2017.
*/ */
public class GuiAutoCrafting extends GuiBase<BuiltScreenHandler> { public class GuiAutoCrafting extends GuiBase<BuiltScreenHandler> {
final AutoCraftingTableBlockEntity blockEntityAutoCraftingTable;
static final Identifier RECIPE_BOOK_TEXTURE = new Identifier("textures/gui/recipe_book.png");
boolean showGui = true;
AutoCraftingTableBlockEntity blockEntityAutoCraftingTable;
public GuiAutoCrafting(int syncID, PlayerEntity player, AutoCraftingTableBlockEntity blockEntity) { public GuiAutoCrafting(int syncID, PlayerEntity player, AutoCraftingTableBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiBatbox.java
View file

@ -35,7 +35,7 @@ import techreborn.blockentity.storage.energy.LowVoltageSUBlockEntity;
public class GuiBatbox extends GuiBase<BuiltScreenHandler> { public class GuiBatbox extends GuiBase<BuiltScreenHandler> {
LowVoltageSUBlockEntity blockEntity; final LowVoltageSUBlockEntity blockEntity;
public GuiBatbox(int syncID, final PlayerEntity player, final LowVoltageSUBlockEntity blockEntity) { public GuiBatbox(int syncID, final PlayerEntity player, final LowVoltageSUBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiBlockBreaker.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier0.block.blockbreaker.BlockBreakerProce
public class GuiBlockBreaker extends GuiBase<BuiltScreenHandler> { public class GuiBlockBreaker extends GuiBase<BuiltScreenHandler> {
BlockBreakerBlockEntity blockEntity; final BlockBreakerBlockEntity blockEntity;
public GuiBlockBreaker(int syncID, final PlayerEntity player, final BlockBreakerBlockEntity blockEntity) { public GuiBlockBreaker(int syncID, final PlayerEntity player, final BlockBreakerBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiBlockPlacer.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier0.block.blockplacer.BlockPlacerProcess
public class GuiBlockPlacer extends GuiBase<BuiltScreenHandler> { public class GuiBlockPlacer extends GuiBase<BuiltScreenHandler> {
BlockPlacerBlockEntity blockEntity; final BlockPlacerBlockEntity blockEntity;
public GuiBlockPlacer(int syncID, final PlayerEntity player, final BlockPlacerBlockEntity blockEntity) { public GuiBlockPlacer(int syncID, final PlayerEntity player, final BlockPlacerBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiCentrifuge.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier3.IndustrialCentrifugeBlockEntity;
public class GuiCentrifuge extends GuiBase<BuiltScreenHandler> { public class GuiCentrifuge extends GuiBase<BuiltScreenHandler> {
IndustrialCentrifugeBlockEntity blockEntity; final IndustrialCentrifugeBlockEntity blockEntity;
public GuiCentrifuge(int syncID, final PlayerEntity player, final IndustrialCentrifugeBlockEntity blockEntity) { public GuiCentrifuge(int syncID, final PlayerEntity player, final IndustrialCentrifugeBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiChargeBench.java
View file

@ -32,7 +32,7 @@ import techreborn.blockentity.machine.misc.ChargeOMatBlockEntity;
public class GuiChargeBench extends GuiBase<BuiltScreenHandler> { public class GuiChargeBench extends GuiBase<BuiltScreenHandler> {
ChargeOMatBlockEntity blockEntity; final ChargeOMatBlockEntity blockEntity;
public GuiChargeBench(int syncID, final PlayerEntity player, final ChargeOMatBlockEntity blockEntity) { public GuiChargeBench(int syncID, final PlayerEntity player, final ChargeOMatBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiChemicalReactor.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.ChemicalReactorBlockEntity;
public class GuiChemicalReactor extends GuiBase<BuiltScreenHandler> { public class GuiChemicalReactor extends GuiBase<BuiltScreenHandler> {
ChemicalReactorBlockEntity blockEntity; final ChemicalReactorBlockEntity blockEntity;
public GuiChemicalReactor(int syncID, final PlayerEntity player, final ChemicalReactorBlockEntity blockEntity) { public GuiChemicalReactor(int syncID, final PlayerEntity player, final ChemicalReactorBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiChunkLoader.java
View file

@ -39,7 +39,7 @@ import techreborn.packets.ServerboundPackets;
public class GuiChunkLoader extends GuiBase<BuiltScreenHandler> { public class GuiChunkLoader extends GuiBase<BuiltScreenHandler> {
ChunkLoaderBlockEntity blockEntity; final ChunkLoaderBlockEntity blockEntity;
public GuiChunkLoader(int syncID, PlayerEntity player, ChunkLoaderBlockEntity blockEntity) { public GuiChunkLoader(int syncID, PlayerEntity player, ChunkLoaderBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiCompressor.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.CompressorBlockEntity;
public class GuiCompressor extends GuiBase<BuiltScreenHandler> { public class GuiCompressor extends GuiBase<BuiltScreenHandler> {
CompressorBlockEntity blockEntity; final CompressorBlockEntity blockEntity;
public GuiCompressor(int syncID, final PlayerEntity player, final CompressorBlockEntity blockEntity) { public GuiCompressor(int syncID, final PlayerEntity player, final CompressorBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiDieselGenerator.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.generator.advanced.DieselGeneratorBlockEntity;
public class GuiDieselGenerator extends GuiBase<BuiltScreenHandler> { public class GuiDieselGenerator extends GuiBase<BuiltScreenHandler> {
DieselGeneratorBlockEntity blockEntity; final DieselGeneratorBlockEntity blockEntity;
public GuiDieselGenerator(int syncID, final PlayerEntity player, final DieselGeneratorBlockEntity blockEntity) { public GuiDieselGenerator(int syncID, final PlayerEntity player, final DieselGeneratorBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiElectricFurnace.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.ElectricFurnaceBlockEntity;
public class GuiElectricFurnace extends GuiBase<BuiltScreenHandler> { public class GuiElectricFurnace extends GuiBase<BuiltScreenHandler> {
ElectricFurnaceBlockEntity blockEntity; final ElectricFurnaceBlockEntity blockEntity;
public GuiElectricFurnace(int syncID, final PlayerEntity player, final ElectricFurnaceBlockEntity blockEntity) { public GuiElectricFurnace(int syncID, final PlayerEntity player, final ElectricFurnaceBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiElevator.java
View file

@ -32,7 +32,7 @@ import techreborn.blockentity.machine.tier1.ElevatorBlockEntity;
public class GuiElevator extends GuiBase<BuiltScreenHandler> { public class GuiElevator extends GuiBase<BuiltScreenHandler> {
ElevatorBlockEntity blockEntity; final ElevatorBlockEntity blockEntity;
public GuiElevator(int syncID, final PlayerEntity player, final ElevatorBlockEntity blockEntity) { public GuiElevator(int syncID, final PlayerEntity player, final ElevatorBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiExtractor.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.ExtractorBlockEntity;
public class GuiExtractor extends GuiBase<BuiltScreenHandler> { public class GuiExtractor extends GuiBase<BuiltScreenHandler> {
ExtractorBlockEntity blockEntity; final ExtractorBlockEntity blockEntity;
public GuiExtractor(int syncID, final PlayerEntity player, final ExtractorBlockEntity blockEntity) { public GuiExtractor(int syncID, final PlayerEntity player, final ExtractorBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiFishingStation.java
View file

@ -32,7 +32,7 @@ import techreborn.blockentity.machine.tier2.FishingStationBlockEntity;
public class GuiFishingStation extends GuiBase<BuiltScreenHandler> { public class GuiFishingStation extends GuiBase<BuiltScreenHandler> {
FishingStationBlockEntity blockEntity; final FishingStationBlockEntity blockEntity;
public GuiFishingStation(int syncID, final PlayerEntity player, final FishingStationBlockEntity blockEntity) { public GuiFishingStation(int syncID, final PlayerEntity player, final FishingStationBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiGasTurbine.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.generator.advanced.GasTurbineBlockEntity;
public class GuiGasTurbine extends GuiBase<BuiltScreenHandler> { public class GuiGasTurbine extends GuiBase<BuiltScreenHandler> {
GasTurbineBlockEntity blockEntity; final GasTurbineBlockEntity blockEntity;
public GuiGasTurbine(int syncID, final PlayerEntity player, final GasTurbineBlockEntity blockEntity) { public GuiGasTurbine(int syncID, final PlayerEntity player, final GasTurbineBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiGenerator.java
View file

@ -32,7 +32,7 @@ import techreborn.blockentity.generator.basic.SolidFuelGeneratorBlockEntity;
public class GuiGenerator extends GuiBase<BuiltScreenHandler> { public class GuiGenerator extends GuiBase<BuiltScreenHandler> {
SolidFuelGeneratorBlockEntity blockEntity; final SolidFuelGeneratorBlockEntity blockEntity;
public GuiGenerator(int syncID, final PlayerEntity player, final SolidFuelGeneratorBlockEntity blockEntity) { public GuiGenerator(int syncID, final PlayerEntity player, final SolidFuelGeneratorBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiGrinder.java
View file

@ -32,7 +32,7 @@ import reborncore.common.screen.BuiltScreenHandler;
import techreborn.blockentity.machine.tier1.GrinderBlockEntity; import techreborn.blockentity.machine.tier1.GrinderBlockEntity;
public class GuiGrinder extends GuiBase<BuiltScreenHandler> { public class GuiGrinder extends GuiBase<BuiltScreenHandler> {
GrinderBlockEntity blockEntity; final GrinderBlockEntity blockEntity;
public GuiGrinder(int syncID, final PlayerEntity player, final GrinderBlockEntity blockEntity) { public GuiGrinder(int syncID, final PlayerEntity player, final GrinderBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiIDSU.java
View file

@ -35,7 +35,7 @@ import techreborn.blockentity.storage.energy.idsu.InterdimensionalSUBlockEntity;
public class GuiIDSU extends GuiBase<BuiltScreenHandler> { public class GuiIDSU extends GuiBase<BuiltScreenHandler> {
InterdimensionalSUBlockEntity idsu; final InterdimensionalSUBlockEntity idsu;
public GuiIDSU(int syncID, PlayerEntity player, InterdimensionalSUBlockEntity blockEntityIDSU) { public GuiIDSU(int syncID, PlayerEntity player, InterdimensionalSUBlockEntity blockEntityIDSU) {
super(player, blockEntityIDSU, blockEntityIDSU.createScreenHandler(syncID, player)); super(player, blockEntityIDSU, blockEntityIDSU.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.IndustrialElectrolyzerBlockEntity;
public class GuiIndustrialElectrolyzer extends GuiBase<BuiltScreenHandler> { public class GuiIndustrialElectrolyzer extends GuiBase<BuiltScreenHandler> {
IndustrialElectrolyzerBlockEntity blockEntity; final IndustrialElectrolyzerBlockEntity blockEntity;
public GuiIndustrialElectrolyzer(int syncID, final PlayerEntity player, final IndustrialElectrolyzerBlockEntity blockEntity) { public GuiIndustrialElectrolyzer(int syncID, final PlayerEntity player, final IndustrialElectrolyzerBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiIronFurnace.java
View file

@ -42,7 +42,7 @@ import techreborn.utils.PlayerUtils;
import java.util.Objects; import java.util.Objects;
public class GuiIronFurnace extends GuiBase<BuiltScreenHandler> { public class GuiIronFurnace extends GuiBase<BuiltScreenHandler> {
IronFurnaceBlockEntity blockEntity; final IronFurnaceBlockEntity blockEntity;
private static final Identifier EXP_BUTTON_TEXTURE = new Identifier("minecraft", "textures/item/experience_bottle.png"); private static final Identifier EXP_BUTTON_TEXTURE = new Identifier("minecraft", "textures/item/experience_bottle.png");
public GuiIronFurnace(int syncID, PlayerEntity player, IronFurnaceBlockEntity furnace) { public GuiIronFurnace(int syncID, PlayerEntity player, IronFurnaceBlockEntity furnace) {

2
src/client/java/techreborn/client/gui/GuiLESU.java
View file

@ -35,7 +35,7 @@ import techreborn.blockentity.storage.energy.lesu.LapotronicSUBlockEntity;
public class GuiLESU extends GuiBase<BuiltScreenHandler> { public class GuiLESU extends GuiBase<BuiltScreenHandler> {
LapotronicSUBlockEntity blockEntity; final LapotronicSUBlockEntity blockEntity;
public GuiLESU(int syncID, final PlayerEntity player, final LapotronicSUBlockEntity blockEntity) { public GuiLESU(int syncID, final PlayerEntity player, final LapotronicSUBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiLaunchpad.java
View file

@ -36,7 +36,7 @@ import techreborn.packets.ServerboundPackets;
public class GuiLaunchpad extends GuiBase<BuiltScreenHandler> { public class GuiLaunchpad extends GuiBase<BuiltScreenHandler> {
LaunchpadBlockEntity blockEntity; final LaunchpadBlockEntity blockEntity;
public GuiLaunchpad(int syncID, final PlayerEntity player, final LaunchpadBlockEntity blockEntity) { public GuiLaunchpad(int syncID, final PlayerEntity player, final LaunchpadBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiMFE.java
View file

@ -35,7 +35,7 @@ import techreborn.blockentity.storage.energy.MediumVoltageSUBlockEntity;
public class GuiMFE extends GuiBase<BuiltScreenHandler> { public class GuiMFE extends GuiBase<BuiltScreenHandler> {
MediumVoltageSUBlockEntity mfe; final MediumVoltageSUBlockEntity mfe;
public GuiMFE(int syncID, final PlayerEntity player, final MediumVoltageSUBlockEntity mfe) { public GuiMFE(int syncID, final PlayerEntity player, final MediumVoltageSUBlockEntity mfe) {
super(player, mfe, mfe.createScreenHandler(syncID, player)); super(player, mfe, mfe.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiMFSU.java
View file

@ -35,7 +35,7 @@ import techreborn.blockentity.storage.energy.HighVoltageSUBlockEntity;
public class GuiMFSU extends GuiBase<BuiltScreenHandler> { public class GuiMFSU extends GuiBase<BuiltScreenHandler> {
HighVoltageSUBlockEntity mfsu; final HighVoltageSUBlockEntity mfsu;
public GuiMFSU(int syncID, final PlayerEntity player, final HighVoltageSUBlockEntity mfsu) { public GuiMFSU(int syncID, final PlayerEntity player, final HighVoltageSUBlockEntity mfsu) {
super(player, mfsu, mfsu.createScreenHandler(syncID, player)); super(player, mfsu, mfsu.createScreenHandler(syncID, player));

4
src/client/java/techreborn/client/gui/GuiManual.java
View file

@ -38,8 +38,8 @@ import techreborn.packets.ServerboundPackets;
public class GuiManual extends Screen { public class GuiManual extends Screen {
private static final Identifier MANUAL_TEXTURE = new Identifier("techreborn", "textures/gui/manual.png"); private static final Identifier MANUAL_TEXTURE = new Identifier("techreborn", "textures/gui/manual.png");
int guiWidth = 207; final int guiWidth = 207;
int guiHeight = 195; final int guiHeight = 195;
private static final Text text1 = Text.translatable("techreborn.manual.wiki"); private static final Text text1 = Text.translatable("techreborn.manual.wiki");
private static final Text text2 = Text.translatable("techreborn.manual.discord"); private static final Text text2 = Text.translatable("techreborn.manual.discord");
private static final Text text3 = Text.translatable("techreborn.manual.refund"); private static final Text text3 = Text.translatable("techreborn.manual.refund");

2
src/client/java/techreborn/client/gui/GuiMatterFabricator.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier3.MatterFabricatorBlockEntity;
public class GuiMatterFabricator extends GuiBase<BuiltScreenHandler> { public class GuiMatterFabricator extends GuiBase<BuiltScreenHandler> {
MatterFabricatorBlockEntity blockEntity; final MatterFabricatorBlockEntity blockEntity;
public GuiMatterFabricator(int syncID, final PlayerEntity player, final MatterFabricatorBlockEntity blockEntity) { public GuiMatterFabricator(int syncID, final PlayerEntity player, final MatterFabricatorBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiPlasmaGenerator.java
View file

@ -36,7 +36,7 @@ import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity;
*/ */
public class GuiPlasmaGenerator extends GuiBase<BuiltScreenHandler> { public class GuiPlasmaGenerator extends GuiBase<BuiltScreenHandler> {
PlasmaGeneratorBlockEntity blockEntity; final PlasmaGeneratorBlockEntity blockEntity;
public GuiPlasmaGenerator(int syncID, final PlayerEntity player, final PlasmaGeneratorBlockEntity blockEntity) { public GuiPlasmaGenerator(int syncID, final PlayerEntity player, final PlasmaGeneratorBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiPlayerDetector.java
View file

@ -36,7 +36,7 @@ import techreborn.packets.ServerboundPackets;
public class GuiPlayerDetector extends GuiBase<BuiltScreenHandler> { public class GuiPlayerDetector extends GuiBase<BuiltScreenHandler> {
PlayerDetectorBlockEntity blockEntity; final PlayerDetectorBlockEntity blockEntity;
public GuiPlayerDetector(int syncID, final PlayerEntity player, final PlayerDetectorBlockEntity blockEntity) { public GuiPlayerDetector(int syncID, final PlayerEntity player, final PlayerDetectorBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiRecycler.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.RecyclerBlockEntity;
public class GuiRecycler extends GuiBase<BuiltScreenHandler> { public class GuiRecycler extends GuiBase<BuiltScreenHandler> {
RecyclerBlockEntity blockEntity; final RecyclerBlockEntity blockEntity;
public GuiRecycler(int syncID, final PlayerEntity player, final RecyclerBlockEntity blockEntity) { public GuiRecycler(int syncID, final PlayerEntity player, final RecyclerBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiRollingMachine.java
View file

@ -35,7 +35,7 @@ import techreborn.packets.ServerboundPackets;
public class GuiRollingMachine extends GuiBase<BuiltScreenHandler> { public class GuiRollingMachine extends GuiBase<BuiltScreenHandler> {
RollingMachineBlockEntity rollingMachine; final RollingMachineBlockEntity rollingMachine;
public GuiRollingMachine(int syncID, final PlayerEntity player, final RollingMachineBlockEntity blockEntityRollingmachine) { public GuiRollingMachine(int syncID, final PlayerEntity player, final RollingMachineBlockEntity blockEntityRollingmachine) {
super(player, blockEntityRollingmachine, blockEntityRollingmachine.createScreenHandler(syncID, player)); super(player, blockEntityRollingmachine, blockEntityRollingmachine.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiScrapboxinator.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.ScrapboxinatorBlockEntity;
public class GuiScrapboxinator extends GuiBase<BuiltScreenHandler> { public class GuiScrapboxinator extends GuiBase<BuiltScreenHandler> {
ScrapboxinatorBlockEntity blockEntity; final ScrapboxinatorBlockEntity blockEntity;
public GuiScrapboxinator(int syncID, final PlayerEntity player, final ScrapboxinatorBlockEntity blockEntity) { public GuiScrapboxinator(int syncID, final PlayerEntity player, final ScrapboxinatorBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiSemifluidGenerator.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.generator.advanced.SemiFluidGeneratorBlockEntity;
public class GuiSemifluidGenerator extends GuiBase<BuiltScreenHandler> { public class GuiSemifluidGenerator extends GuiBase<BuiltScreenHandler> {
SemiFluidGeneratorBlockEntity blockEntity; final SemiFluidGeneratorBlockEntity blockEntity;
public GuiSemifluidGenerator(int syncID, final PlayerEntity player, final SemiFluidGeneratorBlockEntity blockEntity) { public GuiSemifluidGenerator(int syncID, final PlayerEntity player, final SemiFluidGeneratorBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiSolar.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.generator.SolarPanelBlockEntity;
public class GuiSolar extends GuiBase<BuiltScreenHandler> { public class GuiSolar extends GuiBase<BuiltScreenHandler> {
SolarPanelBlockEntity blockEntity; final SolarPanelBlockEntity blockEntity;
public GuiSolar(int syncID, PlayerEntity player, SolarPanelBlockEntity panel) { public GuiSolar(int syncID, PlayerEntity player, SolarPanelBlockEntity panel) {
super(player, panel, panel.createScreenHandler(syncID, player)); super(player, panel, panel.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiSolidCanningMachine.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.SolidCanningMachineBlockEntity;
public class GuiSolidCanningMachine extends GuiBase<BuiltScreenHandler> { public class GuiSolidCanningMachine extends GuiBase<BuiltScreenHandler> {
SolidCanningMachineBlockEntity blockEntity; final SolidCanningMachineBlockEntity blockEntity;
public GuiSolidCanningMachine(int syncID, final PlayerEntity player, final SolidCanningMachineBlockEntity blockEntity) { public GuiSolidCanningMachine(int syncID, final PlayerEntity player, final SolidCanningMachineBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiStorageUnit.java
View file

@ -35,7 +35,7 @@ import techreborn.packets.ServerboundPackets;
public class GuiStorageUnit extends GuiBase<BuiltScreenHandler> { public class GuiStorageUnit extends GuiBase<BuiltScreenHandler> {
StorageUnitBaseBlockEntity storageEntity; final StorageUnitBaseBlockEntity storageEntity;
public GuiStorageUnit(int syncID, final PlayerEntity player, final StorageUnitBaseBlockEntity storageEntity) { public GuiStorageUnit(int syncID, final PlayerEntity player, final StorageUnitBaseBlockEntity storageEntity) {
super(player, storageEntity, storageEntity.createScreenHandler(syncID, player)); super(player, storageEntity, storageEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiTankUnit.java
View file

@ -35,7 +35,7 @@ import techreborn.blockentity.storage.fluid.TankUnitBaseBlockEntity;
public class GuiTankUnit extends GuiBase<BuiltScreenHandler> { public class GuiTankUnit extends GuiBase<BuiltScreenHandler> {
TankUnitBaseBlockEntity tankEntity; final TankUnitBaseBlockEntity tankEntity;
public GuiTankUnit(int syncID, final PlayerEntity player, final TankUnitBaseBlockEntity tankEntity) { public GuiTankUnit(int syncID, final PlayerEntity player, final TankUnitBaseBlockEntity tankEntity) {
super(player, tankEntity, tankEntity.createScreenHandler(syncID, player)); super(player, tankEntity, tankEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiThermalGenerator.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.generator.advanced.ThermalGeneratorBlockEntity;
public class GuiThermalGenerator extends GuiBase<BuiltScreenHandler> { public class GuiThermalGenerator extends GuiBase<BuiltScreenHandler> {
ThermalGeneratorBlockEntity blockEntity; final ThermalGeneratorBlockEntity blockEntity;
public GuiThermalGenerator(int syncID, final PlayerEntity player, final ThermalGeneratorBlockEntity blockEntity) { public GuiThermalGenerator(int syncID, final PlayerEntity player, final ThermalGeneratorBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

2
src/client/java/techreborn/client/gui/GuiWireMill.java
View file

@ -33,7 +33,7 @@ import techreborn.blockentity.machine.tier1.WireMillBlockEntity;
public class GuiWireMill extends GuiBase<BuiltScreenHandler> { public class GuiWireMill extends GuiBase<BuiltScreenHandler> {
WireMillBlockEntity blockEntity; final WireMillBlockEntity blockEntity;
public GuiWireMill(int syncID, final PlayerEntity player, final WireMillBlockEntity blockEntity) { public GuiWireMill(int syncID, final PlayerEntity player, final WireMillBlockEntity blockEntity) {
super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); super(player, blockEntity, blockEntity.createScreenHandler(syncID, player));

3
src/main/java/techreborn/TechReborn.java
View file

@ -55,14 +55,11 @@ import techreborn.utils.PoweredCraftingHandler;
import techreborn.world.WorldGenerator; import techreborn.world.WorldGenerator;
public class TechReborn implements ModInitializer { public class TechReborn implements ModInitializer {
public static final String MOD_ID = "techreborn"; public static final String MOD_ID = "techreborn";
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
public static TechReborn INSTANCE;
@Override @Override
public void onInitialize() { public void onInitialize() {
INSTANCE = this;
new Configuration(TechRebornConfig.class, "techreborn"); new Configuration(TechRebornConfig.class, "techreborn");
// Done to force the class to load // Done to force the class to load

2
src/main/java/techreborn/api/generator/GeneratorRecipeHelper.java
View file

@ -37,7 +37,7 @@ public class GeneratorRecipeHelper {
* value of the {@link EFluidGenerator} enum is linked to an object holding a set of * value of the {@link EFluidGenerator} enum is linked to an object holding a set of
* {@link FluidGeneratorRecipe}. * {@link FluidGeneratorRecipe}.
*/ */
public static EnumMap<EFluidGenerator, FluidGeneratorRecipeList> fluidRecipes = new EnumMap<>( public static final EnumMap<EFluidGenerator, FluidGeneratorRecipeList> fluidRecipes = new EnumMap<>(
EFluidGenerator.class); EFluidGenerator.class);
/** /**

2
src/main/java/techreborn/blockentity/cable/CableBlockEntity.java
View file

@ -133,7 +133,7 @@ public class CableBlockEntity extends BlockEntity
return energyContainer.getSideStorage(side); return energyContainer.getSideStorage(side);
} }
public BlockState getCover() { public @Nullable BlockState getCover() {
return cover; return cover;
} }

4
src/main/java/techreborn/blockentity/cable/CableTickManager.java
View file

@ -148,7 +148,7 @@ class CableTickManager {
// Limit max amount to the cable transfer rate. // Limit max amount to the cable transfer rate.
long targetMaxAmount = Math.min(remainingAmount / remainingTargets, cableType.transferRate); 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) { if (localTransferred > 0) {
transferredAmount += localTransferred; transferredAmount += localTransferred;
// Block duplicate operations. // Block duplicate operations.
@ -171,7 +171,7 @@ class CableTickManager {
SortableStorage(TransferOperation operation, OfferedEnergyStorage storage) { SortableStorage(TransferOperation operation, OfferedEnergyStorage storage) {
this.storage = storage; this.storage = storage;
try (Transaction tx = Transaction.openOuter()) { 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);
} }
} }
} }

12
src/main/java/techreborn/blockentity/cable/OfferedEnergyStorage.java
View file

@ -30,17 +30,7 @@ import team.reborn.energy.api.EnergyStorage;
/** /**
* {@link EnergyStorage} adjacent to an energy cable, with some additional info. * {@link EnergyStorage} adjacent to an energy cable, with some additional info.
*/ */
class OfferedEnergyStorage { record OfferedEnergyStorage(CableBlockEntity sourceCable, Direction direction, EnergyStorage storage) {
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;
}
void afterTransfer() { void afterTransfer() {
// Block insertions from this side. // Block insertions from this side.
sourceCable.blockedSides |= 1 << direction.ordinal(); sourceCable.blockedSides |= 1 << direction.ordinal();

2
src/main/java/techreborn/blockentity/generator/advanced/DragonEggSyphonBlockEntity.java
View file

@ -45,7 +45,7 @@ import techreborn.init.TRContent;
public class DragonEggSyphonBlockEntity extends PowerAcceptorBlockEntity public class DragonEggSyphonBlockEntity extends PowerAcceptorBlockEntity
implements IToolDrop, InventoryProvider { implements IToolDrop, InventoryProvider {
public RebornInventory<DragonEggSyphonBlockEntity> inventory = new RebornInventory<>(3, "DragonEggSyphonBlockEntity", 64, this); public final RebornInventory<DragonEggSyphonBlockEntity> inventory = new RebornInventory<>(3, "DragonEggSyphonBlockEntity", 64, this);
private long lastOutput = 0; private long lastOutput = 0;
public DragonEggSyphonBlockEntity(BlockPos pos, BlockState state) { public DragonEggSyphonBlockEntity(BlockPos pos, BlockState state) {

4
src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java
View file

@ -54,8 +54,8 @@ import java.util.Map;
public class SolidFuelGeneratorBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { public class SolidFuelGeneratorBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider {
public RebornInventory<SolidFuelGeneratorBlockEntity> inventory = new RebornInventory<>(2, "SolidFuelGeneratorBlockEntity", 64, this); public final RebornInventory<SolidFuelGeneratorBlockEntity> inventory = new RebornInventory<>(2, "SolidFuelGeneratorBlockEntity", 64, this);
public int fuelSlot = 0; public final int fuelSlot = 0;
public int burnTime; public int burnTime;
public int totalBurnTime = 0; public int totalBurnTime = 0;
public boolean isBurning; public boolean isBurning;

10
src/main/java/techreborn/blockentity/machine/GenericMachineBlockEntity.java
View file

@ -49,11 +49,11 @@ import reborncore.common.util.RebornInventory;
public abstract class GenericMachineBlockEntity extends PowerAcceptorBlockEntity public abstract class GenericMachineBlockEntity extends PowerAcceptorBlockEntity
implements IToolDrop, InventoryProvider, IRecipeCrafterProvider { implements IToolDrop, InventoryProvider, IRecipeCrafterProvider {
public String name; public final String name;
public int maxInput; public final int maxInput;
public int maxEnergy; public final int maxEnergy;
public Block toolDrop; public final Block toolDrop;
public int energySlot; public final int energySlot;
public RebornInventory<?> inventory; public RebornInventory<?> inventory;
public RecipeCrafter crafter; public RecipeCrafter crafter;

4
src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java
View file

@ -47,8 +47,8 @@ public abstract class AbstractIronMachineBlockEntity extends MachineBaseBlockEnt
public int burnTime; public int burnTime;
public int totalBurnTime; public int totalBurnTime;
public int progress; public int progress;
int fuelSlot; final int fuelSlot;
Block toolDrop; final Block toolDrop;
public AbstractIronMachineBlockEntity(BlockEntityType<?> blockEntityTypeIn, BlockPos pos, BlockState state, int fuelSlot, Block toolDrop) { public AbstractIronMachineBlockEntity(BlockEntityType<?> blockEntityTypeIn, BlockPos pos, BlockState state, int fuelSlot, Block toolDrop) {
super(blockEntityTypeIn, pos, state); super(blockEntityTypeIn, pos, state);

2
src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java
View file

@ -46,7 +46,7 @@ import techreborn.init.TRContent;
public class ChargeOMatBlockEntity extends PowerAcceptorBlockEntity public class ChargeOMatBlockEntity extends PowerAcceptorBlockEntity
implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider {
public RebornInventory<ChargeOMatBlockEntity> inventory = new RebornInventory<>(6, "ChargeOMatBlockEntity", 64, this); public final RebornInventory<ChargeOMatBlockEntity> inventory = new RebornInventory<>(6, "ChargeOMatBlockEntity", 64, this);
public ChargeOMatBlockEntity(BlockPos pos, BlockState state) { public ChargeOMatBlockEntity(BlockPos pos, BlockState state) {
super(TRBlockEntities.CHARGE_O_MAT, pos, state); super(TRBlockEntities.CHARGE_O_MAT, pos, state);

2
src/main/java/techreborn/blockentity/machine/misc/DrainBlockEntity.java
View file

@ -45,7 +45,7 @@ import techreborn.init.TRContent;
public class DrainBlockEntity extends MachineBaseBlockEntity implements IToolDrop { 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) { public DrainBlockEntity(BlockPos pos, BlockState state) {
super(TRBlockEntities.DRAIN, pos, state); super(TRBlockEntities.DRAIN, pos, state);

2
src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java
View file

@ -55,7 +55,7 @@ import techreborn.init.TRContent;
public class FluidReplicatorBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public class FluidReplicatorBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider {
public static final FluidValue TANK_CAPACITY = FluidValue.BUCKET.multiply(16); public static final FluidValue TANK_CAPACITY = FluidValue.BUCKET.multiply(16);
public Tank tank; public final Tank tank;
int ticksSinceLastChange; int ticksSinceLastChange;
public FluidReplicatorBlockEntity(BlockPos pos, BlockState state) { public FluidReplicatorBlockEntity(BlockPos pos, BlockState state) {

6
src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java
View file

@ -59,9 +59,9 @@ public class FusionControlComputerBlockEntity extends GenericMachineBlockEntity
public int neededPower = 0; public int neededPower = 0;
public int size = 6; public int size = 6;
public int state = -1; public int state = -1;
int topStackSlot = 0; final int topStackSlot = 0;
int bottomStackSlot = 1; final int bottomStackSlot = 1;
int outputStackSlot = 2; final int outputStackSlot = 2;
FusionReactorRecipe currentRecipe = null; FusionReactorRecipe currentRecipe = null;
Identifier currentRecipeID = null; Identifier currentRecipeID = null;
boolean hasStartedCrafting = false; boolean hasStartedCrafting = false;

2
src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java
View file

@ -51,7 +51,7 @@ import techreborn.init.TRContent;
public class IndustrialGrinderBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public class IndustrialGrinderBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider {
public static final FluidValue TANK_CAPACITY = FluidValue.BUCKET.multiply(16); public static final FluidValue TANK_CAPACITY = FluidValue.BUCKET.multiply(16);
public Tank tank; public final Tank tank;
int ticksSinceLastChange; int ticksSinceLastChange;
public IndustrialGrinderBlockEntity(BlockPos pos, BlockState state) { public IndustrialGrinderBlockEntity(BlockPos pos, BlockState state) {

2
src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java
View file

@ -51,7 +51,7 @@ import techreborn.init.TRContent;
public class IndustrialSawmillBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public class IndustrialSawmillBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider {
public static final FluidValue TANK_CAPACITY = FluidValue.BUCKET.multiply(16); public static final FluidValue TANK_CAPACITY = FluidValue.BUCKET.multiply(16);
public Tank tank; public final Tank tank;
int ticksSinceLastChange; int ticksSinceLastChange;
public IndustrialSawmillBlockEntity(BlockPos pos, BlockState state) { public IndustrialSawmillBlockEntity(BlockPos pos, BlockState state) {

4
src/main/java/techreborn/blockentity/machine/tier0/block/AbstractBlockBlockEntity.java
View file

@ -41,8 +41,8 @@ import reborncore.common.screen.builder.ScreenHandlerBuilder;
import techreborn.blockentity.machine.GenericMachineBlockEntity; import techreborn.blockentity.machine.GenericMachineBlockEntity;
public class AbstractBlockBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider, BlockProcessable { public class AbstractBlockBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider, BlockProcessable {
private final int ENERGY_SLOT = 0; private static final int ENERGY_SLOT = 0;
private final int INPUT_SLOT = 1; private static final int INPUT_SLOT = 1;
protected BlockProcessor processor; protected BlockProcessor processor;

5
src/main/java/techreborn/blockentity/machine/tier0/block/BlockProcessorUtils.java
View file

@ -38,7 +38,7 @@ import reborncore.common.blockentity.MachineBaseBlockEntity;
* @author SimonFlapse * @author SimonFlapse
*/ */
public class BlockProcessorUtils { public class BlockProcessorUtils {
private BlockProcessorUtils() {}; private BlockProcessorUtils() {}
/** /**
* <b>Get the hardness to break of a block</b> * <b>Get the hardness to break of a block</b>
@ -48,8 +48,7 @@ public class BlockProcessorUtils {
* @return the hardness to break of the supplied {@link BlockState} * @return the hardness to break of the supplied {@link BlockState}
*/ */
public static float getHardness(World world, BlockState blockInFront, BlockPos positionInFront) { public static float getHardness(World world, BlockState blockInFront, BlockPos positionInFront) {
float hardness = blockInFront.getHardness(world, positionInFront); return blockInFront.getHardness(world, positionInFront);
return hardness;
} }

12
src/main/java/techreborn/blockentity/machine/tier0/block/blockbreaker/BlockBreakerProcessor.java
View file

@ -58,14 +58,14 @@ import java.util.UUID;
*/ */
public class BlockBreakerProcessor extends BlockBreakerNbt implements BlockProcessor { public class BlockBreakerProcessor extends BlockBreakerNbt implements BlockProcessor {
private UUID processorId = UUID.randomUUID(); private final UUID processorId = UUID.randomUUID();
private BlockProcessable processable; private final BlockProcessable processable;
private int outputSlot; private final int outputSlot;
private int fakeInputSlot; private final int fakeInputSlot;
private int baseBreakTime; private final int baseBreakTime;
private int baseCostToBreak; private final int baseCostToBreak;
public BlockBreakerProcessor(BlockProcessable processable, int outputSlot, int fakeInputSlot, int baseBreakTime, int baseCostToBreak) { public BlockBreakerProcessor(BlockProcessable processable, int outputSlot, int fakeInputSlot, int baseBreakTime, int baseCostToBreak) {
this.processable = processable; this.processable = processable;

10
src/main/java/techreborn/blockentity/machine/tier0/block/blockplacer/BlockPlacerProcessor.java
View file

@ -48,13 +48,13 @@ import techreborn.blockentity.machine.tier0.block.ProcessingStatus;
*/ */
public class BlockPlacerProcessor extends BlockPlacerNbt implements BlockProcessor { public class BlockPlacerProcessor extends BlockPlacerNbt implements BlockProcessor {
private BlockProcessable processable; private final BlockProcessable processable;
private int inputSlot; private final int inputSlot;
private int fakeOutputSlot; private final int fakeOutputSlot;
private int basePlaceTime; private final int basePlaceTime;
private int baseCostToPlace; private final int baseCostToPlace;
public BlockPlacerProcessor(BlockProcessable processable, int inputSlot, int fakeOutputSlot, int basePlaceTime, int baseCostToPlace) { public BlockPlacerProcessor(BlockProcessable processable, int inputSlot, int fakeOutputSlot, int basePlaceTime, int baseCostToPlace) {
this.processable = processable; this.processable = processable;

4
src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java
View file

@ -71,13 +71,13 @@ public class AutoCraftingTableBlockEntity extends PowerAcceptorBlockEntity
public static final int CRAFTING_WIDTH = 3; public static final int CRAFTING_WIDTH = 3;
public static final int CRAFTING_AREA = CRAFTING_HEIGHT*CRAFTING_WIDTH; public static final int CRAFTING_AREA = CRAFTING_HEIGHT*CRAFTING_WIDTH;
public RebornInventory<AutoCraftingTableBlockEntity> inventory = new RebornInventory<>(CRAFTING_AREA+2, "AutoCraftingTableBlockEntity", 64, this); public final RebornInventory<AutoCraftingTableBlockEntity> 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 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; private final int EXTRA_OUTPUT_SLOT = CRAFTING_AREA + 1;
public int progress; public int progress;
public int maxProgress = 120; public int maxProgress = 120;
public int euTick = 10; public final int euTick = 10;
public int balanceSlot = 0; public int balanceSlot = 0;
CraftingInventory inventoryCrafting = null; CraftingInventory inventoryCrafting = null;

6
src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java
View file

@ -54,9 +54,9 @@ import java.util.Optional;
public class ElectricFurnaceBlockEntity extends PowerAcceptorBlockEntity public class ElectricFurnaceBlockEntity extends PowerAcceptorBlockEntity
implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider {
public RebornInventory<ElectricFurnaceBlockEntity> inventory = new RebornInventory<>(3, "ElectricFurnaceBlockEntity", 64, this); public final RebornInventory<ElectricFurnaceBlockEntity> inventory = new RebornInventory<>(3, "ElectricFurnaceBlockEntity", 64, this);
int inputSlot = 0; final int inputSlot = 0;
int outputSlot = 1; final int outputSlot = 1;
int ticksSinceLastChange; int ticksSinceLastChange;
private SmeltingRecipe currentRecipe; private SmeltingRecipe currentRecipe;
private int cookTime; private int cookTime;

6
src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java
View file

@ -36,7 +36,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.minecraft.world.World; import net.minecraft.world.World;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import reborncore.api.IToolDrop; import reborncore.api.IToolDrop;
import reborncore.api.blockentity.InventoryProvider; 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}; public int[] craftingSlots = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8};
private CraftingInventory craftCache; private CraftingInventory craftCache;
public RebornInventory<RollingMachineBlockEntity> inventory = new RebornInventory<>(12, "RollingMachineBlockEntity", 64, this); public final RebornInventory<RollingMachineBlockEntity> inventory = new RebornInventory<>(12, "RollingMachineBlockEntity", 64, this);
public boolean isRunning; public boolean isRunning;
public int tickTime; public int tickTime;
// Only synced to the client // Only synced to the client
public int currentRecipeTime; public int currentRecipeTime;
@NotNull public ItemStack currentRecipeOutput = ItemStack.EMPTY;
public ItemStack currentRecipeOutput;
public RollingMachineRecipe currentRecipe; public RollingMachineRecipe currentRecipe;
private final int outputSlot; private final int outputSlot;
public boolean locked = false; public boolean locked = false;

2
src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java
View file

@ -49,7 +49,7 @@ import techreborn.init.TRContent;
public class ChunkLoaderBlockEntity extends MachineBaseBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { public class ChunkLoaderBlockEntity extends MachineBaseBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider {
public RebornInventory<ChunkLoaderBlockEntity> inventory = new RebornInventory<>(0, "ChunkLoaderBlockEntity", 64, this); public final RebornInventory<ChunkLoaderBlockEntity> inventory = new RebornInventory<>(0, "ChunkLoaderBlockEntity", 64, this);
private int radius; private int radius;
private String ownerUdid; private String ownerUdid;

2
src/main/java/techreborn/blockentity/machine/tier3/MatterFabricatorBlockEntity.java
View file

@ -47,7 +47,7 @@ import techreborn.init.TRContent;
public class MatterFabricatorBlockEntity extends PowerAcceptorBlockEntity public class MatterFabricatorBlockEntity extends PowerAcceptorBlockEntity
implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider {
public RebornInventory<MatterFabricatorBlockEntity> inventory = new RebornInventory<>(12, "MatterFabricatorBlockEntity", 64, this); public final RebornInventory<MatterFabricatorBlockEntity> inventory = new RebornInventory<>(12, "MatterFabricatorBlockEntity", 64, this);
private int amplifier = 0; private int amplifier = 0;
public MatterFabricatorBlockEntity(BlockPos pos, BlockState state) { public MatterFabricatorBlockEntity(BlockPos pos, BlockState state) {

6
src/main/java/techreborn/blockentity/storage/energy/EnergyStorageBlockEntity.java
View file

@ -46,9 +46,9 @@ import techreborn.blocks.storage.energy.EnergyStorageBlock;
*/ */
public class EnergyStorageBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider { public class EnergyStorageBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider {
public RebornInventory<EnergyStorageBlockEntity> inventory; public final RebornInventory<EnergyStorageBlockEntity> inventory;
public String name; public final String name;
public Block wrenchDrop; public final Block wrenchDrop;
public int maxInput; public int maxInput;
public int maxOutput; public int maxOutput;
public int maxStorage; public int maxStorage;

2
src/main/java/techreborn/blockentity/storage/energy/lesu/LesuNetwork.java
View file

@ -28,7 +28,7 @@ import java.util.ArrayList;
public class LesuNetwork { public class LesuNetwork {
public ArrayList<LSUStorageBlockEntity> storages = new ArrayList<>(); public final ArrayList<LSUStorageBlockEntity> storages = new ArrayList<>();
public LapotronicSUBlockEntity master; public LapotronicSUBlockEntity master;

2
src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java
View file

@ -55,7 +55,7 @@ public class TankUnitBaseBlockEntity extends MachineBaseBlockEntity implements I
protected Tank tank; protected Tank tank;
private long serverMaxCapacity = -1; private long serverMaxCapacity = -1;
protected RebornInventory<TankUnitBaseBlockEntity> inventory = new RebornInventory<>(2, "TankInventory", 64, this); protected final RebornInventory<TankUnitBaseBlockEntity> inventory = new RebornInventory<>(2, "TankInventory", 64, this);
private TRContent.TankUnit type; private TRContent.TankUnit type;

2
src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java
View file

@ -67,7 +67,7 @@ public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity implement
// Client sync variables for GUI, what and how much stored // Client sync variables for GUI, what and how much stored
public int storedAmount = 0; public int storedAmount = 0;
protected RebornInventory<StorageUnitBaseBlockEntity> inventory; protected final RebornInventory<StorageUnitBaseBlockEntity> inventory;
private int maxCapacity; private int maxCapacity;
private int serverCapacity = -1; private int serverCapacity = -1;

14
src/main/java/techreborn/blockentity/transformers/TransformerBlockEntity.java
View file

@ -50,13 +50,13 @@ import java.util.List;
*/ */
public class TransformerBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, IListInfoProvider { public class TransformerBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, IListInfoProvider {
public String name; public final String name;
public Block wrenchDrop; public final Block wrenchDrop;
public RcEnergyTier inputTier; public final RcEnergyTier inputTier;
public RcEnergyTier outputTier; public final RcEnergyTier outputTier;
public int maxInput; public final int maxInput;
public int maxOutput; public final int maxOutput;
public int maxStorage; public final int maxStorage;
public TransformerBlockEntity(BlockEntityType<?> blockEntityType, BlockPos pos, BlockState state, String name, Block wrenchDrop, RcEnergyTier tier) { public TransformerBlockEntity(BlockEntityType<?> blockEntityType, BlockPos pos, BlockState state, String name, Block wrenchDrop, RcEnergyTier tier) {
super(blockEntityType, pos, state); super(blockEntityType, pos, state);

2
src/main/java/techreborn/blocks/GenericMachineBlock.java
View file

@ -39,7 +39,7 @@ import java.util.function.BiFunction;
public class GenericMachineBlock extends BlockMachineBase { public class GenericMachineBlock extends BlockMachineBase {
private final IMachineGuiHandler gui; private final IMachineGuiHandler gui;
BiFunction<BlockPos, BlockState, BlockEntity> blockEntityClass; final BiFunction<BlockPos, BlockState, BlockEntity> blockEntityClass;
public GenericMachineBlock(IMachineGuiHandler gui, BiFunction<BlockPos, BlockState, BlockEntity> blockEntityClass) { public GenericMachineBlock(IMachineGuiHandler gui, BiFunction<BlockPos, BlockState, BlockEntity> blockEntityClass) {
super(TRBlockSettings.genericMachine()); super(TRBlockSettings.genericMachine());

5
src/main/java/techreborn/blocks/machine/tier1/ResinBasinBlock.java
View file

@ -60,7 +60,7 @@ public class ResinBasinBlock extends BaseBlockEntityProvider {
public static final BooleanProperty POURING = BooleanProperty.of("pouring"); public static final BooleanProperty POURING = BooleanProperty.of("pouring");
public static final BooleanProperty FULL = BooleanProperty.of("full"); public static final BooleanProperty FULL = BooleanProperty.of("full");
protected static final VoxelShape SHAPE = Block.createCuboidShape(0d,0d, 0d, 16d, 8d, 16d); protected static final VoxelShape SHAPE = Block.createCuboidShape(0d,0d, 0d, 16d, 8d, 16d);
BiFunction<BlockPos, BlockState, BlockEntity> blockEntityClass; final BiFunction<BlockPos, BlockState, BlockEntity> blockEntityClass;
public ResinBasinBlock(BiFunction<BlockPos, BlockState, BlockEntity> blockEntityClass) { public ResinBasinBlock(BiFunction<BlockPos, BlockState, BlockEntity> blockEntityClass) {
super(TRBlockSettings.resinBasin()); super(TRBlockSettings.resinBasin());
@ -93,9 +93,8 @@ public class ResinBasinBlock extends BaseBlockEntityProvider {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@Override @Override
public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { 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; return ActionResult.PASS;
ResinBasinBlockEntity basin = (ResinBasinBlockEntity)world.getBlockEntity(pos);
ItemStack sap = basin.empty(); ItemStack sap = basin.empty();
if (sap.isEmpty()) if (sap.isEmpty())
return ActionResult.PASS; return ActionResult.PASS;

15
src/main/java/techreborn/blocks/misc/BlockAlarm.java
View file

@ -68,15 +68,14 @@ public class BlockAlarm extends BaseBlockEntityProvider {
private VoxelShape[] GenCuboidShapes(double depth, double width) { private VoxelShape[] GenCuboidShapes(double depth, double width) {
double culling = (16.0D - width) / 2; double culling = (16.0D - width) / 2;
VoxelShape[] shapes = { return new VoxelShape[]{
Block.createCuboidShape(culling, 16.0 - depth, culling, 16.0 - culling, 16.0D, 16.0 - culling), 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), 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), 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), 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), 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) createCuboidShape(0.0D, culling, culling, depth, 16.0 - culling, 16.0 - culling)
}; };
return shapes;
} }
public static boolean isActive(BlockState state) { public static boolean isActive(BlockState state) {

2
src/main/java/techreborn/blocks/misc/BlockNuke.java
View file

@ -46,7 +46,7 @@ import techreborn.init.TRBlockSettings;
* Created by Mark on 13/03/2016. * Created by Mark on 13/03/2016.
*/ */
public class BlockNuke extends BaseBlock { public class BlockNuke extends BaseBlock {
public static BooleanProperty OVERLAY = BooleanProperty.of("overlay"); public static final BooleanProperty OVERLAY = BooleanProperty.of("overlay");
public BlockNuke() { public BlockNuke() {
super(TRBlockSettings.nuke()); super(TRBlockSettings.nuke());

6
src/main/java/techreborn/blocks/misc/BlockRubberLog.java
View file

@ -61,9 +61,9 @@ import techreborn.items.tool.basic.ElectricTreetapItem;
*/ */
public class BlockRubberLog extends PillarBlock { public class BlockRubberLog extends PillarBlock {
public static DirectionProperty SAP_SIDE = Properties.HORIZONTAL_FACING; public static final DirectionProperty SAP_SIDE = Properties.HORIZONTAL_FACING;
public static BooleanProperty HAS_SAP = BooleanProperty.of("hassap"); public static final BooleanProperty HAS_SAP = BooleanProperty.of("hassap");
public static BooleanProperty SHOULD_SAP = BooleanProperty.of("shouldsap"); public static final BooleanProperty SHOULD_SAP = BooleanProperty.of("shouldsap");
public BlockRubberLog() { public BlockRubberLog() {
super(TRBlockSettings.rubberLog()); super(TRBlockSettings.rubberLog());

6
src/main/java/techreborn/blocks/storage/energy/EnergyStorageBlock.java
View file

@ -54,9 +54,9 @@ import techreborn.init.TRBlockSettings;
* Created by Rushmead * Created by Rushmead
*/ */
public abstract class EnergyStorageBlock extends BaseBlockEntityProvider { public abstract class EnergyStorageBlock extends BaseBlockEntityProvider {
public static DirectionProperty FACING = Properties.FACING; public static final DirectionProperty FACING = Properties.FACING;
public String name; public final String name;
public IMachineGuiHandler gui; public final IMachineGuiHandler gui;
public EnergyStorageBlock(String name, IMachineGuiHandler gui) { public EnergyStorageBlock(String name, IMachineGuiHandler gui) {
super(TRBlockSettings.energyStorage()); super(TRBlockSettings.energyStorage());

8
src/main/java/techreborn/blocks/storage/energy/LSUStorageBlock.java
View file

@ -58,9 +58,7 @@ public class LSUStorageBlock extends BaseBlockEntityProvider {
return; return;
} }
if (worldIn.getBlockEntity(pos) instanceof LSUStorageBlockEntity blockEntity) { if (worldIn.getBlockEntity(pos) instanceof LSUStorageBlockEntity blockEntity) {
if (blockEntity != null) { blockEntity.removeFromNetwork();
blockEntity.removeFromNetwork();
}
} }
super.onStateReplaced(state, worldIn, pos, newState, isMoving); 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) { public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity player, ItemStack itemstack) {
super.onPlaced(world, pos, state, player, itemstack); super.onPlaced(world, pos, state, player, itemstack);
if (world.getBlockEntity(pos) instanceof LSUStorageBlockEntity blockEntity) { if (world.getBlockEntity(pos) instanceof LSUStorageBlockEntity blockEntity) {
if (blockEntity != null) { blockEntity.rebuildNetwork();
blockEntity.rebuildNetwork();
}
} }
} }

4
src/main/java/techreborn/blocks/transformers/BlockTransformer.java
View file

@ -50,8 +50,8 @@ import techreborn.init.TRBlockSettings;
*/ */
public abstract class BlockTransformer extends BaseBlockEntityProvider { public abstract class BlockTransformer extends BaseBlockEntityProvider {
public static DirectionProperty FACING = Properties.FACING; public static final DirectionProperty FACING = Properties.FACING;
public String name; public final String name;
public BlockTransformer(String name) { public BlockTransformer(String name) {
super(TRBlockSettings.transformer()); super(TRBlockSettings.transformer());

2
src/main/java/techreborn/entities/EntityNukePrimed.java
View file

@ -52,7 +52,7 @@ public class EntityNukePrimed extends TntEntity {
setFuse(TechRebornConfig.nukeFuseTime); 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(TRContent.ENTITY_NUKE, world);
this.setPosition(x, y, z); this.setPosition(x, y, z);

2
src/main/java/techreborn/init/TRBlockEntities.java
View file

@ -81,10 +81,8 @@ import java.util.List;
import java.util.function.BiFunction; import java.util.function.BiFunction;
public class TRBlockEntities { public class TRBlockEntities {
private static final List<BlockEntityType<?>> TYPES = new ArrayList<>(); private static final List<BlockEntityType<?>> TYPES = new ArrayList<>();
public static final BlockEntityType<StorageUnitBaseBlockEntity> STORAGE_UNIT = register(StorageUnitBaseBlockEntity::new, "storage_unit", TRContent.StorageUnit.values()); public static final BlockEntityType<StorageUnitBaseBlockEntity> STORAGE_UNIT = register(StorageUnitBaseBlockEntity::new, "storage_unit", TRContent.StorageUnit.values());
public static final BlockEntityType<TankUnitBaseBlockEntity> TANK_UNIT = register(TankUnitBaseBlockEntity::new, "tank_unit", TRContent.TankUnit.values()); public static final BlockEntityType<TankUnitBaseBlockEntity> TANK_UNIT = register(TankUnitBaseBlockEntity::new, "tank_unit", TRContent.TankUnit.values());
public static final BlockEntityType<DrainBlockEntity> DRAIN = register(DrainBlockEntity::new, "drain", TRContent.Machine.DRAIN); public static final BlockEntityType<DrainBlockEntity> DRAIN = register(DrainBlockEntity::new, "drain", TRContent.Machine.DRAIN);

34
src/main/java/techreborn/init/TRContent.java
View file

@ -109,9 +109,9 @@ import java.util.stream.Stream;
public class TRContent { public class TRContent {
public static Marker DATAGEN = MarkerFactory.getMarker("datagen"); public static final Marker DATAGEN = MarkerFactory.getMarker("datagen");
public static BlockSetType RUBBER_WOOD_SET_TYPE = BlockSetTypeRegistry.registerWood(new Identifier(TechReborn.MOD_ID, "rubber_wood")); public static final 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 WoodType RUBBER_WOOD_TYPE = WoodTypeRegistry.register(new Identifier(TechReborn.MOD_ID, "rubber_wood"), RUBBER_WOOD_SET_TYPE);
// Misc Blocks // Misc Blocks
public static Block COMPUTER_CUBE; public static Block COMPUTER_CUBE;
@ -313,11 +313,11 @@ public class TRContent {
public final Block block; public final Block block;
// Generation of EU during Day // Generation of EU during Day
public int generationRateD; public final int generationRateD;
// Generation of EU during Night // Generation of EU during Night
public int generationRateN; public final int generationRateN;
// Internal EU storage of solar panel // Internal EU storage of solar panel
public int internalCapacity; public final int internalCapacity;
public final RcEnergyTier powerTier; public final RcEnergyTier powerTier;
SolarPanels(RcEnergyTier tier, int generationRateD, int generationRateN) { SolarPanels(RcEnergyTier tier, int generationRateD, int generationRateN) {
@ -352,7 +352,7 @@ public class TRContent {
public final Item upgrader; public final Item upgrader;
// How many items it can hold // How many items it can hold
public int capacity; public final int capacity;
StorageUnit(int capacity, boolean upgradable) { StorageUnit(int capacity, boolean upgradable) {
@ -409,7 +409,7 @@ public class TRContent {
public final Block block; public final Block block;
// How many blocks it can hold // How many blocks it can hold
public FluidValue capacity; public final FluidValue capacity;
TankUnit(int capacity) { TankUnit(int capacity) {
@ -464,12 +464,12 @@ public class TRContent {
public final String name; public final String name;
public final CableBlock block; public final CableBlock block;
public int transferRate; public final int transferRate;
public int defaultTransferRate; public final int defaultTransferRate;
public double cableThickness; public final double cableThickness;
public boolean canKill; public final boolean canKill;
public boolean defaultCanKill; public final boolean defaultCanKill;
public RcEnergyTier tier; public final RcEnergyTier tier;
Cables(int transferRate, double cableThickness, boolean canKill, RcEnergyTier tier) { Cables(int transferRate, double cableThickness, boolean canKill, RcEnergyTier tier) {
@ -1577,8 +1577,8 @@ public class TRContent {
blockEntity.muffle(); blockEntity.muffle();
}); });
public String name; public final String name;
public Item item; public final Item item;
Upgrades(IUpgrade upgrade) { Upgrades(IUpgrade upgrade) {
name = this.toString().toLowerCase(Locale.ROOT); name = this.toString().toLowerCase(Locale.ROOT);
@ -1592,7 +1592,7 @@ public class TRContent {
} }
} }
public static EntityType<EntityNukePrimed> ENTITY_NUKE = FabricEntityTypeBuilder.create() public static final EntityType<EntityNukePrimed> ENTITY_NUKE = FabricEntityTypeBuilder.create()
.entityFactory((EntityType.EntityFactory<EntityNukePrimed>) EntityNukePrimed::new) .entityFactory((EntityType.EntityFactory<EntityNukePrimed>) EntityNukePrimed::new)
.dimensions(EntityDimensions.fixed(1f, 1f)) .dimensions(EntityDimensions.fixed(1f, 1f))
.trackRangeChunks(10) .trackRangeChunks(10)

2
src/main/java/techreborn/items/tool/basic/ElectricTreetapItem.java
View file

@ -35,7 +35,7 @@ import techreborn.config.TechRebornConfig;
* Created by modmuss50 on 05/11/2016. * Created by modmuss50 on 05/11/2016.
*/ */
public class ElectricTreetapItem extends Item implements RcEnergyItem { public class ElectricTreetapItem extends Item implements RcEnergyItem {
public RcEnergyTier tier = RcEnergyTier.MEDIUM; public final RcEnergyTier tier = RcEnergyTier.MEDIUM;
public ElectricTreetapItem() { public ElectricTreetapItem() {
super(new Item.Settings().maxCount(1).maxDamage(-1)); super(new Item.Settings().maxCount(1).maxDamage(-1));

2
src/main/java/techreborn/items/tool/vanilla/TRAxeItem.java
View file

@ -32,7 +32,7 @@ import reborncore.common.util.ItemUtils;
public class TRAxeItem extends AxeItem { public class TRAxeItem extends AxeItem {
String repairOreDict; final String repairOreDict;
public TRAxeItem(ToolMaterial material) { public TRAxeItem(ToolMaterial material) {
this(material, ""); this(material, "");

2
src/main/java/techreborn/items/tool/vanilla/TRHoeItem.java
View file

@ -32,7 +32,7 @@ import reborncore.common.util.ItemUtils;
public class TRHoeItem extends HoeItem { public class TRHoeItem extends HoeItem {
String repairOreDict; final String repairOreDict;
public TRHoeItem(ToolMaterial material) { public TRHoeItem(ToolMaterial material) {
this(material, ""); this(material, "");

2
src/main/java/techreborn/items/tool/vanilla/TRPickaxeItem.java
View file

@ -32,7 +32,7 @@ import reborncore.common.util.ItemUtils;
public class TRPickaxeItem extends PickaxeItem { public class TRPickaxeItem extends PickaxeItem {
String repairOreDict; final String repairOreDict;
public TRPickaxeItem(ToolMaterial material) { public TRPickaxeItem(ToolMaterial material) {
this(material, ""); this(material, "");

2
src/main/java/techreborn/items/tool/vanilla/TRSpadeItem.java
View file

@ -32,7 +32,7 @@ import reborncore.common.util.ItemUtils;
public class TRSpadeItem extends ShovelItem { public class TRSpadeItem extends ShovelItem {
String repairOreDict; final String repairOreDict;
public TRSpadeItem(ToolMaterial material) { public TRSpadeItem(ToolMaterial material) {
this(material, ""); this(material, "");

2
src/main/java/techreborn/items/tool/vanilla/TRSwordItem.java
View file

@ -32,7 +32,7 @@ import reborncore.common.util.ItemUtils;
public class TRSwordItem extends SwordItem { public class TRSwordItem extends SwordItem {
String repairOreDict; final String repairOreDict;
public TRSwordItem(ToolMaterial material) { public TRSwordItem(ToolMaterial material) {
this(material, ""); this(material, "");

6
src/main/java/techreborn/utils/TagRemapper.java
View file

@ -87,10 +87,10 @@ public class TagRemapper {
} }
private static class TagRename { private static class TagRename {
Path parent; final Path parent;
String oldName; final String oldName;
String newName; final String newName;
public TagRename(Path tag) { public TagRename(Path tag) {
this.parent = tag.getParent(); this.parent = tag.getParent();

2
src/main/java/techreborn/world/OreDepth.java
View file

@ -52,7 +52,7 @@ public record OreDepth(Identifier identifier, int minY, int maxY, TargetDimensio
TargetDimension.CODEC.fieldOf("dimension").forGetter(OreDepth::dimension) TargetDimension.CODEC.fieldOf("dimension").forGetter(OreDepth::dimension)
).apply(instance, OreDepth::new) ).apply(instance, OreDepth::new)
); );
public static Codec<List<OreDepth>> LIST_CODEC = Codec.list(OreDepth.CODEC); public static final Codec<List<OreDepth>> LIST_CODEC = Codec.list(OreDepth.CODEC);
public static List<OreDepth> create(MinecraftServer server) { public static List<OreDepth> create(MinecraftServer server) {