Adapt to AE2 Stack Type API changes

gradle.properties

@@ -108,7 +108,7 @@ mixinsPackage =
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
 # This parameter is for legacy compatibility only
 # Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin
-coreModClass = coremod.FluidCraftCore
+coreModClass =
 
 # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
 # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!

src/main/java/com/glodblock/github/FluidCraft.java

@@ -6,7 +6,6 @@
 import com.glodblock.github.crossmod.opencomputers.OCDriverInit;
 import com.glodblock.github.crossmod.waila.WailaInit;
 import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.loader.CalculatorV2PluginLoader;
 import com.glodblock.github.loader.ChannelLoader;
 import com.glodblock.github.loader.ItemAndBlockHolder;
 import com.glodblock.github.loader.RecipeLoader;
@@ -74,10 +73,6 @@ public static void postInit(FMLPostInitializationEvent event) {
         RecipeLoader.runTerminalRecipe();
         RecipeLoader.addDisassembleRecipe();
 
-        if (ModAndClassUtil.isV2) {
-            CalculatorV2PluginLoader.installCalculatorV2Plugins();
-        }
-
         proxy.postInit(event);
     }
 

src/main/java/com/glodblock/github/api/FluidCraftAPI.java

@@ -6,7 +6,7 @@
 import net.minecraftforge.fluids.Fluid;
 
 import com.glodblock.github.api.registries.ILevelTerminalRegistry;
