From 48183f6670c96853c352e96ae5ee52a0209cc570 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Mon, 21 Jul 2014 17:47:29 -0400 Subject: [PATCH] Work on the new upgrade system, specifically with GUI changes --- .../mekanism/client/gui/GuiUpgradeTab.java | 44 ++++-------------- .../ContainerAdvancedElectricMachine.java | 35 ++++---------- .../container/ContainerChanceMachine.java | 43 ++++++----------- .../ContainerChemicalCrystallizer.java | 33 ++++--------- .../ContainerChemicalDissolutionChamber.java | 33 ++++--------- .../container/ContainerChemicalOxidizer.java | 31 +++--------- .../container/ContainerDigitalMiner.java | 27 ++--------- .../container/ContainerElectricMachine.java | 35 ++++---------- .../container/ContainerUpgradeManagement.java | 43 ++++++++++++----- .../tile/component/TileComponentUpgrade.java | 5 ++ .../mekanism/gui/GuiUpgradeManagement.png | Bin 4662 -> 5019 bytes .../assets/mekanism/gui/GuiUpgrades.png | Bin 5009 -> 0 bytes .../gui/elements/GuiConfigurationTab.png | Bin 3603 -> 3551 bytes .../gui/elements/GuiRedstoneControl.png | Bin 4479 -> 4427 bytes .../gui/elements/GuiUpgradeManagement.png | Bin 2922 -> 0 bytes .../mekanism/gui/elements/GuiUpgradeTab.png | Bin 0 -> 3508 bytes .../resources/assets/mekanism/lang/en_US.lang | 2 + 17 files changed, 106 insertions(+), 225 deletions(-) delete mode 100644 src/main/resources/assets/mekanism/gui/GuiUpgrades.png delete mode 100644 src/main/resources/assets/mekanism/gui/elements/GuiUpgradeManagement.png create mode 100644 src/main/resources/assets/mekanism/gui/elements/GuiUpgradeTab.png diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeTab.java b/src/main/java/mekanism/client/gui/GuiUpgradeTab.java index a101dfe52..dd94bc319 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeTab.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeTab.java @@ -1,15 +1,16 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.api.Coord4D; import mekanism.client.sound.SoundHandler; import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; import mekanism.common.network.PacketRemoveUpgrade.RemoveUpgradeMessage; +import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; public class GuiUpgradeTab extends GuiElement { @@ -17,7 +18,7 @@ public class GuiUpgradeTab extends GuiElement public GuiUpgradeTab(IGuiWrapper gui, TileEntity tile, ResourceLocation def) { - super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiUpgradeManagement.png"), gui, def); + super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiUpgradeTab.png"), gui, def); tileEntity = tile; } @@ -25,7 +26,7 @@ public class GuiUpgradeTab extends GuiElement @Override public Rectangle4i getBounds(int guiWidth, int guiHeight) { - return new Rectangle4i(guiWidth + 176, guiHeight + 6, 26, 63); + return new Rectangle4i(guiWidth + 176, guiHeight + 6, 26, 26); } @Override @@ -50,52 +51,25 @@ public class GuiUpgradeTab extends GuiElement IUpgradeTile upgradeTile = (IUpgradeTile)tileEntity; - if(getFontRenderer() != null) + if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - getFontRenderer().drawString("S:" + (upgradeTile.getSpeedMultiplier()+1) + "x", 179, 47, 0x404040); - getFontRenderer().drawString("E:" + (upgradeTile.getEnergyMultiplier()+1) + "x", 179, 57, 0x404040); + displayTooltip(MekanismUtils.localize("gui.upgrades"), xAxis, yAxis); } - if(xAxis >= 179 && xAxis <= 198 && yAxis >= 47 && yAxis <= 54) - { - displayTooltip(MekanismUtils.localize("gui.removeSpeedUpgrade"), xAxis, yAxis); - } - - if(xAxis >= 179 && xAxis <= 198 && yAxis >= 57 && yAxis <= 64) - { - displayTooltip(MekanismUtils.localize("gui.removeEnergyUpgrade"), xAxis, yAxis); - } mc.renderEngine.bindTexture(defaultLocation); } @Override - public void preMouseClicked(int xAxis, int yAxis, int button) - { - if(xAxis >= 180 && xAxis <= 196 && yAxis >= 11 && yAxis <= 27) - { - offsetX(26); - } - } + public void preMouseClicked(int xAxis, int yAxis, int button) {} @Override public void mouseClicked(int xAxis, int yAxis, int button) { - if(xAxis >= 179 && xAxis <= 198 && yAxis >= 47 && yAxis <= 54) + if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { + Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 9)); SoundHandler.playSound("gui.button.press"); - Mekanism.packetHandler.sendToServer(new RemoveUpgradeMessage(Coord4D.get(tileEntity), (byte)0)); - } - - if(xAxis >= 179 && xAxis <= 198 && yAxis >= 57 && yAxis <= 64) - { - SoundHandler.playSound("gui.button.press"); - Mekanism.packetHandler.sendToServer(new RemoveUpgradeMessage(Coord4D.get(tileEntity), (byte)1)); - } - - if(xAxis >= 180 && xAxis <= 196 && yAxis >= 11 && yAxis <= 27) - { - offsetX(-26); } } } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java index fc38b1374..4231f7cd9 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java @@ -26,7 +26,6 @@ public class ContainerAdvancedElectricMachine extends Container addSlotToContainer(new Slot(tentity, 1, 56, 53)); addSlotToContainer(new SlotOutput(tentity, 2, 116, 35)); addSlotToContainer(new SlotDischarge(tentity, 3, 31, 35)); - addSlotToContainer(new SlotMachineUpgrade(tentity, 4, 180, 11)); int slotX; @@ -75,7 +74,7 @@ public class ContainerAdvancedElectricMachine extends Container if(slotID == 2) { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { return null; } @@ -90,7 +89,7 @@ public class ContainerAdvancedElectricMachine extends Container } } else { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { return null; } @@ -106,7 +105,7 @@ public class ContainerAdvancedElectricMachine extends Container } } else { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { return null; } @@ -122,45 +121,29 @@ public class ContainerAdvancedElectricMachine extends Container } } else { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) - { - return null; - } - } - } - else if(slotStack.getItem() instanceof ItemMachineUpgrade) - { - if(slotID != 4) - { - if(!mergeItemStack(slotStack, 4, 5, false)) - { - return null; - } - } - else { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { return null; } } } else { - if(slotID >= 5 && slotID <= 31) + if(slotID >= 4 && slotID <= 30) { - if(!mergeItemStack(slotStack, 32, inventorySlots.size(), false)) + if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) { return null; } } - else if(slotID > 31) + else if(slotID > 30) { - if(!mergeItemStack(slotStack, 5, 31, false)) + if(!mergeItemStack(slotStack, 4, 30, false)) { return null; } } else { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { return null; } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java index 587922a28..3184a0e41 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java @@ -23,19 +23,18 @@ public class ContainerChanceMachine extends Container addSlotToContainer(new Slot(tentity, 0, 56, 17)); addSlotToContainer(new SlotDischarge(tentity, 1, 56, 53)); addSlotToContainer(new SlotOutput(tentity, 2, 116, 35)); - addSlotToContainer(new SlotMachineUpgrade(tentity, 3, 180, 11)); addSlotToContainer(new SlotOutput(tentity, 4, 132, 35)); int slotX; - for(slotX = 0; slotX < 3; ++slotX) + for(slotX = 0; slotX < 3; slotX++) { - for(int slotY = 0; slotY < 9; ++slotY) + for(int slotY = 0; slotY < 9; slotY++) { addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); } } - for(slotX = 0; slotX < 9; ++slotX) + for(slotX = 0; slotX < 9; slotX++) { addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); } @@ -70,9 +69,9 @@ public class ContainerChanceMachine extends Container ItemStack slotStack = currentSlot.getStack(); stack = slotStack.copy(); - if(slotID == 2 || slotID == 4) + if(slotID == 2 || slotID == 3) { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { return null; } @@ -88,7 +87,7 @@ public class ContainerChanceMachine extends Container } else if(slotID == 1) { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { return null; } @@ -96,7 +95,7 @@ public class ContainerChanceMachine extends Container } else if(RecipeHandler.getChanceOutput(slotStack, false, tileEntity.getRecipes()) != null) { - if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3 && slotID != 4) + if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3) { if(!mergeItemStack(slotStack, 0, 1, false)) { @@ -104,45 +103,29 @@ public class ContainerChanceMachine extends Container } } else { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) - { - return null; - } - } - } - else if(slotStack.getItem() instanceof ItemMachineUpgrade) - { - if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3) - { - if(!mergeItemStack(slotStack, 3, 4, false)) - { - return null; - } - } - else { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { return null; } } } else { - if(slotID >= 5 && slotID <= 31) + if(slotID >= 4 && slotID <= 30) { - if(!mergeItemStack(slotStack, 32, inventorySlots.size(), false)) + if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) { return null; } } - else if(slotID > 31) + else if(slotID > 30) { - if(!mergeItemStack(slotStack, 5, 31, false)) + if(!mergeItemStack(slotStack, 4, 30, false)) { return null; } } else { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { return null; } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java index 956005c43..6607d00ab 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java @@ -24,7 +24,6 @@ public class ContainerChemicalCrystallizer extends Container addSlotToContainer(new SlotStorageTank(tentity, 0, 6, 65)); addSlotToContainer(new SlotOutput(tentity, 1, 131, 57)); addSlotToContainer(new SlotDischarge(tentity, 2, 155, 5)); - addSlotToContainer(new SlotMachineUpgrade(tentity, 3, 180, 11)); int slotY; @@ -81,7 +80,7 @@ public class ContainerChemicalCrystallizer extends Container } } else { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { return null; } @@ -89,7 +88,7 @@ public class ContainerChemicalCrystallizer extends Container } else if(slotID == 1) { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { return null; } @@ -105,45 +104,29 @@ public class ContainerChemicalCrystallizer extends Container } else if(slotID == 2) { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) - { - return null; - } - } - } - else if(slotStack.getItem() instanceof ItemMachineUpgrade) - { - if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3) - { - if(!mergeItemStack(slotStack, 3, 4, false)) - { - return null; - } - } - else { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { return null; } } } else { - if(slotID >= 4 && slotID <= 30) + if(slotID >= 3 && slotID <= 29) { - if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) + if(!mergeItemStack(slotStack, 30, inventorySlots.size(), false)) { return null; } } - else if(slotID > 30) + else if(slotID > 29) { - if(!mergeItemStack(slotStack, 4, 30, false)) + if(!mergeItemStack(slotStack, 3, 29, false)) { return null; } } else { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { return null; } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java index a59e395f4..d7d6db4c5 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java @@ -26,7 +26,6 @@ public class ContainerChemicalDissolutionChamber extends Container addSlotToContainer(new Slot(tentity, 1, 26, 36)); addSlotToContainer(new SlotStorageTank(tentity, 2, 155, 25)); addSlotToContainer(new SlotDischarge(tentity, 3, 155, 5)); - addSlotToContainer(new SlotMachineUpgrade(tentity, 4, 180, 11)); int slotY; @@ -83,7 +82,7 @@ public class ContainerChemicalDissolutionChamber extends Container } } else { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { return null; } @@ -100,7 +99,7 @@ public class ContainerChemicalDissolutionChamber extends Container } else if(slotID == 3) { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { return null; } @@ -119,45 +118,29 @@ public class ContainerChemicalDissolutionChamber extends Container } } else { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) - { - return null; - } - } - } - else if(slotStack.getItem() instanceof ItemMachineUpgrade) - { - if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3 && slotID != 4) - { - if(!mergeItemStack(slotStack, 4, 5, false)) - { - return null; - } - } - else { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { return null; } } } else { - if(slotID >= 5 && slotID <= 31) + if(slotID >= 4 && slotID <= 30) { - if(!mergeItemStack(slotStack, 32, inventorySlots.size(), false)) + if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) { return null; } } - else if(slotID > 31) + else if(slotID > 30) { - if(!mergeItemStack(slotStack, 5, 31, false)) + if(!mergeItemStack(slotStack, 4, 30, false)) { return null; } } else { - if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { return null; } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java index d4a659825..ccba9f249 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java @@ -25,7 +25,6 @@ public class ContainerChemicalOxidizer extends Container addSlotToContainer(new Slot(tentity, 0, 26, 36)); addSlotToContainer(new SlotDischarge(tentity, 1, 155, 5)); addSlotToContainer(new SlotStorageTank(tentity, 2, 155, 25)); - addSlotToContainer(new SlotMachineUpgrade(tentity, 3, 180, 11)); int slotX; @@ -90,7 +89,7 @@ public class ContainerChemicalOxidizer extends Container } else if(slotID == 1) { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { return null; } @@ -106,45 +105,29 @@ public class ContainerChemicalOxidizer extends Container } } else { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) - { - return null; - } - } - } - else if(slotStack.getItem() instanceof ItemMachineUpgrade) - { - if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3) - { - if(!mergeItemStack(slotStack, 3, 4, false)) - { - return null; - } - } - else { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { return null; } } } else { - if(slotID >= 4 && slotID <= 30) + if(slotID >= 3 && slotID <= 29) { - if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) + if(!mergeItemStack(slotStack, 30, inventorySlots.size(), false)) { return null; } } - else if(slotID > 30) + else if(slotID > 29) { - if(!mergeItemStack(slotStack, 4, 30, false)) + if(!mergeItemStack(slotStack, 3, 29, false)) { return null; } } else { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { return null; } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java index 82e7c4c9a..5d6c96e57 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java @@ -28,19 +28,18 @@ public class ContainerDigitalMiner extends Container } addSlotToContainer(new SlotDischarge(tentity, 27, 152, 6)); - addSlotToContainer(new SlotMachineUpgrade(tentity, 28, 180, 11)); int slotX; - for(slotX = 0; slotX < 3; ++slotX) + for(slotX = 0; slotX < 3; slotX++) { - for(int slotY = 0; slotY < 9; ++slotY) + for(int slotY = 0; slotY < 9; slotY++) { addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 148 + slotX * 18)); } } - for(slotX = 0; slotX < 9; ++slotX) + for(slotX = 0; slotX < 9; slotX++) { addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 206)); } @@ -86,23 +85,7 @@ public class ContainerDigitalMiner extends Container } else if(slotID == 27) { - if(!mergeItemStack(slotStack, 29, inventorySlots.size(), true)) - { - return null; - } - } - } - else if(slotStack.getItem() instanceof ItemMachineUpgrade) - { - if(slotID != 27 && slotID != 28) - { - if(!mergeItemStack(slotStack, 28, 29, false)) - { - return null; - } - } - else { - if(!mergeItemStack(slotStack, 29, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 28, inventorySlots.size(), true)) { return null; } @@ -111,7 +94,7 @@ public class ContainerDigitalMiner extends Container else { if(slotID < 27) { - if(!mergeItemStack(slotStack, 29, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 28, inventorySlots.size(), true)) { return null; } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java index a33308b1b..8b72812b6 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java @@ -23,7 +23,6 @@ public class ContainerElectricMachine extends Container addSlotToContainer(new Slot(tentity, 0, 56, 17)); addSlotToContainer(new SlotDischarge(tentity, 1, 56, 53)); addSlotToContainer(new SlotOutput(tentity, 2, 116, 35)); - addSlotToContainer(new SlotMachineUpgrade(tentity, 3, 180, 11)); int slotX; for(slotX = 0; slotX < 3; slotX++) @@ -71,14 +70,14 @@ public class ContainerElectricMachine extends Container if(slotID == 2) { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { return null; } } else if(RecipeHandler.getOutput(slotStack, false, tileEntity.getRecipes()) != null) { - if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3) + if(slotID != 0 && slotID != 1 && slotID != 2) { if(!mergeItemStack(slotStack, 0, 1, false)) { @@ -86,7 +85,7 @@ public class ContainerElectricMachine extends Container } } else { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { return null; } @@ -103,45 +102,29 @@ public class ContainerElectricMachine extends Container } else if(slotID == 1) { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) - { - return null; - } - } - } - else if(slotStack.getItem() instanceof ItemMachineUpgrade) - { - if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3) - { - if(!mergeItemStack(slotStack, 3, 4, false)) - { - return null; - } - } - else { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { return null; } } } else { - if(slotID >= 4 && slotID <= 30) + if(slotID >= 3 && slotID <= 29) { - if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) + if(!mergeItemStack(slotStack, 30, inventorySlots.size(), false)) { return null; } } - else if(slotID > 30) + else if(slotID > 29) { - if(!mergeItemStack(slotStack, 4, 30, false)) + if(!mergeItemStack(slotStack, 3, 29, false)) { return null; } } else { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { return null; } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java index dd253b158..ce5dd9bc3 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java @@ -2,6 +2,7 @@ package mekanism.common.inventory.container; import mekanism.common.IUpgradeTile; import mekanism.common.inventory.slot.SlotMachineUpgrade; +import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.tile.TileEntityContainerBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -16,7 +17,7 @@ public class ContainerUpgradeManagement extends Container public ContainerUpgradeManagement(InventoryPlayer inventory, IUpgradeTile tile) { tileEntity = tile; - addSlotToContainer(new SlotMachineUpgrade((TileEntityContainerBlock)tile, 3, 180, 11)); + addSlotToContainer(new SlotMachineUpgrade((TileEntityContainerBlock)tile, tileEntity.getComponent().getUpgradeSlot(), 154, 7)); int slotX; @@ -63,24 +64,42 @@ public class ContainerUpgradeManagement extends Container ItemStack slotStack = currentSlot.getStack(); stack = slotStack.copy(); - if(slotID >= 0 && slotID <= 26) + if(slotStack.getItem() instanceof ItemMachineUpgrade) { - if(!mergeItemStack(slotStack, 27, inventorySlots.size(), false)) + if(slotID != 0) { - return null; + if(!mergeItemStack(slotStack, 0, 1, false)) + { + return null; + } } - } - else if(slotID > 26) - { - if(!mergeItemStack(slotStack, 0, 26, false)) - { - return null; + else { + if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) + { + return null; + } } } else { - if(!mergeItemStack(slotStack, 0, inventorySlots.size(), true)) + if(slotID >= 1 && slotID <= 27) { - return null; + if(!mergeItemStack(slotStack, 28, inventorySlots.size(), false)) + { + return null; + } + } + else if(slotID > 27) + { + if(!mergeItemStack(slotStack, 1, 27, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) + { + return null; + } } } diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index b1a16a5cf..c00358dad 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -96,6 +96,11 @@ public class TileComponentUpgrade implements ITileComponent } } } + + public int getUpgradeSlot() + { + return upgradeSlot; + } public int getScaledUpgradeProgress(int i) { diff --git a/src/main/resources/assets/mekanism/gui/GuiUpgradeManagement.png b/src/main/resources/assets/mekanism/gui/GuiUpgradeManagement.png index 3b1d25315b5a0fb2a950363bca22113541ca7eae..c75320fb91f48e097e025c3bfc697781fdd530cd 100644 GIT binary patch delta 370 zcmY*Vu};G<5Cy4I26hHi%OG`%F9|Tja+Y4|XJZ-)(6%jUFUeM_Cy3KD zg(!g}2^}TW@3kpySnKm%mip*2z~-F ziJ;f!{UY-)y;FiaYj2RptfT(J1|tUE{m(Uh)(&-H^MJwO=5R&hQ69jF7* diff --git a/src/main/resources/assets/mekanism/gui/GuiUpgrades.png b/src/main/resources/assets/mekanism/gui/GuiUpgrades.png deleted file mode 100644 index fbf5977602ac44d939460b7b11bd4ea36d8d48b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5009 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 IcGV;4zgL%lZU6uP diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiConfigurationTab.png b/src/main/resources/assets/mekanism/gui/elements/GuiConfigurationTab.png index dc7ac6a5506e097e3fcefd7b6ec5e32b6557a311..45bded2cd3228806e89f4d8bfc5458960d445377 100644 GIT binary patch delta 1038 zcmV+p1o8Wm9N!y|BYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wF2RW Ivrz=X2{x__4*&oF delta 1090 zcmV-I1iky;84Tx05}naRo`#hR1`jmZ&IWdKOk5~ zhl<6oRa0BJ8yc;~21%2p?MfD<>DVeH9(p*dx19w`~g7O0}n_%Aq@s% zd)fBDv`JHkDym6Hd+5XuAtvnwRpGmKVkc9?T=n|PIo~$m6N9yl%7qB(zDb{1JtYOPA!qk%@Qub75C2T;T?(y%k7cw{!aEIzj}+@(TO5Y zz-|>CeHr)+QOwk9wo4Sh2mAPGw+7tv9PraN1Olr9mwlWPc+tlvJx(D%369Vz>lLjC zyaqhH*k&)cVSir(7|4_1Rc;%)B4&}Zt&(AK&*3kRaknx54=$T^^z2=OSo@r%xnsBw ziQX&rRKAHn*R}K<@Jp~?uenKKe+BrD`qF#?cpp*psgiwk-seYOU#%402HpjG(Qu~= zP5WwfF?$>svC;J<>zK$RIM;P&60@WifbUlLwAf?lk$1u(mFRYq89Q?S8HyrsX^MVnpsf`{W6(5UXREr zZM&7ilpo6ux^|%%%N9z;(dj0Ct!8>>5!%=VyPg-?ke}Vs>~sbgdDuU^Ixpr19NS&g zQew8Fz<)>RL_{M_7A<1csY*MfP@XcB#Jxr~JS8&7goVS)VKE|4(h_Xlc{z{c$ApZs z7riZ_QKdV_uW-M~u~8PF3UX~a6)MwxDE0Ha zPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiSBY#iOF*IB46Cei@XmvNzKBsGIKkN=X z$_Bgm&h5TyYjpf^^Nrn$ZO1mSZpOC4_}H(pE&Od#0y|)Oik6|u@OHupcq1J>TmjQ1 z4eM{2+Oeah>iL1tBPPK=$Ue-{x#7^N{-XY=Zm3_V7u4T7YJ?d(rX+nTeJlMa zeSar?Fa1o4bXmG0{UlwLzL72kIlJ$@pC#CPuU}yk-HKgk)oY(MCsR(!d*m18l>EH> zvOF8G6uDm>lc(gp@azfp%?$k=y%=-~vuaJXdoA$<7&H$h2Au}i##F_Gt8^Aw+nR IvmFG&2|2hL_y7O^ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiRedstoneControl.png b/src/main/resources/assets/mekanism/gui/elements/GuiRedstoneControl.png index 72fb3b585e5ce2706675f5017abe9a45adbedb0b..19e2b358dd91db48db3c64731c4c08e1078473dd 100644 GIT binary patch delta 1038 zcmV+p1o8X-BFiF>BYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wF2RW Ivrz;t4bLnK4Tx05}naRo`#hR1`jmZ&IWdKOk5~ zhl<6oRa0BJ8yc;~21%2p?MfD<>DVeH9(p*dx19w`~g7O0}n_%Aq@s% zd)fBDv`JHkDym6Hd+5XuAtvnwRpGmKVkc9?T=n|PIo~$m6N9yl%7qB(zDb{1JtYOPA!qk%@Qub75C2T;T?(y%k7cw{!aEIzj}+@(TO5Y zz-|>CeHr)+QOwk9wo4Sh2mAPGw+7tv9PraN1Olr9mwlWPc+tlvJx(D%369Vz>lLjC zyaqhH*k&)cVSir(7|4_1Rc;%)B4&}Zt&(AK&*3kRaknx54=$T^^z2=OSo@r%xnsBw ziQX&rRKAHn*R}K<@Jp~?uenKKe+BrD`qF#?cpp*psgiwk-seYOU#%402HpjG(Qu~= zP5WwfF?$>svC;J<>zK$RIM;P&60@WifbUlLwAf?lk$1u(mFRYq89Q?S8HyrsX^MVnpsf`{W6(5UXREr zZM&7ilpo6ux^|%%%N9z;(dj0Ct!8>>5!%=VyPg-?ke}Vs>~sbgdDuU^Ixpr19NS&g zQew8Fz<)>RL_{M_7A<1csY*MfP@XcB#Jxr~JS8&7goVS)VKE|4(h_Xlc{z{c$ApZs z7riZ_QKdV_uW-M~u~8PF3UX~a6)MwxDE0Ha zPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiSBY#iOF*IB46Cei@XmvNzKBsGIKkN=X z$_Bgm&h5TyYjpf^^Nrn$ZO1mSZpOC4_}H(pE&Od#0y|)Oik6|u@OHupcq1J>TmjQ1 z4eM{2+Oeah>iL1tBPPK=$Ue-{x#7^N{-XY=Zm3_V7u4T7YJ?d(rX+nTeJlMa zeSar?Fa1o4bXmG0{UlwLzL72kIlJ$@pC#CPuU}yk-HKgk)oY(MCsR(!d*m18l>EH> zvOF8G6uDm>lc(gp@azfp%?$k=y%=-~vuaJXdoA$<7&H$h2Au}i##F_Gt8^Aw+nR IvmFF34duKV%>V!Z diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiUpgradeManagement.png b/src/main/resources/assets/mekanism/gui/elements/GuiUpgradeManagement.png deleted file mode 100644 index d278b9bc915eb84be106736ba3a6a2564536008a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2922 zcmeHJXH!#)7Cku$5Ktg=M9M*`1rU`Y^+?Y(LJ&bpfG8If=}oFh5D<72K>?$bZzoeKd`E;H{BybtfApZ1zPduFX!v)0T`$J^Tq3&{xq03eLD zvpNd^h+T*P(EPiD5MJ&F0LUeOOG`Y~(h|alhxqvi`T~GqR+jT{$j~`S^YjoxskAx0 zHd{n0quSZYqjA67V-`R5_JbJp$xba;B|=A$xg9$`b*_oEQta zy|31v%p;y+olZ&hs+O8Y4#JmjuV1eWt*Ult)Pvugzc)t3?jv$n zJoRX~H)+%YV;5yX_9=}uxa_ZZ`zC@msLe{T?Q8c|e!(>m7@XUQh;peYL#mco1fDm& zrnu}+$*VA~5{0-nn@a~rPJLcB`Kq9;p5}TXreN$y`*C?CQA4L$&5H#YrTz7XzN)?Y zaa?yZaPO-8^?DTtty#IIcX5ta=kHzUa&2hK_Wz zI@97Y*i*~aV8aQ6+;#O^aw3Htf)`R-7>Ae z(dKOD6YQ7s(ZtLqCsn2s@@n@@NZ^F-AY-p)HmF^EZ`3d0@2W8^@E}#qa7YQ8Kayvj zFEz1eqB%U;TU_N`*1?3|IVt=A^QzUXUK$QNy-mWh-`fD8xK`^8nd`?;V z;GjxEEM57&u}t>d*IXE^S17vFI?F>5$Hx3tX%l`CW2e{J_(R`r%eVnyG2-=KZUBIQ z9@gsAxfsO!XVdUOSeBpI!HA&AtJDu2Wod*J8d-~AXfHH$6|Xd$#1SM4?iPzdW+*>j z|5&Or^!TYc+s_-tDzR6;-Mi(rqJJh|M>?bL>cZk;!(d5Oh=*|?2EyY;I|KC#AGtid zxDmznkRjEIRZxM%51_$JM}L3+2aTd|VqBC1qK=@Q!aNw7t;V^{ymMm!O5g4tt^1y~g>F-r(K_E>B!w-9nMn^{%mb5lEc$$65vN6htSwMPV}!{60j&69vQp2WpBl%TRnzMY>xTMxFjvwNQ?2Vf!vECz{`AAM>dN*jUzZA!Ti=p!|-rAyrMQJmS> z97bapB8iUyJM!B%N~?_Qbc5eOEYkzn5k(VfnSE05_|o=vv-38O$EXk5)v+wd0A)vt zW^@xX1kscX$I3J&4~1g#CUG|f2{;%aWS+G~u{0onWpF7DH+m7g0DL2@kZWC>ttdS;zkw4x-{@2A+d8qwzGPusH8TVhg}~T5@?eL0rCd zkluMd;kkVGce@jI6y{s-F%41rUu!iAjS`ucQR`JeI9qG`$d_EW1r$I+!fxmu<7FEg zNH7^eNdpp__)zfhYCt5)0)fD+XsY5HC_s5UDJvV+ga8Z06x6IV28d!;e-uOSUUuBi zfrmkmzOboh1pYw*(6N%@ngr*$e;NTE7w@)E4cMtAT-KWZN*@8~r zN|O5%;V20xv;=miS|f>`ZLi7P&xRQQ0z{!P5KQ?6ewpwq3IFdF&@-6iRnd+Ck(9ZY QyFWC5wYImavLIgn7f8({Z2$lO diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiUpgradeTab.png b/src/main/resources/assets/mekanism/gui/elements/GuiUpgradeTab.png new file mode 100644 index 0000000000000000000000000000000000000000..a6d99df0304927d7e5ace9ee77d8da8c4f32738a GIT binary patch literal 3508 zcmeH~={pn*7shAH78zwr6Jtx+6(LK5EK{;%gdvnHrR-%wX4GRHYoSRro|m#_30cP| z%e=A{V>gz`HX4kPMhvg#-*~U*)44yK>s;4;&i(sv676g(g#@Go004jx((1|$004L> zfdD?9!{QcF>;nLRH}094*&)r$;C3N_KKCAY0|0s{DUQ>DlPJ;4iGgl~;+ONQQ;&(^ zD;*tN8&64n=;A@Xe79mM)z~+tT-g06K+0kC;-{g9j>K(Hpdbf~`^YPujxm)I?AZRu z1lA%QOvI=Pg+^f$2)~!x&q{+TDjk|{bv0yEV)d88jn}{FASg~bbOQ3ECvEeV4lyH* zNXRz0Da$`#qO^r5dLL=i>9QfN=Wks|6*b*|;l)#v z(3rsvF#GUV?x~zNJ)xI>7}qKPJuqBRn(a+GeI-gVRZ%GE$+XYk$X>t zh~aH(KUPZsv;I`7bE{M~t4-BgB5PI|$E^)Z$R(2{zlH_Y%1Y`IGX5CV#gQGYyaIgE zzZn`^q{mD2z}?%uqoM|b4!}AN&~;-0h8GVi;1MZHNGWY$dPz*&r7s@0OfLr7wB0e?E_JrJldu?CzlXF1gk< z0{Qi-hE=6i=YNUAYC=e_@6y9RX@>Qf7K|ECZX1b8-LBTFe1-h|RDu^N{Et&UuR*bp2a*(nli1@mplA~x_ol5bf0WSzH95b#SDs|$7@Cm^+5)_Y8_7g zk4*9B-)hzD2nF^GkKUF9%|%ykJPbVRFPy(yXEhQZK3_uwy6NTXPQ`BY+bTo@H}3EL zW?^rgYyxi%yU-vs{+MlQ znG>GN<)%CxvnUV|BbV3e{!UFQs2$a-_|oTNFBm^0UYzxb&FcJ8i#D&W4=>{^_N0k> ze6+>2o#LydPZ)%+wU~(edPFcM>g1#d&Ee~BxAu2;>$Ba1GSP9}oZ{s$*UlhKbu@EW zuD5W8xPP(6_az`k8M5f_BBtN}qq_WdVv_N4ns2{yQn!NRo=tQ4R&|~V_6o$+)%%oV zt(;&wAG8?diEd74R;X|RTg(d{9fweEUhz$|h55M#w%pk~r zTXYh_hl1PrL(&7mT^~rVDtWv`p%ih4ad;w2ZJ0?@3Q4EAe~}Teq?NCqbDSiRghv)5Ej5RcTn#^AS(ax1YoN9w*zZQ#<(;Z=$BT794bj{`=cWnE_~BIVXTF7!Qd49sxgnU|b<$VQ8rOCSU>9KqI{S3eB9x&Z^;H?^|-vk61ktlx32Ng5={ikuvo>lOLA|FWc|Hig_ z4(-0$_Tuwph_V;~59t4+NGzpk4QyGyOSOP2KSFKt9mp6*Ik)y@sW^RI^5Y9ZrPr4! z$4Bu&2?7taL1WX?d7*EGRtrQDcw}!>>{W9)EIM67P^TvWE|uVXgdiWIXDNrsmx?(L zaxO2X-Zkn|01iY#hvD@&h zg4n*}^j4MKL&BgI6L_*6_j7NxJl@${2uXn28tUs$R<=a8ls>a zof~+%tvvnVA$Y@5z;g5t*ct^2j~3LHZv5=5BfKO64{Aj)MG$M#1%AHQH#?`FC5X;X zF`3Lw2T4%w0VRwlW>gHLB7{g@q0^#K8yL5yu$8-?u#auvi-64!?W0`JekH_gRLsOF z-1s{1haX%QVn1bwl>BDW3Wio*JH$o9&L6z7{H@RA-~d1ngbxb;SNyw#f0OY4LO~n$`m6@*{MXs;T}_e0Zw!Dmx4BYb>iO({DppZ0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 3562824e6..bad7f9a71 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -349,6 +349,8 @@ gui.id=ID gui.finished=Finished gui.well=All is well! +gui.upgrades=Upgrades + gui.chemicalInfuser.short=C. Infuser gui.chemicalDissolutionChamber.short=C. Dissolution Chamber