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 7be3941e..40ba383d 100644 Binary files a/resources/assets/enderio/textures/gui/externalConduitConnection.png and b/resources/assets/enderio/textures/gui/externalConduitConnection.png differ diff --git a/resources/assets/enderio/textures/gui/itemFilterAdvanced.png b/resources/assets/enderio/textures/gui/itemFilterAdvanced.png deleted file mode 100644 index 48b8e376..00000000 Binary files a/resources/assets/enderio/textures/gui/itemFilterAdvanced.png and /dev/null differ diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index 74c0de30..b186a54d 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -36,6 +36,7 @@ import crazypants.enderio.conduit.geom.ConduitConnectorType; import crazypants.enderio.conduit.gui.ExternalConnectionContainer; import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.gui.GuiExternalConnectionSelector; +import crazypants.enderio.conduit.gui.PacketFluidFilter; import crazypants.enderio.conduit.gui.PacketOpenConduitUI; import crazypants.enderio.conduit.gui.item.PacketExistingItemFilterSnapshot; import crazypants.enderio.conduit.liquid.PacketFluidLevel; @@ -63,6 +64,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler { PacketHandler.INSTANCE.registerMessage(PacketConnectionMode.class, PacketConnectionMode.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketItemConduitFilter.class, PacketItemConduitFilter.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketExistingItemFilterSnapshot.class, PacketExistingItemFilterSnapshot.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketFluidFilter.class, PacketFluidFilter.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketRedstoneConduitSignalColor.class, PacketRedstoneConduitSignalColor.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketOpenConduitUI.class, PacketOpenConduitUI.class, PacketHandler.nextID(), Side.SERVER); diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/BaseSettingsPanel.java b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java similarity index 96% rename from src/main/java/crazypants/enderio/conduit/gui/item/BaseSettingsPanel.java rename to src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java index 1db1b46c..891dc74d 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/BaseSettingsPanel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java @@ -1,4 +1,4 @@ -package crazypants.enderio.conduit.gui.item; +package crazypants.enderio.conduit.gui; import java.awt.Color; @@ -10,8 +10,6 @@ import org.lwjgl.opengl.GL11; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.conduit.gui.GuiExternalConnection; -import crazypants.enderio.conduit.gui.ISettingsPanel; import crazypants.enderio.conduit.packet.PacketConnectionMode; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; @@ -89,6 +87,10 @@ public class BaseSettingsPanel implements ISettingsPanel { @Override public void deactivate() { } + + public void mouseClicked(int x, int y, int par3) { + + } @Override public IconEIO getIcon() { diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java index 193b3524..605d855f 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java @@ -138,6 +138,7 @@ public class GuiExternalConnection extends GuiContainerBase { return; } } + tabs.get(activeTab).mouseClicked(x,y,par3); } diff --git a/src/main/java/crazypants/enderio/conduit/gui/ISettingsPanel.java b/src/main/java/crazypants/enderio/conduit/gui/ISettingsPanel.java index 19988934..4b8707c6 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ISettingsPanel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/ISettingsPanel.java @@ -15,4 +15,6 @@ public interface ISettingsPanel { void actionPerformed(GuiButton guiButton); + void mouseClicked(int x, int y, int par3); + } diff --git a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java index 727bcba0..c27a09c9 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java @@ -1,11 +1,23 @@ package crazypants.enderio.conduit.gui; import java.awt.Color; +import java.awt.Rectangle; +import java.util.Collections; +import java.util.List; +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.Fluid; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.conduit.gui.item.BaseSettingsPanel; +import crazypants.enderio.conduit.liquid.EnderLiquidConduit; +import crazypants.enderio.conduit.liquid.FluidFilter; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.packet.PacketExtractMode; import crazypants.enderio.gui.ColorButton; @@ -14,7 +26,9 @@ import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.network.PacketHandler; +import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; +import crazypants.render.RenderUtil; import crazypants.util.DyeColor; import crazypants.util.Lang; @@ -29,13 +43,32 @@ public class LiquidSettings extends BaseSettingsPanel { private ColorButton colorB; private String autoExtractStr = Lang.localize("gui.conduit.fluid.autoExtract"); + private String filterStr = Lang.localize("gui.conduit.fluid.filter"); private ILiquidConduit conduit; + private EnderLiquidConduit eConduit; + private boolean isEnder; + private int filterX = 59; + private int filterY = 59; + private Rectangle filterBounds = new Rectangle(filterX, filterY, 90, 18); + private GuiToolTip[] filterToolTips; + protected LiquidSettings(final GuiExternalConnection gui, IConduit con) { super(IconEIO.WRENCH_OVERLAY_FLUID, Lang.localize("itemLiquidConduit.name"), gui, con); conduit = (ILiquidConduit) con; + if(con instanceof EnderLiquidConduit) { + eConduit = (EnderLiquidConduit) con; + isEnder = true; + if(isFilterVisible()) { + gui.getContainer().setInventorySlotsVisible(true); + } + addFilterTooltips(); + } else { + isEnder = false; + gui.getContainer().setInventorySlotsVisible(false); + } int x = gap + gui.getFontRenderer().getStringWidth(autoExtractStr) + gap * 2; int y = customTop; @@ -64,6 +97,15 @@ public class LiquidSettings extends BaseSettingsPanel { colorB.setColorIndex(conduit.getExtractionSignalColor(gui.getDir()).ordinal()); } + private void addFilterTooltips() { + filterToolTips = new GuiToolTip[5]; + for(int i=0;i<5;i++) { + Rectangle bound = new Rectangle(filterX + (i*18), filterY, 18, 18); + filterToolTips[i] = new FilterToolTip(bound, i); + gui.addToolTip(filterToolTips[i]); + } + } + @Override public void actionPerformed(GuiButton guiButton) { super.actionPerformed(guiButton); @@ -84,6 +126,35 @@ public class LiquidSettings extends BaseSettingsPanel { gui.removeButton(colorB); } + if(isEnder && isFilterVisible()) { + gui.getContainer().setInventorySlotsVisible(true); + } else { + gui.getContainer().setInventorySlotsVisible(false); + } + + } + + @Override + public void mouseClicked(int x, int y, int par3) { + + if(!isFilterVisible()) { + return; + } + ItemStack st = Minecraft.getMinecraft().thePlayer.inventory.getItemStack(); + FluidFilter filter = eConduit.getFilter(gui.getDir(), isInput()); + if(filter == null && st == null) { + return; + } + if(filter == null) { + filter = new FluidFilter(); + } + if(filterBounds.contains(x, y)) { + int slot = (x - filterX) / 18; + filter.setFluid(slot, st); + } + eConduit.setFilter(gui.getDir(), filter, isInput()); + EnderIO.packetPipeline.INSTANCE.sendToServer(new PacketFluidFilter(eConduit, gui.getDir(), filter, isInput())); + } @Override @@ -91,15 +162,98 @@ public class LiquidSettings extends BaseSettingsPanel { super.deactivate(); rsB.setToolTip((String[]) null); colorB.setToolTip((String[]) null); + if(isEnder) { + gui.getContainer().setInventorySlotsVisible(false); + for(GuiToolTip tt : filterToolTips) { + if(tt != null) { + gui.removeToolTip(tt); + } + } + } } @Override protected void renderCustomOptions(int top, float par1, int par2, int par3) { - if(conduit.getConectionMode(gui.getDir()) == ConnectionMode.INPUT) { + boolean isInput = isInput(); + if(isInput) { int x = gui.getGuiLeft() + gap + gui.getFontRenderer().getStringWidth(autoExtractStr) + gap + 2; int y = customTop; gui.getFontRenderer().drawString(autoExtractStr, left, top, ColorUtil.getRGB(Color.DARK_GRAY)); } + if(isEnder && isFilterVisible()) { + + GL11.glColor3f(1, 1, 1); + RenderUtil.bindTexture("enderio:textures/gui/itemFilter.png"); + gui.drawTexturedModalRect(gui.getGuiLeft(), gui.getGuiTop() + 55, 0, 55, gui.getXSize(), 145); + + FontRenderer fr = gui.getFontRenderer(); + int sw = fr.getStringWidth(filterStr); + int x = (gui.width / 2) - sw / 2; + int y = top + 20; + fr.drawString(filterStr, x, y, ColorUtil.getRGB(Color.DARK_GRAY)); + + x = gui.getGuiLeft() + filterX; + y = customTop + filterY; + GL11.glColor3f(1, 1, 1); + RenderUtil.bindTexture("enderio:textures/gui/externalConduitConnection.png"); + gui.drawTexturedModalRect(x, y, 24, 238, 90, 18); + + FluidFilter filter = eConduit.getFilter(gui.getDir(), isInput); + if(filter != null && !filter.isEmpty()) { + for (int i = 0; i < filter.size(); i++) { + Fluid f = filter.getFluidAt(i); + if(f != null) { + renderFluid(f, x + (i * 18), y); + } + } + + } + + } + } + + private void renderFluid(Fluid f, int x, int y) { + IIcon icon = f.getIcon(); + if(icon != null) { + RenderUtil.bindBlockTexture(); + gui.drawTexturedModelRectFromIcon(x + 1, y + 1, icon, 16, 16); + } + + } + + private boolean isInput() { + return conduit.getConectionMode(gui.getDir()) == ConnectionMode.INPUT; + } + + private boolean isFilterVisible() { + ConnectionMode mode = conduit.getConectionMode(gui.getDir()); + return mode == ConnectionMode.INPUT || mode == ConnectionMode.OUTPUT; + } + + private class FilterToolTip extends GuiToolTip { + + int index; + + public FilterToolTip(Rectangle bounds, int index) { + super(bounds, (String[])null); + this.index = index; + } + + @Override + public List 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++) {