tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Aw yeah. This GUI…is coming together.

Browse source
This commit is contained in:
Aidan Brady 2013-11-19 22:27:28 -05:00
parent 515cbf38c8
commit 7f9acda277
4 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
common/mekanism/client/gui/GuiDigitalMiner.java
View file

@ -138,9 +138,7 @@ public class GuiDigitalMiner extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
{
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
@ -150,8 +148,11 @@ public class GuiDigitalMiner extends GuiMekanism
fontRenderer.drawString(tileEntity.running ? "Running" : "Idle", 9, 19, 0x00CD00);
fontRenderer.drawString(tileEntity.searcher.state.desc, 9, 28, 0x00CD00);
fontRenderer.drawString("Eject: " + (tileEntity.doEject ? "On" : "Off"), 9, 40, 0x00CD00);
fontRenderer.drawString("Pull: " + (tileEntity.doPull ? "On" : "Off"), 9, 49, 0x00CD00);
fontRenderer.drawString("Eject: " + (tileEntity.doEject ? "On" : "Off"), 9, 39, 0x00CD00);
fontRenderer.drawString("Pull: " + (tileEntity.doPull ? "On" : "Off"), 9, 48, 0x00CD00);
fontRenderer.drawString("To mine:", 9, 59, 0x00CD00);
fontRenderer.drawString("" + tileEntity.clientToMine, 9, 68, 0x00CD00);
if(tileEntity.replaceStack != null)
{
@ -186,6 +187,8 @@ public class GuiDigitalMiner extends GuiMekanism
{
drawCreativeTabHoveringText("Reset", xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
@Override

6
common/mekanism/client/gui/GuiDigitalMinerConfig.java
View file

@ -16,8 +16,6 @@ import mekanism.common.miner.MOreDictFilter;
import mekanism.common.miner.MinerFilter;
import mekanism.common.network.PacketDigitalMinerGui;
import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket;
import mekanism.common.network.PacketLogisticalSorterGui;
import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket;
import mekanism.common.network.PacketSimpleGui;
import mekanism.common.tileentity.TileEntityDigitalMiner;
import mekanism.common.util.MekanismUtils;
@ -252,11 +250,11 @@ public class GuiDigitalMinerConfig extends GuiMekanism
if(guibutton.id == 0)
{
PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Object3D.get(tileEntity), 1));
PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Object3D.get(tileEntity), 1));
}
else if(guibutton.id == 1)
{
PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Object3D.get(tileEntity), 2));
PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Object3D.get(tileEntity), 2));
}
}

8
common/mekanism/client/gui/GuiMItemStackFilter.java
View file

@ -164,14 +164,6 @@ public class GuiMItemStackFilter extends GuiMekanism
else {
drawTexturedModalRect(guiWidth + 5, guiHeight + 5, 176, 11, 11, 11);
}
if(xAxis >= 128 && xAxis <= 139 && yAxis >= 44 && yAxis <= 55)
{
drawTexturedModalRect(guiWidth + 128, guiHeight + 44, 187, 0, 11, 11);
}
else {
drawTexturedModalRect(guiWidth + 128, guiHeight + 44, 187, 11, 11, 11);
}
if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35)
{

1
common/mekanism/common/network/PacketDigitalMinerGui.java
View file

@ -170,7 +170,6 @@ public class PacketDigitalMinerGui implements IMekanismPacket
{
if(type == 1)
{
System.out.println("hi");
return new GuiMItemStackFilter(player, (TileEntityDigitalMiner)world.getBlockTileEntity(x, y, z));
}
else if(type == 2)