From 0bb7ef4f5c3b5861b7a2ac2841a6ec65e78599ae Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sat, 10 Jan 2015 15:04:21 +0100 Subject: [PATCH] added chargeable item filter - part of #1330 --- resources/assets/enderio/lang/en_US.lang | 3 + .../textures/items/filterUpgradePower.png | Bin 0 -> 391 bytes src/main/java/crazypants/enderio/EnderIO.java | 3 + .../java/crazypants/enderio/ModObject.java | 1 + .../enderio/conduit/ConduitRecipes.java | 3 + .../conduit/gui/item/ItemSettings.java | 3 + .../conduit/gui/item/PowerItemFilterGui.java | 129 ++++++++++++++++ .../item/filter/ItemPowerItemFilter.java | 65 ++++++++ .../conduit/item/filter/PowerItemFilter.java | 142 ++++++++++++++++++ 9 files changed, 349 insertions(+) create mode 100644 resources/assets/enderio/textures/items/filterUpgradePower.png create mode 100644 src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java create mode 100644 src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java create mode 100644 src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index afba5672..88cd8dff 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -74,6 +74,9 @@ item.itemModItemFilter.tooltip.basic.line1=Upgrade for item conduits item.itemModItemFilter.tooltip.detailed.line1=Selects only items for a specified item.itemModItemFilter.tooltip.detailed.line2=mod/s +item.itemPowerItemFilter.name=Chargeable Item Filter +item.itemPowerItemFilter.tooltip.basic.line1=Upgrade for item conduits + item.itemExtractSpeedUpgrade.name=Item Conduit Speed Upgrade item.itemExtractSpeedUpgrade.tooltip.basic.line1=Upgrade for item conduits item.itemExtractSpeedUpgrade.tooltip.detailed.line1=Increases speed by 4 diff --git a/resources/assets/enderio/textures/items/filterUpgradePower.png b/resources/assets/enderio/textures/items/filterUpgradePower.png new file mode 100644 index 0000000000000000000000000000000000000000..ac49007be8f09c73d039c76d50592da7d8408662 GIT binary patch literal 391 zcmV;20eJq2P)|mCcTYZj3QTvC&fvhnaKE%)r0IWw$FyZLJk+txR&?;=Wv#$zf})6t~JV1)Q%$ zthE9V1OY)1eBdUbrinsnQ!<$h0K?%B*L4ZQkW4xa!0pX7xm<2M=T19TYjvvI6-IGP z9LFf75D^fef7c)PCL&I@1)VvLc(MoHF-8= ref; + case MORE: return cur > ref; + default: return false; + } + } + return false; + } + + @Override + public boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item) { + boolean res = sticky && doesItemPassFilter(inv, item); + return res; + } + + @Override + public boolean isValid() { + return true; + } + + @Override + public boolean isSticky() { + return sticky; + } + + public void setSticky(boolean sticky) { + this.sticky = sticky; + } + + @Override + public List getSlots(int xOffset, int yOffset) { + return Collections.emptyList(); + } + + @Override + public int getSlotCount() { + return 0; + } + + public CmpMode getMode() { + return mode; + } + + public void setMode(CmpMode mode) { + this.mode = mode; + } + + public int getLevel() { + return level; + } + + public void setLevel(int level) { + this.level = level; + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + readSettingsFromNBT(nbtRoot); + } + + protected void readSettingsFromNBT(NBTTagCompound nbtRoot) { + mode = CmpMode.values()[nbtRoot.getByte("mode") & 255]; + level = nbtRoot.getShort("level"); + sticky = nbtRoot.getBoolean("sticky"); + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + writeSettingToNBT(nbtRoot); + } + + protected void writeSettingToNBT(NBTTagCompound nbtRoot) { + nbtRoot.setByte("mode", (byte)mode.ordinal()); + nbtRoot.setShort("level", (short)level); + nbtRoot.setBoolean("sticky", sticky); + } + + @Override + public void writeToByteBuf(ByteBuf buf) { + NBTTagCompound settingsTag = new NBTTagCompound(); + writeSettingToNBT(settingsTag); + NetworkUtil.writeNBTTagCompound(settingsTag, buf); + } + + @Override + public void readFromByteBuf(ByteBuf buf) { + NBTTagCompound settingsTag = NetworkUtil.readNBTTagCompound(buf); + readSettingsFromNBT(settingsTag); + } +}