1 files changed, 13 insertions, 73 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
index 52aeb864dd..2b0e2a7a4d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
@@ -1,99 +1,49 @@
 package gtPlusPlus.xmod.gregtech.common.helpers;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.FluidStack;
 
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gregtech.api.enums.ItemList;
+import gregtech.common.items.GT_VolumetricFlask;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 
 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;
+        return ItemList.VOLUMETRIC_FLASK.get(aAmount);
     }
 
     public static ItemStack getLargeVolumetricFlask(int aAmount) {
-        ItemStack aFlask = GregtechItemList.VOLUMETRIC_FLASK_8k.get(aAmount);
-        return aFlask;
+        return GregtechItemList.VOLUMETRIC_FLASK_8k.get(aAmount);
     }
 
     public static ItemStack getGiganticVolumetricFlask(int aAmount) {
-        ItemStack aFlask = GregtechItemList.VOLUMETRIC_FLASK_32k.get(aAmount);
-        return aFlask;
+        return GregtechItemList.VOLUMETRIC_FLASK_32k.get(aAmount);
     }
 
     public static boolean isVolumetricFlask(ItemStack aStack) {
-        if (isNormalVolumetricFlask(aStack) || isLargeVolumetricFlask(aStack) || isGiganticVolumetricFlask(aStack)) {
-            return true;
-        }
-        return false;
+        return isNormalVolumetricFlask(aStack) || isLargeVolumetricFlask(aStack) || isGiganticVolumetricFlask(aStack);
     }
 
     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;
+        return aStack.getItem() == ItemList.VOLUMETRIC_FLASK.getItem();
     }
 
     public static boolean isLargeVolumetricFlask(ItemStack aStack) {
-        if (GregtechItemList.VOLUMETRIC_FLASK_8k.getItem() == aStack.getItem()) {
-            return true;
-        }
-        return false;
+        return GregtechItemList.VOLUMETRIC_FLASK_8k.getItem() == aStack.getItem();
     }
 
     public static boolean isGiganticVolumetricFlask(ItemStack aStack) {
-        if (GregtechItemList.VOLUMETRIC_FLASK_32k.getItem() == aStack.getItem()) {
-            return true;
-        }
-        return false;
+        return GregtechItemList.VOLUMETRIC_FLASK_32k.getItem() == aStack.getItem();
     }
 
     public static int getMaxFlaskCapacity(ItemStack aStack) {
-        if (aStack != null && sMethodGetFlaskMaxCapacity != null) {
+        if (aStack != null) {
             Item aItem = aStack.getItem();
-            if (sClassVolumetricFlask.isInstance(aItem)) {
-                int aMaxCapacity = (int) ReflectionUtils
-                        .invokeNonBool(aItem, sMethodGetFlaskMaxCapacity, new Object[] {});
-                return aMaxCapacity;
+            if (aItem instanceof GT_VolumetricFlask) {
+                return ((GT_VolumetricFlask) aItem).getMaxCapacity();
             }
         }
         return 0;
@@ -170,16 +120,6 @@ public class VolumetricFlaskHelper {
     }
 
     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;
+        return new GT_VolumetricFlask(unlocalized, english, maxCapacity);
     }
 }