diff --git a/src/main/java/com/glodblock/github/common/item/ItemCreativeFluidStorageCell.java b/src/main/java/com/glodblock/github/common/item/ItemCreativeFluidStorageCell.java index 009be4b7..4e6d0887 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemCreativeFluidStorageCell.java +++ b/src/main/java/com/glodblock/github/common/item/ItemCreativeFluidStorageCell.java @@ -9,36 +9,40 @@ import com.glodblock.github.common.tabs.FluidCraftingTabs; import com.glodblock.github.loader.IRegister; import com.glodblock.github.util.NameConst; -import appeng.api.config.FuzzyMode; +import appeng.api.storage.StorageChannel; import appeng.core.features.AEFeature; -import appeng.util.Platform; +import appeng.items.AEBaseInfiniteCell; import cpw.mods.fml.common.registry.GameRegistry; -public class ItemCreativeFluidStorageCell extends ItemBaseInfinityStorageCell +public class ItemCreativeFluidStorageCell extends AEBaseInfiniteCell implements IRegister { public ItemCreativeFluidStorageCell() { - super(com.google.common.base.Optional.absent()); setUnlocalizedName(NameConst.ITEM_CREATIVE_FLUID_STORAGE); setTextureName(FluidCraft.resource(NameConst.ITEM_CREATIVE_FLUID_STORAGE).toString()); this.setFeature(EnumSet.of(AEFeature.StorageCells)); this.setMaxStackSize(1); } - @Override - public FuzzyMode getFuzzyMode(ItemStack is) { - final String fz = Platform.openNbtData(is).getString("FuzzyMode"); - try { - return FuzzyMode.valueOf(fz); - } catch (final Throwable t) { - return FuzzyMode.IGNORE_ALL; - } - } - @Override public ItemCreativeFluidStorageCell register() { GameRegistry.registerItem(this, NameConst.ITEM_CREATIVE_FLUID_STORAGE, FluidCraft.MODID); setCreativeTab(FluidCraftingTabs.INSTANCE); return this; } + + @Override + public boolean isEditable(ItemStack is) { + return true; + } + + @Override + public int getTotalTypes(ItemStack cellItem) { + return 63; + } + + @Override + public StorageChannel getStorageChannel() { + return StorageChannel.FLUIDS; + } } diff --git a/src/main/java/com/glodblock/github/common/item/ItemInfinityWaterStorageCell.java b/src/main/java/com/glodblock/github/common/item/ItemInfinityWaterStorageCell.java index d4e5cb1a..f0646c9e 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemInfinityWaterStorageCell.java +++ b/src/main/java/com/glodblock/github/common/item/ItemInfinityWaterStorageCell.java @@ -12,19 +12,15 @@ import com.glodblock.github.loader.IRegister; import com.glodblock.github.util.NameConst; import com.glodblock.github.util.Util; -import appeng.api.config.FuzzyMode; +import appeng.api.storage.StorageChannel; import appeng.core.features.AEFeature; +import appeng.items.AEBaseInfiniteCell; import appeng.tile.inventory.IAEStackInventory; import cpw.mods.fml.common.registry.GameRegistry; -public class ItemInfinityWaterStorageCell extends ItemBaseInfinityStorageCell +public class ItemInfinityWaterStorageCell extends AEBaseInfiniteCell implements IRegister { - @Override - public IAEStackInventory getConfigAEInventory(ItemStack is) { - return new InfinityConfig(water_bucket); - } - public static class InfinityConfig extends IAEStackInventory { public InfinityConfig(final ItemStack is) { @@ -37,7 +33,6 @@ public class ItemInfinityWaterStorageCell extends ItemBaseInfinityStorageCell } public ItemInfinityWaterStorageCell() { - super(com.google.common.base.Optional.absent()); setUnlocalizedName(NameConst.ITEM_INFINITY_WATER_FLUID_STORAGE); setTextureName(FluidCraft.resource(NameConst.ITEM_INFINITY_FLUID_STORAGE).toString()); this.setFeature(EnumSet.of(AEFeature.StorageCells)); @@ -51,17 +46,23 @@ public class ItemInfinityWaterStorageCell extends ItemBaseInfinityStorageCell return this; } + @Override + public IAEStackInventory getConfigAEInventory(ItemStack is) { + return new InfinityConfig(water_bucket); + } + @Override public boolean isEditable(ItemStack is) { return false; } @Override - public FuzzyMode getFuzzyMode(ItemStack is) { - return FuzzyMode.IGNORE_ALL; + public int getTotalTypes(ItemStack cellItem) { + return 1; } @Override - public void setFuzzyMode(ItemStack is, FuzzyMode fzMode) {} - + public StorageChannel getStorageChannel() { + return StorageChannel.FLUIDS; + } }