Gui tabs cleanup

This commit is contained in:
modmuss50 2020-01-20 21:56:05 +00:00
parent 30a9aa2324
commit 3ca34f79a5
13 changed files with 273 additions and 284 deletions

View file

@ -70,7 +70,7 @@ public class GuiAESU extends GuiBase<BuiltContainer> {
super.drawForeground(mouseX, mouseY); super.drawForeground(mouseX, mouseY);
final Layer layer = Layer.FOREGROUND; final Layer layer = Layer.FOREGROUND;
if(GuiBase.slotConfigType == SlotConfigType.NONE){ if(!isTabOpen()){
RenderSystem.pushMatrix(); RenderSystem.pushMatrix();
RenderSystem.scaled(0.6, 0.6, 1); RenderSystem.scaled(0.6, 0.6, 1);
drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) blockEntity.getEnergy()) + "/" drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) blockEntity.getEnergy()) + "/"

View file

@ -54,7 +54,7 @@ public class GuiBatbox extends GuiBase<BuiltContainer> {
super.drawForeground(mouseX, mouseY); super.drawForeground(mouseX, mouseY);
final Layer layer = Layer.FOREGROUND; final Layer layer = Layer.FOREGROUND;
if(GuiBase.slotConfigType == SlotConfigType.NONE){ if(!isTabOpen()){
RenderSystem.pushMatrix(); RenderSystem.pushMatrix();
RenderSystem.scaled(0.6, 0.6, 5); RenderSystem.scaled(0.6, 0.6, 5);
drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) blockEntity.getEnergy()) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) blockEntity.getMaxPower()) + " " + PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer); drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) blockEntity.getEnergy()) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) blockEntity.getMaxPower()) + " " + PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer);

View file

