+ Added custom Flask Renderer.

+ Added ability for the Volumetric Flask Configurator to handle the new Flasks.
% Made 64k Flask have a capacity of 32k instead. (Technical limitation involving Short data types)

1 files changed, 22 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
index a169419fea..61d0797ccf 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
@@ -39,11 +39,18 @@ public class VolumetricFlaskHelper {
 	}
 	
 	public static ItemStack getGiganticVolumetricFlask(int aAmount) {
-		ItemStack aFlask = GregtechItemList.VOLUMETRIC_FLASK_64k.get(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);
 			if (aFlask != null) {
@@ -56,6 +63,20 @@ 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();