From c6ddec37e7e42eeac7c142d639f0cee54468fa73 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sun, 8 Feb 2015 11:00:02 +0100 Subject: [PATCH 1/2] #991 add item filters and range control to vacuum chest --- resources/assets/enderio/lang/en_US.lang | 6 + .../enderio/textures/gui/vacumChest.png | Bin 2075 -> 2317 bytes .../conduit/item/filter/ItemFilter.java | 11 +- .../crazypants/enderio/config/Config.java | 4 +- .../machine/vacuum/BlockVacuumChest.java | 4 +- .../machine/vacuum/ContainerVacuumChest.java | 50 ++++- .../machine/vacuum/GuiVacuumChest.java | 199 +++++++++++++++++- .../vacuum/InventoryFilterUpgrade.java | 101 +++++++++ .../machine/vacuum/PacketVaccumChest.java | 96 +++++++++ .../machine/vacuum/TileVacuumChest.java | 134 ++++++++++-- src/main/java/crazypants/gui/GhostSlot.java | 26 +++ .../java/crazypants/gui/GuiContainerBase.java | 108 +++++++++- 12 files changed, 693 insertions(+), 46 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/vacuum/InventoryFilterUpgrade.java create mode 100644 src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java create mode 100644 src/main/java/crazypants/gui/GhostSlot.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 2f8c1d0e..cff012dc 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -818,6 +818,12 @@ enderio.gui.alloy.mode.all=All Smelting enderio.gui.alloy.mode.alloy=Alloys Only enderio.gui.alloy.mode.furnace=Furnace Only +//Vacuum chest +enderio.gui.vacuum.range=Suction strength +enderio.gui.vacuum.header.chest=Vacuum Chest +enderio.gui.vacuum.header.filter=Item filter +enderio.gui.vacuum.header.range=Range + //Vat enderio.vat.outputTank=Output Tank enderio.vat.inputTank=Input Tank diff --git a/resources/assets/enderio/textures/gui/vacumChest.png b/resources/assets/enderio/textures/gui/vacumChest.png index 71d73ed45c544f51966132f7e474471bb497231c..387fb944752d14dab10b3505cdd4f881a740c21c 100644 GIT binary patch literal 2317 zcmaJ?2~bm67JW$|L4uG7hD8CT5f}DWL_;$ML?O0f+aL&u5U@m98bS6&2pvU`$kx*= z3JQ$~6hcH02x}S!p+)v3f*=SeG3*csOG4&{vZtn|?Rmdmy0NaUH7C!<2gI-}k3JERboB3|gf^_}f(gKLYPgZT-FOX%MkClTT0J7!c32Sd* z=0Zl4Kk?it)CgQ^+djF;i?KQYNIf80nArvo&J5RklBSeV^OMJtF3%@uk2Q6g8D$$I zg|NEvyCz17dmq+3?bIERS?u2D|3@-4wcG2m$t6-Wx~=#3#rmu=sj=+Q&)w)(Eu2ev zG~K3@$cY_mcb_b+Q3)ykwEXaP&VFu5ZNropo+L?+eiD}F#AwbjW{gjs5Pd8Zai*v2 z?Cn*XV$wLWn>wuxZ9ge^3)St;JKdsN-f(hOnie{r2w64^3=E{N*MSymxkL2Zp|ufu z5`l5c!He80yu0Qic6Cz~jXmiiLR42*$4j65$sja5HWvgEzL zzrWwwiT6w);n8FF?bh{98#{~4)kuK$IH^zM9=TX5NMN)}bI?GE*l`BCu-0uv)i)JQ z#$4Oy3E))UZqoF|!Q&!#(T9;q=iqh0QlzlQOdinLJdt1c`aAV?^AAg(-;7%DL$1Lk zz!hU*!s`5Z&wKbN@qj?@AEu%@{)=ClSWDSdK$*zoZT2mGy3>3@uv*6Ndo2=-B>>8F zc<5%Cu{`J8Oh@?Z$ELc$i|cc$M_{bV)kSUAWBu>!i#C@V&VKMJgd+TF`RU5F4!EF< zy^B}t@cZW_Mbe${Fb>AxHH6FC5Wb$qd#A;>7a4vy0x&qL_pm#1rX;jhO^ZYHGAoJ z-?8XvJbr{cS&Vd3J4rx;N|VDC>f}!4gMVC8Goz^ z4Ffr&S}4y)$a)-fXjKwS1ka;E%fhH4P!b$h6TkuOL^I79BzlIZ3$WIRZ^u+3$q6Hx z*aT_0vFf|fMD2g?d3m{phAUJIo0}UWTK&M=9oZ>F$~43qb7dU&Cy)Xh z5I_R#+3G4l08ms6pn^Y5&+};;9 z_woG8ci&yH+!GL8*PcHoRaR3I?vC~e4ptg23F_zZc)7ZSWX+&@BqdKJV79vb*sPR4 zwCVofboFrE{LsRJ@0+%^;Xg!;Dqx6aohJ{CBu(NIcNOSFvZkSt(auck{Wu&>0?-T7 z)6=iNbTmAET)DKg)bQ|Oc^ey>E{~UE3**gLY|sw4HKIXvN_Lt?qaDNJxu%bp!DvHYeLhQwuhEyQ(Hg27n)~d+T0G`YjRbHI|T#d zDscNYoVVX72|*2$jmpih=&Q>9VS-6 zzw#voMxzHXx05~v3EBYlT^h{G%S%RpOuam!s+5FdEf1TaA-6sDx~!|Ra&lqzM@&6K zLkF>Ud}XPPjg3}4yzbWB>gwvvLqi!k(&K}0e|%1XQwSY(YT*#~)wv z{P}2pLnV^+=FQnM$D*{14En&pKw5gbcpoCD7Og4`Q)_b)F&i5j@dorz;E#%^nA89DOi4wBqC?852T!{``?nWu^PlVJ=rCz8;OY`` zx+?v<7-3pj!`_xma=dwVXISxo*NWaP8M+V1sErS?FR!-HXZrm~7`=HHDA+9N` zo@eNTfcadMA{&tm=3VIhVErV;-Tk1322N42F2g@%URVw>}_2Jqa~sOSUIpEJhcK>`)Q%0lhBA_F6R1TcA7b>ZVMAfKX z<#qg!nm8seU|P!m{Nb&X18Xi^>%<32yg+`v?!JJr2keGp06}&DYn7SJXq;gNTJBLg z9VpQa-%=KqF*6X`Ssc`mQL#!?=0cdr=!vp%gX@> zezYUiDp`}e9QusG_};dKgvMaAB`Fdl@P7x@Bt=JG{~8Tf0FhDHXP#L&<>l?I6)~jr z8i+58odtG<3ypFoZsYCQ#AFL#;IAdln))9}{puf5uGik$I9k1pOYS(Y(#R1hx_zwb SHk6AJr$RhsZBcAa`T5`K#@B-Y literal 2075 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6kBO_y;s`N57=^ff~$MqGj87bfJas9uI;s1a6?(Xhm$BzB~{~xG$ z6pV(za0&r_3GG9mj8YQh7Yt0{BN;FRe`i+(#w}-oM`SSr1K&0fW;}Od=Te}cM2Txe zNpOBzNqJ&XDnmhHW?qS2UTTSgiJpO;VbY6lHNXO;(bL5-q$2L^&D(ja4Mbc6{oZo| zOO5R^v)42PeQkZ9`)Zx#(h~P|A`b;KqO8t*zTp4a#((FZq`cUuIMGgwZaUweJdDb)v@8|M5yooO(w8zLU8H(UNQNT~}@S-U;UYj%gbHI->U zs~xna|NrF*6s%|HU(3G!@0)ei4ZkmD+wb1Z{O5Pvr8`!YOXZ&WGyMGK^84mpt^mCi z?Vs|aSGxaHKH%#B6p3eu*thiWn|J;USKepZ?|#kyVB6FDo6ITY4dKcS*W2Iy{{Bxf z;#)p%!1wn&8{XWPc(AQLp5g6%u?PF=qZ>@$rkCGk+_Sg7rmnWOZqNQqc6Me5hLv>- z?7rL%Yho<9pQ@diH+PQ^?*ijo-47{sdB8#*9c1tdl&del>SfUIZg-CA*|n3y7crJB zTgy7{%=xwGYJvQ7TSiMVI%kXP+weAP~-_OI~ z3T4YT!`Tdv{;j>6r7Gd@J$BoqXV*?@Uu3Yle2vNf8BX;OdoR>ZU%O;y=_fCfhI3oC z9+>=drzp%!hvRp3U~Gnl9oCj>fr0Rg11NN%(EK&ug6j3rp2e@9OwC}Zy|sq5Zh`G~ zCYbUUJ7y!oMxfk$J1{^T= current.stackSize) { + result = current.copy(); + remaining = null; + } else { + result = current.copy(); + result.stackSize = num; + remaining = current.copy(); + remaining.stackSize -= num; + } + te.setFilterItem(remaining); + return result; + } + + return null; + } + + @Override + public ItemStack getStackInSlotOnClosing(int i) { + return null; + } + + @Override + public void setInventorySlotContents(int slot, ItemStack is) { + if(slot == 0) { + te.setFilterItem(is); + } + } + + @Override + public String getInventoryName() { + return "FilterUpgrade"; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public int getInventoryStackLimit() { + return 1; + } + + @Override + public void markDirty() { + } + + @Override + public boolean isUseableByPlayer(EntityPlayer ep) { + return true; + } + + @Override + public void openInventory() { + } + + @Override + public void closeInventory() { + } + + @Override + public boolean isItemValidForSlot(int slot, ItemStack is) { + return slot == 0 && te.isItemValidForFilter(is); + } +} diff --git a/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java new file mode 100644 index 00000000..c18057af --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java @@ -0,0 +1,96 @@ +package crazypants.enderio.machine.vacuum; + +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.network.MessageTileEntity; +import io.netty.buffer.ByteBuf; +import net.minecraft.item.ItemStack; + +public class PacketVaccumChest extends MessageTileEntity implements IMessageHandler { + + public static final int CMD_SET_RANGE = 0; + public static final int CMD_SET_SLOT = 1; + public static final int CMD_SET_BLACKLIST = 2; + public static final int CMD_SET_MATCHMETA = 3; + + private int cmd; + private int value; + private ItemStack stack; + + public PacketVaccumChest() { + } + + private PacketVaccumChest(TileVacuumChest tile, int cmd) { + super(tile); + this.cmd = cmd; + } + + public static PacketVaccumChest setRange(TileVacuumChest tile, int range) { + PacketVaccumChest msg = new PacketVaccumChest(tile, CMD_SET_RANGE); + msg.value = range; + tile.setRange(range); + return msg; + } + + public static PacketVaccumChest setFilterSlot(TileVacuumChest tile, int slot, ItemStack stack) { + PacketVaccumChest msg = new PacketVaccumChest(tile, CMD_SET_SLOT); + msg.value = slot; + msg.stack = stack; + tile.setItemFilterSlot(slot, stack); + return msg; + } + + public static PacketVaccumChest setFilterBlacklist(TileVacuumChest tile, boolean isBlacklist) { + PacketVaccumChest msg = new PacketVaccumChest(tile, CMD_SET_BLACKLIST); + msg.value = isBlacklist ? 1 : 0; + tile.setFilterBlacklist(isBlacklist); + return msg; + } + + public static PacketVaccumChest setFilterMatchMeta(TileVacuumChest tile, boolean matchMeta) { + PacketVaccumChest msg = new PacketVaccumChest(tile, CMD_SET_MATCHMETA); + msg.value = matchMeta ? 1 : 0; + tile.setFilterMatchMeta(matchMeta); + return msg; + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + cmd = buf.readByte() & 255; + value = buf.readInt(); + stack = ByteBufUtils.readItemStack(buf); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeByte(cmd); + buf.writeInt(value); + ByteBufUtils.writeItemStack(buf, stack); + } + + @Override + public IMessage onMessage(PacketVaccumChest msg, MessageContext ctx) { + TileVacuumChest te = msg.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); + if (te != null) { + switch (msg.cmd) { + case CMD_SET_RANGE: + te.setRange(msg.value); + break; + case CMD_SET_SLOT: + te.setItemFilterSlot(msg.value, msg.stack); + break; + case CMD_SET_BLACKLIST: + te.setFilterBlacklist(msg.value != 0); + break; + case CMD_SET_MATCHMETA: + te.setFilterMatchMeta(msg.value != 0); + break; + } + } + return null; + } +} diff --git a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java index 4219f7c6..da9c781a 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java @@ -12,8 +12,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.AxisAlignedBB; +import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.TileEntityEio; +import crazypants.enderio.conduit.item.FilterRegister; +import crazypants.enderio.conduit.item.filter.IItemFilter; +import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.config.Config; import crazypants.render.BoundingBox; import crazypants.util.BlockCoord; @@ -21,8 +25,14 @@ import crazypants.util.ItemUtil; public class TileVacuumChest extends TileEntityEio implements IEntitySelector, IInventory { - private static final double RANGE = Config.vacuumChestRange; - private ItemStack[] inv = new ItemStack[27]; + public static final int ITEM_ROWS = 3; + public static final int ITEM_SLOTS = 9*ITEM_ROWS; + public static final int FILTER_SLOTS = 5; + + private final ItemStack[] inv = new ItemStack[ITEM_SLOTS]; + private int range = Config.vacuumChestRange; + private ItemFilter filter; + private ItemStack filterItem; @Override public void updateEntity() { @@ -48,29 +58,31 @@ public class TileVacuumChest extends TileEntityEio implements IEntitySelector, I private void doHoover() { + int rangeSqr = range*range; BoundingBox bb = new BoundingBox(getLocation()); AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); - aabb = aabb.expand(RANGE, RANGE, RANGE); + aabb = aabb.expand(range, range, range); List interestingItems = worldObj.selectEntitiesWithinAABB(EntityItem.class, aabb, this); for (EntityItem entity : interestingItems) { - double x = (xCoord + 0.5D - entity.posX); - double y = (yCoord + 0.5D - entity.posY); - double z = (zCoord + 0.5D - entity.posZ); + if(filter == null || filter.doesItemPassFilter(entity.getEntityItem())) { + double x = (xCoord + 0.5D - entity.posX); + double y = (yCoord + 0.5D - entity.posY); + double z = (zCoord + 0.5D - entity.posZ); - double distance = Math.sqrt(x * x + y * y + z * z); - if(distance < 1.25) { - hooverEntity(entity); - } else { - double speed = 0.06; - double distScale = 1.0 - Math.min(0.9, distance / (RANGE * RANGE)); - distScale *= distScale; + double distance = Math.sqrt(x * x + y * y + z * z); + if(distance < 1.25) { + hooverEntity(entity); + } else { + double speed = 0.06; + double distScale = 1.0 - Math.min(0.9, distance / rangeSqr); + distScale *= distScale; - entity.motionX += x / distance * distScale * speed; - entity.motionY += y / distance * distScale * 0.2; - entity.motionZ += z / distance * distScale * speed; + entity.motionX += x / distance * distScale * speed; + entity.motionY += y / distance * distScale * 0.2; + entity.motionZ += z / distance * distScale * speed; + } } - } } @@ -191,6 +203,70 @@ public class TileVacuumChest extends TileEntityEio implements IEntitySelector, I return true; } + public boolean isItemValidForFilter(ItemStack itemstack) { + return itemstack != null && itemstack.getItem() == EnderIO.itemBasicFilterUpgrade && itemstack.getItemDamage() == 0; + } + + public int getRange() { + return range; + } + + private int limitRange(int range) { + return Math.max(1, Math.min(Config.vacuumChestRange, range)); + } + + public void setRange(int range) { + this.range = limitRange(range); + updateBlock(); + } + + public ItemStack getFilterItem() { + return filterItem; + } + + public void setFilterItem(ItemStack filterItem) { + IItemFilter newFilter = FilterRegister.getFilterForUpgrade(filterItem); + if(newFilter == null || newFilter instanceof ItemFilter) { + this.filterItem = filterItem; + this.filter = (ItemFilter)newFilter; + updateBlock(); + } + } + + public void setFilterBlacklist(boolean isBlacklist) { + if(filter != null) { + filter.setBlacklist(isBlacklist); + updateFilterItem(); + } + } + + public void setFilterMatchMeta(boolean matchMeta) { + if(filter != null) { + filter.setMatchMeta(matchMeta); + updateFilterItem(); + } + } + + public boolean hasItemFilter() { + return filter != null; + } + + public ItemFilter getItemFilter() { + return filter; + } + + public void setItemFilterSlot(int slot, ItemStack stack) { + if(slot >= 0 && slot < FILTER_SLOTS && filter != null) { + filter.setInventorySlotContents(slot, stack); + updateFilterItem(); + } + } + + private void updateFilterItem() { + FilterRegister.writeFilterToStack(filter, filterItem); + updateBlock(); + } + @Override public void readCustomNBT(NBTTagCompound nbtRoot) { readContentsFromNBT(nbtRoot); @@ -207,6 +283,24 @@ public class TileVacuumChest extends TileEntityEio implements IEntitySelector, I } } } + if(nbtRoot.hasKey("range")) { + range = limitRange(nbtRoot.getInteger("range")); + } else { + range = Config.vacuumChestRange; + } + if(nbtRoot.hasKey("filter")) { + NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag("filter"); + filterItem = ItemStack.loadItemStackFromNBT(filterTag); + IItemFilter flt = FilterRegister.getFilterForUpgrade(filterItem); + if(flt instanceof ItemFilter) { + filter = (ItemFilter)flt; + } else { + filterItem = null; + } + } else { + filterItem = null; + filter = null; + } } @Override @@ -225,6 +319,12 @@ public class TileVacuumChest extends TileEntityEio implements IEntitySelector, I } } nbtRoot.setTag("Items", itemList); + nbtRoot.setInteger("range", range); + if(filterItem != null) { + NBTTagCompound filterNBT = new NBTTagCompound(); + filterItem.writeToNBT(filterNBT); + nbtRoot.setTag("filter", filterNBT); + } } } diff --git a/src/main/java/crazypants/gui/GhostSlot.java b/src/main/java/crazypants/gui/GhostSlot.java new file mode 100644 index 00000000..d9889788 --- /dev/null +++ b/src/main/java/crazypants/gui/GhostSlot.java @@ -0,0 +1,26 @@ +package crazypants.gui; + +import net.minecraft.item.ItemStack; + +public class GhostSlot { + + public int x; + public int y; + public boolean visible = true; + public ItemStack stack; + + public boolean isMouseOver(int mx, int my) { + return mx >= x && mx < (x+16) && my >= y && my < (y+16); + } + + public boolean isVisible() { + return visible; + } + + protected ItemStack getStack() { + return stack; + } + + protected void putStack(ItemStack stack) { + } +} diff --git a/src/main/java/crazypants/gui/GuiContainerBase.java b/src/main/java/crazypants/gui/GuiContainerBase.java index bedda7cd..447b52de 100644 --- a/src/main/java/crazypants/gui/GuiContainerBase.java +++ b/src/main/java/crazypants/gui/GuiContainerBase.java @@ -1,6 +1,5 @@ package crazypants.gui; -import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -20,11 +19,9 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.ReflectionHelper; import codechicken.nei.VisiblityData; import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; -import crazypants.enderio.Log; import crazypants.enderio.gui.IGuiOverlay; import crazypants.gui.ToolTipManager.ToolTipRenderer; import crazypants.render.RenderUtil; @@ -36,6 +33,9 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe protected ToolTipManager ttMan = new ToolTipManager(); protected List overlays = new ArrayList(); + protected List ghostSlots = new ArrayList(); + + protected GhostSlot hoverGhostSlot; protected GuiContainerBase(Container par1Container) { super(par1Container); @@ -111,6 +111,11 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe private int realMx, realMy; + @Override + protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) { + drawGhostSlots(mouseX, mouseY); + } + @Override protected final void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { drawForegroundImpl(mouseX, mouseY); @@ -135,7 +140,7 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe @Override public void drawScreen(int par1, int par2, float par3) { - + hoverGhostSlot = null; int mx = realMx = par1; int my = realMy = par2; for (IGuiOverlay overlay : overlays) { @@ -147,6 +152,13 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe } super.drawScreen(mx, my, par3); + + if(hoverGhostSlot != null && mc.thePlayer.inventory.getItemStack() == null) { + ItemStack stack = hoverGhostSlot.getStack(); + if(stack != null) { + renderToolTip(stack, par1, par2); + } + } } // copied from super with hate @@ -168,13 +180,93 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe itemRender.zLevel = 0.0F; } + protected void drawFakeItemsStart() { + zLevel = 100.0F; + itemRender.zLevel = 100.0F; + GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glEnable(GL11.GL_DEPTH_TEST); + RenderHelper.enableGUIStandardItemLighting(); + } + + protected void drawFakeItemStack(int x, int y, ItemStack stack) { + itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.renderEngine, stack, x, y); + } + + protected void drawFakeItemHover(int x, int y) { + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glColorMask(true, true, true, false); + drawGradientRect(x, y, x + 16, y + 16, 0x80FFFFFF, 0x80FFFFFF); + GL11.glColorMask(true, true, true, true); + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glEnable(GL11.GL_LIGHTING); + } + + protected void drawFakeItemsEnd() { + GL11.glPopAttrib(); + itemRender.zLevel = 0.0F; + zLevel = 0.0F; + } + + protected void drawGhostSlots(int mouseX, int mouseY) { + if(ghostSlots.isEmpty()) { + return; + } + int sx = getGuiLeft(); + int sy = getGuiTop(); + drawFakeItemsStart(); + try { + hoverGhostSlot = null; + for(GhostSlot slot : ghostSlots) { + ItemStack stack = slot.getStack(); + if(slot.isVisible()) { + if(stack != null) { + drawFakeItemStack(slot.x + sx, slot.y + sy, stack); + } + if(slot.isMouseOver(mouseX - sx, mouseY - sy)) { + hoverGhostSlot = slot; + } + } + } + if(hoverGhostSlot != null) { + // draw hover last to prevent it from affecting rendering of other slots ... + drawFakeItemHover(hoverGhostSlot.x + sx, hoverGhostSlot.y + sy); + } + } finally { + drawFakeItemsEnd(); + } + } + + protected GhostSlot getGhostSlot(int mouseX, int mouseY) { + mouseX -= getGuiLeft(); + mouseY -= getGuiTop(); + for(GhostSlot slot : ghostSlots) { + if(slot.isVisible() && slot.isMouseOver(mouseX, mouseY)) { + return slot; + } + } + return null; + } + + @Override + protected void mouseClicked(int mouseX, int mouseY, int button) { + if(!ghostSlots.isEmpty()) { + GhostSlot slot = getGhostSlot(mouseX, mouseY); + if(slot != null) { + ItemStack st = Minecraft.getMinecraft().thePlayer.inventory.getItemStack(); + slot.putStack(st); + return; + } + } + super.mouseClicked(mouseX, mouseY, button); + } + private boolean isMouseInOverlay(int mouseX, int mouseY, IGuiOverlay overlay) { int x = mouseX - getGuiLeft(); int y = mouseY - getGuiTop(); - if(overlay.getBounds().contains(x, y)) { - return true; - } - return false; + return overlay.getBounds().contains(x, y); } @Override From 0c23f5ece36c2152ddf3b5eac757648cbd77400c Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sun, 8 Feb 2015 14:25:45 +0100 Subject: [PATCH 2/2] #1770 add redstone control to vacuum chest --- .../machine/vacuum/BlockVacuumChest.java | 18 ++++++- .../machine/vacuum/GuiVacuumChest.java | 9 ++++ .../machine/vacuum/TileVacuumChest.java | 48 ++++++++++++++++++- 3 files changed, 72 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java index f583db3d..eff0430e 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java @@ -1,11 +1,13 @@ package crazypants.enderio.machine.vacuum; +import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.BlockEio; @@ -13,10 +15,11 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.TileEntityEio; +import crazypants.enderio.api.redstone.IRedstoneConnectable; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; -public class BlockVacuumChest extends BlockEio implements IGuiHandler, IResourceTooltipProvider { +public class BlockVacuumChest extends BlockEio implements IGuiHandler, IResourceTooltipProvider, IRedstoneConnectable { public static BlockVacuumChest create() { PacketHandler.INSTANCE.registerMessage(PacketVaccumChest.class,PacketVaccumChest.class,PacketHandler.nextID(), Side.SERVER); @@ -32,6 +35,19 @@ public class BlockVacuumChest extends BlockEio implements IGuiHandler, IResource setBlockTextureName("enderio:blockVacuumChest"); } + @Override + public boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from) { + return true; + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { + TileEntity ent = world.getTileEntity(x, y, z); + if(ent instanceof TileVacuumChest) { + ((TileVacuumChest) ent).onNeighborBlockChange(blockId); + } + } + @Override protected void init() { super.init(); diff --git a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java index 586313a5..8c0f1d16 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java @@ -5,6 +5,7 @@ import org.lwjgl.opengl.GL11; import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.network.PacketHandler; import crazypants.gui.GhostSlot; @@ -12,6 +13,7 @@ import crazypants.gui.GuiContainerBase; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; +import crazypants.util.BlockCoord; import crazypants.util.Lang; import java.awt.Color; import java.awt.Rectangle; @@ -34,6 +36,7 @@ public class GuiVacuumChest extends GuiContainerBase { private static final int ID_RANGE_DOWN = 4712; private static final int ID_WHITELIST = 4713; private static final int ID_MATCHMETA = 4714; + private static final int ID_REDSTONE = 4715; private final TileVacuumChest te; @@ -42,6 +45,7 @@ public class GuiVacuumChest extends GuiContainerBase { private final IconButtonEIO rangeDownB; private final ToggleButtonEIO whiteListB; private final ToggleButtonEIO useMetaB; + private final RedstoneModeButton rsB; private final String headerChest; private final String headerFilter; private final String headerRange; @@ -66,6 +70,10 @@ public class GuiVacuumChest extends GuiContainerBase { rangeDownB = new IconButtonEIO(this, ID_RANGE_DOWN, x, y, IconEIO.MINUS_BUT); rangeDownB.setSize(8, 8); + x = xSize - 16 - 7; + y = 104; + rsB = new RedstoneModeButton(this, ID_REDSTONE, x, y, te, new BlockCoord(te)); + x = FILTER_LEFT + TileVacuumChest.FILTER_SLOTS*18 + 2; y = 86; whiteListB = new ToggleButtonEIO(this, ID_WHITELIST, x, y, IconEIO.FILTER_WHITELIST, IconEIO.FILTER_BLACKLIST); @@ -102,6 +110,7 @@ public class GuiVacuumChest extends GuiContainerBase { rangeUpB.onGuiInit(); rangeDownB.onGuiInit(); + rsB.onGuiInit(); addToolTip(rangeTooltip); filterChanged(); diff --git a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java index da9c781a..8f60abde 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java @@ -19,11 +19,14 @@ import crazypants.enderio.conduit.item.FilterRegister; import crazypants.enderio.conduit.item.filter.IItemFilter; import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.config.Config; +import crazypants.enderio.machine.IRedstoneModeControlable; +import crazypants.enderio.machine.RedstoneControlMode; import crazypants.render.BoundingBox; import crazypants.util.BlockCoord; import crazypants.util.ItemUtil; +import net.minecraft.block.Block; -public class TileVacuumChest extends TileEntityEio implements IEntitySelector, IInventory { +public class TileVacuumChest extends TileEntityEio implements IEntitySelector, IInventory, IRedstoneModeControlable { public static final int ITEM_ROWS = 3; public static final int ITEM_SLOTS = 9*ITEM_ROWS; @@ -34,13 +37,33 @@ public class TileVacuumChest extends TileEntityEio implements IEntitySelector, I private ItemFilter filter; private ItemStack filterItem; + protected RedstoneControlMode redstoneControlMode = RedstoneControlMode.IGNORE; + protected boolean redstoneCheckPassed; + private boolean redstoneStateDirty = true; + @Override public void updateEntity() { - if(!isFull()) { + if(redstoneStateDirty) { + updateRedstoneStatus(); + } + if(redstoneCheckPassed && !isFull()) { doHoover(); } } + private void updateRedstoneStatus() { + boolean prevRedstoneCheckPassed = redstoneCheckPassed; + redstoneCheckPassed = RedstoneControlMode.isConditionMet(redstoneControlMode, this); + redstoneStateDirty = false; + if(redstoneCheckPassed != prevRedstoneCheckPassed) { + updateBlock(); + } + } + + public void onNeighborBlockChange(Block blockId) { + redstoneStateDirty = true; + } + @Override public boolean isEntityApplicable(Entity entity) { if(entity.isDead) { @@ -267,9 +290,22 @@ public class TileVacuumChest extends TileEntityEio implements IEntitySelector, I updateBlock(); } + @Override + public RedstoneControlMode getRedstoneControlMode() { + return redstoneControlMode; + } + + @Override + public void setRedstoneControlMode(RedstoneControlMode redstoneControlMode) { + this.redstoneControlMode = redstoneControlMode; + redstoneStateDirty = true; + updateBlock(); + } + @Override public void readCustomNBT(NBTTagCompound nbtRoot) { readContentsFromNBT(nbtRoot); + redstoneCheckPassed = nbtRoot.getBoolean("redstoneCheckPassed"); } public void readContentsFromNBT(NBTTagCompound nbtRoot) { @@ -301,11 +337,18 @@ public class TileVacuumChest extends TileEntityEio implements IEntitySelector, I filterItem = null; filter = null; } + + int rsContr = nbtRoot.getInteger("redstoneControlMode"); + if(rsContr < 0 || rsContr >= RedstoneControlMode.values().length) { + rsContr = 0; + } + redstoneControlMode = RedstoneControlMode.values()[rsContr]; } @Override public void writeCustomNBT(NBTTagCompound nbtRoot) { writeContentsToNBT(nbtRoot); + nbtRoot.setBoolean("redstoneCheckPassed", redstoneCheckPassed); } public void writeContentsToNBT(NBTTagCompound nbtRoot) { @@ -325,6 +368,7 @@ public class TileVacuumChest extends TileEntityEio implements IEntitySelector, I filterItem.writeToNBT(filterNBT); nbtRoot.setTag("filter", filterNBT); } + nbtRoot.setInteger("redstoneControlMode", redstoneControlMode.ordinal()); } }