GUI cleanup, mouse wheel and filter card support

This commit is contained in:
Matthias Mann committed 2015-04-20 05:05:12 +02:00
1 parent f26b0ba3df
commit 9dd1d45078
10 files changed
+173 -35

No files matched your search

@@ -10,11 +10,12 @@ import crazypants.enderio.conduit.item.filter.IItemFilterUpgrade;
public class FilterRegister {
public static boolean isItemFilter(ItemStack stack) {
return stack != null && (stack.getItem() instanceof IItemFilterUpgrade);
}
public static IItemFilter getFilterForUpgrade(ItemStack stack) {
if(stack == null) {
return null;
}
if(!(stack.getItem() instanceof IItemFilterUpgrade)) {
if(!isItemFilter(stack)) {
return null;
}
IItemFilterUpgrade upgrade = (IItemFilterUpgrade)stack.getItem();
@@ -30,7 +30,9 @@ public class ExistingItemFilter implements IItemFilter {
if(item == null) {
return false;
}
if(snapshot == null) {
if(snapshot != null) {
return isStackInSnapshot(item);
} else if(ni != null) {
int[] slots = ni.getInventory().getAccessibleSlotsFromSide(ni.getInventorySide());
for (int i = 0; i < slots.length; i++) {
ItemStack stack = ni.getInventory().getStackInSlot(i);
@@ -38,8 +40,6 @@ public class ExistingItemFilter implements IItemFilter {
return true;
}
}
} else {
return isStackInSnapshot(item);
}
return false;
}
@@ -19,6 +19,12 @@ public interface IItemFilter {
void readFromByteBuf(ByteBuf buf);
/**
* Checks if the given item passes the filter or not.
* @param inv the attached inventory - or null when used without an inventory (eg for a GUI)
* @param item the item to check
* @return true if the item is allowed to pass
*/
boolean doesItemPassFilter(NetworkedInventory inv, ItemStack item);
boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item);
@@ -11,6 +11,7 @@ import crazypants.enderio.network.PacketHandler;
import crazypants.gui.GhostSlot;
import crazypants.gui.GuiToolTip;
import crazypants.render.RenderUtil;
import crazypants.util.ItemUtil;
import crazypants.util.Lang;
import java.awt.Rectangle;
import java.util.ArrayList;
@@ -21,14 +22,18 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class GuiInventoryPanel extends GuiMachineBase<TileInventoryPanel> {
private static final Rectangle btnScrollUp = new Rectangle(216, 27, 16, 8);
private static final Rectangle btnScrollDown = new Rectangle(216, 109, 16, 8);
private static final Rectangle thumbArea = new Rectangle(216, 35, 16, 74);
private static final Rectangle btnScrollUp = new Rectangle(215, 27, 11, 8);
private static final Rectangle btnScrollDown = new Rectangle(215, 109, 11, 8);
private static final Rectangle thumbArea = new Rectangle(215, 35, 11, 74);
private static final Rectangle scrollbarArea = new Rectangle(215, 27, 11, 90);
private static final Rectangle inventoryArea = new Rectangle(107, 27, 108, 90);
private static final int ID_SORT = 9876;
@@ -49,8 +54,6 @@ public class GuiInventoryPanel extends GuiMachineBase<TileInventoryPanel> {
private final String headerInventory;
private final String infoTextFilter;
private final GuiToolTip tooltipReturn;
public GuiInventoryPanel(TileInventoryPanel te, Container container) {
super(te, container);
redstoneButton.visible = false;
@@ -59,15 +62,15 @@ public class GuiInventoryPanel extends GuiMachineBase<TileInventoryPanel> {
for(int y = 0; y < GHOST_ROWS; y++) {
for(int x = 0; x < GHOST_COLUMNS; x++) {
ghostSlots.add(new InvSlot(109 + x*18, 28 + y*18));
ghostSlots.add(new InvSlot(108 + x*18, 28 + y*18));
}
}
FontRenderer fr = Minecraft.getMinecraft().fontRenderer;
tfFilter = new TextFieldEIO(fr, 109, 10, 106, 10);
tfFilter = new TextFieldEIO(fr, 108, 11, 106, 10);
tfFilter.setEnableBackgroundDrawing(false);
btnSort = new IconButtonEIO(this, ID_SORT, 216, 7, getSortOrderIcon());
btnSort = new IconButtonEIO(this, ID_SORT, 233, 27, getSortOrderIcon());
textFields.add(tfFilter);
@@ -78,14 +81,22 @@ public class GuiInventoryPanel extends GuiMachineBase<TileInventoryPanel> {
ArrayList<String> list = new ArrayList<String>();
TooltipAddera.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.return.line");
tooltipReturn = new GuiToolTip(new Rectangle(6, 72, 5*18, 8), list);
addToolTip(new GuiToolTip(new Rectangle(6, 72, 5*18, 8), list));
list = new ArrayList<String>();
TooltipAddera.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.filterslot.line");
addToolTip(new GuiToolTip(new Rectangle(InventoryPanelContainer.FILTER_SLOT_X, InventoryPanelContainer.FILTER_SLOT_Y, 16, 16), list) {
@Override
public boolean shouldDraw() {
return !((InventoryPanelContainer) inventorySlots).getSlotFilter().getHasStack() && super.shouldDraw();
}
});
}
@Override
public void initGui() {
super.initGui();
btnSort.onGuiInit();
addToolTip(tooltipReturn);
}
@Override
@@ -124,12 +135,13 @@ public class GuiInventoryPanel extends GuiMachineBase<TileInventoryPanel> {
if(scrollMax > 0) {
icon = IconEIO.VSCROLL_THUMB;
icon.renderIcon(sx+thumbArea.x, sy+thumbArea.y + (thumbArea.height - icon.height) * scrollPos / scrollMax);
icon.renderIcon(sx+thumbArea.x, sy+getThumbPosition());
}
tes.draw();
InventoryDatabaseClient db = getDatabase();
db.setItemFilter(getTileEntity().getItemFilter());
db.updateFilter(tfFilter.getText());
if(db.sortItems()) {
@@ -149,6 +161,10 @@ public class GuiInventoryPanel extends GuiMachineBase<TileInventoryPanel> {
}
}
private int getThumbPosition() {
return thumbArea.y + (int)(thumbArea.height - IconEIO.VSCROLL_THUMB.height) * scrollPos / scrollMax;
}
@Override
protected void drawFakeItemStack(int x, int y, ItemStack stack) {
FontRenderer font = stack.getItem().getFontRenderer(stack);
@@ -228,7 +244,7 @@ public class GuiInventoryPanel extends GuiMachineBase<TileInventoryPanel> {
@Override
public int getXSize() {
return 238;
return 256;
}
@Override
@@ -243,8 +259,14 @@ public class GuiInventoryPanel extends GuiMachineBase<TileInventoryPanel> {
x -= guiLeft;
y -= guiTop;
scrollUpPressed = btnScrollUp.contains(x, y);
scrollDownPressed = btnScrollDown.contains(x, y);
if(scrollMax > 0 && thumbArea.contains(x, y)) {
int thumbPos = getThumbPosition();
scrollUpPressed = y < thumbPos;
scrollDownPressed = y >= thumbPos + (int)IconEIO.VSCROLL_THUMB.height;
} else {
scrollUpPressed = btnScrollUp.contains(x, y);
scrollDownPressed = btnScrollDown.contains(x, y);
}
if(scrollUpPressed || scrollDownPressed) {
scrollLastTime = Minecraft.getSystemTime();
@@ -259,6 +281,38 @@ public class GuiInventoryPanel extends GuiMachineBase<TileInventoryPanel> {
scrollDownPressed = false;
}
@Override
public void handleMouseInput() {
super.handleMouseInput();
int wheel = Mouse.getEventDWheel();
if(wheel != 0) {
int x = Mouse.getEventX() * this.width / this.mc.displayWidth;
int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
boolean shift = isShiftKeyDown();
x -= guiLeft;
y -= guiTop;
if(scrollbarArea.contains(x, y) || (shift && inventoryArea.contains(x, y))) {
scrollUpPressed = wheel > 0;
scrollDownPressed = wheel < 0;
doScroll();
scrollUpPressed = false;
scrollDownPressed = false;
} else if(!shift && wheel > 0 & (hoverGhostSlot instanceof InvSlot)) {
InvSlot invSlot = (InvSlot) hoverGhostSlot;
if(invSlot.stack != null && invSlot.entry != null) {
ItemStack itemStack = mc.thePlayer.inventory.getItemStack();
if(itemStack == null || ItemUtil.areStackMergable(itemStack, hoverGhostSlot.stack)) {
PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(invSlot.entry, -1, 1));
}
}
}
}
}
@Override
protected void mouseClickMove(int x, int y, int button, long time) {
super.mouseClickMove(x, y, button, time);
@@ -1,6 +1,7 @@
package crazypants.enderio.machine.invpanel;
import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.enderio.conduit.item.filter.IItemFilter;
import crazypants.enderio.network.CompressedDataInput;
import crazypants.enderio.network.PacketHandler;
import java.io.IOException;
@@ -29,6 +30,7 @@ public class InventoryDatabaseClient extends InventoryDatabase<InventoryDatabase
private SortOrder order = SortOrder.NAME;
private boolean invertSortOrder;
private boolean needsSorting;
private IItemFilter itemFilter;
private String currentFilter;
private boolean needsFiltering;
private boolean needsNewFiltering;
@@ -202,6 +204,14 @@ public class InventoryDatabaseClient extends InventoryDatabase<InventoryDatabase
}
}
public void setItemFilter(IItemFilter itemFilter) {
if(this.itemFilter != itemFilter) {
this.itemFilter = itemFilter;
needsNewFiltering = true;
needsFiltering = true;
}
}
public void updateFilter(String newFilter) {
newFilter = newFilter.trim();
@@ -233,7 +243,7 @@ public class InventoryDatabaseClient extends InventoryDatabase<InventoryDatabase
needsSorting = true;
}
ItemFilter filter = ItemFilter.parse(currentFilter, getLocale());
ItemFilter filter = ItemFilter.parse(currentFilter, getLocale(), itemFilter);
System.out.println("filtering new="+needsNewFiltering+" currentFilter="+currentFilter+" parsed="+filter);
if(filter != null) {
Iterator<ItemEntry> iter = filteredItems.iterator();
@@ -35,9 +35,15 @@ public class InventoryPanelContainer extends AbstractMachineContainer implements
public static final int RETURN_INV_X = 7;
public static final int RETURN_INV_Y = 82;
public static final int FILTER_SLOT_X = 233;
public static final int FILTER_SLOT_Y = 7;
private final HashSet<InventoryDatabaseServer.ItemEntry> changedItems;
private Slot slotFilter;
private int indexCraftingSlot;
private int indexFilterSlot;
private int startReturnSlot;
private int endReturnSlot;
@@ -56,11 +62,12 @@ public class InventoryPanelContainer extends AbstractMachineContainer implements
@Override
protected void addMachineSlots(InventoryPlayer playerInv) {
indexCraftingSlot = inventorySlots.size();
addSlotToContainer(new SlotCrafting(playerInv.player, tileEntity, tileEntity, 9, CRAFTING_GRID_X+59, CRAFTING_GRID_Y+18) {
addSlotToContainer(new SlotCrafting(playerInv.player, tileEntity, tileEntity,
TileInventoryPanel.SLOT_CRAFTING_RESULT, CRAFTING_GRID_X+59, CRAFTING_GRID_Y+18) {
@Override
public void onPickupFromSlot(EntityPlayer player, ItemStack p_82870_2_) {
FMLCommonHandler.instance().firePlayerCraftingEvent(player, p_82870_2_, tileEntity);
for (int i = 0; i < 9; i++) {
for (int i = TileInventoryPanel.SLOT_CRAFTING_START; i < TileInventoryPanel.SLOT_CRAFTING_RESULT; i++) {
ItemStack itemstack = tileEntity.getStackInSlot(i);
if(itemstack == null)
continue;
@@ -89,14 +96,22 @@ public class InventoryPanelContainer extends AbstractMachineContainer implements
}
});
for(int y=0,i=0 ; y<3 ; y++) {
for(int y=0,i=TileInventoryPanel.SLOT_CRAFTING_START ; y<3 ; y++) {
for(int x=0 ; x<3 ; x++,i++) {
addSlotToContainer(new Slot(tileEntity, i, CRAFTING_GRID_X+x*18, CRAFTING_GRID_Y+y*18));
}
}
indexFilterSlot = inventorySlots.size();
slotFilter = addSlotToContainer(new Slot(tileEntity, TileInventoryPanel.SLOT_VIEW_FILTER, FILTER_SLOT_X, FILTER_SLOT_Y) {
@Override
public int getSlotStackLimit() {
return 1;
}
});
startReturnSlot = inventorySlots.size();
for(int y=0,i=10 ; y<2 ; y++) {
for(int y=0,i=TileInventoryPanel.SLOT_RETURN_START ; y<2 ; y++) {
for(int x=0 ; x<5 ; x++,i++) {
addSlotToContainer(new Slot(tileEntity, i, RETURN_INV_X+x*18, RETURN_INV_Y+y*18));
}
@@ -122,6 +137,10 @@ public class InventoryPanelContainer extends AbstractMachineContainer implements
return (TileInventoryPanel) tileEntity;
}
public Slot getSlotFilter() {
return slotFilter;
}
private void removeChangeLog() {
if(changedItems != null) {
getInventoryPanel().getDatabaseServer().removeChangeLog(this);
@@ -1,5 +1,6 @@
package crazypants.enderio.machine.invpanel;
import crazypants.enderio.conduit.item.filter.IItemFilter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Locale;
@@ -11,13 +12,13 @@ public abstract class ItemFilter {
public abstract boolean matches(InventoryDatabaseClient.ItemEntry entry);
public static ItemFilter parse(String filter, Locale locale) {
String[] parts = SPLIT_PATTERN.split(filter);
if(parts.length == 0) {
return null;
public static ItemFilter parse(String filter, Locale locale, IItemFilter filterCard) {
ArrayList<ItemFilter> list = new ArrayList<ItemFilter>();
if(filterCard != null) {
list.add(new CardFilter(filterCard));
}
ArrayList<ItemFilter> list = new ArrayList<ItemFilter>();
String[] parts = SPLIT_PATTERN.split(filter);
for(String part : parts) {
if(part.startsWith("@")) {
part = part.substring(1);
@@ -100,4 +101,16 @@ public abstract class ItemFilter {
return text;
}
}
static class CardFilter extends ItemFilter {
final IItemFilter filter;
CardFilter(IItemFilter filter) {
this.filter = filter;
}
@Override
public boolean matches(InventoryDatabaseClient.ItemEntry entry) {
return filter.doesItemPassFilter(null, entry.makeItemStack());
}
}
}
@@ -3,20 +3,28 @@ package crazypants.enderio.machine.invpanel;
import crazypants.enderio.ModObject;
import crazypants.enderio.conduit.ConnectionMode;
import crazypants.enderio.conduit.TileConduitBundle;
import crazypants.enderio.conduit.item.FilterRegister;
import crazypants.enderio.conduit.item.ItemConduit;
import crazypants.enderio.conduit.item.ItemConduitNetwork;
import crazypants.enderio.conduit.item.NetworkedInventory;
import crazypants.enderio.conduit.item.filter.IItemFilter;
import crazypants.enderio.machine.AbstractMachineEntity;
import crazypants.enderio.machine.SlotDefinition;
import crazypants.util.DyeColor;
import java.util.List;
import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
public class TileInventoryPanel extends AbstractMachineEntity {
public static final int SLOT_CRAFTING_START = 0;
public static final int SLOT_CRAFTING_RESULT = 9;
public static final int SLOT_VIEW_FILTER = 10;
public static final int SLOT_RETURN_START = 11;
private InventoryDatabaseServer dbServer;
private InventoryDatabaseClient dbClient;
@@ -24,9 +32,10 @@ public class TileInventoryPanel extends AbstractMachineEntity {
private int networkChangeCount;
public Container eventHandler;
private IItemFilter itemFilter;
public TileInventoryPanel() {
super(new SlotDefinition(0, 8, 10, 19, 20, 19));
super(new SlotDefinition(0, 8, 11, 20, 21, 20));
}
public InventoryDatabaseServer getDatabaseServer() {
@@ -49,25 +58,42 @@ public class TileInventoryPanel extends AbstractMachineEntity {
}
@Override
protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) {
protected boolean isMachineItemValidForSlot(int slot, ItemStack stack) {
if(slot == SLOT_VIEW_FILTER && stack != null) {
return FilterRegister.isItemFilter(stack) && FilterRegister.isFilterSet(stack);
}
return true;
}
@Override
public ItemStack decrStackSize(int fromSlot, int amount) {
ItemStack res = super.decrStackSize(fromSlot, amount);
if(res != null && fromSlot < 9 && eventHandler != null) {
if(res != null && fromSlot < SLOT_CRAFTING_RESULT && eventHandler != null) {
eventHandler.onCraftMatrixChanged(this);
}
if(res != null && fromSlot == SLOT_VIEW_FILTER) {
updateItemFilter();
}
return res;
}
@Override
public void setInventorySlotContents(int slot, ItemStack contents) {
super.setInventorySlotContents(slot, contents);
if(slot < 9 && eventHandler != null) {
if(slot < SLOT_CRAFTING_RESULT && eventHandler != null) {
eventHandler.onCraftMatrixChanged(this);
}
if(slot == SLOT_VIEW_FILTER) {
updateItemFilter();
}
}
private void updateItemFilter() {
itemFilter = FilterRegister.getFilterForUpgrade(inventory[SLOT_VIEW_FILTER]);
}
public IItemFilter getItemFilter() {
return itemFilter;
}
@Override
@@ -140,6 +166,12 @@ public class TileInventoryPanel extends AbstractMachineEntity {
return false;
}
@Override
public void readCommon(NBTTagCompound nbtRoot) {
super.readCommon(nbtRoot);
updateItemFilter();
}
@Override
public String getMachineName() {
return ModObject.blockInventoryPanel.unlocalisedName;