1 files changed, 0 insertions, 168 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
deleted file mode 100644
index 84bb52d064..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package gtPlusPlus.xmod.gregtech.common.helpers;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-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;
-
-	static {
-		if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) {
-			sClassVolumetricFlask = ReflectionUtils.getClass("gregtech.common.items.GT_VolumetricFlask");
-			Method aMaxCapacity = null;
-			try {
-				aMaxCapacity = sClassVolumetricFlask.getDeclaredMethod("getMaxCapacity", new Class[] {});
-			}
-			catch (NoSuchMethodException e) {
-				e.printStackTrace();
-				CORE.crash("Secondary Error Obtaining instance of 'getMaxCapacity' from 'GT_VolumetricFlask'. Crashing.");
-			}
-			sMethodGetFlaskMaxCapacity = aMaxCapacity;
-		}
-		else {
-			sClassVolumetricFlask = null;
-			sMethodGetFlaskMaxCapacity = null;
-		}
-	}
-
-	public static ItemStack getVolumetricFlask(int aAmount) {
-		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);
-			if (aFlask != null) {
-				mFlask = aFlask.getItem();				
-			}
-		}
-		if (aStack.getItem() == mFlask) {
-			return true;
-		}
-		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();
-			if (sClassVolumetricFlask.isInstance(aItem)) {
-				int aMaxCapacity = (int) ReflectionUtils.invokeNonBool(aItem, sMethodGetFlaskMaxCapacity, new Object[] {});
-				return aMaxCapacity;
-			}
-		}
-		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 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()));
-		}
-	}
-
-	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;
-	}
-
-	public static Item generateNewFlask(String unlocalized, String english, int maxCapacity) {
-		Constructor aFlask = ReflectionUtils.getConstructor(sClassVolumetricFlask, new Class[] {String.class, String.class, int.class});
-		if (aFlask != null) {			
-			Object aInstance = ReflectionUtils.createNewInstanceFromConstructor(aFlask, new Object[] {unlocalized, english, maxCapacity});
-			if (aInstance != null && aInstance instanceof Item) {
-				Item aNewFlaskItem = (Item) aInstance;
-				return aNewFlaskItem;
-			}
-		}
-		return null;		
-	}
-
-}