From 53a386909280ef80d72a73bab0d5b4d89fa5ef22 Mon Sep 17 00:00:00 2001 From: Ourten Date: Sat, 7 Jan 2017 19:12:50 +0100 Subject: [PATCH] Convert MFSU and BatBox --- .../java/techreborn/client/GuiHandler.java | 8 +- .../client/container/ContainerBatbox.java | 80 ---------------- .../client/container/ContainerMFSU.java | 94 ------------------- .../java/techreborn/client/gui/GuiBatbox.java | 43 ++++----- .../java/techreborn/client/gui/GuiMFSU.java | 44 ++++----- 5 files changed, 49 insertions(+), 220 deletions(-) delete mode 100644 src/main/java/techreborn/client/container/ContainerBatbox.java delete mode 100644 src/main/java/techreborn/client/container/ContainerMFSU.java diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index dbfba45d3..cec483aa5 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -157,10 +157,10 @@ public class GuiHandler implements IGuiHandler { } else if (ID == GuiHandler.scrapboxinatorID) { return new ContainerScrapboxinator((TileScrapboxinator) world.getTileEntity(new BlockPos(x, y, z)), player); } else if (ID == GuiHandler.batboxID) { - return new ContainerBatbox((TileBatBox) world.getTileEntity(new BlockPos(x, y, z)), player); - } else if (ID == GuiHandler.mfsuID) { - return new ContainerMFSU((TileMFSU) world.getTileEntity(new BlockPos(x, y, z)), player); - } else if (ID == GuiHandler.mfeID) { + return new ContainerBuilder().player(player.inventory).inventory(8, 84).hotbar(8, 142).addInventory() + .tile((IInventory) world.getTileEntity(new BlockPos(x, y, z))).energySlot(0, 80, 17) + .energySlot(1, 80, 53).syncEnergyValue().addInventory().create(); + } else if (ID == GuiHandler.mfeID || ID == GuiHandler.mfsuID) { return new ContainerBuilder().player(player.inventory).inventory(8, 84).hotbar(8, 142).armor() .complete(44, 6).addArmor().addInventory() .tile((IInventory) world.getTileEntity(new BlockPos(x, y, z))).energySlot(0, 80, 17) diff --git a/src/main/java/techreborn/client/container/ContainerBatbox.java b/src/main/java/techreborn/client/container/ContainerBatbox.java deleted file mode 100644 index 8d934ad15..000000000 --- a/src/main/java/techreborn/client/container/ContainerBatbox.java +++ /dev/null @@ -1,80 +0,0 @@ -package techreborn.client.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IContainerListener; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.slots.BaseSlot; -import reborncore.client.gui.slots.SlotCharge; -import reborncore.common.container.RebornContainer; -import techreborn.tiles.storage.TileBatBox; - -public class ContainerBatbox extends RebornContainer { - - public int burnTime = 0; - public int totalBurnTime = 0; - public int energy; - public int tickTime; - EntityPlayer player; - TileBatBox tile; - - public ContainerBatbox(TileBatBox tile, EntityPlayer player) { - super(); - this.tile = tile; - this.player = player; - - int i; - - for (i = 0; i < 3; ++i) { - for (int j = 0; j < 9; ++j) { - this.addSlotToContainer(new BaseSlot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); - } - } - - for (i = 0; i < 9; ++i) { - this.addSlotToContainer(new BaseSlot(player.inventory, i, 8 + i * 18, 142)); - } - - this.addSlotToContainer(new SlotCharge(tile.inventory, 0, 80, 17)); - this.addSlotToContainer(new SlotCharge(tile.inventory, 1, 80, 53)); - } - - @Override - public boolean canInteractWith(EntityPlayer player) { - return true; - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - for (int i = 0; i < this.listeners.size(); i++) { - IContainerListener IContainerListener = this.listeners.get(i); - if (this.energy != (int) tile.getEnergy()) { - IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); - } - } - } - - @Override - public void addListener(IContainerListener crafting) { - super.addListener(crafting); - crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); - } - - @SideOnly(Side.CLIENT) - @Override - public void updateProgressBar(int id, int value) { - if (id == 0) { - this.burnTime = value; - } else if (id == 1) { - this.totalBurnTime = value; - } else if (id == 2) { - this.energy = value; - } - this.tile.setEnergy(energy); - } - - public int getScaledBurnTime(int i) { - return (int) (((float) burnTime / (float) totalBurnTime) * i); - } -} diff --git a/src/main/java/techreborn/client/container/ContainerMFSU.java b/src/main/java/techreborn/client/container/ContainerMFSU.java deleted file mode 100644 index a630caa82..000000000 --- a/src/main/java/techreborn/client/container/ContainerMFSU.java +++ /dev/null @@ -1,94 +0,0 @@ -package techreborn.client.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.inventory.IContainerListener; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.slots.BaseSlot; -import reborncore.client.gui.slots.SlotCharge; -import reborncore.common.container.RebornContainer; -import techreborn.tiles.storage.TileMFSU; - -public class ContainerMFSU extends RebornContainer { - - public int burnTime = 0; - public int totalBurnTime = 0; - public int energy; - public int tickTime; - EntityPlayer player; - TileMFSU tile; - private static final EntityEquipmentSlot[] equipmentSlots = new EntityEquipmentSlot[] { EntityEquipmentSlot.HEAD, EntityEquipmentSlot.CHEST, EntityEquipmentSlot.LEGS, EntityEquipmentSlot.FEET }; - - public ContainerMFSU(TileMFSU tile, EntityPlayer player) { - super(); - this.tile = tile; - this.player = player; - - int i; - - for (i = 0; i < 3; ++i) { - for (int j = 0; j < 9; ++j) { - this.addSlotToContainer(new BaseSlot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); - } - } - - for (i = 0; i < 9; ++i) { - this.addSlotToContainer(new BaseSlot(player.inventory, i, 8 + i * 18, 142)); - } - for (int k = 0; k < 4; k++) { - final EntityEquipmentSlot slot = equipmentSlots[k]; - addSlotToContainer(new BaseSlot(player.inventory, player.inventory.getSizeInventory() - 2 - k, 44, 6 + k * 19) { - @Override - public int getSlotStackLimit() { return 1; } - - @Override - public boolean isItemValid(ItemStack stack) { - return stack != null && stack.getItem().isValidArmor(stack, slot, player); - } - }); - } - this.addSlotToContainer(new SlotCharge(tile.inventory, 0, 80, 17)); - this.addSlotToContainer(new SlotCharge(tile.inventory, 1, 80, 53)); - } - - @Override - public boolean canInteractWith(EntityPlayer player) { - return true; - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - for (int i = 0; i < this.listeners.size(); i++) { - IContainerListener IContainerListener = this.listeners.get(i); - if (this.energy != (int) tile.getEnergy()) { - IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); - } - } - } - - @Override - public void addListener(IContainerListener crafting) { - super.addListener(crafting); - crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); - } - - @SideOnly(Side.CLIENT) - @Override - public void updateProgressBar(int id, int value) { - if (id == 0) { - this.burnTime = value; - } else if (id == 1) { - this.totalBurnTime = value; - } else if (id == 2) { - this.energy = value; - } - this.tile.setEnergy(energy); - } - - public int getScaledBurnTime(int i) { - return (int) (((float) burnTime / (float) totalBurnTime) * i); - } -} diff --git a/src/main/java/techreborn/client/gui/GuiBatbox.java b/src/main/java/techreborn/client/gui/GuiBatbox.java index 6422f1efa..3b6ef8b2e 100644 --- a/src/main/java/techreborn/client/gui/GuiBatbox.java +++ b/src/main/java/techreborn/client/gui/GuiBatbox.java @@ -4,8 +4,10 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; + import reborncore.common.powerSystem.PowerSystem; -import techreborn.client.container.ContainerBatbox; + +import techreborn.client.container.builder.ContainerBuilder; import techreborn.tiles.storage.TileBatBox; public class GuiBatbox extends GuiContainer { @@ -14,33 +16,31 @@ public class GuiBatbox extends GuiContainer { TileBatBox generator; - ContainerBatbox containerGenerator; - - public GuiBatbox(EntityPlayer player, TileBatBox generator) { - super(new ContainerBatbox(generator, player)); + public GuiBatbox(final EntityPlayer player, final TileBatBox generator) { + super(new ContainerBuilder().player(player.inventory).inventory(8, 84).hotbar(8, 142).addInventory() + .tile(generator).energySlot(0, 80, 17).energySlot(1, 80, 53).syncEnergyValue().addInventory().create()); this.xSize = 176; this.ySize = 167; this.generator = generator; - this.containerGenerator = (ContainerBatbox) this.inventorySlots; } @Override public void initGui() { - int k = (this.width - this.xSize) / 2; - int l = (this.height - this.ySize) / 2; + final int k = (this.width - this.xSize) / 2; + final int l = (this.height - this.ySize) / 2; super.initGui(); } @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { - this.mc.getTextureManager().bindTexture(texture); - int k = (this.width - this.xSize) / 2; - int l = (this.height - this.ySize) / 2; + protected void drawGuiContainerBackgroundLayer(final float p_146976_1_, final int p_146976_2_, final int p_146976_3_) { + this.mc.getTextureManager().bindTexture(GuiBatbox.texture); + final int k = (this.width - this.xSize) / 2; + final int l = (this.height - this.ySize) / 2; this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); int j = 0; - j = generator.getEnergyScaled(24); + j = this.generator.getEnergyScaled(24); if (j > 0) { this.drawTexturedModalRect(k + 109, l + 21 + 12, 176, 0, j + 1, 16); } @@ -53,16 +53,17 @@ public class GuiBatbox extends GuiContainer { // } } - protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - String name = I18n.translateToLocal("tile.techreborn.batbox.name"); + @Override + protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { + final String name = I18n.translateToLocal("tile.techreborn.batbox.name"); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); - this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(generator.getMaxPower()), 25, this.ySize - 140, - 4210752); - this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerGenerator.energy), 25, this.ySize - 150, - 4210752); + this.ySize - 96 + 2, 4210752); + this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(this.generator.getMaxPower()), 25, this.ySize - 140, + 4210752); + this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(this.generator.getEnergy()), 25, + this.ySize - 150, 4210752); } } diff --git a/src/main/java/techreborn/client/gui/GuiMFSU.java b/src/main/java/techreborn/client/gui/GuiMFSU.java index bdde73fc9..a8784ca28 100644 --- a/src/main/java/techreborn/client/gui/GuiMFSU.java +++ b/src/main/java/techreborn/client/gui/GuiMFSU.java @@ -4,8 +4,10 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; + import reborncore.common.powerSystem.PowerSystem; -import techreborn.client.container.ContainerMFSU; + +import techreborn.client.container.builder.ContainerBuilder; import techreborn.tiles.storage.TileMFSU; /** @@ -17,33 +19,32 @@ public class GuiMFSU extends GuiContainer { TileMFSU generator; - ContainerMFSU containerGenerator; - - public GuiMFSU(EntityPlayer player, TileMFSU generator) { - super(new ContainerMFSU(generator, player)); + public GuiMFSU(final EntityPlayer player, final TileMFSU generator) { + super(new ContainerBuilder().player(player.inventory).inventory(8, 84).hotbar(8, 142).armor().complete(44, 6) + .addArmor().addInventory().tile(generator).energySlot(0, 80, 17).energySlot(1, 80, 53).syncEnergyValue() + .addInventory().create()); this.xSize = 176; this.ySize = 167; this.generator = generator; - this.containerGenerator = (ContainerMFSU) this.inventorySlots; } @Override public void initGui() { - int k = (this.width - this.xSize) / 2; - int l = (this.height - this.ySize) / 2; + final int k = (this.width - this.xSize) / 2; + final int l = (this.height - this.ySize) / 2; super.initGui(); } @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { - this.mc.getTextureManager().bindTexture(texture); - int k = (this.width - this.xSize) / 2; - int l = (this.height - this.ySize) / 2; + protected void drawGuiContainerBackgroundLayer(final float p_146976_1_, final int p_146976_2_, final int p_146976_3_) { + this.mc.getTextureManager().bindTexture(GuiMFSU.texture); + final int k = (this.width - this.xSize) / 2; + final int l = (this.height - this.ySize) / 2; this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); int j = 0; - j = generator.getEnergyScaled(24); + j = this.generator.getEnergyScaled(24); if (j > 0) { this.drawTexturedModalRect(k + 109, l + 21 + 12, 176, 0, j + 1, 16); } @@ -56,16 +57,17 @@ public class GuiMFSU extends GuiContainer { // } } - protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - String name = I18n.translateToLocal("tile.techreborn.mfsu.name"); + @Override + protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { + final String name = I18n.translateToLocal("tile.techreborn.mfsu.name"); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), this.xSize - 60, - this.ySize - 96 + 2, 4210752); - this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(generator.getMaxPower()), 110, this.ySize - 150, - 4210752); - this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerGenerator.energy), 110, this.ySize - 160, - 4210752); + this.ySize - 96 + 2, 4210752); + this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(this.generator.getMaxPower()), 110, this.ySize - 150, + 4210752); + this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(this.generator.getEnergy()), 110, + this.ySize - 160, 4210752); } }