From 2f247084fbf5cfc0ad6e2963cd993de4bf452e53 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sun, 15 Jun 2014 17:21:11 +0800 Subject: [PATCH] Added filter for Ender Fluid Conduits. --- resources/assets/enderio/lang/en_US.lang | 1 + .../gui/externalConduitConnection.png | Bin 1802 -> 1843 bytes .../textures/gui/itemFilterAdvanced.png | Bin 1930 -> 0 bytes .../enderio/conduit/BlockConduitBundle.java | 2 + .../gui/{item => }/BaseSettingsPanel.java | 8 +- .../conduit/gui/GuiExternalConnection.java | 1 + .../enderio/conduit/gui/ISettingsPanel.java | 2 + .../enderio/conduit/gui/LiquidSettings.java | 158 +++++++++++++++++- .../conduit/gui/PacketFluidFilter.java | 66 ++++++++ .../enderio/conduit/gui/PowerSettings.java | 1 - .../enderio/conduit/gui/RedstoneSettings.java | 1 - .../conduit/gui/item/ItemSettings.java | 1 + .../conduit/liquid/EnderLiquidConduit.java | 82 ++++++++- .../liquid/EnderLiquidConduitNetwork.java | 83 +++++++-- .../enderio/conduit/liquid/FluidFilter.java | 124 ++++++++++++++ .../java/crazypants/gui/ToolTipManager.java | 3 + 16 files changed, 513 insertions(+), 20 deletions(-) delete mode 100644 resources/assets/enderio/textures/gui/itemFilterAdvanced.png rename src/main/java/crazypants/enderio/conduit/gui/{item => }/BaseSettingsPanel.java (96%) create mode 100644 src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java create mode 100644 src/main/java/crazypants/enderio/conduit/liquid/FluidFilter.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index b9913807..6c9bc00e 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -495,3 +495,4 @@ enderio.gui.conduit.redstone.signalColor=Signal Color enderio.gui.conduit.redstone.color=Color enderio.gui.conduit.fluid.autoExtract=Auto Extract +enderio.gui.conduit.fluid.filter=Filter diff --git a/resources/assets/enderio/textures/gui/externalConduitConnection.png b/resources/assets/enderio/textures/gui/externalConduitConnection.png index 7be3941e5c706ab939fdce13307be75a5ea32ea2..40ba383d1999891285b9d47088fa20a5bea4d064 100644 GIT binary patch literal 1843 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~62^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;M)Vjj8pd%c>)EcN?apKg7ec#$`gxH83GbB^GfvmTtgJfjP*?Q3=Isv z6fI<6V4Cjf;uum9_xAQ(zuN%drF*4cXv;Et&ru3iwv6?8igXR zmG1Og~?e2)<$H&o0?Lm*qswPoSj})~Yc9sfIJt`GM5UEF~bx zFyf^2mu_!xX3xf$@>LLM%D3uSED5_$zEWmj zesI0|`y6-m^*Q-}i+|Z4_`CMGf9%bBzn(+o85nY|Gdy`*%esK`!2RP#qZxaiGsl&( z-_ZZcbb|R&=Kg!!4|ap)864s&OLH5l=V@5|TB%*hE`M>?Keh(JB|5ivr}zM^WbkzL Kb6Mw<&;$Th<}FMB literal 1802 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP&_m=^w_au|Ns97vPZ#a2#lx@P@L251?N;C%<|`~Y1qVHw#mb82JpVZ5oVD!p zk9A(#S^A#e`TuX%=jjQIHMWbdzgBbjcAK4np&=%e1C$mw-M0ghPgXgBI1~PU1D0$G z;i61HPQ#n+{6K2wDglsG%Klm)c_OqG#8LSD7FhH-tkYrv@owhJ1IeOLMG)si-ESZ{ zVKo=fAcjG1RX=0JU1p2^?9YmKnJoHqzP~^ASNy>J{O0y8{;Nu}UwSg0kdbaUvynXN z^?CcZ&ySbPdH-KZ?St@x>}dxk&Nu#B^8PvRZ8nAUdSD1U#7PS_%=ya+45-Rn7lxv5 z>Oj_$t%8gvZr;E9hxN?1*yHc+TmLnYO}O%R{~let*Z)`zcCk*-|C?uPySy~tPVk2B zAF&fJcW27?#PI*rKalspzL}xu7a!1+*HaZ4cgW#pXWjb!==F`il?Tc%GrHZ~&-kgW rBI2^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;M)Vjj8pd%c>)EcN?apKg7ec#$`gxH83GbB^GfvmTtgJfjP*?Q3=Isv z6fI<6V0!22;uum9_x8@gEM-FhhKn~X{{8o#mt)qt%rLT``1LzNwyJ{`VJ;lZ6`o-d1m5U@BPc!o;D_!0_h29V3fC zL$s=p0|O&V!vAlaK*2j&6B&TA48OPg0|g(1b+QNmWpC`S1qp8VQUU7cIPmYSFi>zu zs1i`W1H-rc`5?iyLLmK28|r_91oNhPFfi7!{`h>Wxzcp!A?Y_#+v^lHQJOX3^ zT(!L#!*f|q1qOXLpkOyp>O;~N{R5Am$BVSB3ae-qom$5f_qj7*^ZEvcIpsjx_eh{B zR$<8B0CEP%8xP7GzWKLo^FedC2-An@dsc7S&ug?^E!-kwjYz}&Shv*uJfUj~F3do2 z%eHq9LbYW~)Q|(If9>zv30Jw;dqFOV{*lvO`Slu*_fr(+Nub?-HS zbM78o9R{>dDBmkQvlwiKGt2rF# z$OzQ~yVNZ~E(_z_kP1=pMV?{a-Z getToolTipText() { + if(!isFilterVisible()) { + return null; + } + FluidFilter filter = eConduit.getFilter(gui.getDir(), isInput()); + if(filter == null) { + return null; + } + if(filter.getFluidAt(index) == null) { + return null; + } + return Collections.singletonList(filter.getFluidAt(index).getLocalizedName()); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java b/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java new file mode 100644 index 00000000..512cf0c5 --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java @@ -0,0 +1,66 @@ +package crazypants.enderio.conduit.gui; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; +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.conduit.item.IItemConduit; +import crazypants.enderio.conduit.liquid.EnderLiquidConduit; +import crazypants.enderio.conduit.liquid.FluidFilter; +import crazypants.enderio.conduit.liquid.ILiquidConduit; +import crazypants.enderio.conduit.packet.AbstractConduitPacket; +import crazypants.enderio.conduit.packet.ConTypeEnum; +import crazypants.enderio.conduit.packet.PacketExtractMode; + +public class PacketFluidFilter extends AbstractConduitPacket implements IMessageHandler{ + + private ForgeDirection dir; + private boolean isInput; + private FluidFilter filter; + + public PacketFluidFilter() { + } + + public PacketFluidFilter(EnderLiquidConduit eConduit, ForgeDirection dir, FluidFilter filter, boolean isInput) { + super(eConduit.getBundle().getEntity(), ConTypeEnum.FLUID); + this.dir = dir; + this.filter = filter; + this.isInput = isInput; + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(dir.ordinal()); + buf.writeBoolean(isInput); + NBTTagCompound tag = new NBTTagCompound(); + filter.writeToNBT(tag); + ByteBufUtils.writeTag(buf, tag); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + dir = ForgeDirection.values()[buf.readShort()]; + isInput = buf.readBoolean(); + NBTTagCompound tag = ByteBufUtils.readTag(buf); + filter = new FluidFilter(); + filter.readFromNBT(tag); + } + + @Override + public IMessage onMessage(PacketFluidFilter message, MessageContext ctx) { + ILiquidConduit conduit = message.getTileCasted(ctx); + if(! (conduit instanceof EnderLiquidConduit)) { + return null; + } + EnderLiquidConduit eCon = (EnderLiquidConduit)conduit; + eCon.setFilter(message.dir, message.filter, message.isInput); + message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); + return null; + } + +} diff --git a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java index 60606328..57bbd48d 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java @@ -2,7 +2,6 @@ package crazypants.enderio.conduit.gui; import net.minecraft.client.gui.GuiButton; import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.conduit.gui.item.BaseSettingsPanel; import crazypants.enderio.conduit.packet.PacketExtractMode; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.gui.ColorButton; diff --git a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java index f499b2ea..80c75c66 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java @@ -4,7 +4,6 @@ import java.awt.Color; import net.minecraft.client.gui.GuiButton; import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.conduit.gui.item.BaseSettingsPanel; import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor; import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; import crazypants.enderio.gui.ColorButton; diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index e9b5822b..eb1e008d 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -10,6 +10,7 @@ import org.lwjgl.opengl.GL11; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.gui.BaseSettingsPanel; import crazypants.enderio.conduit.gui.FilterChangeListener; import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.IItemConduit; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java index 05755787..654ecd14 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java @@ -1,14 +1,17 @@ package crazypants.enderio.conduit.liquid; +import java.util.EnumMap; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -23,6 +26,8 @@ import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.RaytraceResult; import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.item.FilterRegister; +import crazypants.enderio.conduit.item.filter.IItemFilter; import crazypants.render.IconUtil; import crazypants.util.BlockCoord; @@ -58,6 +63,9 @@ public class EnderLiquidConduit extends AbstractLiquidConduit { private EnderLiquidConduitNetwork network; private int ticksSinceFailedExtract; + private final EnumMap outputFilters = new EnumMap(ForgeDirection.class); + private final EnumMap inputFilters = new EnumMap(ForgeDirection.class); + @Override public ItemStack createItem() { return new ItemStack(EnderIO.itemLiquidConduit, 1, 2); @@ -113,6 +121,21 @@ public class EnderLiquidConduit extends AbstractLiquidConduit { return network; } + public FluidFilter getFilter(ForgeDirection dir, boolean isInput) { + if(isInput) { + return inputFilters.get(dir); + } + return outputFilters.get(dir); + } + + public void setFilter(ForgeDirection dir, FluidFilter filter, boolean isInput) { + if(isInput) { + inputFilters.put(dir, filter); + } else { + outputFilters.put(dir, filter); + } + } + @Override public boolean setNetwork(AbstractConduitNetwork network) { if(network == null) { @@ -123,10 +146,10 @@ public class EnderLiquidConduit extends AbstractLiquidConduit { return false; } this.network = (EnderLiquidConduitNetwork) network; - for(ForgeDirection dir : externalConnections) { + for (ForgeDirection dir : externalConnections) { this.network.connectionChanged(this, dir); } - + return true; } @@ -169,7 +192,7 @@ public class EnderLiquidConduit extends AbstractLiquidConduit { } private void refreshConnections(ForgeDirection dir) { - if(network == null) { + if(network == null) { return; } network.connectionChanged(this, dir); @@ -263,4 +286,57 @@ public class EnderLiquidConduit extends AbstractLiquidConduit { return network.getTankInfo(this, from); } + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + for (Entry entry : inputFilters.entrySet()) { + if(entry.getValue() != null) { + FluidFilter f = entry.getValue(); + if(f != null && !f.isEmpty()) { + NBTTagCompound itemRoot = new NBTTagCompound(); + f.writeToNBT(itemRoot); + nbtRoot.setTag("inFilts." + entry.getKey().name(), itemRoot); + } + } + } + for (Entry entry : outputFilters.entrySet()) { + if(entry.getValue() != null) { + FluidFilter f = entry.getValue(); + if(f != null && !f.isEmpty()) { + NBTTagCompound itemRoot = new NBTTagCompound(); + f.writeToNBT(itemRoot); + nbtRoot.setTag("outFilts." + entry.getKey().name(), itemRoot); + } + } + } + + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + super.readFromNBT(nbtRoot, nbtVersion); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + String key = "inFilts." + dir.name(); + if(nbtRoot.hasKey(key)) { + NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key); + FluidFilter f = new FluidFilter(); + f.readFromNBT(filterTag); + if(!f.isEmpty()) { + inputFilters.put(dir, f); + } + } + + key = "outFilts." + dir.name(); + if(nbtRoot.hasKey(key)) { + NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key); + FluidFilter f = new FluidFilter(); + f.readFromNBT(filterTag); + if(!f.isEmpty()) { + outputFilters.put(dir, f); + } + } + } + + } + } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java index 2472e799..d3c845c0 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java @@ -24,7 +24,8 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork tanks = new ArrayList(); - + Map tankMap = new HashMap(); + Map> iterators; public EnderLiquidConduitNetwork() { @@ -36,19 +37,22 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork getIteratorForTank(NetworkTank tank) { if(iterators == null) { iterators = new HashMap>(); @@ -106,11 +125,11 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork res = new ArrayList(tanks.size()); - NetworkTank tank = new NetworkTank(con, conDir); + NetworkTank tank = getTank(con, conDir); for (NetworkTank target : tanks) { if(!target.equals(tank) && target.isValid()) { FluidTankInfo[] tTanks = target.externalTank.getTankInfo(target.tankDir); - for(FluidTankInfo info: tTanks) { + for (FluidTankInfo info : tTanks) { res.add(info); } } @@ -118,6 +137,50 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork= fluids.length) { + return false; + } + fluids[index] = null; + return true; + } + + protected void setFluid(int index, String fluidName) { + Fluid f = FluidRegistry.getFluid(fluidName); + fluids[index] = f; + } + + public void writeToNBT(NBTTagCompound root) { + if(isEmpty()) { + root.removeTag("fluidFilter"); + return; + } + + NBTTagList fluidList = new NBTTagList(); + int index = 0; + for (Fluid f : fluids) { + if(f != null) { + NBTTagCompound fRoot = new NBTTagCompound(); + fRoot.setInteger("index", index); + fRoot.setString("fluidName", f.getName()); + fluidList.appendTag(fRoot); + } + index++; + } + root.setTag("fluidFilter", fluidList); + + } + + public void readFromNBT(NBTTagCompound root) { + if(!root.hasKey("fluidFilter")) { + clear(); + return; + } + NBTTagList fluidList = (NBTTagList) root.getTag("fluidFilter"); + for (int i = 0; i < fluidList.tagCount(); i++) { + NBTTagCompound fRoot = fluidList.getCompoundTagAt(i); + setFluid(fRoot.getInteger("index"), fRoot.getString("fluidName")); + } + } + + private void clear() { + for(int i=0;i list = toolTip.getToolTipText(); + if(list == null) { + return; + } List formatted = new ArrayList(list.size()); for (int i = 0; i < list.size(); i++) {