diff options
Diffstat (limited to 'src/Java/miscutil/core/gui')
| -rw-r--r-- | src/Java/miscutil/core/gui/ContainerHeliumGenerator.java | 133 | ||||
| -rw-r--r-- | src/Java/miscutil/core/gui/GUIHeliumGenerator.java | 8 |
2 files changed, 60 insertions, 81 deletions
diff --git a/src/Java/miscutil/core/gui/ContainerHeliumGenerator.java b/src/Java/miscutil/core/gui/ContainerHeliumGenerator.java index ae8e2d3176..8acf0313fd 100644 --- a/src/Java/miscutil/core/gui/ContainerHeliumGenerator.java +++ b/src/Java/miscutil/core/gui/ContainerHeliumGenerator.java @@ -1,95 +1,72 @@ package miscutil.core.gui; +import ic2.core.ContainerBase; +import ic2.core.slot.SlotInvSlot; + +import java.util.List; + import miscutil.core.tileentities.TileEntityHeliumGenerator; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotFurnace; -import net.minecraft.item.ItemStack; - -public class ContainerHeliumGenerator extends Container { - private TileEntityHeliumGenerator tileThis; - public ContainerHeliumGenerator(InventoryPlayer player, TileEntityHeliumGenerator machine) +public class ContainerHeliumGenerator + extends ContainerBase<TileEntityHeliumGenerator> +{ + public short size; + + public ContainerHeliumGenerator(InventoryPlayer player, TileEntityHeliumGenerator machine) + { + super(machine); + this.addSlotToContainer(new SlotFurnace(player.player, machine, 2, 80, 35)); + this.size = machine.getReactorSize(); + int startX = 16; + int startY = 16; + int i = 0; + for (i = 0; i < 9; i++) { - this.tileThis = machine; - this.addSlotToContainer(new SlotFurnace(player.player, machine, 2, 80, 35)); - int i; - - for (i = 0; i < 3; ++i) - { - for (int j = 0; j < 9; ++j) - { - this.addSlotToContainer(new Slot(player, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); - } - } - - for (i = 0; i < 9; ++i) - { - this.addSlotToContainer(new Slot(player, i, 8 + i * 18, 142)); - } + int x = i % this.size; + int y = i / this.size; + + addSlotToContainer(new SlotInvSlot(machine.reactorSlot, i, startX + 18 * x, startY + 18 * y)); } - - public boolean canInteractWith(EntityPlayer player) + startX = 108; + startY = 16; + for (i = 9; i < 18; i++) { - return this.tileThis.isUseableByPlayer(player); + int x = i % this.size; + int y = (i-9) / this.size; + + addSlotToContainer(new SlotInvSlot(machine.reactorSlot, i, startX + 18 * x, startY + 18 * y)); } - - /** - * Called when a player shift-clicks on a slot. You must override this or you will crash when someone does that. - */ - public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) + for (i = 0; i < 3; ++i) { - ItemStack itemstack = null; - Slot slot = (Slot)this.inventorySlots.get(slotNumber); - - if (slot != null && slot.getHasStack()) + for (int j = 0; j < 9; ++j) { - ItemStack itemstack1 = slot.getStack(); - itemstack = itemstack1.copy(); - - if (slotNumber == 0) - { - if (!this.mergeItemStack(itemstack1, 1, 37, true)) - { - return null; - } - - slot.onSlotChange(itemstack1, itemstack); - } - else - { - if (slotNumber >= 1 && slotNumber < 28) - { - if (!this.mergeItemStack(itemstack1, 28, 37, false)) - { - return null; - } - } - else if (slotNumber >= 28 && slotNumber < 37 && !this.mergeItemStack(itemstack1, 1, 28, false)) - { - return null; - } - } - - if (itemstack1.stackSize == 0) - { - slot.putStack((ItemStack)null); - } - else - { - slot.onSlotChanged(); - } - - if (itemstack1.stackSize == itemstack.stackSize) - { - return null; - } - - slot.onPickupFromSlot(player, itemstack1); + this.addSlotToContainer(new Slot(player, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); } + } - return itemstack; + for (i = 0; i < 9; ++i) + { + this.addSlotToContainer(new Slot(player, i, 8 + i * 18, 142)); } + // addSlotToContainer(new SlotInvSlot(machine.coolantinputSlot, 0, 8, 25)); + //addSlotToContainer(new SlotInvSlot(machine.hotcoolinputSlot, 0, 188, 25)); + //addSlotToContainer(new SlotInvSlot(machine.coolantoutputSlot, 0, 8, 115)); + //addSlotToContainer(new SlotInvSlot(machine.hotcoolantoutputSlot, 0, 188, 115)); + } + + public List<String> getNetworkedFields() + { + List<String> ret = super.getNetworkedFields(); + + ret.add("heat"); + ret.add("maxHeat"); + ret.add("EmitHeat"); + /*ret.add("inputTank"); + ret.add("outputTank"); + ret.add("fluidcoolreactor");*/ + return ret; + } }
\ No newline at end of file diff --git a/src/Java/miscutil/core/gui/GUIHeliumGenerator.java b/src/Java/miscutil/core/gui/GUIHeliumGenerator.java index 6510f7480f..8188176c83 100644 --- a/src/Java/miscutil/core/gui/GUIHeliumGenerator.java +++ b/src/Java/miscutil/core/gui/GUIHeliumGenerator.java @@ -25,14 +25,16 @@ public class GUIHeliumGenerator extends GuiContainer /** * Draw the foreground layer for the GuiContainer (everything in front of the items) */ - protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) + @Override + protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - String s = StatCollector.translateToLocal("container.helium_collector"); + String s = StatCollector.translateToLocal("container.radiation_collector"); this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 6, 4210752); this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752); } - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) + @Override + protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(collectorGuiTexture); |