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

Fix a few things

Browse source
This commit is contained in:
Aidan Brady 2013-11-06 19:44:52 -05:00
parent 44addd9c75
commit 1f59e441b8
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -91,7 +91,7 @@ public class GuiItemStackFilter extends GuiMekanism
if(guibutton.id == 0)
{
if(filter.itemType != null && !minField.getText().isEmpty() && !maxField.getText().isEmpty())
if(filter.itemType != null && !minField.getText().isEmpty() && !maxField.getText().isEmpty() && Integer.parseInt(maxField.getText()) >= Integer.parseInt(minField.getText()))
{
filter.min = Integer.parseInt(minField.getText());
filter.max = Integer.parseInt(maxField.getText());
@ -116,6 +116,11 @@ public class GuiItemStackFilter extends GuiMekanism
status = EnumColor.DARK_RED + "Max/min";
ticker = 20;
}
else if(Integer.parseInt(maxField.getText()) < Integer.parseInt(minField.getText()))
{
status = EnumColor.DARK_RED + "Max<min";
ticker = 20;
}
}
else if(guibutton.id == 1)
{
@ -241,6 +246,9 @@ public class GuiItemStackFilter extends GuiMekanism
else {
drawTexturedModalRect(guiWidth + 128, guiHeight + 44, 187, 11, 11, 11);
}
minField.drawTextBox();
maxField.drawTextBox();
if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35)
{
@ -256,9 +264,6 @@ public class GuiItemStackFilter extends GuiMekanism
GL11.glEnable(GL11.GL_DEPTH_TEST);
GL11.glPopMatrix();
}
minField.drawTextBox();
maxField.drawTextBox();
}
@Override

2
common/mekanism/common/transporter/ItemStackFilter.java
View file

@ -31,7 +31,7 @@ public class ItemStackFilter extends TransporterFilter
{
return false;
}
return itemType.isItemEqual(itemStack) && (!sizeMode || itemStack.stackSize >= min);
}