diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index eab99091d..e7bb4a43e 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -74,7 +74,7 @@ public class GuiHandler { } @Environment(EnvType.CLIENT) - private static AbstractContainerScreen getClientGuiElement(final EGui gui, final PlayerEntity player, BlockPos pos, int syncID) { + private static AbstractContainerScreen getClientGuiElement(final EGui gui, final PlayerEntity player, BlockPos pos, int syncID) { final BlockEntity blockEntity = player.world.getBlockEntity(pos); switch (gui) { diff --git a/src/main/java/techreborn/client/gui/GuiAESU.java b/src/main/java/techreborn/client/gui/GuiAESU.java index 2230e5492..190a4d7cb 100644 --- a/src/main/java/techreborn/client/gui/GuiAESU.java +++ b/src/main/java/techreborn/client/gui/GuiAESU.java @@ -27,6 +27,7 @@ package techreborn.client.gui; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonUpDown; import reborncore.common.network.NetworkManager; @@ -34,7 +35,7 @@ import reborncore.common.powerSystem.PowerSystem; import techreborn.packets.ServerboundPackets; import techreborn.blockentity.storage.AdjustableSUBlockEntity; -public class GuiAESU extends GuiBase { +public class GuiAESU extends GuiBase { AdjustableSUBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java index 011f44d35..015d3f236 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java +++ b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java @@ -25,11 +25,12 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.AlloySmelterBlockEntity; -public class GuiAlloySmelter extends GuiBase { +public class GuiAlloySmelter extends GuiBase { AlloySmelterBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java index 530b0f777..ed9fa193a 100644 --- a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java @@ -25,11 +25,12 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.AssemblingMachineBlockEntity; -public class GuiAssemblingMachine extends GuiBase { +public class GuiAssemblingMachine extends GuiBase { AssemblingMachineBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiAutoCrafting.java b/src/main/java/techreborn/client/gui/GuiAutoCrafting.java index e333eb698..8d39c1184 100644 --- a/src/main/java/techreborn/client/gui/GuiAutoCrafting.java +++ b/src/main/java/techreborn/client/gui/GuiAutoCrafting.java @@ -29,6 +29,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Recipe; import net.minecraft.util.Identifier; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.common.network.NetworkManager; @@ -38,7 +39,7 @@ import techreborn.blockentity.machine.tier1.AutoCraftingTableBlockEntity; /** * Created by modmuss50 on 20/06/2017. */ -public class GuiAutoCrafting extends GuiBase { +public class GuiAutoCrafting extends GuiBase { static final Identifier RECIPE_BOOK_TEXTURE = new Identifier("textures/gui/recipe_book.png"); boolean showGui = true; diff --git a/src/main/java/techreborn/client/gui/GuiBatbox.java b/src/main/java/techreborn/client/gui/GuiBatbox.java index 4aff61777..ac3f55c9e 100644 --- a/src/main/java/techreborn/client/gui/GuiBatbox.java +++ b/src/main/java/techreborn/client/gui/GuiBatbox.java @@ -26,11 +26,12 @@ package techreborn.client.gui; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.common.powerSystem.PowerSystem; import techreborn.blockentity.storage.LowVoltageSUBlockEntity; -public class GuiBatbox extends GuiBase { +public class GuiBatbox extends GuiBase { LowVoltageSUBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index 928d177d3..f6c54f6cb 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -30,6 +30,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import reborncore.RebornCoreClient; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.guibuilder.GuiBuilder; @@ -39,7 +40,7 @@ import reborncore.client.multiblock.MultiblockSet; import techreborn.init.TRContent; import techreborn.blockentity.machine.multiblock.IndustrialBlastFurnaceBlockEntity; -public class GuiBlastFurnace extends GuiBase { +public class GuiBlastFurnace extends GuiBase { public IndustrialBlastFurnaceBlockEntity blockEntity; boolean hasMultiBlock; diff --git a/src/main/java/techreborn/client/gui/GuiCentrifuge.java b/src/main/java/techreborn/client/gui/GuiCentrifuge.java index f13421b8f..ec2309d3a 100644 --- a/src/main/java/techreborn/client/gui/GuiCentrifuge.java +++ b/src/main/java/techreborn/client/gui/GuiCentrifuge.java @@ -25,11 +25,12 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.IndustrialCentrifugeBlockEntity; -public class GuiCentrifuge extends GuiBase { +public class GuiCentrifuge extends GuiBase { IndustrialCentrifugeBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiChargeBench.java b/src/main/java/techreborn/client/gui/GuiChargeBench.java index 79d51bb8f..965af9afe 100644 --- a/src/main/java/techreborn/client/gui/GuiChargeBench.java +++ b/src/main/java/techreborn/client/gui/GuiChargeBench.java @@ -25,10 +25,11 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import techreborn.blockentity.ChargeOMatBlockEntity; -public class GuiChargeBench extends GuiBase { +public class GuiChargeBench extends GuiBase { ChargeOMatBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiChemicalReactor.java b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java index 4f3290039..fed2dfce5 100644 --- a/src/main/java/techreborn/client/gui/GuiChemicalReactor.java +++ b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java @@ -25,11 +25,12 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.ChemicalReactorBlockEntity; -public class GuiChemicalReactor extends GuiBase { +public class GuiChemicalReactor extends GuiBase { ChemicalReactorBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiCompressor.java b/src/main/java/techreborn/client/gui/GuiCompressor.java index ec586934d..d0d699d99 100644 --- a/src/main/java/techreborn/client/gui/GuiCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiCompressor.java @@ -25,11 +25,12 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.CompressorBlockEntity; -public class GuiCompressor extends GuiBase { +public class GuiCompressor extends GuiBase { CompressorBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java index 4e3cc0c08..0c3715a19 100644 --- a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java @@ -27,12 +27,13 @@ package techreborn.client.gui; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.generator.advanced.DieselGeneratorBlockEntity; @Environment(EnvType.CLIENT) -public class GuiDieselGenerator extends GuiBase { +public class GuiDieselGenerator extends GuiBase { DieselGeneratorBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiDigitalChest.java b/src/main/java/techreborn/client/gui/GuiDigitalChest.java index 49fbc2dab..77cec3876 100644 --- a/src/main/java/techreborn/client/gui/GuiDigitalChest.java +++ b/src/main/java/techreborn/client/gui/GuiDigitalChest.java @@ -25,10 +25,11 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import techreborn.blockentity.DigitalChestBlockEntity; -public class GuiDigitalChest extends GuiBase { +public class GuiDigitalChest extends GuiBase { DigitalChestBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiDistillationTower.java b/src/main/java/techreborn/client/gui/GuiDistillationTower.java index 990efb262..7dd170cb3 100644 --- a/src/main/java/techreborn/client/gui/GuiDistillationTower.java +++ b/src/main/java/techreborn/client/gui/GuiDistillationTower.java @@ -30,6 +30,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import reborncore.RebornCoreClient; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.guibuilder.GuiBuilder; @@ -39,7 +40,7 @@ import reborncore.client.multiblock.MultiblockSet; import techreborn.init.TRContent; import techreborn.blockentity.machine.multiblock.DistillationTowerBlockEntity; -public class GuiDistillationTower extends GuiBase { +public class GuiDistillationTower extends GuiBase { public DistillationTowerBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiElectricFurnace.java b/src/main/java/techreborn/client/gui/GuiElectricFurnace.java index baf7eaed0..e4fe36a1d 100644 --- a/src/main/java/techreborn/client/gui/GuiElectricFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiElectricFurnace.java @@ -25,11 +25,12 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.ElectricFurnaceBlockEntity; -public class GuiElectricFurnace extends GuiBase { +public class GuiElectricFurnace extends GuiBase { ElectricFurnaceBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiExtractor.java b/src/main/java/techreborn/client/gui/GuiExtractor.java index b20996c5a..5058e6dfa 100644 --- a/src/main/java/techreborn/client/gui/GuiExtractor.java +++ b/src/main/java/techreborn/client/gui/GuiExtractor.java @@ -25,11 +25,12 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.ExtractorBlockEntity; -public class GuiExtractor extends GuiBase { +public class GuiExtractor extends GuiBase { ExtractorBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java index 280a9c9e4..d9f7076c3 100644 --- a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java +++ b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java @@ -29,6 +29,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import reborncore.RebornCoreClient; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.guibuilder.GuiBuilder; @@ -42,7 +43,7 @@ import techreborn.blockentity.machine.multiblock.FluidReplicatorBlockEntity; * @author drcrazy * */ -public class GuiFluidReplicator extends GuiBase { +public class GuiFluidReplicator extends GuiBase { FluidReplicatorBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 380f6a20f..a3e368d9f 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -30,6 +30,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import org.apache.commons.lang3.tuple.Pair; import reborncore.RebornCoreClient; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.builder.widget.GuiButtonUpDown; @@ -48,7 +49,7 @@ import java.awt.*; import java.util.List; import java.util.Optional; -public class GuiFusionReactor extends GuiBase { +public class GuiFusionReactor extends GuiBase { FusionControlComputerBlockEntity blockEntity; public GuiFusionReactor(int syncID, final PlayerEntity player, final FusionControlComputerBlockEntity blockEntity) { diff --git a/src/main/java/techreborn/client/gui/GuiGasTurbine.java b/src/main/java/techreborn/client/gui/GuiGasTurbine.java index e7829617d..1819b638a 100644 --- a/src/main/java/techreborn/client/gui/GuiGasTurbine.java +++ b/src/main/java/techreborn/client/gui/GuiGasTurbine.java @@ -25,11 +25,12 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.generator.advanced.GasTurbineBlockEntity; -public class GuiGasTurbine extends GuiBase { +public class GuiGasTurbine extends GuiBase { GasTurbineBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiGenerator.java b/src/main/java/techreborn/client/gui/GuiGenerator.java index e54b06159..afd6de919 100644 --- a/src/main/java/techreborn/client/gui/GuiGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiGenerator.java @@ -25,10 +25,11 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import techreborn.blockentity.generator.basic.SolidFuelGeneratorBlockEntity; -public class GuiGenerator extends GuiBase { +public class GuiGenerator extends GuiBase { SolidFuelGeneratorBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiGrinder.java b/src/main/java/techreborn/client/gui/GuiGrinder.java index 024b31e69..75555513f 100644 --- a/src/main/java/techreborn/client/gui/GuiGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiGrinder.java @@ -25,11 +25,12 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.GrinderBlockEntity; -public class GuiGrinder extends GuiBase { +public class GuiGrinder extends GuiBase { GrinderBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiIDSU.java b/src/main/java/techreborn/client/gui/GuiIDSU.java index 7740ce8c3..b7c4048a3 100644 --- a/src/main/java/techreborn/client/gui/GuiIDSU.java +++ b/src/main/java/techreborn/client/gui/GuiIDSU.java @@ -26,11 +26,12 @@ package techreborn.client.gui; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.common.powerSystem.PowerSystem; import techreborn.blockentity.storage.idsu.InterdimensionalSUBlockEntity; -public class GuiIDSU extends GuiBase { +public class GuiIDSU extends GuiBase { InterdimensionalSUBlockEntity idsu; diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index 3b6fe31f5..b89b4f254 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -29,6 +29,7 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import reborncore.RebornCoreClient; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.guibuilder.GuiBuilder; @@ -38,7 +39,7 @@ import reborncore.client.multiblock.MultiblockSet; import techreborn.init.TRContent; import techreborn.blockentity.machine.multiblock.ImplosionCompressorBlockEntity; -public class GuiImplosionCompressor extends GuiBase { +public class GuiImplosionCompressor extends GuiBase { ImplosionCompressorBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java index 57e7577fa..0a760078b 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java @@ -25,11 +25,12 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.IndustrialElectrolyzerBlockEntity; -public class GuiIndustrialElectrolyzer extends GuiBase { +public class GuiIndustrialElectrolyzer extends GuiBase { IndustrialElectrolyzerBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java index f826e905e..3e308f2c8 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java @@ -30,6 +30,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import reborncore.RebornCoreClient; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.guibuilder.GuiBuilder; @@ -39,7 +40,7 @@ import reborncore.client.multiblock.MultiblockSet; import techreborn.init.TRContent; import techreborn.blockentity.machine.multiblock.IndustrialGrinderBlockEntity; -public class GuiIndustrialGrinder extends GuiBase { +public class GuiIndustrialGrinder extends GuiBase { IndustrialGrinderBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index 9e22541f1..efb3cc842 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -30,6 +30,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import reborncore.RebornCoreClient; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.guibuilder.GuiBuilder; @@ -39,7 +40,7 @@ import reborncore.client.multiblock.MultiblockSet; import techreborn.blockentity.machine.multiblock.IndustrialSawmillBlockEntity; import techreborn.init.TRContent; -public class GuiIndustrialSawmill extends GuiBase { +public class GuiIndustrialSawmill extends GuiBase { IndustrialSawmillBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiIronFurnace.java b/src/main/java/techreborn/client/gui/GuiIronFurnace.java index a693edb8e..75445c832 100644 --- a/src/main/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiIronFurnace.java @@ -25,26 +25,24 @@ package techreborn.client.gui; import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.resource.language.I18n; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import techreborn.init.TRContent; import techreborn.blockentity.machine.iron.IronFurnaceBlockEntity; -public class GuiIronFurnace extends GuiBase { +public class GuiIronFurnace extends GuiBase { public static final Identifier texture = new Identifier("minecraft", "textures/gui/container/furnace.png"); - IronFurnaceBlockEntity furnace; + IronFurnaceBlockEntity blockEntity; public GuiIronFurnace(int syncID, final PlayerEntity player, final IronFurnaceBlockEntity furnace) { super(player, furnace, furnace.createContainer(syncID, player)); - this.containerWidth = 176; - this.containerHeight = 167; - this.furnace = furnace; + this.blockEntity = furnace; } @Override @@ -59,30 +57,14 @@ public class GuiIronFurnace extends GuiBase { int j = 0; - j = furnace.gaugeProgressScaled(24); + j = blockEntity.gaugeProgressScaled(24); if (j > 0) { blit(k + 78, l + 35, 176, 14, j + 1, 16); } - j = furnace.gaugeFuelScaled(12); + j = blockEntity.gaugeFuelScaled(12); if (j > 0) { blit(k + 57, l + 36 + 12 - j, 176, 12 - j, 14, j + 2); } } - - @Override - protected void drawForeground(int mouseX, int mouseY) { - final String name = I18n.translate("block.techreborn.iron_furnace"); - font.draw(name, containerWidth / 2 - font.getStringWidth(name) / 2, 6, 4210752); - font.draw(I18n.translate("container.inventory", new Object[0]), 8, containerHeight - 96 + 2, 4210752); - - super.drawForeground(mouseX, mouseY); - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - super.render(mouseX, mouseY, partialTicks); - drawMouseoverTooltip(mouseX, mouseY); - } - } diff --git a/src/main/java/techreborn/client/gui/GuiLESU.java b/src/main/java/techreborn/client/gui/GuiLESU.java index 730302187..d1e8eed5d 100644 --- a/src/main/java/techreborn/client/gui/GuiLESU.java +++ b/src/main/java/techreborn/client/gui/GuiLESU.java @@ -26,11 +26,12 @@ package techreborn.client.gui; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.common.powerSystem.PowerSystem; import techreborn.blockentity.storage.lesu.LapotronicSUBlockEntity; -public class GuiLESU extends GuiBase { +public class GuiLESU extends GuiBase { LapotronicSUBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiMFE.java b/src/main/java/techreborn/client/gui/GuiMFE.java index bc031617a..87809f41b 100644 --- a/src/main/java/techreborn/client/gui/GuiMFE.java +++ b/src/main/java/techreborn/client/gui/GuiMFE.java @@ -26,11 +26,12 @@ package techreborn.client.gui; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.common.powerSystem.PowerSystem; import techreborn.blockentity.storage.MediumVoltageSUBlockEntity; -public class GuiMFE extends GuiBase { +public class GuiMFE extends GuiBase { MediumVoltageSUBlockEntity mfe; diff --git a/src/main/java/techreborn/client/gui/GuiMFSU.java b/src/main/java/techreborn/client/gui/GuiMFSU.java index a07a6ba9d..8bae66088 100644 --- a/src/main/java/techreborn/client/gui/GuiMFSU.java +++ b/src/main/java/techreborn/client/gui/GuiMFSU.java @@ -26,11 +26,12 @@ package techreborn.client.gui; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.common.powerSystem.PowerSystem; import techreborn.blockentity.storage.HighVoltageSUBlockEntity; -public class GuiMFSU extends GuiBase { +public class GuiMFSU extends GuiBase { HighVoltageSUBlockEntity mfsu; diff --git a/src/main/java/techreborn/client/gui/GuiMatterFabricator.java b/src/main/java/techreborn/client/gui/GuiMatterFabricator.java index cab104db1..7b9f7e9b8 100644 --- a/src/main/java/techreborn/client/gui/GuiMatterFabricator.java +++ b/src/main/java/techreborn/client/gui/GuiMatterFabricator.java @@ -25,11 +25,12 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier3.MatterFabricatorBlockEntity; -public class GuiMatterFabricator extends GuiBase { +public class GuiMatterFabricator extends GuiBase { MatterFabricatorBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java b/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java index acc77124d..502cb0ca6 100644 --- a/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java @@ -27,6 +27,7 @@ package techreborn.client.gui; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity; @@ -36,7 +37,7 @@ import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity; * */ @Environment(EnvType.CLIENT) -public class GuiPlasmaGenerator extends GuiBase { +public class GuiPlasmaGenerator extends GuiBase { /** * @param player diff --git a/src/main/java/techreborn/client/gui/GuiQuantumChest.java b/src/main/java/techreborn/client/gui/GuiQuantumChest.java index 0ca32e0e4..e18ac1472 100644 --- a/src/main/java/techreborn/client/gui/GuiQuantumChest.java +++ b/src/main/java/techreborn/client/gui/GuiQuantumChest.java @@ -25,10 +25,11 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import techreborn.blockentity.machine.tier3.QuantumChestBlockEntity; -public class GuiQuantumChest extends GuiBase { +public class GuiQuantumChest extends GuiBase { QuantumChestBlockEntity quantumChest; diff --git a/src/main/java/techreborn/client/gui/GuiQuantumTank.java b/src/main/java/techreborn/client/gui/GuiQuantumTank.java index 06ba57843..1b2afc9ba 100644 --- a/src/main/java/techreborn/client/gui/GuiQuantumTank.java +++ b/src/main/java/techreborn/client/gui/GuiQuantumTank.java @@ -26,11 +26,12 @@ package techreborn.client.gui; import io.github.prospector.silk.fluid.FluidInstance; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.common.fluid.FluidUtil; import techreborn.blockentity.machine.tier3.QuantumTankBlockEntity; -public class GuiQuantumTank extends GuiBase { +public class GuiQuantumTank extends GuiBase { QuantumTankBlockEntity quantumTank; diff --git a/src/main/java/techreborn/client/gui/GuiRecycler.java b/src/main/java/techreborn/client/gui/GuiRecycler.java index 0f180e1fa..a359ab187 100644 --- a/src/main/java/techreborn/client/gui/GuiRecycler.java +++ b/src/main/java/techreborn/client/gui/GuiRecycler.java @@ -25,11 +25,12 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.RecyclerBlockEntity; -public class GuiRecycler extends GuiBase { +public class GuiRecycler extends GuiBase { RecyclerBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiRollingMachine.java b/src/main/java/techreborn/client/gui/GuiRollingMachine.java index 6ea181d85..f69f9e8e9 100644 --- a/src/main/java/techreborn/client/gui/GuiRollingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiRollingMachine.java @@ -25,13 +25,14 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.common.network.NetworkManager; import techreborn.packets.ServerboundPackets; import techreborn.blockentity.machine.tier1.RollingMachineBlockEntity; -public class GuiRollingMachine extends GuiBase { +public class GuiRollingMachine extends GuiBase { RollingMachineBlockEntity rollingMachine; diff --git a/src/main/java/techreborn/client/gui/GuiScrapboxinator.java b/src/main/java/techreborn/client/gui/GuiScrapboxinator.java index 0010b6f08..338f83666 100644 --- a/src/main/java/techreborn/client/gui/GuiScrapboxinator.java +++ b/src/main/java/techreborn/client/gui/GuiScrapboxinator.java @@ -25,11 +25,12 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.ScrapboxinatorBlockEntity; -public class GuiScrapboxinator extends GuiBase { +public class GuiScrapboxinator extends GuiBase { ScrapboxinatorBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java index febea7111..59807d740 100644 --- a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java @@ -25,11 +25,12 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.generator.advanced.SemiFluidGeneratorBlockEntity; -public class GuiSemifluidGenerator extends GuiBase { +public class GuiSemifluidGenerator extends GuiBase { SemiFluidGeneratorBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiThermalGenerator.java b/src/main/java/techreborn/client/gui/GuiThermalGenerator.java index e91b87c3a..5b8fcbe21 100644 --- a/src/main/java/techreborn/client/gui/GuiThermalGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiThermalGenerator.java @@ -25,11 +25,12 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.generator.advanced.ThermalGeneratorBlockEntity; -public class GuiThermalGenerator extends GuiBase { +public class GuiThermalGenerator extends GuiBase { ThermalGeneratorBlockEntity blockEntity; diff --git a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java index da0d7bbb5..741214b47 100644 --- a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java +++ b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java @@ -28,6 +28,7 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import reborncore.RebornCoreClient; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.guibuilder.GuiBuilder; @@ -37,7 +38,7 @@ import reborncore.client.multiblock.MultiblockSet; import techreborn.init.TRContent; import techreborn.blockentity.machine.multiblock.VacuumFreezerBlockEntity; -public class GuiVacuumFreezer extends GuiBase { +public class GuiVacuumFreezer extends GuiBase { VacuumFreezerBlockEntity blockEntity;