ug fixes (#377)

src/main/java/com/glodblock/github/common/block/BlockFluidDiscretizer.java

@@ -1,49 +0,0 @@
-package com.glodblock.github.common.block;
-
-import static net.minecraft.client.gui.GuiScreen.isShiftKeyDown;
-
-import java.util.List;
-
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
-import com.glodblock.github.common.item.FCBaseItemBlock;
-import com.glodblock.github.common.tabs.FluidCraftingTabs;
-import com.glodblock.github.common.tile.TileFluidDiscretizer;
-import com.glodblock.github.util.NameConst;
-import com.glodblock.github.util.RenderUtil;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class BlockFluidDiscretizer extends FCBaseBlock {
-
-    public BlockFluidDiscretizer() {
-        super(Material.iron, NameConst.BLOCK_FLUID_DISCRETIZER);
-        setFullBlock(true);
-        setOpaque(true);
-        setTileEntity(TileFluidDiscretizer.class);
-    }
-
-    @Override
-    public BlockFluidDiscretizer register() {
-        GameRegistry.registerBlock(this, FCBaseItemBlock.class, NameConst.BLOCK_FLUID_DISCRETIZER);
-        GameRegistry.registerTileEntity(TileFluidDiscretizer.class, NameConst.BLOCK_FLUID_DISCRETIZER);
-        setCreativeTab(FluidCraftingTabs.INSTANCE);
-        return this;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List<String> toolTip,
-            final boolean advancedToolTips) {
-
-        if (isShiftKeyDown()) {
-            toolTip.addAll(RenderUtil.listFormattedStringToWidth(NameConst.i18n(NameConst.TT_FLUID_DISCRETIZER_DESC)));
-        } else {
-            toolTip.add(NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE));
-        }
-    }
-}

src/main/java/com/glodblock/github/common/item/FCBaseItemCell.java

@@ -8,6 +8,7 @@ import com.google.common.base.Optional;
 
 import appeng.api.storage.StorageChannel;
 import appeng.items.AEBaseCell;
+import appeng.util.Platform;
 
 public abstract class FCBaseItemCell extends AEBaseCell {
 
@@ -46,4 +47,20 @@ public abstract class FCBaseItemCell extends AEBaseCell {
     public ItemStack stack() {
         return new ItemStack(this, 1);
     }
+
+    @Override
+    public String getCellData(ItemStack is) {
+        return totalBytes + ","
+                + this.getTotalTypes(null)
+                + ","
+                + perType
+                + ","
+                + 8 * 256
+                + ","
+                + Platform.openNbtData(is).getByte("cellRestrictionTypes")
+                + ","
+                + Platform.openNbtData(is).getLong("cellRestrictionAmount")
+                + ","
+                + "fluid";
+    }
 }

src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java

@@ -63,7 +63,7 @@ public class ItemFluidLevelEmitter extends FCBaseItem implements IPartItem {
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer player, final List<String> lines,
             final boolean displayMoreInfo) {
-        lines.add("Deprecated, use regular level emitter, hold CTRL for get fluid of container.");
+        lines.add("§4Deprecated, use regular level emitter, hold CTRL for get fluid of container.");
         super.addInformation(stack, player, lines, displayMoreInfo);
     }
 }

src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminal.java

@@ -59,6 +59,6 @@ public class ItemPartFluidPatternTerminal extends FCBaseItem implements IPartIte
     @Override
     @SideOnly(Side.CLIENT)
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> toolTip, boolean flag) {
-        toolTip.add("DEPRECATED!");
+        toolTip.add("§4DEPRECATED!");
     }
 }

src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminalEx.java

@@ -59,6 +59,6 @@ public class ItemPartFluidPatternTerminalEx extends FCBaseItem implements IPartI
     @Override
     @SideOnly(Side.CLIENT)
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> toolTip, boolean flag) {
-        toolTip.add("DEPRECATED!");
+        toolTip.add("§4DEPRECATED!");
     }
 }

src/main/java/com/glodblock/github/common/item/ItemPartFluidTerminal.java

@@ -45,7 +45,7 @@ public class ItemPartFluidTerminal extends FCBaseItem implements IPartItem {
     @Override
     @SideOnly(Side.CLIENT)
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> toolTip, boolean flag) {
-        toolTip.add("DEPRECATED!");
+        toolTip.add("§4DEPRECATED!");
         if (isShiftKeyDown()) {
             toolTip.add(NameConst.i18n(NameConst.TT_FLUID_TERMINAL));
         } else {

src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java

@@ -1,6 +1,7 @@
 package com.glodblock.github.common.item;
 
 import java.util.EnumSet;
+import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -38,4 +39,10 @@ public class ItemWirelessFluidTerminal extends ItemBaseWirelessTerminal
         return null;
     }
 
+    @Override
+    public void addCheckedInformation(ItemStack stack, EntityPlayer player, List<String> lines,
+            boolean displayMoreInfo) {
+        lines.add("§4DEPRECATED!");
+        super.addCheckedInformation(stack, player, lines, displayMoreInfo);
+    }
 }

src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java

@@ -1,7 +1,12 @@
 package com.glodblock.github.common.parts;
 
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 
+import com.glodblock.github.common.item.ItemFluidPacket;
+
+import appeng.api.storage.data.IAEItemStack;
+import appeng.api.storage.data.IAEStack;
 import appeng.helpers.Reflected;
 import appeng.parts.automation.PartLevelEmitter;
 
@@ -11,4 +16,14 @@ public class PartFluidLevelEmitter extends PartLevelEmitter {
     public PartFluidLevelEmitter(final ItemStack is) {
         super(is);
     }
+
+    @Override
+    public void readFromNBT(NBTTagCompound data) {
+        super.readFromNBT(data);
+
+        final IAEStack<?> aes = this.getAEInventoryByName(null).getAEStackInSlot(0);
+        if (aes instanceof IAEItemStack ais && ais.getItem() instanceof ItemFluidPacket) {
+            this.getAEInventoryByName(null).putAEStackInSlot(0, ItemFluidPacket.getFluidAEStack(ais));
+        }
+    }
 }

src/main/java/com/glodblock/github/common/tabs/FluidCraftingTabs.java

@@ -16,6 +16,6 @@ public class FluidCraftingTabs extends CreativeTabs {
 
     @Override
     public Item getTabIconItem() {
-        return ItemAndBlockHolder.DISCRETIZER.stack().getItem();
+        return ItemAndBlockHolder.WALRUS.stack().getItem();
     }
 }

src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java

@@ -1,10 +0,0 @@
-package com.glodblock.github.common.tile;
-
-import appeng.tile.grid.AENetworkTile;
-
-public class TileFluidDiscretizer extends AENetworkTile {
-
-    public TileFluidDiscretizer() {
-        super();
-    }
-}