-import com.glodblock.github.coremod.registries.LevelTerminalRegistry;
+import com.glodblock.github.util.LevelTerminalRegistry;
 
 public final class FluidCraftAPI implements IFluidCraftAPI {
 

src/main/java/com/glodblock/github/client/gui/container/ContainerLevelTerminal.java

@@ -16,12 +16,12 @@
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.client.gui.container.base.FCBaseContainer;
 import com.glodblock.github.common.parts.PartLevelTerminal;
-import com.glodblock.github.coremod.registries.LevelTerminalRegistry;
 import com.glodblock.github.inventory.gui.GuiType;
 import com.glodblock.github.inventory.item.IWirelessTerminal;
 import com.glodblock.github.loader.ItemAndBlockHolder;
 import com.glodblock.github.network.SPacketLevelTerminalUpdate;
 import com.glodblock.github.util.FluidPrimaryGui;
+import com.glodblock.github.util.LevelTerminalRegistry;
 
 import appeng.api.features.ILevelViewable;
 import appeng.api.features.LevelItemInfo;

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

@@ -1,12 +1,16 @@
 package com.glodblock.github.common.item;
 
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
+
 import net.minecraft.item.ItemStack;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.glodblock.github.common.storage.CellType;
 import com.glodblock.github.loader.ItemAndBlockHolder;
 import com.google.common.base.Optional;
 
-import appeng.api.storage.StorageChannel;
+import appeng.api.storage.data.IAEStackType;
 import appeng.items.AEBaseCell;
 import appeng.util.Platform;
 
@@ -24,8 +28,8 @@ public FCBaseItemCell(long bytes, int perType, int totalType, double drain) {
     }
 
     @Override
-    public StorageChannel getStorageChannel() {
-        return StorageChannel.FLUIDS;
+    public @NotNull IAEStackType<?> getStackType() {
+        return FLUID_STACK_TYPE;
     }
 
     public FCBaseItemCell(Optional subName) {

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

@@ -1,17 +1,24 @@
 package com.glodblock.github.common.item;
 
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
+
 import java.util.EnumSet;
 
 import net.minecraft.item.ItemStack;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.loader.IRegister;
 import com.glodblock.github.util.NameConst;
 
-import appeng.api.storage.StorageChannel;
+import appeng.api.storage.IMEInventoryHandler;
+import appeng.api.storage.data.IAEStackType;
 import appeng.core.features.AEFeature;
 import appeng.items.AEBaseInfiniteCell;
+import appeng.me.storage.CreativeCellInventory;
+import appeng.me.storage.FluidCellInventoryHandler;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public class ItemCreativeFluidStorageCell extends AEBaseInfiniteCell
@@ -42,7 +49,12 @@ public int getTotalTypes(ItemStack cellItem) {
     }
 
     @Override
-    public StorageChannel getStorageChannel() {
-        return StorageChannel.FLUIDS;
+    public @NotNull IAEStackType<?> getStackType() {
+        return FLUID_STACK_TYPE;
+    }
+
+    @Override
+    public IMEInventoryHandler getCellInventory(ItemStack stack) {
+        return new FluidCellInventoryHandler(new CreativeCellInventory<>(stack));
     }
 }

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

@@ -3,9 +3,11 @@
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.textures.FCPartsTexture;
 import com.glodblock.github.common.parts.PartFluidConversionMonitor;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.util.NameConst;
@@ -37,6 +39,11 @@ public ItemFluidConversionMonitor register() {
         return this;
     }
 
+    @Override
+    public IIcon getIconIndex(ItemStack p_77650_1_) {
+        return FCPartsTexture.PartTerminalBroad.getIcon();
+    }
+
     public void registerIcons(IIconRegister _iconRegister) {}
 
     @SideOnly(Side.CLIENT)

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

@@ -3,9 +3,11 @@
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.textures.FCPartsTexture;
 import com.glodblock.github.common.parts.PartFluidStorageMonitor;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.util.NameConst;
@@ -37,6 +39,11 @@ public ItemFluidStorageMonitor register() {
         return this;
     }
 
+    @Override
+    public IIcon getIconIndex(ItemStack p_77650_1_) {
+        return FCPartsTexture.PartTerminalBroad.getIcon();
+    }
+
     public void registerIcons(IIconRegister _iconRegister) {}
 
     @SideOnly(Side.CLIENT)

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

@@ -5,7 +5,6 @@
 import com.glodblock.github.loader.IRegister;
 import com.glodblock.github.util.NameConst;
 
-import appeng.api.storage.StorageChannel;
 import appeng.items.storage.ItemVoidStorageCell;
 import cpw.mods.fml.common.registry.GameRegistry;
 
@@ -23,9 +22,4 @@ public ItemFluidVoidStorageCell register() {
         setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
-
-    @Override
-    public StorageChannel getStorageChannel() {
-        return StorageChannel.FLUIDS;
-    }
 }

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

@@ -1,20 +1,26 @@
 package com.glodblock.github.common.item;
 
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
 import static com.glodblock.github.util.Util.FluidUtil.water_bucket;
 
 import java.util.EnumSet;
 
 import net.minecraft.item.ItemStack;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.loader.IRegister;
 import com.glodblock.github.util.NameConst;
 import com.glodblock.github.util.Util;
 
-import appeng.api.storage.StorageChannel;
+import appeng.api.storage.IMEInventoryHandler;
+import appeng.api.storage.data.IAEStackType;
 import appeng.core.features.AEFeature;
 import appeng.items.AEBaseInfiniteCell;
+import appeng.me.storage.CreativeCellInventory;
+import appeng.me.storage.FluidCellInventoryHandler;
 import appeng.tile.inventory.IAEStackInventory;
 import cpw.mods.fml.common.registry.GameRegistry;
 
@@ -62,7 +68,12 @@ public int getTotalTypes(ItemStack cellItem) {
     }
 
     @Override
-    public StorageChannel getStorageChannel() {
-        return StorageChannel.FLUIDS;
+    public @NotNull IAEStackType<?> getStackType() {
+        return FLUID_STACK_TYPE;
+    }
+
+    @Override
+    public IMEInventoryHandler getCellInventory(ItemStack stack) {
+        return new FluidCellInventoryHandler(new CreativeCellInventory<>(stack));
     }
 }

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

@@ -1,5 +1,7 @@
 package com.glodblock.github.common.item;
 
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
+
 import java.util.List;
 
 import net.minecraft.client.gui.GuiScreen;
@@ -9,6 +11,8 @@
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.api.FluidCraftAPI;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
@@ -17,9 +21,9 @@
 import com.glodblock.github.util.RenderUtil;
 
 import appeng.api.implementations.guiobjects.IGuiItemObject;
-import appeng.api.storage.StorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IAEStackType;
 import appeng.items.AEBasePortableCell;
 import appeng.items.contents.CellUpgrades;
 import appeng.items.contents.PortableCellViewer;
@@ -79,12 +83,12 @@ public IInventory getUpgradesInventory(final ItemStack is) {
     @Override
     public IGuiItemObject getGuiObject(final ItemStack is, final World w, final EntityPlayer p, final int x,
             final int y, final int z) {
-        return new PortableCellViewer<IAEFluidStack>(is, x, StorageChannel.FLUIDS);
+        return new PortableCellViewer<IAEFluidStack>(is, x, FLUID_STACK_TYPE);
     }
 
     @Override
-    public StorageChannel getStorageChannel() {
-        return StorageChannel.FLUIDS;
+    public @NotNull IAEStackType<?> getStackType() {
+        return FLUID_STACK_TYPE;
     }
 
     @Override