From bc024b851f002a4890b854f615d8ce2e2fd5e147 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Mon, 1 Feb 2016 23:42:43 +0000 Subject: [PATCH] GUIs are back! --- .../java/mekanism/client/ClientProxy.java | 60 ++++++++++++++++++- .../gui/GuiAdvancedElectricMachine.java | 2 +- .../client/gui/GuiChemicalCrystallizer.java | 2 +- .../mekanism/client/gui/GuiDictionary.java | 8 ++- .../mekanism/client/gui/GuiDigitalMiner.java | 21 +++---- .../client/gui/GuiDigitalMinerConfig.java | 27 +++++---- .../mekanism/client/gui/GuiDynamicTank.java | 3 +- .../mekanism/client/gui/GuiElectricChest.java | 4 +- .../client/gui/GuiElectrolyticSeparator.java | 3 +- .../client/gui/GuiEntangledBlock.java | 7 ++- .../java/mekanism/client/gui/GuiFactory.java | 14 +++-- .../java/mekanism/client/gui/GuiGasTank.java | 3 +- .../client/gui/GuiInductionMatrix.java | 2 +- .../client/gui/GuiLaserAmplifier.java | 15 ++--- .../client/gui/GuiLogisticalSorter.java | 21 +++---- .../mekanism/client/gui/GuiMFilterSelect.java | 6 +- .../client/gui/GuiMItemStackFilter.java | 12 ++-- .../client/gui/GuiMMaterialFilter.java | 10 ++-- .../mekanism/client/gui/GuiMModIDFilter.java | 15 ++--- .../client/gui/GuiMOreDictFilter.java | 13 ++-- .../java/mekanism/client/gui/GuiMekanism.java | 27 ++++----- .../client/gui/GuiMetallurgicInfuser.java | 5 +- .../client/gui/GuiOredictionificator.java | 11 ++-- .../gui/GuiOredictionificatorFilter.java | 13 ++-- .../mekanism/client/gui/GuiPasswordEnter.java | 8 ++- .../client/gui/GuiPasswordModify.java | 10 ++-- .../mekanism/client/gui/GuiRobitCrafting.java | 4 +- .../client/gui/GuiRobitInventory.java | 4 +- .../mekanism/client/gui/GuiRobitMain.java | 8 ++- .../mekanism/client/gui/GuiRobitRepair.java | 21 ++++--- .../mekanism/client/gui/GuiRobitSmelting.java | 4 +- .../client/gui/GuiRotaryCondensentrator.java | 3 +- .../mekanism/client/gui/GuiSeismicReader.java | 17 +++--- .../client/gui/GuiSideConfiguration.java | 10 ++-- .../mekanism/client/gui/GuiTFilterSelect.java | 6 +- .../client/gui/GuiTItemStackFilter.java | 16 ++--- .../client/gui/GuiTMaterialFilter.java | 12 ++-- .../mekanism/client/gui/GuiTModIDFilter.java | 15 ++--- .../client/gui/GuiTOreDictFilter.java | 15 ++--- .../mekanism/client/gui/GuiTeleporter.java | 9 +-- .../client/gui/GuiTransporterConfig.java | 6 +- .../client/gui/GuiUpgradeManagement.java | 13 ++-- .../java/mekanism/client/gui/IGuiWrapper.java | 4 +- .../client/gui/element/GuiBucketIO.java | 1 - .../client/gui/element/GuiConfigTypeTab.java | 2 +- .../gui/element/GuiContainerEditMode.java | 2 +- .../client/gui/element/GuiDetectionTab.java | 2 +- .../client/gui/element/GuiElement.java | 15 ++++- .../client/gui/element/GuiEnergyGauge.java | 4 +- .../client/gui/element/GuiEnergyInfo.java | 2 +- .../client/gui/element/GuiFluidGauge.java | 11 ++-- .../client/gui/element/GuiGasGauge.java | 9 +-- .../mekanism/client/gui/element/GuiGauge.java | 6 +- .../client/gui/element/GuiMatrixTab.java | 2 +- .../client/gui/element/GuiNumberGauge.java | 7 ++- .../client/gui/element/GuiPowerBar.java | 2 +- .../client/gui/element/GuiProgress.java | 2 +- .../client/gui/element/GuiRateBar.java | 2 +- .../client/gui/element/GuiRecipeType.java | 2 +- .../gui/element/GuiRedstoneControl.java | 2 +- .../client/gui/element/GuiScrollList.java | 6 +- .../gui/element/GuiSideConfigurationTab.java | 2 +- .../mekanism/client/gui/element/GuiSlot.java | 2 +- .../client/gui/element/GuiSortingTab.java | 2 +- .../gui/element/GuiTransporterConfigTab.java | 2 +- .../client/gui/element/GuiUpgradeTab.java | 2 +- .../client/gui/element/GuiVisualsTab.java | 2 +- .../common/network/PacketDigitalMinerGui.java | 11 +++- .../network/PacketLogisticalSorterGui.java | 10 +++- 69 files changed, 372 insertions(+), 229 deletions(-) diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index f6540bf0a..4f4c742ce 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -58,6 +58,55 @@ import mekanism.client.entity.EntityLaser; //import mekanism.client.gui.GuiTeleporter; //import mekanism.client.gui.GuiTransporterConfig; //import mekanism.client.gui.GuiUpgradeManagement; +import mekanism.client.gui.GuiAmbientAccumulator; +import mekanism.client.gui.GuiChemicalCrystallizer; +import mekanism.client.gui.GuiChemicalDissolutionChamber; +import mekanism.client.gui.GuiChemicalInfuser; +import mekanism.client.gui.GuiChemicalInjectionChamber; +import mekanism.client.gui.GuiChemicalOxidizer; +import mekanism.client.gui.GuiChemicalWasher; +import mekanism.client.gui.GuiCombiner; +import mekanism.client.gui.GuiCredits; +import mekanism.client.gui.GuiCrusher; +import mekanism.client.gui.GuiDictionary; +import mekanism.client.gui.GuiDigitalMiner; +import mekanism.client.gui.GuiDynamicTank; +import mekanism.client.gui.GuiElectricPump; +import mekanism.client.gui.GuiElectrolyticSeparator; +import mekanism.client.gui.GuiEnergizedSmelter; +import mekanism.client.gui.GuiEnergyCube; +import mekanism.client.gui.GuiEnrichmentChamber; +import mekanism.client.gui.GuiEntangledBlock; +import mekanism.client.gui.GuiFactory; +import mekanism.client.gui.GuiFluidicPlenisher; +import mekanism.client.gui.GuiGasTank; +import mekanism.client.gui.GuiInductionMatrix; +import mekanism.client.gui.GuiLaserAmplifier; +import mekanism.client.gui.GuiLaserTractorBeam; +import mekanism.client.gui.GuiMatrixStats; +import mekanism.client.gui.GuiMetallurgicInfuser; +import mekanism.client.gui.GuiOredictionificator; +import mekanism.client.gui.GuiOsmiumCompressor; +import mekanism.client.gui.GuiPRC; +import mekanism.client.gui.GuiPasswordEnter; +import mekanism.client.gui.GuiPasswordModify; +import mekanism.client.gui.GuiPortableTank; +import mekanism.client.gui.GuiPrecisionSawmill; +import mekanism.client.gui.GuiPurificationChamber; +import mekanism.client.gui.GuiRobitCrafting; +import mekanism.client.gui.GuiRobitInventory; +import mekanism.client.gui.GuiRobitMain; +import mekanism.client.gui.GuiRobitRepair; +import mekanism.client.gui.GuiRobitSmelting; +import mekanism.client.gui.GuiRotaryCondensentrator; +import mekanism.client.gui.GuiSeismicReader; +import mekanism.client.gui.GuiSeismicVibrator; +import mekanism.client.gui.GuiSideConfiguration; +import mekanism.client.gui.GuiSolarEvaporationController; +import mekanism.client.gui.GuiSolarNeutronActivator; +import mekanism.client.gui.GuiTeleporter; +import mekanism.client.gui.GuiTransporterConfig; +import mekanism.client.gui.GuiUpgradeManagement; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.RenderTickHandler; import mekanism.client.render.entity.RenderBalloon; @@ -95,6 +144,8 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.base.IElectricChest; +import mekanism.common.base.ISideConfiguration; +import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.entity.EntityBabySkeleton; import mekanism.common.entity.EntityBalloon; @@ -102,8 +153,11 @@ import mekanism.common.entity.EntityFlame; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.InventoryElectricChest; +import mekanism.common.item.ItemPortableTeleporter; +import mekanism.common.item.ItemSeismicReader; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; +import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityAmbientAccumulator; import mekanism.common.tile.TileEntityBin; @@ -120,12 +174,14 @@ import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; import mekanism.common.tile.TileEntityElectricChest; +import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.tile.TileEntityEliteFactory; import mekanism.common.tile.TileEntityEnergizedSmelter; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.tile.TileEntityEnrichmentChamber; +import mekanism.common.tile.TileEntityEntangledBlock; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityGasTank; @@ -466,7 +522,7 @@ public class ClientProxy extends CommonProxy { TileEntity tileEntity = world.getTileEntity(pos); - /*switch(ID) + switch(ID) { case 0: return new GuiDictionary(player.inventory); @@ -593,7 +649,7 @@ public class ClientProxy extends CommonProxy return new GuiTransporterConfig(player, (ISideConfiguration)tileEntity); case 52: return new GuiOredictionificator(player.inventory, (TileEntityOredictionificator)tileEntity); - }*/ + } return null; } diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index 30ae0222f..e9a4073f7 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -121,6 +121,6 @@ public class GuiAdvancedElectricMachine extends GuiMekanism int guiHeight = (height - ySize) / 2; mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); - drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, gas.getGas().getIcon(), sizeX, sizeY); + drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, gas.getGas().getSprite(), sizeX, sizeY); } } \ No newline at end of file diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index 40091816c..746e3484e 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -131,7 +131,7 @@ public class GuiChemicalCrystallizer extends GuiMekanism try { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), renderStack, 131, 14); + itemRender.renderItemAndEffectIntoGUI(renderStack, 131, 14); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } catch(Exception e) {} diff --git a/src/main/java/mekanism/client/gui/GuiDictionary.java b/src/main/java/mekanism/client/gui/GuiDictionary.java index 3fc606e64..8016758d1 100644 --- a/src/main/java/mekanism/client/gui/GuiDictionary.java +++ b/src/main/java/mekanism/client/gui/GuiDictionary.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import java.io.IOException; + import mekanism.client.gui.element.GuiScrollList; import mekanism.client.sound.SoundHandler; import mekanism.common.inventory.container.ContainerDictionary; @@ -42,7 +44,7 @@ public class GuiDictionary extends GuiMekanism { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), itemType, 6, 6); + itemRender.renderItemAndEffectIntoGUI(itemType, 6, 6); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -87,7 +89,7 @@ public class GuiDictionary extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); @@ -100,7 +102,7 @@ public class GuiDictionary extends GuiMekanism for(int i = 0; i < inventorySlots.inventorySlots.size(); i++) { - Slot slot = (Slot)inventorySlots.inventorySlots.get(i); + Slot slot = inventorySlots.inventorySlots.get(i); if(isMouseOverSlot(slot, mouseX, mouseY)) { diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index 9d09e4ac2..aa7aba2fc 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -104,20 +105,20 @@ public class GuiDigitalMiner extends GuiMekanism } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); if(guibutton.id == 0) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList(); data.add(3); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); } else if(guibutton.id == 1) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList(); data.add(4); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -186,8 +187,8 @@ public class GuiDigitalMiner extends GuiMekanism mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); - itemRender.renderIcon(144, 27, MekanismRenderer.getColorIcon(EnumColor.DARK_RED), 16, 16); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), tileEntity.missingStack, 144, 27); + //TODO itemRender.renderIcon(144, 27, MekanismRenderer.getColorIcon(EnumColor.DARK_RED), 16, 16); + itemRender.renderItemAndEffectIntoGUI(tileEntity.missingStack, 144, 27); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); @@ -289,7 +290,7 @@ public class GuiDigitalMiner extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); @@ -302,7 +303,7 @@ public class GuiDigitalMiner extends GuiMekanism { SoundHandler.playSound("gui.button.press"); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList(); data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -312,7 +313,7 @@ public class GuiDigitalMiner extends GuiMekanism { SoundHandler.playSound("gui.button.press"); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList(); data.add(1); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -322,7 +323,7 @@ public class GuiDigitalMiner extends GuiMekanism { SoundHandler.playSound("gui.button.press"); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList(); data.add(5); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -332,7 +333,7 @@ public class GuiDigitalMiner extends GuiMekanism { SoundHandler.playSound("gui.button.press"); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList(); data.add(9); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index ce6963b14..599de4260 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -198,7 +199,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism } @Override - public void mouseClicked(int mouseX, int mouseY, int button) + public void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); @@ -342,9 +343,9 @@ public class GuiDigitalMinerConfig extends GuiMekanism } @Override - protected void mouseMovedOrUp(int x, int y, int type) + protected void mouseReleased(int x, int y, int type) { - super.mouseMovedOrUp(x, y, type); + super.mouseReleased(x, y, type); if(type == 0 && isDragging) { @@ -357,7 +358,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism * Handles mouse input. */ @Override - public void handleMouseInput() + public void handleMouseInput() throws IOException { super.handleMouseInput(); @@ -406,21 +407,21 @@ public class GuiDigitalMinerConfig extends GuiMekanism String prevMin = minField != null ? minField.getText() : ""; String prevMax = maxField != null ? maxField.getText() : ""; - radiusField = new GuiTextField(fontRendererObj, guiWidth + 12, guiHeight + 67, 26, 11); + radiusField = new GuiTextField(1, fontRendererObj, guiWidth + 12, guiHeight + 67, 26, 11); radiusField.setMaxStringLength(2); radiusField.setText(prevRad); - minField = new GuiTextField(fontRendererObj, guiWidth + 12, guiHeight + 92, 26, 11); + minField = new GuiTextField(2, fontRendererObj, guiWidth + 12, guiHeight + 92, 26, 11); minField.setMaxStringLength(3); minField.setText(prevMin); - maxField = new GuiTextField(fontRendererObj, guiWidth + 12, guiHeight + 117, 26, 11); + maxField = new GuiTextField(3, fontRendererObj, guiWidth + 12, guiHeight + 117, 26, 11); maxField.setMaxStringLength(3); maxField.setText(prevMax); } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); @@ -464,7 +465,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), itemFilter.itemType, 59, yStart + 3); + itemRender.renderItemAndEffectIntoGUI(itemFilter.itemType, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -485,7 +486,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism try { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), oreDictStacks.get(filter).renderStack, 59, yStart + 3); + itemRender.renderItemAndEffectIntoGUI(oreDictStacks.get(filter).renderStack, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } catch(Exception e) {} @@ -501,7 +502,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), itemFilter.materialItem, 59, yStart + 3); + itemRender.renderItemAndEffectIntoGUI(itemFilter.materialItem, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -522,7 +523,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism try { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), modIDStacks.get(filter).renderStack, 59, yStart + 3); + itemRender.renderItemAndEffectIntoGUI(modIDStacks.get(filter).renderStack, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } catch(Exception e) {} @@ -647,7 +648,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism } @Override - public void keyTyped(char c, int i) + public void keyTyped(char c, int i) throws IOException { if((!radiusField.isFocused() && !minField.isFocused() && !maxField.isFocused()) || i == Keyboard.KEY_ESCAPE) { diff --git a/src/main/java/mekanism/client/gui/GuiDynamicTank.java b/src/main/java/mekanism/client/gui/GuiDynamicTank.java index 069e27732..df765b098 100644 --- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java +++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiContainerEditMode; import mekanism.client.render.MekanismRenderer; +import mekanism.client.render.MekanismRenderer.FluidType; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.inventory.container.ContainerDynamicTank; import mekanism.common.tile.TileEntityDynamicTank; @@ -96,7 +97,7 @@ public class GuiDynamicTank extends GuiMekanism } mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); - drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, fluid.getFluid().getIcon(), 16, 16 - (16 - renderRemaining)); + drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, MekanismRenderer.getFluidTexture(fluid.getFluid(), FluidType.STILL), 16, 16 - (16 - renderRemaining)); start+=16; if(renderRemaining == 0 || scale == 0) diff --git a/src/main/java/mekanism/client/gui/GuiElectricChest.java b/src/main/java/mekanism/client/gui/GuiElectricChest.java index 3ff01b0d3..46a7216e7 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricChest.java +++ b/src/main/java/mekanism/client/gui/GuiElectricChest.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import java.io.IOException; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.energy.IEnergizedItem; @@ -96,7 +98,7 @@ public class GuiElectricChest extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index e21f1d03f..89ce1c8b5 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -26,6 +26,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -89,7 +90,7 @@ public class GuiElectrolyticSeparator extends GuiMekanism } @Override - protected void mouseClicked(int x, int y, int button) + protected void mouseClicked(int x, int y, int button) throws IOException { super.mouseClicked(x, y, button); diff --git a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java index dfaa3153d..811c786ff 100644 --- a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java +++ b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import mekanism.api.Coord4D; @@ -66,7 +67,7 @@ public class GuiEntangledBlock extends GuiMekanism } @Override - public void mouseClicked(int mouseX, int mouseY, int button) + public void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); @@ -74,7 +75,7 @@ public class GuiEntangledBlock extends GuiMekanism } @Override - public void keyTyped(char c, int i) + public void keyTyped(char c, int i) throws IOException { if(!frequencyField.isFocused() || i == Keyboard.KEY_ESCAPE) { @@ -123,7 +124,7 @@ public class GuiEntangledBlock extends GuiMekanism String prevFreq = frequencyField != null ? frequencyField.getText() : ""; - frequencyField = new GuiTextField(fontRendererObj, guiWidth + 75, guiHeight + 55, 96, 11); + frequencyField = new GuiTextField(0, fontRendererObj, guiWidth + 75, guiHeight + 55, 96, 11); frequencyField.setText(prevFreq); } } diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index 1876a1df8..e12102285 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -24,9 +25,10 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; @@ -125,21 +127,21 @@ public class GuiFactory extends GuiMekanism { if(tileEntity.getScaledGasLevel(160) > 0) { - displayGauge(8, 78, tileEntity.getScaledGasLevel(160), 5, tileEntity.gasTank.getGas().getGas().getIcon()); + displayGauge(8, 78, tileEntity.getScaledGasLevel(160), 5, tileEntity.gasTank.getGas().getGas().getSprite()); } } else if(tileEntity.recipeType == RecipeType.INFUSING) { if(tileEntity.getScaledInfuseLevel(160) > 0) { - displayGauge(8, 78, tileEntity.getScaledInfuseLevel(160), 5, tileEntity.infuseStored.type.icon); + displayGauge(8, 78, tileEntity.getScaledInfuseLevel(160), 5, tileEntity.infuseStored.type.sprite); } } super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } - public void displayGauge(int xPos, int yPos, int sizeX, int sizeY, IIcon icon) + public void displayGauge(int xPos, int yPos, int sizeX, int sizeY, TextureAtlasSprite icon) { if(icon == null) { @@ -150,11 +152,11 @@ public class GuiFactory extends GuiMekanism int guiHeight = (height - ySize) / 2; mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); - drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos, icon, sizeX, sizeY); + drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, icon, sizeX, sizeY); } @Override - protected void mouseClicked(int x, int y, int button) + protected void mouseClicked(int x, int y, int button) throws IOException { super.mouseClicked(x, y, button); diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index 1fd80c6cf..4f5e70288 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import mekanism.api.Coord4D; @@ -82,7 +83,7 @@ public class GuiGasTank extends GuiMekanism } @Override - protected void mouseClicked(int x, int y, int button) + protected void mouseClicked(int x, int y, int button) throws IOException { super.mouseClicked(x, y, button); diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java index 99e4212b4..367d47329 100644 --- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java +++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java @@ -88,7 +88,7 @@ public class GuiInductionMatrix extends GuiMekanism } mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); - drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, MekanismRenderer.energyIcon, 16, 16 - (16 - renderRemaining)); + drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, MekanismRenderer.energyIcon, 16, 16 - (16 - renderRemaining)); start+=16; if(renderRemaining == 0 || scale == 0) diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index 71dccbf15..57effd19b 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import mekanism.api.Coord4D; @@ -18,7 +19,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.IIcon; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; @@ -43,7 +44,7 @@ public class GuiLaserAmplifier extends GuiMekanism guiElements.add(new GuiNumberGauge(new INumberInfoHandler() { @Override - public IIcon getIcon() + public TextureAtlasSprite getIcon() { return MekanismRenderer.energyIcon; } @@ -113,7 +114,7 @@ public class GuiLaserAmplifier extends GuiMekanism } @Override - public void mouseClicked(int mouseX, int mouseY, int button) + public void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); @@ -123,7 +124,7 @@ public class GuiLaserAmplifier extends GuiMekanism } @Override - public void keyTyped(char c, int i) + public void keyTyped(char c, int i) throws IOException { if(!(minField.isFocused() || maxField.isFocused() || timerField.isFocused()) || i == Keyboard.KEY_ESCAPE) { @@ -226,18 +227,18 @@ public class GuiLaserAmplifier extends GuiMekanism String prevTime = timerField != null ? timerField.getText() : ""; - timerField = new GuiTextField(fontRendererObj, guiWidth + 96, guiHeight + 28, 36, 11); + timerField = new GuiTextField(0, fontRendererObj, guiWidth + 96, guiHeight + 28, 36, 11); timerField.setMaxStringLength(4); timerField.setText(prevTime); String prevMin = minField != null ? minField.getText() : ""; - minField = new GuiTextField(fontRendererObj, guiWidth + 96, guiHeight + 43, 72, 11); + minField = new GuiTextField(1, fontRendererObj, guiWidth + 96, guiHeight + 43, 72, 11); minField.setMaxStringLength(10); minField.setText(prevMin); String prevMax = maxField != null ? maxField.getText() : ""; - maxField = new GuiTextField(fontRendererObj, guiWidth + 96, guiHeight + 58, 72, 11); + maxField = new GuiTextField(2, fontRendererObj, guiWidth + 96, guiHeight + 58, 72, 11); maxField.setMaxStringLength(10); maxField.setText(prevMax); } diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 36961e538..46c86c1a0 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -215,7 +216,7 @@ public class GuiLogisticalSorter extends GuiMekanism } @Override - public void mouseClicked(int mouseX, int mouseY, int mouseBtn) + public void mouseClicked(int mouseX, int mouseY, int mouseBtn) throws IOException { super.mouseClicked(mouseX, mouseY, mouseBtn); @@ -362,9 +363,9 @@ public class GuiLogisticalSorter extends GuiMekanism } @Override - protected void mouseMovedOrUp(int mouseX, int mouseY, int type) + protected void mouseReleased(int mouseX, int mouseY, int type) { - super.mouseMovedOrUp(mouseX, mouseY, type); + super.mouseReleased(mouseX, mouseY, type); if(type == 0 && isDragging) { @@ -377,7 +378,7 @@ public class GuiLogisticalSorter extends GuiMekanism * Handles mouse input. */ @Override - public void handleMouseInput() + public void handleMouseInput() throws IOException { super.handleMouseInput(); @@ -422,7 +423,7 @@ public class GuiLogisticalSorter extends GuiMekanism } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); @@ -469,7 +470,7 @@ public class GuiLogisticalSorter extends GuiMekanism { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), itemFilter.itemType, 59, yStart + 3); + itemRender.renderItemAndEffectIntoGUI(itemFilter.itemType, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -491,7 +492,7 @@ public class GuiLogisticalSorter extends GuiMekanism try { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), oreDictStacks.get(filter).renderStack, 59, yStart + 3); + itemRender.renderItemAndEffectIntoGUI(oreDictStacks.get(filter).renderStack, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } catch(final Exception e) {} @@ -508,7 +509,7 @@ public class GuiLogisticalSorter extends GuiMekanism { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), itemFilter.materialItem, 59, yStart + 3); + itemRender.renderItemAndEffectIntoGUI(itemFilter.materialItem, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -530,7 +531,7 @@ public class GuiLogisticalSorter extends GuiMekanism try { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), modIDStacks.get(filter).renderStack, 59, yStart + 3); + itemRender.renderItemAndEffectIntoGUI(modIDStacks.get(filter).renderStack, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } catch(final Exception e) {} @@ -569,7 +570,7 @@ public class GuiLogisticalSorter extends GuiMekanism GL11.glEnable(GL12.GL_RESCALE_NORMAL); mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); - itemRender.renderIcon(13, 137, MekanismRenderer.getColorIcon(tileEntity.color), 16, 16); + //TODO itemRender.renderIcon(13, 137, MekanismRenderer.getColorIcon(tileEntity.color), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); diff --git a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java index ad3f546a2..2d3485ac0 100644 --- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import java.io.IOException; + import mekanism.api.Coord4D; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -45,7 +47,7 @@ public class GuiMFilterSelect extends GuiMekanism } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); @@ -102,7 +104,7 @@ public class GuiMFilterSelect extends GuiMekanism } @Override - public void mouseClicked(int mouseX, int mouseY, int button) + public void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index 3919cd322..2c0306169 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import java.io.IOException; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.sound.SoundHandler; @@ -78,7 +80,7 @@ public class GuiMItemStackFilter extends GuiMekanism } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); @@ -96,7 +98,7 @@ public class GuiMItemStackFilter extends GuiMekanism Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); } - else if(filter.itemType == null) + else { status = EnumColor.DARK_RED + LangUtils.localize("gui.itemFilter.noItem"); ticker = 20; @@ -128,7 +130,7 @@ public class GuiMItemStackFilter extends GuiMekanism { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), filter.itemType, 12, 19); + itemRender.renderItemAndEffectIntoGUI(filter.itemType, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -137,7 +139,7 @@ public class GuiMItemStackFilter extends GuiMekanism { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), filter.replaceStack, 149, 19); + itemRender.renderItemAndEffectIntoGUI(filter.replaceStack, 149, 19); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -239,7 +241,7 @@ public class GuiMItemStackFilter extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index 4fa0c249f..f87f38d9c 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import java.io.IOException; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.sound.SoundHandler; @@ -78,7 +80,7 @@ public class GuiMMaterialFilter extends GuiMekanism } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); @@ -128,7 +130,7 @@ public class GuiMMaterialFilter extends GuiMekanism { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), filter.materialItem, 12, 19); + itemRender.renderItemAndEffectIntoGUI(filter.materialItem, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -137,7 +139,7 @@ public class GuiMMaterialFilter extends GuiMekanism { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), filter.replaceStack, 149, 19); + itemRender.renderItemAndEffectIntoGUI(filter.replaceStack, 149, 19); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -226,7 +228,7 @@ public class GuiMMaterialFilter extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java index 0c352fbd9..4a1d310fb 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.List; import mekanism.api.Coord4D; @@ -90,16 +91,16 @@ public class GuiMModIDFilter extends GuiMekanism if(isNew) { - ((GuiButton)buttonList.get(1)).enabled = false; + (buttonList.get(1)).enabled = false; } - modIDText = new GuiTextField(fontRendererObj, guiWidth + 35, guiHeight + 47, 95, 12); + modIDText = new GuiTextField(2, fontRendererObj, guiWidth + 35, guiHeight + 47, 95, 12); modIDText.setMaxStringLength(TransporterFilter.MAX_LENGTH); modIDText.setFocused(true); } @Override - public void keyTyped(char c, int i) + public void keyTyped(char c, int i) throws IOException { if(!modIDText.isFocused() || i == Keyboard.KEY_ESCAPE) { @@ -119,7 +120,7 @@ public class GuiMModIDFilter extends GuiMekanism } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); @@ -169,7 +170,7 @@ public class GuiMModIDFilter extends GuiMekanism try { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), renderStack, 12, 19); + itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } catch(Exception e) {} @@ -179,7 +180,7 @@ public class GuiMModIDFilter extends GuiMekanism { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), filter.replaceStack, 149, 19); + itemRender.renderItemAndEffectIntoGUI(filter.replaceStack, 149, 19); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -290,7 +291,7 @@ public class GuiMModIDFilter extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index fbd8ca557..e9526fc11 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.List; import mekanism.api.Coord4D; @@ -93,13 +94,13 @@ public class GuiMOreDictFilter extends GuiMekanism ((GuiButton)buttonList.get(1)).enabled = false; } - oreDictText = new GuiTextField(fontRendererObj, guiWidth + 35, guiHeight + 47, 95, 12); + oreDictText = new GuiTextField(2, fontRendererObj, guiWidth + 35, guiHeight + 47, 95, 12); oreDictText.setMaxStringLength(TransporterFilter.MAX_LENGTH); oreDictText.setFocused(true); } @Override - public void keyTyped(char c, int i) + public void keyTyped(char c, int i) throws IOException { if(!oreDictText.isFocused() || i == Keyboard.KEY_ESCAPE) { @@ -119,7 +120,7 @@ public class GuiMOreDictFilter extends GuiMekanism } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); @@ -169,7 +170,7 @@ public class GuiMOreDictFilter extends GuiMekanism try { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), renderStack, 12, 19); + itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } catch(Exception e) {} @@ -179,7 +180,7 @@ public class GuiMOreDictFilter extends GuiMekanism { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), filter.replaceStack, 149, 19); + itemRender.renderItemAndEffectIntoGUI(filter.replaceStack, 149, 19); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -290,7 +291,7 @@ public class GuiMOreDictFilter extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index 9fb250f13..82ca4090b 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -1,6 +1,7 @@ package mekanism.client.gui; -import java.util.Arrays; +import java.io.IOException; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -17,8 +18,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - import org.lwjgl.opengl.GL11; public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper @@ -145,7 +144,7 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper protected boolean isMouseOverSlot(Slot slot, int mouseX, int mouseY) { - return func_146978_c(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX, mouseY);//isPointInRegion + return isPointInRegion(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX, mouseY); } @Override @@ -164,7 +163,7 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); @@ -183,17 +182,15 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper } @Override - protected void drawCreativeTabHoveringText(String text, int x, int y) + public void drawTexturedRect(int x, int y, int u, int v, int w, int h) { - func_146283_a(Arrays.asList(new String[] {text}), x, y); + drawTexturedModalRect(x, y, u, v, w, h); } @Override - protected void func_146283_a(List list, int x, int y) + public void drawTexturedRectFromIcon(int x, int y, TextureAtlasSprite icon, int w, int h) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT + GL11.GL_LIGHTING_BIT); - super.func_146283_a(list, x, y); - GL11.glPopAttrib(); + drawTexturedModalRect(x, y, icon, w, h); } @Override @@ -205,7 +202,7 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper @Override public void displayTooltips(List list, int xAxis, int yAxis) { - func_146283_a(list, xAxis, yAxis); + drawHoveringText(list, xAxis, yAxis); } @Override @@ -229,16 +226,16 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper } @Override - protected void mouseMovedOrUp(int mouseX, int mouseY, int type) + protected void mouseReleased(int mouseX, int mouseY, int type) { - super.mouseMovedOrUp(mouseX, mouseY, type); + super.mouseReleased(mouseX, mouseY, type); int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); for(GuiElement element : guiElements) { - element.mouseMovedOrUp(xAxis, yAxis, type); + element.mouseReleased(xAxis, yAxis, type); } } diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index efa133615..a1ad4e90d 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -103,14 +104,14 @@ public class GuiMetallurgicInfuser extends GuiMekanism { mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); int displayInt = tileEntity.getScaledInfuseLevel(52); - drawTexturedRectFromIcon(guiWidth + 7, guiHeight + 17 + 52 - displayInt, tileEntity.infuseStored.type.icon, 4, displayInt); + drawTexturedRectFromIcon(guiWidth + 7, guiHeight + 17 + 52 - displayInt, tileEntity.infuseStored.type.sprite, 4, displayInt); } super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } @Override - protected void mouseClicked(int x, int y, int button) + protected void mouseClicked(int x, int y, int button) throws IOException { super.mouseClicked(x, y, button); diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificator.java b/src/main/java/mekanism/client/gui/GuiOredictionificator.java index 3cf66178c..32af9f960 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificator.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificator.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -92,7 +93,7 @@ public class GuiOredictionificator extends GuiMekanism } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); @@ -129,7 +130,7 @@ public class GuiOredictionificator extends GuiMekanism { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), stack, 13, yStart + 3); + itemRender.renderItemAndEffectIntoGUI(stack, 13, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -178,7 +179,7 @@ public class GuiOredictionificator extends GuiMekanism } @Override - public void mouseClicked(int mouseX, int mouseY, int button) + public void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); @@ -232,9 +233,9 @@ public class GuiOredictionificator extends GuiMekanism } @Override - protected void mouseMovedOrUp(int x, int y, int type) + protected void mouseReleased(int x, int y, int type) { - super.mouseMovedOrUp(x, y, type); + super.mouseReleased(x, y, type); if(type == 0 && isDragging) { diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java index 84a3baa30..a8dfb6aff 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.Arrays; import java.util.List; @@ -120,10 +121,10 @@ public class GuiOredictionificatorFilter extends GuiMekanism if(isNew) { - ((GuiButton)buttonList.get(1)).enabled = false; + buttonList.get(1).enabled = false; } - filterText = new GuiTextField(fontRendererObj, guiWidth + 33, guiHeight + 48, 96, 12); + filterText = new GuiTextField(2, fontRendererObj, guiWidth + 33, guiHeight + 48, 96, 12); filterText.setMaxStringLength(TileEntityOredictionificator.MAX_LENGTH); filterText.setFocused(true); @@ -151,7 +152,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism try { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), renderStack, 45, 19); + itemRender.renderItemAndEffectIntoGUI(renderStack, 45, 19); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } catch(Exception e) {} @@ -236,7 +237,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism } @Override - public void keyTyped(char c, int i) + public void keyTyped(char c, int i) throws IOException { if(!filterText.isFocused() || i == Keyboard.KEY_ESCAPE) { @@ -256,7 +257,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); @@ -296,7 +297,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java index 3138e6966..fc5ba7258 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import java.io.IOException; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.energy.IEnergizedItem; @@ -53,7 +55,7 @@ public class GuiPasswordEnter extends GuiScreen } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); passwordField.mouseClicked(mouseX, mouseY, button); @@ -70,13 +72,13 @@ public class GuiPasswordEnter extends GuiScreen buttonList.clear(); buttonList.add(new GuiButton(0, guiWidth + 55, guiHeight + 68, 60, 20, LangUtils.localize("gui.open"))); - passwordField = new GuiTextField(fontRendererObj, guiWidth + 45, guiHeight + 50, 80, 12); + passwordField = new GuiTextField(1, fontRendererObj, guiWidth + 45, guiHeight + 50, 80, 12); passwordField.setMaxStringLength(12); passwordField.setFocused(true); } @Override - public void keyTyped(char c, int i) + public void keyTyped(char c, int i) throws IOException { super.keyTyped(c, i); diff --git a/src/main/java/mekanism/client/gui/GuiPasswordModify.java b/src/main/java/mekanism/client/gui/GuiPasswordModify.java index dd8c707fb..04f12c815 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordModify.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordModify.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import java.io.IOException; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.Mekanism; @@ -63,17 +65,17 @@ public class GuiPasswordModify extends GuiScreen buttonList.clear(); buttonList.add(new GuiButton(0, guiWidth + 55, guiHeight + 68, 60, 20, LangUtils.localize("gui.confirm"))); - newPasswordField = new GuiTextField(fontRendererObj, guiWidth + 60, guiHeight + 34, 80, 12); + newPasswordField = new GuiTextField(1, fontRendererObj, guiWidth + 60, guiHeight + 34, 80, 12); newPasswordField.setMaxStringLength(12); newPasswordField.setFocused(true); - confirmPasswordField = new GuiTextField(fontRendererObj, guiWidth + 60, guiHeight + 51, 80, 12); + confirmPasswordField = new GuiTextField(2, fontRendererObj, guiWidth + 60, guiHeight + 51, 80, 12); confirmPasswordField.setMaxStringLength(12); confirmPasswordField.setFocused(false); } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); newPasswordField.mouseClicked(mouseX, mouseY, button); @@ -81,7 +83,7 @@ public class GuiPasswordModify extends GuiScreen } @Override - public void keyTyped(char c, int i) + public void keyTyped(char c, int i) throws IOException { super.keyTyped(c, i); diff --git a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java index 18df82d02..87a50e929 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import java.io.IOException; + import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerRobitCrafting; @@ -92,7 +94,7 @@ public class GuiRobitCrafting extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiRobitInventory.java b/src/main/java/mekanism/client/gui/GuiRobitInventory.java index b459eb1b9..99e08d862 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java +++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import java.io.IOException; + import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.entity.EntityRobit; @@ -92,7 +94,7 @@ public class GuiRobitInventory extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index 2524fe124..46150562d 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import java.io.IOException; + import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.entity.EntityRobit; @@ -73,13 +75,13 @@ public class GuiRobitMain extends GuiMekanism buttonList.add(confirmName = new GuiButton(0, guiWidth + 58, guiHeight + 47, 60, 20, LangUtils.localize("gui.confirm"))); confirmName.visible = displayNameChange; - nameChangeField = new GuiTextField(fontRendererObj, guiWidth + 48, guiHeight + 21, 80, 12); + nameChangeField = new GuiTextField(1, fontRendererObj, guiWidth + 48, guiHeight + 21, 80, 12); nameChangeField.setMaxStringLength(12); nameChangeField.setFocused(true); } @Override - public void keyTyped(char c, int i) + public void keyTyped(char c, int i) throws IOException { if(!displayNameChange) { @@ -253,7 +255,7 @@ public class GuiRobitMain extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index 15cafd061..f3d6c0ea2 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.List; import mekanism.client.sound.SoundHandler; @@ -15,13 +16,16 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ContainerRepair; import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.client.C17PacketCustomPayload; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import io.netty.buffer.Unpooled; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.apache.commons.io.Charsets; @@ -52,7 +56,7 @@ public class GuiRobitRepair extends GuiMekanism implements ICrafting int i = (width - xSize) / 2; int j = (height - ySize) / 2; - itemNameField = new GuiTextField(fontRendererObj, i + 62, j + 24, 103, 12); + itemNameField = new GuiTextField(0, fontRendererObj, i + 62, j + 24, 103, 12); itemNameField.setTextColor(-1); itemNameField.setDisabledTextColour(-1); itemNameField.setEnableBackgroundDrawing(false); @@ -79,7 +83,7 @@ public class GuiRobitRepair extends GuiMekanism implements ICrafting { int k = 8453920; boolean flag = true; - String s = StatCollector.translateToLocalFormatted("container.repair.cost", new Object[] {Integer.valueOf(repairContainer.maximumCost)}); + String s = StatCollector.translateToLocalFormatted("container.repair.cost", repairContainer.maximumCost); if(repairContainer.maximumCost >= 40 && !mc.thePlayer.capabilities.isCreativeMode) { @@ -122,12 +126,12 @@ public class GuiRobitRepair extends GuiMekanism implements ICrafting } @Override - protected void keyTyped(char c, int i) + protected void keyTyped(char c, int i) throws IOException { if(itemNameField.textboxKeyTyped(c, i)) { repairContainer.updateItemName(itemNameField.getText()); - mc.thePlayer.sendQueue.addToSendQueue(new C17PacketCustomPayload("MC|ItemName", itemNameField.getText().getBytes())); + mc.thePlayer.sendQueue.addToSendQueue(new C17PacketCustomPayload("MC|ItemName", (new PacketBuffer(Unpooled.buffer())).writeString(itemNameField.getText()))); } else { super.keyTyped(c, i); @@ -135,7 +139,7 @@ public class GuiRobitRepair extends GuiMekanism implements ICrafting } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); @@ -249,7 +253,7 @@ public class GuiRobitRepair extends GuiMekanism implements ICrafting } @Override - public void sendContainerAndContentsToPlayer(Container container, List list) + public void updateCraftingInventory(Container container, List list) { sendSlotContents(container, 0, container.getSlot(0).getStack()); } @@ -265,11 +269,14 @@ public class GuiRobitRepair extends GuiMekanism implements ICrafting if(itemstack != null) { repairContainer.updateItemName(itemNameField.getText()); - mc.thePlayer.sendQueue.addToSendQueue(new C17PacketCustomPayload("MC|ItemName", itemNameField.getText().getBytes(Charsets.UTF_8))); + mc.thePlayer.sendQueue.addToSendQueue(new C17PacketCustomPayload("MC|ItemName", (new PacketBuffer(Unpooled.buffer())).writeString(itemNameField.getText()))); } } } @Override public void sendProgressBarUpdate(Container par1Container, int par2, int par3) {} + + @Override + public void sendAllWindowProperties(Container p_175173_1_, IInventory p_175173_2_) {} } diff --git a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java index f78d1cd21..c212cca14 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import java.io.IOException; + import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.entity.EntityRobit; @@ -100,7 +102,7 @@ public class GuiRobitSmelting extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index 4ad25840c..f726f402a 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -160,7 +161,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java index e5e86688c..773ae68ef 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicReader.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicReader.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import mekanism.api.Coord4D; @@ -7,9 +8,11 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.gui.GuiScreen; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import org.apache.commons.lang3.tuple.Pair; @@ -40,8 +43,7 @@ public class GuiSeismicReader extends GuiScreen public GuiSeismicReader(World world, Coord4D coord, ItemStack stack) { - pos = coord; - pos.yCoord = Math.min(255, pos.yCoord); + pos = new Coord4D(coord.getX(), Math.min(255, coord.getY()), coord.getZ()); worldObj = world; itemStack = stack; @@ -130,7 +132,7 @@ public class GuiSeismicReader extends GuiScreen GL11.glScalef(0.8f, 0.8f, 0.8f); } - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, this.mc.getTextureManager(), stack, 0, 0); + itemRender.renderItemAndEffectIntoGUI(stack, 0, 0); GL11.glPopMatrix(); } } @@ -224,17 +226,18 @@ public class GuiSeismicReader extends GuiScreen public void calculate() { - for(int y = 0; y < pos.yCoord; y++) + for(BlockPos p = new BlockPos(pos.getX(), 0, pos.getZ()); p.getY() < pos.getY(); p = p.up()) { - Block block = worldObj.getBlock(pos.xCoord, y, pos.zCoord); - int metadata = worldObj.getBlockMetadata(pos.xCoord, y, pos.zCoord); + IBlockState state = worldObj.getBlockState(p); + Block block = state.getBlock(); + int metadata = block.getMetaFromState(state); blockList.add(Pair.of(metadata, block)); } } @Override - protected void mouseClicked(int xPos, int yPos, int buttonClicked) + protected void mouseClicked(int xPos, int yPos, int buttonClicked) throws IOException { super.mouseClicked(xPos, yPos, buttonClicked); diff --git a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java index d02b9f51b..a767e03f1 100644 --- a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -24,6 +25,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; @@ -132,7 +134,7 @@ public class GuiSideConfiguration extends GuiMekanism int x = slotPosMap.get(i).xPos; int y = slotPosMap.get(i).yPos; - SideData data = configurable.getConfig().getOutput(currentType, i); + SideData data = configurable.getConfig().getOutput(currentType, EnumFacing.getFront(i)); if(data.color != EnumColor.GREY) { @@ -175,7 +177,7 @@ public class GuiSideConfiguration extends GuiMekanism int x = slotPosMap.get(i).xPos; int y = slotPosMap.get(i).yPos; - SideData data = configurable.getConfig().getOutput(currentType, i); + SideData data = configurable.getConfig().getOutput(currentType, EnumFacing.getFront(i)); if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) { @@ -198,14 +200,14 @@ public class GuiSideConfiguration extends GuiMekanism TileEntity tile = (TileEntity)configurable; - if(tile == null || mc.theWorld.getTileEntity(tile.xCoord, tile.yCoord, tile.zCoord) == null) + if(tile == null || mc.theWorld.getTileEntity(tile.getPos()) == null) { mc.displayGuiScreen(null); } } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java index 1c3dcdea4..8cd7af810 100644 --- a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import java.io.IOException; + import mekanism.api.Coord4D; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -45,7 +47,7 @@ public class GuiTFilterSelect extends GuiMekanism } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); @@ -102,7 +104,7 @@ public class GuiTFilterSelect extends GuiMekanism } @Override - public void mouseClicked(int mouseX, int mouseY, int button) + public void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 529fb6dc2..a0e819736 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import java.io.IOException; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; @@ -79,17 +81,17 @@ public class GuiTItemStackFilter extends GuiMekanism ((GuiButton)buttonList.get(1)).enabled = false; } - minField = new GuiTextField(fontRendererObj, guiWidth + 149, guiHeight + 19, 20, 11); + minField = new GuiTextField(2, fontRendererObj, guiWidth + 149, guiHeight + 19, 20, 11); minField.setMaxStringLength(2); minField.setText("" + filter.min); - maxField = new GuiTextField(fontRendererObj, guiWidth + 149, guiHeight + 31, 20, 11); + maxField = new GuiTextField(3, fontRendererObj, guiWidth + 149, guiHeight + 31, 20, 11); maxField.setMaxStringLength(2); maxField.setText("" + filter.max); } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); @@ -145,7 +147,7 @@ public class GuiTItemStackFilter extends GuiMekanism } @Override - public void keyTyped(char c, int i) + public void keyTyped(char c, int i) throws IOException { if((!minField.isFocused() && !maxField.isFocused()) || i == Keyboard.KEY_ESCAPE) { @@ -182,7 +184,7 @@ public class GuiTItemStackFilter extends GuiMekanism { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), filter.itemType, 12, 19); + itemRender.renderItemAndEffectIntoGUI(filter.itemType, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -195,7 +197,7 @@ public class GuiTItemStackFilter extends GuiMekanism GL11.glEnable(GL12.GL_RESCALE_NORMAL); mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); - itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); + //TODO itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); @@ -282,7 +284,7 @@ public class GuiTItemStackFilter extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index 2dd439f50..f87a43e4e 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import java.io.IOException; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; @@ -75,12 +77,12 @@ public class GuiTMaterialFilter extends GuiMekanism if(isNew) { - ((GuiButton)buttonList.get(1)).enabled = false; + buttonList.get(1).enabled = false; } } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); @@ -130,7 +132,7 @@ public class GuiTMaterialFilter extends GuiMekanism { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), filter.materialItem, 12, 19); + itemRender.renderItemAndEffectIntoGUI(filter.materialItem, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -143,7 +145,7 @@ public class GuiTMaterialFilter extends GuiMekanism GL11.glEnable(GL12.GL_RESCALE_NORMAL); mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); - itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); + //TODO itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); @@ -216,7 +218,7 @@ public class GuiTMaterialFilter extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java index 2570fb1d8..4fa6af506 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.List; import mekanism.api.Coord4D; @@ -90,16 +91,16 @@ public class GuiTModIDFilter extends GuiMekanism if(isNew) { - ((GuiButton)buttonList.get(1)).enabled = false; + buttonList.get(1).enabled = false; } - modIDText = new GuiTextField(fontRendererObj, guiWidth + 35, guiHeight + 47, 95, 12); + modIDText = new GuiTextField(2, fontRendererObj, guiWidth + 35, guiHeight + 47, 95, 12); modIDText.setMaxStringLength(TransporterFilter.MAX_LENGTH); modIDText.setFocused(true); } @Override - public void keyTyped(char c, int i) + public void keyTyped(char c, int i) throws IOException { if(!modIDText.isFocused() || i == Keyboard.KEY_ESCAPE) { @@ -119,7 +120,7 @@ public class GuiTModIDFilter extends GuiMekanism } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); @@ -169,7 +170,7 @@ public class GuiTModIDFilter extends GuiMekanism try { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), renderStack, 12, 19); + itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } catch(Exception e) {} @@ -183,7 +184,7 @@ public class GuiTModIDFilter extends GuiMekanism GL11.glEnable(GL12.GL_RESCALE_NORMAL); mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); - itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); + //TODO itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); @@ -278,7 +279,7 @@ public class GuiTModIDFilter extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index 6b071e97a..9682810e9 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.List; import mekanism.api.Coord4D; @@ -89,16 +90,16 @@ public class GuiTOreDictFilter extends GuiMekanism if(isNew) { - ((GuiButton)buttonList.get(1)).enabled = false; + buttonList.get(1).enabled = false; } - oreDictText = new GuiTextField(fontRendererObj, guiWidth + 35, guiHeight + 47, 95, 12); + oreDictText = new GuiTextField(2, fontRendererObj, guiWidth + 35, guiHeight + 47, 95, 12); oreDictText.setMaxStringLength(TransporterFilter.MAX_LENGTH); oreDictText.setFocused(true); } @Override - public void keyTyped(char c, int i) + public void keyTyped(char c, int i) throws IOException { if(!oreDictText.isFocused() || i == Keyboard.KEY_ESCAPE) { @@ -118,7 +119,7 @@ public class GuiTOreDictFilter extends GuiMekanism } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); @@ -168,7 +169,7 @@ public class GuiTOreDictFilter extends GuiMekanism try { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), renderStack, 12, 19); + itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } catch(Exception e) {} @@ -182,7 +183,7 @@ public class GuiTOreDictFilter extends GuiMekanism GL11.glEnable(GL12.GL_RESCALE_NORMAL); mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); - itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); + //TODO itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); @@ -277,7 +278,7 @@ public class GuiTOreDictFilter extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index 9996b241a..c1a0cdcc2 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -145,7 +146,7 @@ public class GuiTeleporter extends GuiMekanism teleportButton = new GuiButton(4, guiWidth + 42, guiHeight + 140, 92, 20, LangUtils.localize("gui.teleport")); } - frequencyField = new GuiTextField(fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11); + frequencyField = new GuiTextField(5, fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11); frequencyField.setMaxStringLength(MAX_LENGTH); frequencyField.setEnableBackgroundDrawing(false); @@ -275,7 +276,7 @@ public class GuiTeleporter extends GuiMekanism } @Override - public void mouseClicked(int mouseX, int mouseY, int button) + public void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); @@ -298,7 +299,7 @@ public class GuiTeleporter extends GuiMekanism } @Override - public void keyTyped(char c, int i) + public void keyTyped(char c, int i) throws IOException { if(!frequencyField.isFocused() || i == Keyboard.KEY_ESCAPE) { @@ -323,7 +324,7 @@ public class GuiTeleporter extends GuiMekanism } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java index 15352f5e4..15174d243 100644 --- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -10,7 +11,6 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.base.ISideConfiguration; -import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationPacket; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; @@ -133,7 +133,7 @@ public class GuiTransporterConfig extends GuiMekanism GL11.glEnable(GL12.GL_RESCALE_NORMAL); mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); - itemRender.renderIcon(122, 49, MekanismRenderer.getColorIcon(configurable.getEjector().getOutputColor()), 16, 16); + //TODO itemRender.renderIcon(122, 49, MekanismRenderer.getColorIcon(configurable.getEjector().getOutputColor()), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); @@ -172,7 +172,7 @@ public class GuiTransporterConfig extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index ff89228ed..249396461 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.Set; import mekanism.api.Coord4D; @@ -8,7 +9,7 @@ import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.IUpgradeTile; -import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.inventory.container.ContainerUpgradeManagement; import mekanism.common.network.PacketRemoveUpgrade.RemoveUpgradeMessage; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; @@ -125,7 +126,7 @@ public class GuiUpgradeManagement extends GuiMekanism if(xAxis >= xPos && xAxis <= xPos+58 && yAxis >= yPos && yAxis <= yPos+12) { - func_146283_a(MekanismUtils.splitLines(upgrade.getDescription()), xAxis, yAxis); + drawHoveringText(MekanismUtils.splitLines(upgrade.getDescription()), xAxis, yAxis); } } @@ -145,7 +146,7 @@ public class GuiUpgradeManagement extends GuiMekanism GL11.glPushMatrix(); GL11.glScalef(size, size, size); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), type.getStack(), scale ? (int)((1F/size)*x) : x, scale ? (int)((1F/size)*y) : y); + itemRender.renderItemAndEffectIntoGUI(type.getStack(), scale ? (int)((1F/size)*x) : x, scale ? (int)((1F/size)*y) : y); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -263,9 +264,9 @@ public class GuiUpgradeManagement extends GuiMekanism } @Override - protected void mouseMovedOrUp(int mouseX, int mouseY, int type) + protected void mouseReleased(int mouseX, int mouseY, int type) { - super.mouseMovedOrUp(mouseX, mouseY, type); + super.mouseReleased(mouseX, mouseY, type); if(type == 0 && isDragging) { @@ -275,7 +276,7 @@ public class GuiUpgradeManagement extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/IGuiWrapper.java b/src/main/java/mekanism/client/gui/IGuiWrapper.java index c22ccf2f9..f5d33f44a 100644 --- a/src/main/java/mekanism/client/gui/IGuiWrapper.java +++ b/src/main/java/mekanism/client/gui/IGuiWrapper.java @@ -3,13 +3,13 @@ package mekanism.client.gui; import java.util.List; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.util.IIcon; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; public interface IGuiWrapper { public void drawTexturedRect(int x, int y, int u, int v, int w, int h); - public void drawTexturedRectFromIcon(int x, int y, IIcon icon, int w, int h); + public void drawTexturedRectFromIcon(int x, int y, TextureAtlasSprite icon, int w, int h); public void displayTooltip(String s, int xAxis, int yAxis); diff --git a/src/main/java/mekanism/client/gui/element/GuiBucketIO.java b/src/main/java/mekanism/client/gui/element/GuiBucketIO.java index 863baa5c8..a2469d211 100644 --- a/src/main/java/mekanism/client/gui/element/GuiBucketIO.java +++ b/src/main/java/mekanism/client/gui/element/GuiBucketIO.java @@ -6,7 +6,6 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) public class GuiBucketIO extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java b/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java index 2bc489d2e..f920b3e96 100644 --- a/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java @@ -8,7 +8,7 @@ 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; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java b/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java index 71a98cfc2..ba85dbafa 100644 --- a/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java +++ b/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java @@ -11,7 +11,7 @@ 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; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java b/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java index 4a186b13f..ec45fda7f 100644 --- a/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java @@ -13,7 +13,7 @@ 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; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/element/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java index db8ce0943..4c6e1420e 100644 --- a/src/main/java/mekanism/client/gui/element/GuiElement.java +++ b/src/main/java/mekanism/client/gui/element/GuiElement.java @@ -11,7 +11,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -125,7 +124,7 @@ public abstract class GuiElement public void mouseClickMove(int mouseX, int mouseY, int button, long ticks) {} - public void mouseMovedOrUp(int x, int y, int type) {} + public void mouseReleased(int x, int y, int type) {} public abstract Rectangle4i getBounds(int guiWidth, int guiHeight); @@ -136,4 +135,16 @@ public abstract class GuiElement public abstract void preMouseClicked(int xAxis, int yAxis, int button); public abstract void mouseClicked(int xAxis, int yAxis, int button); + + public static class Rectangle4i + { + public int x, y, width, height; + public Rectangle4i(int x, int y, int width, int height) + { + this.x = x; + this.y = y; + this.width = width; + this.height = height; + } + } } diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java index 605606e2e..532f5a2f9 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java @@ -6,6 +6,8 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; public class GuiEnergyGauge extends GuiGauge @@ -38,7 +40,7 @@ public class GuiEnergyGauge extends GuiGauge } @Override - public IIcon getIcon() + public TextureAtlasSprite getIcon() { return MekanismRenderer.energyIcon; } diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java index cc5a4def1..91ddfccce 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java @@ -8,7 +8,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiEnergyInfo extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java index 9155961e1..c6e2c09d4 100644 --- a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java @@ -4,14 +4,17 @@ import mekanism.api.Coord4D; import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.IGuiWrapper; +import mekanism.client.render.MekanismRenderer; +import mekanism.client.render.MekanismRenderer.FluidType; import mekanism.common.Mekanism; import mekanism.common.base.ITankManager; import mekanism.common.item.ItemGaugeDropper; import mekanism.common.network.PacketDropperUse.DropperUseMessage; import mekanism.common.util.LangUtils; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidTank; @@ -90,14 +93,14 @@ public class GuiFluidGauge extends GuiGauge } @Override - public IIcon getIcon() + public TextureAtlasSprite getIcon() { if(dummy) { - return dummyType.getIcon(); + return MekanismRenderer.getFluidTexture(dummyType, FluidType.STILL); } - return infoHandler.getTank().getFluid().getFluid().getIcon(); + return MekanismRenderer.getFluidTexture(infoHandler.getTank().getFluid().getFluid(), FluidType.STILL); } @Override diff --git a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java index 3d4112f43..72a6431bb 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java @@ -11,9 +11,10 @@ import mekanism.common.base.ITankManager; import mekanism.common.item.ItemGaugeDropper; import mekanism.common.network.PacketDropperUse.DropperUseMessage; import mekanism.common.util.LangUtils; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; @@ -90,14 +91,14 @@ public class GuiGasGauge extends GuiGauge } @Override - public IIcon getIcon() + public TextureAtlasSprite getIcon() { if(dummy) { - return dummyType.getIcon(); + return dummyType.getSprite(); } - return (infoHandler.getTank() != null && infoHandler.getTank().getGas() != null && infoHandler.getTank().getGas().getGas() != null) ? infoHandler.getTank().getGas().getGas().getIcon() : null; + return (infoHandler.getTank() != null && infoHandler.getTank().getGas() != null && infoHandler.getTank().getGas().getGas() != null) ? infoHandler.getTank().getGas().getGas().getSprite() : null; } @Override diff --git a/src/main/java/mekanism/client/gui/element/GuiGauge.java b/src/main/java/mekanism/client/gui/element/GuiGauge.java index 7d43268ae..5f24b3b98 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGauge.java @@ -10,11 +10,11 @@ import mekanism.common.base.ISideConfiguration; import mekanism.common.item.ItemConfigurator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; public abstract class GuiGauge extends GuiElement { @@ -52,7 +52,7 @@ public abstract class GuiGauge extends GuiElement public abstract int getScaledLevel(); - public abstract IIcon getIcon(); + public abstract TextureAtlasSprite getIcon(); public abstract String getTooltipText(); diff --git a/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java index 1729fb128..507d9d8fb 100644 --- a/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java @@ -10,7 +10,7 @@ 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; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java b/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java index 8143e7bee..24b02bbe9 100644 --- a/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java @@ -3,7 +3,8 @@ package mekanism.client.gui.element; import static java.lang.Math.min; import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.IGuiWrapper; -import net.minecraft.util.IIcon; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; public class GuiNumberGauge extends GuiGauge @@ -30,7 +31,7 @@ public class GuiNumberGauge extends GuiGauge } @Override - public IIcon getIcon() + public TextureAtlasSprite getIcon() { return infoHandler.getIcon(); } @@ -44,7 +45,7 @@ public class GuiNumberGauge extends GuiGauge public static interface INumberInfoHandler { - public IIcon getIcon(); + public TextureAtlasSprite getIcon(); public double getLevel(); diff --git a/src/main/java/mekanism/client/gui/element/GuiPowerBar.java b/src/main/java/mekanism/client/gui/element/GuiPowerBar.java index f768efa11..299f08ea5 100644 --- a/src/main/java/mekanism/client/gui/element/GuiPowerBar.java +++ b/src/main/java/mekanism/client/gui/element/GuiPowerBar.java @@ -5,7 +5,7 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/element/GuiProgress.java b/src/main/java/mekanism/client/gui/element/GuiProgress.java index ce2bc7323..92b02f91e 100644 --- a/src/main/java/mekanism/client/gui/element/GuiProgress.java +++ b/src/main/java/mekanism/client/gui/element/GuiProgress.java @@ -6,7 +6,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiProgress extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiRateBar.java b/src/main/java/mekanism/client/gui/element/GuiRateBar.java index 1043b9091..c42c5f5f3 100644 --- a/src/main/java/mekanism/client/gui/element/GuiRateBar.java +++ b/src/main/java/mekanism/client/gui/element/GuiRateBar.java @@ -4,7 +4,7 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/element/GuiRecipeType.java b/src/main/java/mekanism/client/gui/element/GuiRecipeType.java index cba684451..3b212d8af 100644 --- a/src/main/java/mekanism/client/gui/element/GuiRecipeType.java +++ b/src/main/java/mekanism/client/gui/element/GuiRecipeType.java @@ -5,7 +5,7 @@ import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; + public class GuiRecipeType extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java b/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java index 8f1018b11..4413d88a9 100644 --- a/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java +++ b/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java @@ -11,7 +11,7 @@ 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 GuiRedstoneControl extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/element/GuiScrollList.java b/src/main/java/mekanism/client/gui/element/GuiScrollList.java index 197c77173..f7a34f79d 100644 --- a/src/main/java/mekanism/client/gui/element/GuiScrollList.java +++ b/src/main/java/mekanism/client/gui/element/GuiScrollList.java @@ -10,7 +10,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import codechicken.lib.vec.Rectangle4i; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -233,9 +233,9 @@ public class GuiScrollList extends GuiElement } @Override - public void mouseMovedOrUp(int xAxis, int yAxis, int type) + public void mouseReleased(int xAxis, int yAxis, int type) { - super.mouseMovedOrUp(xAxis, yAxis, type); + super.mouseReleased(xAxis, yAxis, type); if(type == 0) { diff --git a/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java b/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java index c3ec8bba8..efa9bd45b 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java @@ -12,7 +12,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiSideConfigurationTab extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiSlot.java b/src/main/java/mekanism/client/gui/element/GuiSlot.java index c3c8af31d..ffb54ba15 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSlot.java +++ b/src/main/java/mekanism/client/gui/element/GuiSlot.java @@ -4,7 +4,7 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; + public class GuiSlot extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java index 7b2d48122..cb0bdf0e9 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java @@ -12,7 +12,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java b/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java index 22fe23ab1..4ae2f8fe5 100644 --- a/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java @@ -10,7 +10,7 @@ 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; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java b/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java index 051a8eb8a..e0a0fc9a6 100644 --- a/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java @@ -10,7 +10,7 @@ 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 { diff --git a/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java b/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java index a638548b3..9f828e489 100644 --- a/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java @@ -7,7 +7,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; + public class GuiVisualsTab extends GuiElement { diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index 262548dea..5b0f7a8d4 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -10,6 +10,13 @@ import mekanism.api.Coord4D; //import mekanism.client.gui.GuiMMaterialFilter; //import mekanism.client.gui.GuiMModIDFilter; //import mekanism.client.gui.GuiMOreDictFilter; +import mekanism.client.gui.GuiDigitalMiner; +import mekanism.client.gui.GuiDigitalMinerConfig; +import mekanism.client.gui.GuiMFilterSelect; +import mekanism.client.gui.GuiMItemStackFilter; +import mekanism.client.gui.GuiMMaterialFilter; +import mekanism.client.gui.GuiMModIDFilter; +import mekanism.client.gui.GuiMOreDictFilter; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.inventory.container.ContainerDigitalMiner; @@ -165,7 +172,7 @@ public class PacketDigitalMinerGui implements IMessageHandler