From c84e13124a73d594ae08ea065f119e3922ef7921 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sat, 7 Mar 2015 21:19:59 -0500 Subject: [PATCH] Work on configuration GUI --- .../mekanism/client/gui/GuiConfiguration.java | 89 ++----------------- .../client/gui/GuiElectricMachine.java | 13 +-- .../gui/element/GuiContainerEditMode.java | 2 +- .../client/gui/element/GuiRecipeType.java | 2 +- .../tile/component/TileComponentConfig.java | 2 +- 5 files changed, 17 insertions(+), 91 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiConfiguration.java b/src/main/java/mekanism/client/gui/GuiConfiguration.java index ab57397b0..1447d10ae 100644 --- a/src/main/java/mekanism/client/gui/GuiConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiConfiguration.java @@ -21,7 +21,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; @@ -35,8 +34,6 @@ public class GuiConfiguration extends GuiMekanism { public Map slotPosMap = new HashMap(); - public Map inputPosMap = new HashMap(); - public ISideConfiguration configurable; public GuiConfiguration(EntityPlayer player, ISideConfiguration tile) @@ -47,19 +44,12 @@ public class GuiConfiguration extends GuiMekanism configurable = tile; - slotPosMap.put(0, new GuiPos(126, 64)); - slotPosMap.put(1, new GuiPos(126, 34)); - slotPosMap.put(2, new GuiPos(126, 49)); - slotPosMap.put(3, new GuiPos(111, 64)); - slotPosMap.put(4, new GuiPos(111, 49)); - slotPosMap.put(5, new GuiPos(141, 49)); - - inputPosMap.put(0, new GuiPos(36, 64)); - inputPosMap.put(1, new GuiPos(36, 34)); - inputPosMap.put(2, new GuiPos(36, 49)); - inputPosMap.put(3, new GuiPos(21, 64)); - inputPosMap.put(4, new GuiPos(21, 49)); - inputPosMap.put(5, new GuiPos(51, 49)); + slotPosMap.put(0, new GuiPos(81, 64)); + slotPosMap.put(1, new GuiPos(81, 34)); + slotPosMap.put(2, new GuiPos(81, 49)); + slotPosMap.put(3, new GuiPos(66, 64)); + slotPosMap.put(4, new GuiPos(66, 49)); + slotPosMap.put(5, new GuiPos(96, 49)); } @Override @@ -86,14 +76,6 @@ public class GuiConfiguration extends GuiMekanism drawTexturedModalRect(guiWidth + 156, guiHeight + 6, 176 + 14, 14, 14, 14); } - if(xAxis >= 156 && xAxis <= 170 && yAxis >= 21 && yAxis <= 35) - { - drawTexturedModalRect(guiWidth + 156, guiHeight + 21, 176 + 42, 0, 14, 14); - } - else { - drawTexturedModalRect(guiWidth + 156, guiHeight + 21, 176 + 42, 14, 14, 14); - } - if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) { drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176 + 28, 0, 14, 14); @@ -125,29 +107,6 @@ public class GuiConfiguration extends GuiMekanism } } - for(int i = 0; i < inputPosMap.size(); i++) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - int x = inputPosMap.get(i).xPos; - int y = inputPosMap.get(i).yPos; - - EnumColor color = configurable.getEjector().getInputColor(ForgeDirection.getOrientation(i)); - - if(color != null) - { - GL11.glColor4f(color.getColor(0), color.getColor(1), color.getColor(2), 1); - } - - if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) - { - drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 0, 14, 14); - } - else { - drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 14, 14, 14); - } - } - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } @@ -192,19 +151,6 @@ public class GuiConfiguration extends GuiMekanism } } - for(int i = 0; i < inputPosMap.size(); i++) - { - int x = inputPosMap.get(i).xPos; - int y = inputPosMap.get(i).yPos; - - EnumColor color = configurable.getEjector().getInputColor(ForgeDirection.getOrientation(i)); - - if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) - { - drawCreativeTabHoveringText(color != null ? color.getName() : MekanismUtils.localize("gui.none"), xAxis, yAxis); - } - } - if(xAxis >= 80 && xAxis <= 96 && yAxis >= 49 && yAxis <= 65) { if(configurable.getEjector().getOutputColor() != null) @@ -221,11 +167,6 @@ public class GuiConfiguration extends GuiMekanism drawCreativeTabHoveringText(MekanismUtils.localize("gui.autoEject"), xAxis, yAxis); } - if(xAxis >= 156 && xAxis <= 170 && yAxis >= 21 && yAxis <= 35) - { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.configuration.strictInput"), xAxis, yAxis); - } - super.drawGuiContainerForegroundLayer(mouseX, mouseY); } @@ -266,12 +207,6 @@ public class GuiConfiguration extends GuiMekanism SoundHandler.playSound("gui.button.press"); Mekanism.packetHandler.sendToServer(new ConfigurationUpdateMessage(ConfigurationPacket.EJECT, Coord4D.get(tile), 0, 0, TransmissionType.ITEM)); } - - if(xAxis >= 156 && xAxis <= 170 && yAxis >= 21 && yAxis <= 35) - { - SoundHandler.playSound("gui.button.press"); - Mekanism.packetHandler.sendToServer(new ConfigurationUpdateMessage(ConfigurationPacket.STRICT_INPUT, Coord4D.get(tile), 0, 0, null)); - } } if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && button == 0) @@ -296,18 +231,6 @@ public class GuiConfiguration extends GuiMekanism Mekanism.packetHandler.sendToServer(new ConfigurationUpdateMessage(ConfigurationPacket.SIDE_DATA, Coord4D.get(tile), button, i, TransmissionType.ITEM)); } } - - for(int i = 0; i < inputPosMap.size(); i++) - { - int x = inputPosMap.get(i).xPos; - int y = inputPosMap.get(i).yPos; - - if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) - { - SoundHandler.playSound("gui.button.press"); - Mekanism.packetHandler.sendToServer(new ConfigurationUpdateMessage(ConfigurationPacket.INPUT_COLOR, Coord4D.get(tile), button, i, null)); - } - } } public static class GuiPos diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index 9914404b9..717f6bae9 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -5,24 +5,26 @@ import java.util.List; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiConfigurationTab; import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiTransporterConfigTab; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerElectricMachine; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiElectricMachine extends GuiMekanism { @@ -36,6 +38,7 @@ public class GuiElectricMachine extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiConfigurationTab(this, tileEntity, tileEntity.guiLocation)); + guiElements.add(new GuiTransporterConfigTab(this, 30, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiPowerBar(this, tileEntity, tileEntity.guiLocation, 164, 15)); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override diff --git a/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java b/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java index ffa6032c4..b265d4c7a 100644 --- a/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java +++ b/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java @@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiContainerEditMode extends GuiElement { - TileEntity tileEntity; + public TileEntity tileEntity; public GuiContainerEditMode(IGuiWrapper gui, TileEntity tile, ResourceLocation def) { diff --git a/src/main/java/mekanism/client/gui/element/GuiRecipeType.java b/src/main/java/mekanism/client/gui/element/GuiRecipeType.java index 45217ecc0..cba684451 100644 --- a/src/main/java/mekanism/client/gui/element/GuiRecipeType.java +++ b/src/main/java/mekanism/client/gui/element/GuiRecipeType.java @@ -9,7 +9,7 @@ import codechicken.lib.vec.Rectangle4i; public class GuiRecipeType extends GuiElement { - TileEntityFactory tileEntity; + public TileEntityFactory tileEntity; public GuiRecipeType(IGuiWrapper gui, TileEntityFactory tile, ResourceLocation def) { diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index d1b2d65e7..d33d18d0a 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -125,7 +125,7 @@ public class TileComponentConfig implements ITileComponent public boolean isEjecting(TransmissionType type) { - return ejecting.get(type); + return ejecting.get(type.ordinal()); } public void setEjecting(TransmissionType type, boolean eject)