diff --git a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java index 0ab5ec504..82419f063 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java +++ b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.tier1.TileAlloySmelter; public class GuiAlloySmelter extends GuiBase { @@ -58,8 +58,8 @@ public class GuiAlloySmelter extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 55, 51, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 105, 51, mouseX, mouseY, TRBuilder.ProgressDirection.LEFT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 55, 51, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 105, 51, mouseX, mouseY, GuiBuilder.ProgressDirection.LEFT, layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } } diff --git a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java index d8d311fd8..4333461e3 100644 --- a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.tier1.TileAssemblingMachine; public class GuiAssemblingMachine extends GuiBase { @@ -60,7 +60,7 @@ public class GuiAssemblingMachine extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } } diff --git a/src/main/java/techreborn/client/gui/GuiAutoCrafting.java b/src/main/java/techreborn/client/gui/GuiAutoCrafting.java index 0cb1d4e76..d467ae92f 100644 --- a/src/main/java/techreborn/client/gui/GuiAutoCrafting.java +++ b/src/main/java/techreborn/client/gui/GuiAutoCrafting.java @@ -33,7 +33,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import reborncore.common.network.NetworkManager; import techreborn.packets.PacketAutoCraftingTableLock; import techreborn.tiles.tier1.TileAutoCraftingTable; @@ -87,8 +87,9 @@ public class GuiAutoCrafting extends GuiBase { renderItemStack(recipe.getRecipeOutput(), 95, 42); } final Layer layer = Layer.FOREGROUND; + + builder.drawProgressBar(this, tileAutoCraftingTable.getProgress(), tileAutoCraftingTable.getMaxProgress(), 120, 44, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 9, 26, (int) tileAutoCraftingTable.getEnergy(), (int) tileAutoCraftingTable.getMaxPower(), mouseX, mouseY, 0, layer); - builder.drawProgressBar(this, tileAutoCraftingTable.getProgress(), tileAutoCraftingTable.getMaxProgress(), 120, 44, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); } @Override @@ -109,7 +110,7 @@ public class GuiAutoCrafting extends GuiBase { @Override protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { - if (builder.isInRect(145 + getGuiLeft(), 4 + getGuiTop(), 20, 12, mouseX, mouseY)) { + if (isPointInRect(145 + getGuiLeft(), 4 + getGuiTop(), 20, 12, mouseX, mouseY)) { NetworkManager.sendToServer(new PacketAutoCraftingTableLock(tileAutoCraftingTable, !tileAutoCraftingTable.locked)); return; } diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index 2c3cf00bb..c99760eff 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -32,7 +32,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import reborncore.ClientProxy; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; @@ -82,7 +82,7 @@ public class GuiBlastFurnace extends GuiBase { this.hasMultiBlock = tile.getCachedHeat() != 0; final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 71, 40, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 71, 40, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawBigHeatBar(this, 31, 71, tile.getCachedHeat(), 3230, layer); if (hasMultiBlock) { diff --git a/src/main/java/techreborn/client/gui/GuiCentrifuge.java b/src/main/java/techreborn/client/gui/GuiCentrifuge.java index 7a540676d..8cdf13e00 100644 --- a/src/main/java/techreborn/client/gui/GuiCentrifuge.java +++ b/src/main/java/techreborn/client/gui/GuiCentrifuge.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.TileIndustrialCentrifuge; public class GuiCentrifuge extends GuiBase { @@ -61,7 +61,7 @@ public class GuiCentrifuge extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final Layer layer = Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 61, 47, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 61, 47, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } } diff --git a/src/main/java/techreborn/client/gui/GuiChemicalReactor.java b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java index 771eecc62..e29d950c7 100644 --- a/src/main/java/techreborn/client/gui/GuiChemicalReactor.java +++ b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.tier1.TileChemicalReactor; public class GuiChemicalReactor extends GuiBase { @@ -57,8 +57,8 @@ public class GuiChemicalReactor extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 55, 51, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 105, 51, mouseX, mouseY, TRBuilder.ProgressDirection.LEFT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 55, 51, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 105, 51, mouseX, mouseY, GuiBuilder.ProgressDirection.LEFT, layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } } diff --git a/src/main/java/techreborn/client/gui/GuiCompressor.java b/src/main/java/techreborn/client/gui/GuiCompressor.java index 183052067..34a0b0452 100644 --- a/src/main/java/techreborn/client/gui/GuiCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiCompressor.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.tier1.TileCompressor; public class GuiCompressor extends GuiBase { @@ -56,7 +56,7 @@ public class GuiCompressor extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - this.builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + this.builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); this.builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } } diff --git a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java index b7934806c..5236fe6b6 100644 --- a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java @@ -28,7 +28,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.generator.TileDieselGenerator; @SideOnly(Side.CLIENT) @@ -56,7 +56,7 @@ public class GuiDieselGenerator extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(10), 100, 83, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(10), 100, 83, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 130, 28, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); builder.drawTank(this, 44, 25, mouseX, mouseY, tile.tank.getFluid(), tile.tank.getCapacity(), tile.tank.isEmpty(), layer); diff --git a/src/main/java/techreborn/client/gui/GuiDistillationTower.java b/src/main/java/techreborn/client/gui/GuiDistillationTower.java index 946cbc3bb..4a33335b3 100644 --- a/src/main/java/techreborn/client/gui/GuiDistillationTower.java +++ b/src/main/java/techreborn/client/gui/GuiDistillationTower.java @@ -32,7 +32,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import reborncore.ClientProxy; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; @@ -80,7 +80,7 @@ public class GuiDistillationTower extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 55, 40, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 55, 40, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); if (tile.getMutliBlock()) { addHologramButton(6, 4, 212, layer); diff --git a/src/main/java/techreborn/client/gui/GuiElectricFurnace.java b/src/main/java/techreborn/client/gui/GuiElectricFurnace.java index c869d78ba..3075a55ec 100644 --- a/src/main/java/techreborn/client/gui/GuiElectricFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiElectricFurnace.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.tier1.TileElectricFurnace; public class GuiElectricFurnace extends GuiBase { @@ -56,7 +56,7 @@ public class GuiElectricFurnace extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); Layer layer = Layer.FOREGROUND; - builder.drawProgressBar(this, tile.gaugeProgressScaled(100), 100, 76, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.gaugeProgressScaled(100), 100, 76, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } } diff --git a/src/main/java/techreborn/client/gui/GuiExtractor.java b/src/main/java/techreborn/client/gui/GuiExtractor.java index 0e6933865..de6978569 100644 --- a/src/main/java/techreborn/client/gui/GuiExtractor.java +++ b/src/main/java/techreborn/client/gui/GuiExtractor.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.tier1.TileExtractor; public class GuiExtractor extends GuiBase { @@ -56,7 +56,7 @@ public class GuiExtractor extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } } diff --git a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java index d80535467..82b8b16fe 100644 --- a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java +++ b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java @@ -31,7 +31,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import reborncore.ClientProxy; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; @@ -98,8 +98,8 @@ public class GuiFluidReplicator extends GuiBase { final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; builder.drawTank(this, 99, 25, mouseX, mouseY, tile.tank.getFluid(), tile.tank.getCapacity(), tile.tank.isEmpty(), layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); if (tile.getMultiBlock()) { addHologramButton(6, 4, 212, layer); builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 65b24be65..9df71b97a 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -31,7 +31,7 @@ import net.minecraft.util.math.BlockPos; import org.apache.commons.lang3.tuple.Pair; import reborncore.ClientProxy; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; @@ -81,8 +81,8 @@ public class GuiFusionReactor extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 55, 51, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 105, 51, mouseX, mouseY, TRBuilder.ProgressDirection.LEFT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 55, 51, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 105, 51, mouseX, mouseY, GuiBuilder.ProgressDirection.LEFT, layer); if (tile.getCoilStatus() > 0) { addHologramButton(6, 4, 212, layer); builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); diff --git a/src/main/java/techreborn/client/gui/GuiGasTurbine.java b/src/main/java/techreborn/client/gui/GuiGasTurbine.java index eaae8e3af..416036989 100644 --- a/src/main/java/techreborn/client/gui/GuiGasTurbine.java +++ b/src/main/java/techreborn/client/gui/GuiGasTurbine.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.generator.TileGasTurbine; public class GuiGasTurbine extends GuiBase { @@ -53,7 +53,7 @@ public class GuiGasTurbine extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(10), 100, 83, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(10), 100, 83, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 130, 28, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); builder.drawTank(this, 44, 25, mouseX, mouseY, tile.tank.getFluid(), tile.tank.getCapacity(), tile.tank.isEmpty(), layer); diff --git a/src/main/java/techreborn/client/gui/GuiGrinder.java b/src/main/java/techreborn/client/gui/GuiGrinder.java index 3b7cfedac..950a71676 100644 --- a/src/main/java/techreborn/client/gui/GuiGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiGrinder.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.tier1.TileGrinder; public class GuiGrinder extends GuiBase { @@ -56,7 +56,7 @@ public class GuiGrinder extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } } diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index b6523753b..a4929af18 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -31,7 +31,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import reborncore.ClientProxy; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; @@ -83,7 +83,7 @@ public class GuiImplosionCompressor extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 71, 40, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 71, 40, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); if (tile.getMutliBlock()) { addHologramButton(6, 4, 212, layer); diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java index a6d9dbe8f..3128657ac 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.tier1.TileIndustrialElectrolyzer; public class GuiIndustrialElectrolyzer extends GuiBase { @@ -58,7 +58,7 @@ public class GuiIndustrialElectrolyzer extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 84, 52, mouseX, mouseY, TRBuilder.ProgressDirection.UP, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 84, 52, mouseX, mouseY, GuiBuilder.ProgressDirection.UP, layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java index f97549ad2..780c52483 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java @@ -32,7 +32,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import reborncore.ClientProxy; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; @@ -85,7 +85,7 @@ public class GuiIndustrialGrinder extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final Layer layer = Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 105, 47, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 105, 47, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawTank(this, 53, 25, mouseX, mouseY, tile.tank.getFluid(), tile.tank.getCapacity(), tile.tank.isEmpty(), layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); if (tile.getMutliBlock()) { diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index 9af1dec5b..b06750fce 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -32,7 +32,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import reborncore.ClientProxy; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; @@ -84,7 +84,7 @@ public class GuiIndustrialSawmill extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final Layer layer = Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 105, 47, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 105, 47, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawTank(this, 53, 25, mouseX, mouseY, tile.tank.getFluid(), tile.tank.getCapacity(), tile.tank.isEmpty(), layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); if (tile.getMutliBlock()) { diff --git a/src/main/java/techreborn/client/gui/GuiIronFurnace.java b/src/main/java/techreborn/client/gui/GuiIronFurnace.java index 7a38ac091..17970882f 100644 --- a/src/main/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiIronFurnace.java @@ -48,10 +48,10 @@ public class GuiIronFurnace extends GuiBase { } @Override - protected void drawGuiContainerBackgroundLayer(final float p_146976_1_, final int p_146976_2_, final int p_146976_3_) { + protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { drawDefaultBackground(); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - builder.drawSlotTab(this, guiLeft, guiTop, p_146976_2_, p_146976_3_, upgrades, new ItemStack(ModItems.WRENCH)); + builder.drawSlotTab(this, guiLeft - 24, guiTop + 6, new ItemStack(ModItems.WRENCH)); mc.getTextureManager().bindTexture(GuiIronFurnace.texture); final int k = (this.width - xSize) / 2; final int l = (this.height - ySize) / 2; @@ -71,12 +71,12 @@ public class GuiIronFurnace extends GuiBase { } @Override - protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { final String name = I18n.format("tile.techreborn.iron_furnace.name"); fontRenderer.drawString(name, xSize / 2 - fontRenderer.getStringWidth(name) / 2, 6, 4210752); fontRenderer.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752); - super.drawGuiContainerForegroundLayer(p_146979_1_, p_146979_2_); + super.drawGuiContainerForegroundLayer(mouseX, mouseY); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiMatterFabricator.java b/src/main/java/techreborn/client/gui/GuiMatterFabricator.java index 50865c578..4dc13f681 100644 --- a/src/main/java/techreborn/client/gui/GuiMatterFabricator.java +++ b/src/main/java/techreborn/client/gui/GuiMatterFabricator.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.TileMatterFabricator; public class GuiMatterFabricator extends GuiBase { @@ -60,7 +60,7 @@ public class GuiMatterFabricator extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final Layer layer = Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 83, 41, mouseX, mouseY, TRBuilder.ProgressDirection.DOWN, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 83, 41, mouseX, mouseY, GuiBuilder.ProgressDirection.DOWN, layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } } diff --git a/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java b/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java index a5e510489..efe6cbd64 100644 --- a/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java @@ -28,7 +28,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.generator.TilePlasmaGenerator; /** @@ -65,7 +65,7 @@ public class GuiPlasmaGenerator extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(10), 100, 83, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(10), 100, 83, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 130, 28, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); builder.drawTank(this, 44, 25, mouseX, mouseY, tile.tank.getFluid(), tile.tank.getCapacity(), tile.tank.isEmpty(), layer); diff --git a/src/main/java/techreborn/client/gui/GuiRecycler.java b/src/main/java/techreborn/client/gui/GuiRecycler.java index 1b652cf5b..7d55fd85a 100644 --- a/src/main/java/techreborn/client/gui/GuiRecycler.java +++ b/src/main/java/techreborn/client/gui/GuiRecycler.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.tier1.TileRecycler; public class GuiRecycler extends GuiBase { @@ -54,7 +54,7 @@ public class GuiRecycler extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.gaugeProgressScaled(100), 100, 76, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.gaugeProgressScaled(100), 100, 76, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } } diff --git a/src/main/java/techreborn/client/gui/GuiRollingMachine.java b/src/main/java/techreborn/client/gui/GuiRollingMachine.java index e5d27e88c..81f26515e 100644 --- a/src/main/java/techreborn/client/gui/GuiRollingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiRollingMachine.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import reborncore.common.network.NetworkManager; import techreborn.packets.PacketRollingMachineLock; import techreborn.tiles.tier1.TileRollingMachine; @@ -70,13 +70,13 @@ public class GuiRollingMachine extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, rollingMachine.getProgressScaled(100), 100, 92, 43, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, rollingMachine.getProgressScaled(100), 100, 92, 43, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 9, 17, (int) rollingMachine.getEnergy(), (int) rollingMachine.getMaxPower(), mouseX, mouseY, 0, layer); } @Override protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { - if(builder.isInRect(130 + getGuiLeft(), 4 + getGuiTop(), 20, 12, mouseX, mouseY)){ + if(isPointInRect(130 + getGuiLeft(), 4 + getGuiTop(), 20, 12, mouseX, mouseY)){ NetworkManager.sendToServer(new PacketRollingMachineLock(rollingMachine, !rollingMachine.locked)); return; } diff --git a/src/main/java/techreborn/client/gui/GuiScrapboxinator.java b/src/main/java/techreborn/client/gui/GuiScrapboxinator.java index 34db51ac3..a22cedb5e 100644 --- a/src/main/java/techreborn/client/gui/GuiScrapboxinator.java +++ b/src/main/java/techreborn/client/gui/GuiScrapboxinator.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.tier1.TileScrapboxinator; public class GuiScrapboxinator extends GuiBase { @@ -58,7 +58,7 @@ public class GuiScrapboxinator extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } } diff --git a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java index 6b6739fbf..76fbd8fe1 100644 --- a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.generator.TileSemiFluidGenerator; public class GuiSemifluidGenerator extends GuiBase { @@ -53,7 +53,7 @@ public class GuiSemifluidGenerator extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(10), 100, 83, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(10), 100, 83, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 130, 28, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); builder.drawTank(this, 44, 25, mouseX, mouseY, tile.tank.getFluid(), tile.tank.getCapacity(), tile.tank.isEmpty(), layer); diff --git a/src/main/java/techreborn/client/gui/GuiThermalGenerator.java b/src/main/java/techreborn/client/gui/GuiThermalGenerator.java index ee343d918..c931382fa 100644 --- a/src/main/java/techreborn/client/gui/GuiThermalGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiThermalGenerator.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import techreborn.tiles.generator.TileThermalGenerator; public class GuiThermalGenerator extends GuiBase { @@ -53,7 +53,7 @@ public class GuiThermalGenerator extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(10), 100, 83, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(10), 100, 83, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 130, 28, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); builder.drawTank(this, 44, 25, mouseX, mouseY, tile.tank.getFluid(), tile.tank.getCapacity(), tile.tank.isEmpty(), layer); diff --git a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java index 9a0b40a44..d86ebfc73 100644 --- a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java +++ b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java @@ -30,7 +30,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import reborncore.ClientProxy; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; @@ -77,7 +77,7 @@ public class GuiVacuumFreezer extends GuiBase { super.drawGuiContainerForegroundLayer(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); if (tile.getMultiBlock()) { addHologramButton(6, 4, 212, layer); diff --git a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java index ed59ae9b9..26535e17a 100644 --- a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java @@ -31,8 +31,9 @@ import mezz.jei.api.gui.IDrawableStatic; import net.minecraft.client.Minecraft; import reborncore.common.powerSystem.PowerSystem; import techreborn.api.recipe.machines.AlloySmelterRecipe; -import reborncore.client.gui.builder.TRBuilder; import techreborn.compat.jei.BaseRecipeWrapper; +import reborncore.client.guibuilder.GuiBuilder; +import reborncore.client.guibuilder.GuiBuilder.ProgressDirection; import javax.annotation.Nonnull; @@ -40,19 +41,21 @@ public class AlloySmelterRecipeWrapper extends BaseRecipeWrapper CentrifugeRecipe baseRecipe) { super(baseRecipe); IGuiHelper guiHelper = jeiHelpers.getGuiHelper(); - IDrawableStatic progressStatic = guiHelper.createDrawable(TRBuilder.GUI_SHEET, 100, 151, 16, 10); + ProgressDirection right = ProgressDirection.RIGHT; + IDrawableStatic progressStatic = guiHelper.createDrawable(GuiBuilder.defaultTextureSheet, right.xActive, + right.yActive, right.width, right.height); int ticksPerCycle = baseRecipe.tickTime() / 4; // speed up the animation diff --git a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java index 76caa88de..b2adcca03 100644 --- a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java @@ -31,7 +31,8 @@ import mezz.jei.api.gui.IDrawableStatic; import net.minecraft.client.Minecraft; import reborncore.common.powerSystem.PowerSystem; import techreborn.api.recipe.machines.ChemicalReactorRecipe; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; +import reborncore.client.guibuilder.GuiBuilder.ProgressDirection; import techreborn.compat.jei.BaseRecipeWrapper; import javax.annotation.Nonnull; @@ -47,8 +48,12 @@ public class ChemicalReactorRecipeWrapper extends BaseRecipeWrapper CompressorRecipe baseRecipe) { super(baseRecipe); IGuiHelper guiHelper = jeiHelpers.getGuiHelper(); - IDrawableStatic progressStatic = guiHelper.createDrawable(TRBuilder.GUI_SHEET, 100, 151, 16, 10); + ProgressDirection right = ProgressDirection.RIGHT; + IDrawableStatic progressStatic = guiHelper.createDrawable(GuiBuilder.defaultTextureSheet, right.xActive, + right.yActive, right.width, right.height); int ticksPerCycle = baseRecipe.tickTime(); // speed up the animation diff --git a/src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeWrapper.java b/src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeWrapper.java index 61249906e..1b91abf00 100644 --- a/src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeWrapper.java @@ -31,7 +31,8 @@ import mezz.jei.api.gui.IDrawableStatic; import net.minecraft.client.Minecraft; import reborncore.common.powerSystem.PowerSystem; import techreborn.api.recipe.machines.DistillationTowerRecipe; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; +import reborncore.client.guibuilder.GuiBuilder.ProgressDirection; import techreborn.compat.jei.BaseRecipeWrapper; import javax.annotation.Nonnull; @@ -51,7 +52,9 @@ public class DistillationTowerRecipeWrapper extends BaseRecipeWrapper { ExtractorRecipe baseRecipe) { super(baseRecipe); IGuiHelper guiHelper = jeiHelpers.getGuiHelper(); - IDrawableStatic progressStatic = guiHelper.createDrawable(TRBuilder.GUI_SHEET, 100, 151, 16, 10); + ProgressDirection right = ProgressDirection.RIGHT; + IDrawableStatic progressStatic = guiHelper.createDrawable(GuiBuilder.defaultTextureSheet, right.xActive, + right.yActive, right.width, right.height); int ticksPerCycle = baseRecipe.tickTime(); // speed up the animation diff --git a/src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.java b/src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.java index c67ce177e..a66c23ad4 100644 --- a/src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.java @@ -36,7 +36,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import techreborn.api.fluidreplicator.FluidReplicatorRecipe; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; +import reborncore.client.guibuilder.GuiBuilder.ProgressDirection; import techreborn.init.ModItems; import javax.annotation.Nonnull; @@ -52,7 +53,9 @@ public class FluidReplicatorRecipeWrapper implements IRecipeWrapper { public FluidReplicatorRecipeWrapper(@Nonnull IJeiHelpers jeiHelpers, @Nonnull FluidReplicatorRecipe recipe) { this.recipe = recipe; IGuiHelper guiHelper = jeiHelpers.getGuiHelper(); - IDrawableStatic progressStatic = guiHelper.createDrawable(TRBuilder.GUI_SHEET, 100, 151, 16, 10); + ProgressDirection right = ProgressDirection.RIGHT; + IDrawableStatic progressStatic = guiHelper.createDrawable(GuiBuilder.defaultTextureSheet, right.xActive, + right.yActive, right.width, right.height); int ticksPerCycle = recipe.getTickTime(); this.progress = guiHelper.createAnimatedDrawable(progressStatic, ticksPerCycle, IDrawableAnimated.StartDirection.LEFT, false); diff --git a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java index 9f9164734..3e765ae7f 100644 --- a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java @@ -30,7 +30,8 @@ import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.gui.IDrawableStatic; import net.minecraft.client.Minecraft; import techreborn.api.recipe.machines.GrinderRecipe; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; +import reborncore.client.guibuilder.GuiBuilder.ProgressDirection; import techreborn.compat.jei.BaseRecipeWrapper; import javax.annotation.Nonnull; @@ -45,7 +46,9 @@ public class GrinderRecipeWrapper extends BaseRecipeWrapper { GrinderRecipe baseRecipe) { super(baseRecipe); IGuiHelper guiHelper = jeiHelpers.getGuiHelper(); - IDrawableStatic progressStatic = guiHelper.createDrawable(TRBuilder.GUI_SHEET, 100, 151, 16, 10); + ProgressDirection right = ProgressDirection.RIGHT; + IDrawableStatic progressStatic = guiHelper.createDrawable(GuiBuilder.defaultTextureSheet, right.xActive, + right.yActive, right.width, right.height); int ticksPerCycle = baseRecipe.tickTime(); // speed up the animation diff --git a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java index 37a6bef29..80c367309 100644 --- a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java @@ -30,7 +30,8 @@ import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.gui.IDrawableStatic; import net.minecraft.client.Minecraft; import techreborn.api.recipe.machines.ImplosionCompressorRecipe; -import reborncore.client.gui.builder.TRBuilder; +import reborncore.client.guibuilder.GuiBuilder; +import reborncore.client.guibuilder.GuiBuilder.ProgressDirection; import techreborn.compat.jei.BaseRecipeWrapper; import javax.annotation.Nonnull; @@ -45,7 +46,9 @@ public class ImplosionCompressorRecipeWrapper extends BaseRecipeWrapper