$ VFS now handles fluids.

$ Fixed crash due to multiple key listeners running. (codechicken.nei.guihook.GuiContainerManager.lastKeyTyped(GuiContainerManager.java:306))

2 files changed, 56 insertions, 23 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
index 61d0797ccf..e85a78b8aa 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
@@ -10,9 +10,10 @@ import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
 
 public class VolumetricFlaskHelper {
-	
+
 	private static final Class sClassVolumetricFlask;
 	private static final Method sMethodGetFlaskMaxCapacity;
 	private static Item mFlask;
@@ -32,24 +33,24 @@ public class VolumetricFlaskHelper {
 		ItemStack aFlask = ItemUtils.getValueOfItemList("VOLUMETRIC_FLASK", aAmount, (ItemStack) null);
 		return aFlask;
 	}
-	
+
 	public static ItemStack getLargeVolumetricFlask(int aAmount) {
 		ItemStack aFlask = GregtechItemList.VOLUMETRIC_FLASK_8k.get(aAmount);
 		return aFlask;
 	}
-	
+
 	public static ItemStack getGiganticVolumetricFlask(int aAmount) {
 		ItemStack aFlask = GregtechItemList.VOLUMETRIC_FLASK_32k.get(aAmount);
 		return aFlask;
 	}
-	
+
 	public static boolean isVolumetricFlask(ItemStack aStack) {
 		if (isNormalVolumetricFlask(aStack) || isLargeVolumetricFlask(aStack) || isGiganticVolumetricFlask(aStack)) {
 			return true;
 		}
 		return false;
 	}
-	
+
 	public static boolean isNormalVolumetricFlask(ItemStack aStack) {
 		if (mFlask == null) {
 			ItemStack aFlask = ItemUtils.getValueOfItemList("VOLUMETRIC_FLASK", 1, (ItemStack) null);
@@ -62,21 +63,21 @@ public class VolumetricFlaskHelper {
 		}
 		return false;
 	}
-	
+
 	public static boolean isLargeVolumetricFlask(ItemStack aStack) {
 		if (GregtechItemList.VOLUMETRIC_FLASK_8k.getItem() == aStack.getItem()) {
 			return true;
 		}
 		return false;
 	}
-	
+
 	public static boolean isGiganticVolumetricFlask(ItemStack aStack) {
 		if (GregtechItemList.VOLUMETRIC_FLASK_32k.getItem() == aStack.getItem()) {
 			return true;
 		}
 		return false;
 	}
-	
+
 	public static int getMaxFlaskCapacity(ItemStack aStack) {
 		if (aStack != null && sMethodGetFlaskMaxCapacity != null) {
 			Item aItem = aStack.getItem();
@@ -87,28 +88,59 @@ public class VolumetricFlaskHelper {
 		}
 		return 0;
 	}
+
+	public static boolean isFlaskEmpty(ItemStack aStack) {
+		return getFlaskFluid(aStack) == null;
+	}
+
+	public static FluidStack getFlaskFluid(ItemStack aStack) {
+		if (aStack.hasTagCompound()) {
+			NBTTagCompound nbt = aStack.getTagCompound();
+			if (nbt.hasKey("Fluid", 10))
+				return FluidStack.loadFluidStackFromNBT(nbt.getCompoundTag("Fluid"));
+		}
+		return null;
+	}
 	
-	public static int getFlaskCapacity(ItemStack aStack) {
-        int capacity = 1000;
-        if (aStack.hasTagCompound()) {
-            NBTTagCompound nbt = aStack.getTagCompound();
-            if (nbt.hasKey("Capacity", 3))
-                capacity = nbt.getInteger("Capacity");
+    public static void setFluid(ItemStack stack, FluidStack fluidStack) {
+        boolean removeFluid = (fluidStack == null) || (fluidStack.amount <= 0);
+        NBTTagCompound nbt = stack.getTagCompound();
+        if (nbt == null) {
+            if (removeFluid)
+                return;
+            stack.setTagCompound(nbt = new NBTTagCompound());
+        }
+        if (removeFluid) {
+            nbt.removeTag("Fluid");
+            if (nbt.hasNoTags()) {
+                stack.setTagCompound(null);
+            }
+        } else {
+            nbt.setTag("Fluid", fluidStack.writeToNBT(new NBTTagCompound()));
         }
-        return Math.min(getMaxFlaskCapacity(aStack), capacity);
+    }
+
+	public static int getFlaskCapacity(ItemStack aStack) {
+		int capacity = 1000;
+		if (aStack.hasTagCompound()) {
+			NBTTagCompound nbt = aStack.getTagCompound();
+			if (nbt.hasKey("Capacity", 3))
+				capacity = nbt.getInteger("Capacity");
+		}
+		return Math.min(getMaxFlaskCapacity(aStack), capacity);
 	}
-	
+
 	public static boolean setNewFlaskCapacity(ItemStack aStack, int aCapacity) {
 		if (aStack == null || aCapacity <= 0) {
 			return false;
 		}		
 		aCapacity = Math.min(aCapacity, getMaxFlaskCapacity(aStack));
-        NBTTagCompound nbt = aStack.getTagCompound();
-        if (nbt == null) {
-        	aStack.setTagCompound(nbt = new NBTTagCompound());
-        }
-        nbt.setInteger("Capacity", aCapacity);
-        return true;
+		NBTTagCompound nbt = aStack.getTagCompound();
+		if (nbt == null) {
+			aStack.setTagCompound(nbt = new NBTTagCompound());
+		}
+		nbt.setInteger("Capacity", aCapacity);
+		return true;
 	}
 
 	public static Item generateNewFlask(String unlocalized, String english, int maxCapacity) {
@@ -122,5 +154,5 @@ public class VolumetricFlaskHelper {
 		}
 		return null;		
 	}
-	
+
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
index 33c6bacbd4..04d37e8c1e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
@@ -268,6 +268,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 										//We are good to clean
 										if (toRemove > 0){
 											if (damageTurbineRotor() && damageAirFilter()){
+												Logger.INFO("Removing "+toRemove+" pollution");
 												removePollution(mSaveRotor ? (toRemove/2) : toRemove);	
 												Logger.WARNING("mNewPollution[4]:"+getCurrentChunkPollution());		
 											}