Merge pull request #31 from GlodBlock/fixstream

fix update

dependencies.gradle

@@ -5,7 +5,7 @@ dependencies {
     compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-87-GTNH:dev')
     compile('curse.maven:cofh-core-69162:2388751')
     compile('com.github.GTNewHorizons:ExtraCells2:2.5.9:dev') {transitive = false}
-    compile("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.8.5:dev") {transitive = false}
+    compile("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.8.5:dev")
 
     compileOnly("com.github.GTNewHorizons:ForestryMC:4.4.7:dev")
     compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.27:dev")
@@ -19,6 +19,7 @@ dependencies {
     compileOnly("com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev") {transitive = false}
     compileOnly('com.github.GTNewHorizons:OpenComputers:1.7.5.23-GTNH:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.3.19-GTNH:dev') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.29:dev") {transitive = false}
     compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.49:dev") {transitive = false}
     
     runtime("com.github.GTNewHorizons:Baubles:1.0.1.14:dev")

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

@@ -20,7 +20,7 @@ import cpw.mods.fml.common.network.NetworkRegistry;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
-@Mod(modid = FluidCraft.MODID, version = FluidCraft.VERSION, name = FluidCraft.MODNAME)
+@Mod(modid = FluidCraft.MODID, version = FluidCraft.VERSION, name = FluidCraft.MODNAME, dependencies = "required-after:appliedenergistics2")
 public class FluidCraft {
 
     public static final String MODID = "GRADLETOKEN_MODID";
@@ -43,8 +43,6 @@ public class FluidCraft {
     @Mod.EventHandler
     public static void init(FMLInitializationEvent event) {
         ModAndClassUtil.init();
-        AEApi.instance().registries().cell().addCellHandler(new FluidCellHandler());
-        ItemAndBlockHolder.loadSetting();
         proxy.init(event);
     }
 
@@ -52,6 +50,9 @@ public class FluidCraft {
     public static void postInit(FMLPostInitializationEvent event) {
         NetworkRegistry.INSTANCE.registerGuiHandler(FluidCraft.INSTANCE, new InventoryHandler());
 
+        AEApi.instance().registries().cell().addCellHandler(new FluidCellHandler());
+        ItemAndBlockHolder.loadSetting();
+
         if (!Config.removeRecipe) {
             (new RecipeLoader()).run();
         }

src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java

@@ -180,8 +180,7 @@ public class FluidCellInventory implements IFluidCellInventory {
 
     @Override
     public long getRemainingFluidCount() {
-        final long remaining = this.getFreeBytes() * 8 + this.getUnusedFluidCount();
-
+        final long remaining = this.getFreeBytes() * 8 * 256 + this.getUnusedFluidCount();
         return remaining > 0 ? remaining : 0;
     }
 

src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java

@@ -32,7 +32,7 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor {
         TileEntity inter = capProvider.getWorldObj().getTileEntity(capProvider.xCoord + f.offsetX, capProvider.yCoord + f.offsetY, capProvider.zCoord + f.offsetZ);
         if (!Config.noFluidPacket && !(inter instanceof TileFluidInterface || (inter instanceof TileCableBus && ((TileCableBus) inter).getPart(f.getOpposite()) instanceof PartFluidInterface)))
             return InventoryAdaptor.getAdaptor(capProvider, f);
-        IInventory item = capProvider instanceof IInventory ? (IInventory) capProvider : null;
+        InventoryAdaptor item = InventoryAdaptor.getAdaptor(capProvider, f);
         IFluidHandler fluid = capProvider instanceof IFluidHandler ? (IFluidHandler) capProvider : null;
         return new FluidConvertingInventoryAdaptor(item, fluid, face);
     }
@@ -41,8 +41,8 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor {
     private final IFluidHandler invFluids;
     private final ForgeDirection side;
 
-    public FluidConvertingInventoryAdaptor(@Nullable IInventory invItems, @Nullable IFluidHandler invFluids, EnumFacing facing) {
-        this.invItems = invItems != null ? InventoryAdaptor.getAdaptor(invItems, Util.from(facing)) : null;
+    public FluidConvertingInventoryAdaptor(@Nullable InventoryAdaptor invItems, @Nullable IFluidHandler invFluids, EnumFacing facing) {
+        this.invItems = invItems;
         this.invFluids = invFluids;
         this.side = Util.from(facing);
     }