@ -34,8 +34,8 @@ import reborncore.client.gui.builder.GuiBase;
import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.builder.widget.GuiButtonExtended;
import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.client.gui.guibuilder.GuiBuilder;
import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.Multiblock;
import techreborn.init.TRContent;
import techreborn.blockentity.machine.multiblock.IndustrialBlastFurnaceBlockEntity; import techreborn.blockentity.machine.multiblock.IndustrialBlastFurnaceBlockEntity;
import techreborn.init.TRContent;
public class GuiBlastFurnace extends GuiBase<BuiltContainer> { public class GuiBlastFurnace extends GuiBase<BuiltContainer> {
@ -93,7 +93,7 @@ public class GuiBlastFurnace extends GuiBase<BuiltContainer> {
} }
public void onClick(GuiButtonExtended button, Double x, Double y){ public void onClick(GuiButtonExtended button, Double x, Double y){
if (GuiBase.slotConfigType == SlotConfigType.NONE) { if (isTabOpen()) return;
if (blockEntity.renderMultiblock == null) { if (blockEntity.renderMultiblock == null) {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.
@ -143,7 +143,6 @@ public class GuiBlastFurnace extends GuiBase<BuiltContainer> {
blockEntity.renderMultiblock = null; blockEntity.renderMultiblock = null;
} }
} }
}
public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) { public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) {
multiblock.addComponent(new BlockPos(x - Direction.byId(blockEntity.getFacingInt()).getOffsetX() * 2, multiblock.addComponent(new BlockPos(x - Direction.byId(blockEntity.getFacingInt()).getOffsetX() * 2,

View file

@ -59,9 +59,8 @@ public class GuiChunkLoader extends GuiBase<BuiltContainer> {
super.drawBackground(partialTicks, mouseX, mouseY); super.drawBackground(partialTicks, mouseX, mouseY);
final Layer layer = Layer.BACKGROUND; final Layer layer = Layer.BACKGROUND;
if (GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE) { if (isTabOpen()) return;
return;
}
String text = "Radius: " + blockEntity.getRadius(); String text = "Radius: " + blockEntity.getRadius();
drawCentredString(text, 25, 4210752, layer); drawCentredString(text, 25, 4210752, layer);
} }

View file

@ -34,8 +34,8 @@ import reborncore.client.gui.builder.GuiBase;
import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.builder.widget.GuiButtonExtended;
import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.client.gui.guibuilder.GuiBuilder;
import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.Multiblock;
import techreborn.init.TRContent;
import techreborn.blockentity.machine.multiblock.DistillationTowerBlockEntity; import techreborn.blockentity.machine.multiblock.DistillationTowerBlockEntity;
import techreborn.init.TRContent;
public class GuiDistillationTower extends GuiBase<BuiltContainer> { public class GuiDistillationTower extends GuiBase<BuiltContainer> {
@ -82,7 +82,7 @@ public class GuiDistillationTower extends GuiBase<BuiltContainer> {
} }
public void onClick(GuiButtonExtended button, Double x, Double y){ public void onClick(GuiButtonExtended button, Double x, Double y){
if (GuiBase.slotConfigType == SlotConfigType.NONE) { if (isTabOpen()) return;
if (blockEntity.renderMultiblock == null) { if (blockEntity.renderMultiblock == null) {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.
@ -134,7 +134,6 @@ public class GuiDistillationTower extends GuiBase<BuiltContainer> {
blockEntity.renderMultiblock = null; blockEntity.renderMultiblock = null;
} }
} }
}
public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) { public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) {
multiblock.addComponent(new BlockPos(x - Direction.byId(blockEntity.getFacingInt()).getOffsetX() * 2, y, z - Direction.byId(blockEntity.getFacingInt()).getOffsetZ() * 2), blockState); multiblock.addComponent(new BlockPos(x - Direction.byId(blockEntity.getFacingInt()).getOffsetX() * 2, y, z - Direction.byId(blockEntity.getFacingInt()).getOffsetZ() * 2), blockState);

View file

@ -33,8 +33,8 @@ import reborncore.client.gui.builder.GuiBase;
import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.builder.widget.GuiButtonExtended;
import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.client.gui.guibuilder.GuiBuilder;
import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.Multiblock;
import techreborn.init.TRContent;
import techreborn.blockentity.machine.multiblock.FluidReplicatorBlockEntity; import techreborn.blockentity.machine.multiblock.FluidReplicatorBlockEntity;
import techreborn.init.TRContent;
/** /**
* @author drcrazy * @author drcrazy
@ -87,7 +87,7 @@ public class GuiFluidReplicator extends GuiBase<BuiltContainer> {
// GuiScreen // GuiScreen
public void onClick(GuiButtonExtended button, Double x, Double y){ public void onClick(GuiButtonExtended button, Double x, Double y){
if (GuiBase.slotConfigType == SlotConfigType.NONE) { if (isTabOpen()) return;
if (blockEntity.renderMultiblock == null) { if (blockEntity.renderMultiblock == null) {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.
@ -109,7 +109,6 @@ public class GuiFluidReplicator extends GuiBase<BuiltContainer> {
blockEntity.renderMultiblock = null; blockEntity.renderMultiblock = null;
} }
} }
}
public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) { public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) {
multiblock.addComponent(new BlockPos( multiblock.addComponent(new BlockPos(

View file

@ -115,14 +115,13 @@ public class GuiFusionReactor extends GuiBase<BuiltContainer> {
} }
public void hologramToggle(GuiButtonExtended button, double x, double y){ public void hologramToggle(GuiButtonExtended button, double x, double y){
if (GuiBase.slotConfigType == SlotConfigType.NONE) { if (isTabOpen()) return;
if (blockEntity.renderMultiblock == null) { if (blockEntity.renderMultiblock == null) {
updateMultiBlockRender(); updateMultiBlockRender();
} else { } else {
blockEntity.renderMultiblock = null; blockEntity.renderMultiblock = null;
} }
} }
}
private void sendSizeChange(int sizeDelta){ private void sendSizeChange(int sizeDelta){
NetworkManager.sendToServer(ServerboundPackets.createPacketFusionControlSize(sizeDelta, blockEntity.getPos())); NetworkManager.sendToServer(ServerboundPackets.createPacketFusionControlSize(sizeDelta, blockEntity.getPos()));

View file

@ -101,7 +101,7 @@ public class GuiGreenhouseController extends GuiBase<BuiltContainer> {
} }
public void onClick(GuiButtonExtended button, Double x, Double y) { public void onClick(GuiButtonExtended button, Double x, Double y) {
if (GuiBase.slotConfigType == SlotConfigType.NONE) { if (isTabOpen()) return;
if (blockEntity.renderMultiblock == null) { if (blockEntity.renderMultiblock == null) {
final Multiblock multiblock = new Multiblock(); final Multiblock multiblock = new Multiblock();
BlockState lamp = TRContent.Machine.LAMP_INCANDESCENT.block.getDefaultState().with(Properties.FACING, Direction.DOWN); BlockState lamp = TRContent.Machine.LAMP_INCANDESCENT.block.getDefaultState().with(Properties.FACING, Direction.DOWN);
@ -128,7 +128,6 @@ public class GuiGreenhouseController extends GuiBase<BuiltContainer> {
blockEntity.renderMultiblock = null; blockEntity.renderMultiblock = null;
} }
} }
}
public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) { public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) {
multiblock.addComponent(new BlockPos( multiblock.addComponent(new BlockPos(

View file

@ -33,8 +33,8 @@ import reborncore.client.gui.builder.GuiBase;
import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.builder.widget.GuiButtonExtended;
import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.client.gui.guibuilder.GuiBuilder;
import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.Multiblock;
import techreborn.init.TRContent;
import techreborn.blockentity.machine.multiblock.ImplosionCompressorBlockEntity; import techreborn.blockentity.machine.multiblock.ImplosionCompressorBlockEntity;
import techreborn.init.TRContent;
public class GuiImplosionCompressor extends GuiBase<BuiltContainer> { public class GuiImplosionCompressor extends GuiBase<BuiltContainer> {
@ -84,7 +84,7 @@ public class GuiImplosionCompressor extends GuiBase<BuiltContainer> {
} }
public void onClick(GuiButtonExtended button, Double mouseX, Double mouseY){ public void onClick(GuiButtonExtended button, Double mouseX, Double mouseY){
if (GuiBase.slotConfigType == SlotConfigType.NONE) { if (isTabOpen()) return;
if (blockEntity.renderMultiblock == null) { if (blockEntity.renderMultiblock == null) {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.
@ -105,7 +105,6 @@ public class GuiImplosionCompressor extends GuiBase<BuiltContainer> {
blockEntity.renderMultiblock = null; blockEntity.renderMultiblock = null;
} }
} }
}
public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) { public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) {
multiblock.addComponent(new BlockPos(x, y, z), blockState); multiblock.addComponent(new BlockPos(x, y, z), blockState);

View file

@ -34,8 +34,8 @@ import reborncore.client.gui.builder.GuiBase;
import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.builder.widget.GuiButtonExtended;
import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.client.gui.guibuilder.GuiBuilder;
import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.Multiblock;
import techreborn.init.TRContent;
import techreborn.blockentity.machine.multiblock.IndustrialGrinderBlockEntity; import techreborn.blockentity.machine.multiblock.IndustrialGrinderBlockEntity;
import techreborn.init.TRContent;
public class GuiIndustrialGrinder extends GuiBase<BuiltContainer> { public class GuiIndustrialGrinder extends GuiBase<BuiltContainer> {
@ -89,7 +89,7 @@ public class GuiIndustrialGrinder extends GuiBase<BuiltContainer> {
} }
public void onClick(GuiButtonExtended button, double mouseX, double mouseY){ public void onClick(GuiButtonExtended button, double mouseX, double mouseY){
if (GuiBase.slotConfigType == SlotConfigType.NONE) { if (isTabOpen()) return;
if (blockEntity.renderMultiblock == null) { if (blockEntity.renderMultiblock == null) {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.
@ -134,7 +134,6 @@ public class GuiIndustrialGrinder extends GuiBase<BuiltContainer> {
blockEntity.renderMultiblock = null; blockEntity.renderMultiblock = null;
} }
} }
}
public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) { public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) {
multiblock.addComponent(new BlockPos( multiblock.addComponent(new BlockPos(

View file

@ -94,7 +94,7 @@ public class GuiIndustrialSawmill extends GuiBase<BuiltContainer> {
} }
public void onClick(GuiButtonExtended button, Double mouseX, Double mouseY){ public void onClick(GuiButtonExtended button, Double mouseX, Double mouseY){
if (GuiBase.slotConfigType == SlotConfigType.NONE) { if (isTabOpen()) return;
if (blockEntity.renderMultiblock == null) { if (blockEntity.renderMultiblock == null) {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.
@ -139,7 +139,6 @@ public class GuiIndustrialSawmill extends GuiBase<BuiltContainer> {
blockEntity.renderMultiblock = null; blockEntity.renderMultiblock = null;
} }
} }
}
public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) { public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) {
multiblock.addComponent(new BlockPos( multiblock.addComponent(new BlockPos(

View file

@ -55,7 +55,7 @@ public class GuiMFE extends GuiBase<BuiltContainer> {
super.drawForeground(mouseX, mouseY); super.drawForeground(mouseX, mouseY);
final Layer layer = Layer.FOREGROUND; final Layer layer = Layer.FOREGROUND;
if(GuiBase.slotConfigType == SlotConfigType.NONE){ if(!isTabOpen()){
RenderSystem.pushMatrix(); RenderSystem.pushMatrix();
RenderSystem.scaled(0.6, 0.6, 1); RenderSystem.scaled(0.6, 0.6, 1);
drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) mfe.getEnergy()) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) mfe.getMaxPower()) + " " + PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer); drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) mfe.getEnergy()) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) mfe.getMaxPower()) + " " + PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer);

View file

@ -27,14 +27,13 @@ package techreborn.client.gui;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.GuiBase;
import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.builder.widget.GuiButtonExtended;
import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.client.gui.guibuilder.GuiBuilder;
import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.Multiblock;
import techreborn.init.TRContent;
import techreborn.blockentity.machine.multiblock.VacuumFreezerBlockEntity; import techreborn.blockentity.machine.multiblock.VacuumFreezerBlockEntity;
import techreborn.init.TRContent;
public class GuiVacuumFreezer extends GuiBase<BuiltContainer> { public class GuiVacuumFreezer extends GuiBase<BuiltContainer> {
@ -81,7 +80,7 @@ public class GuiVacuumFreezer extends GuiBase<BuiltContainer> {
} }
public void onClick(GuiButtonExtended button, Double mouseX, Double mouseY){ public void onClick(GuiButtonExtended button, Double mouseX, Double mouseY){
if (GuiBase.slotConfigType == SlotConfigType.NONE) { if (isTabOpen()) return;
if (blockEntity.renderMultiblock == null) { if (blockEntity.renderMultiblock == null) {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.
@ -124,7 +123,6 @@ public class GuiVacuumFreezer extends GuiBase<BuiltContainer> {
blockEntity.renderMultiblock = null; blockEntity.renderMultiblock = null;
} }
} }
}
public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) { public void addComponent(final int x, final int y, final int z, final BlockState blockState, final Multiblock multiblock) {
multiblock.addComponent(new BlockPos(x, y, z), blockState); multiblock.addComponent(new BlockPos(x, y, z), blockState);