diff --git a/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStorageCell.java b/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStorageCell.java index 2ba2bc2b..26a8ad24 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStorageCell.java +++ b/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStorageCell.java @@ -30,6 +30,7 @@ import com.google.common.base.Optional; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -140,6 +141,14 @@ public class ItemBasicFluidStorageCell extends AEBaseItem implements IStorageFlu { final String list = (handler.getIncludeExcludeMode() == IncludeExclude.WHITELIST ? GuiText.Included : GuiText.Excluded).getLocal(); lines.add(GuiText.Partitioned.getLocal() + " - " + list + ' ' + GuiText.Precise.getLocal()); + + if (GuiScreen.isShiftKeyDown()) + { + lines.add(GuiText.Filter.getLocal() + ": "); + for (IAEFluidStack aeFluidStack : handler.getPartitionInv()) { + if (aeFluidStack != null) lines.add(" " + aeFluidStack.getFluidStack().getLocalizedName()); + } + } } } } diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java b/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java index c1aede92..dd60f416 100644 --- a/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java +++ b/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java @@ -54,6 +54,11 @@ public class FluidCellInventoryHandler extends MEInventoryHandler return (IFluidCellInventory) ( o instanceof IFluidCellInventory ? o : null ); } + @Override + public Iterable getPartitionInv() { + return (Iterable) Ae2Reflect.getPartitionList(this).getItems(); + } + @Override public boolean isPreformatted() { diff --git a/src/main/java/com/glodblock/github/common/storage/IFluidCellInventoryHandler.java b/src/main/java/com/glodblock/github/common/storage/IFluidCellInventoryHandler.java index aedfb3e3..c2f6bf4d 100644 --- a/src/main/java/com/glodblock/github/common/storage/IFluidCellInventoryHandler.java +++ b/src/main/java/com/glodblock/github/common/storage/IFluidCellInventoryHandler.java @@ -1,11 +1,14 @@ package com.glodblock.github.common.storage; import appeng.api.config.IncludeExclude; +import appeng.api.storage.data.IAEFluidStack; public interface IFluidCellInventoryHandler { IFluidCellInventory getCellInv(); + Iterable getPartitionInv(); + boolean isPreformatted(); IncludeExclude getIncludeExcludeMode();