GUIs are cool :D

This commit is contained in:
Aidan C. Brady 2013-10-26 19:04:33 -04:00
parent 3a9a518188
commit a8d6386bb5
3 changed files with 157 additions and 7 deletions

View file

@ -30,6 +30,16 @@ public class GuiItemStackFilter extends GuiMekanism
public String status = EnumColor.DARK_GREEN + "All OK";
public int ticker;
public GuiItemStackFilter(EntityPlayer player, TileEntityLogisticalSorter tentity, int index)
{
super(new ContainerFilter(player.inventory));
tileEntity = tentity;
filter = (ItemStackFilter)tileEntity.filters.get(index);
}
public GuiItemStackFilter(EntityPlayer player, TileEntityLogisticalSorter tentity)
{
super(new ContainerFilter(player.inventory));
@ -109,6 +119,20 @@ public class GuiItemStackFilter extends GuiMekanism
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
@Override
public void updateScreen()
{
super.updateScreen();
if(ticker > 0)
{
ticker--;
}
else {
status = EnumColor.DARK_GREEN + "All OK";
}
}
@Override
protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY)

View file

@ -56,12 +56,12 @@ public class GuiLogisticalSorter extends GuiMekanism
if(guibutton.id == 0)
{
PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(Object3D.get(tileEntity), 1));
mc.thePlayer.openGui(Mekanism.instance, 27, mc.theWorld, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
mc.displayGuiScreen(new GuiItemStackFilter(mc.thePlayer, tileEntity));
}
else if(guibutton.id == 1)
{
PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(Object3D.get(tileEntity), 2));
mc.thePlayer.openGui(Mekanism.instance, 28, mc.theWorld, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
mc.displayGuiScreen(new GuiOreDictFilter(mc.thePlayer, tileEntity));
}
}

View file

@ -1,5 +1,6 @@
package mekanism.client.gui;
import java.util.ArrayList;
import java.util.List;
import mekanism.api.EnumColor;
@ -19,7 +20,9 @@ import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
@ -31,6 +34,10 @@ public class GuiOreDictFilter extends GuiMekanism
private GuiTextField oreDictText;
public ItemStack renderStack;
public int ticker = 0;
public int stackSwitch = 0;
public int stackIndex = 0;
@ -39,6 +46,14 @@ public class GuiOreDictFilter extends GuiMekanism
public String status = EnumColor.DARK_GREEN + "All OK";
public GuiOreDictFilter(EntityPlayer player, TileEntityLogisticalSorter tentity, int index)
{
super(new ContainerFilter(player.inventory));
tileEntity = tentity;
filter = (OreDictFilter)tentity.filters.get(index);
}
public GuiOreDictFilter(EntityPlayer player, TileEntityLogisticalSorter tentity)
{
super(new ContainerFilter(player.inventory));
@ -72,14 +87,21 @@ public class GuiOreDictFilter extends GuiMekanism
@Override
public void keyTyped(char c, int i)
{
if(i == mc.gameSettings.keyBindInventory.keyCode)
if(i == Keyboard.KEY_E)
{
oreDictText.textboxKeyTyped(c, i);
return;
}
super.keyTyped(c, i);
if(Character.isLetter(c) || Character.isDigit(c) || c == '*')
if(oreDictText.isFocused() && i == Keyboard.KEY_RETURN)
{
setOreDictKey();
return;
}
if(Character.isLetter(c) || Character.isDigit(c) || c == '*' || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE)
{
oreDictText.textboxKeyTyped(c, i);
}
@ -106,14 +128,14 @@ public class GuiOreDictFilter extends GuiMekanism
fontRenderer.drawString("Status: " + status, 35, 20, 0x00CD00);
fontRenderer.drawString("Key: " + filter.oreDictName, 35, 32, 0x00CD00);
/*if(filter.itemType != null)
if(renderStack != null)
{
GL11.glPushMatrix();
GL11.glEnable(GL11.GL_LIGHTING);
itemRenderer.renderItemIntoGUI(fontRenderer, mc.getTextureManager(), filter.itemType, 12, 19);
itemRenderer.renderItemIntoGUI(fontRenderer, mc.getTextureManager(), renderStack, 12, 19);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glPopMatrix();
}*/
}
GL11.glPushMatrix();
GL11.glColor4f(1, 1, 1, 1);
@ -172,7 +194,40 @@ public class GuiOreDictFilter extends GuiMekanism
{
super.updateScreen();
oreDictText.updateCursorCounter();
if(ticker > 0)
{
ticker--;
}
else {
status = EnumColor.DARK_GREEN + "All OK";
}
if(stackSwitch > 0)
{
stackSwitch--;
}
if(stackSwitch == 0 && iterStacks != null && iterStacks.size() > 0)
{
stackSwitch = 20;
if(stackIndex == -1 || stackIndex == iterStacks.size()-1)
{
stackIndex = 0;
}
else if(stackIndex < iterStacks.size()-1)
{
stackIndex++;
}
renderStack = iterStacks.get(stackIndex);
}
else if(iterStacks != null && iterStacks.size() == 0)
{
renderStack = null;
}
}
@Override
@ -180,6 +235,8 @@ public class GuiOreDictFilter extends GuiMekanism
{
super.mouseClicked(mouseX, mouseY, button);
oreDictText.mouseClicked(mouseX, mouseY, button);
if(button == 0)
{
int xAxis = (mouseX - (width - xSize) / 2);
@ -201,6 +258,75 @@ public class GuiOreDictFilter extends GuiMekanism
private void setOreDictKey()
{
String oreName = oreDictText.getText();
if(oreName == null || oreName.isEmpty())
{
status = EnumColor.DARK_RED + "No key entered";
return;
}
else if(oreName.equals(filter.oreDictName))
{
status = EnumColor.DARK_RED + "Same key";
return;
}
if(iterStacks == null)
{
iterStacks = new ArrayList<ItemStack>();
}
else {
iterStacks.clear();
}
List<String> keys = new ArrayList<String>();
for(String s : OreDictionary.getOreNames())
{
if(oreName.equals(s))
{
keys.add(s);
}
else if(oreName.endsWith("*") && !oreName.startsWith("*"))
{
if(s.startsWith(oreName.substring(0, oreName.length()-1)))
{
keys.add(s);
}
}
else if(oreName.startsWith("*") && !oreName.endsWith("*"))
{
if(s.endsWith(oreName.substring(1)))
{
keys.add(s);
}
}
else if(oreName.startsWith("*") && oreName.endsWith("*"))
{
if(s.contains(oreName.substring(1, oreName.length()-1)))
{
keys.add(s);
}
}
}
for(String key : keys)
{
for(ItemStack stack : OreDictionary.getOres(key))
{
ItemStack toAdd = stack.copy();
if(!iterStacks.contains(stack))
{
iterStacks.add(stack.copy());
}
}
}
filter.oreDictName = oreName;
oreDictText.setText("");
stackSwitch = 0;
stackIndex = -1;
}
}