Deprecation cleanup (#637)

8 files changed, 6 insertions, 152 deletions

diff --git a/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java
index 75a3daacad..57c75640a6 100644
--- a/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java
@@ -14,18 +14,6 @@ import gtPlusPlus.api.objects.data.AutoMap;
 
 public class ArrayUtils {
 
-    public static <V> V[] expandArray(final V[] someArray, final V newValueToAdd) {
-        V[] series = someArray;
-        series = addElement(series, newValueToAdd);
-        return series;
-    }
-
-    private static <V> V[] addElement(V[] series, final V newValueToAdd) {
-        series = Arrays.copyOf(series, series.length + 1);
-        series[series.length - 1] = newValueToAdd;
-        return series;
-    }
-
     public static <V> V[] insertElementAtIndex(V[] aArray, int aIndex, V aObjectToInsert) {
         V[] newArray = Arrays.copyOf(aArray, aArray.length + 1);
         for (int i = 0; i < aIndex; i++) {
@@ -38,13 +26,6 @@ public class ArrayUtils {
         return newArray;
     }
 
-    /*
-     * public static <V> Object getMostCommonElement(List<V> list) { Optional r =
-     * list.stream().map(V::getTextureSet).collect(Collectors.groupingBy(Function.identity(),
-     * Collectors.counting())).entrySet().stream().max(Map.Entry.comparingByValue()).map(Map.Entry::getKey); return
-     * r.get(); }
-     */
-
     public static Object[] removeNulls(final Object[] v) {
         List<Object> list = new ArrayList<Object>(Arrays.asList(v));
         list.removeAll(Collections.singleton((Object) null));
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java
index 187839e48a..e2922ee642 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java
@@ -57,14 +57,6 @@ public class EntityUtils {
         return d;
     }
 
-    @Deprecated
-    public static Block findBlockUnderEntityNonBoundingBox(final Entity parEntity) {
-        final int blockX = MathHelper.floor_double(parEntity.posX);
-        final int blockY = MathHelper.floor_double(parEntity.posY - 0.2D - parEntity.yOffset);
-        final int blockZ = MathHelper.floor_double(parEntity.posZ);
-        return parEntity.worldObj.getBlock(blockX, blockY, blockZ);
-    }
-
     public static Block findBlockUnderEntity(final Entity parEntity) {
         final int blockX = MathHelper.floor_double(parEntity.posX);
         final int blockY = MathHelper.floor_double(parEntity.boundingBox.minY) - 1;
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index f5920b5549..0646b26866 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -74,17 +74,6 @@ public class FluidUtils {
         return FluidUtils.getFluidStack("ic2superheatedsteam", amount);
     }
 
-    @Deprecated
-    /**
-     * Do not use - Gives third tier steam - Not implemented
-     * 
-     * @param amount
-     * @return
-     */
-    public static FluidStack getHyperSteam(final int amount) {
-        return FluidUtils.getFluidStack("water", amount);
-    }
-
     public static FluidStack getUUA(final int amount) {
         return FluidUtils.getFluidStack("uuamplifier", amount);
     }
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 6ecc4ab5df..0cfa4e7646 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -21,7 +21,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
-import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
@@ -957,27 +956,6 @@ public class ItemUtils {
         return getItemStackOfAmountFromOreDictNoBroken(oredictName, amount);
     }
 
-    @Deprecated
-    public static ItemStack getGregtechOreStack(OrePrefixes mPrefix, Materials mMat, int mAmount) {
-
-        ItemStack aTemp = getOrePrefixStack(mPrefix, mMat, mAmount);
-        if (aTemp != null) {
-            return aTemp;
-        }
-
-        String mName = MaterialUtils.getMaterialName(mMat);
-
-        String mItemName = mPrefix.name() + mName;
-        // Utils.LOG_INFO("[Component Maker] Trying to get "+mItemName+".");
-        ItemStack gregstack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(mItemName, mAmount);
-        if (gregstack == null) {
-            // Utils.LOG_INFO("[Component Maker] Failed to get "+mItemName+".");
-            return null;
-        }
-        // Utils.LOG_INFO("[Component Maker] Found "+mItemName+".");
-        return (gregstack);
-    }
-
     public static ItemStack getOrePrefixStack(OrePrefixes mPrefix, Material mMat, int mAmount) {
 
         String mName = Utils.sanitizeString(mMat.getLocalizedName());
@@ -1182,10 +1160,6 @@ public class ItemUtils {
         return aFluid != null ? aFluid.getFluid().getLocalizedName(aFluid) : "NULL";
     }
 
-    public static String getFluidName(Fluid aFluid) {
-        return aFluid != null ? aFluid.getLocalizedName() : "NULL";
-    }
-
     public static String getItemName(ItemStack aStack) {
         if (aStack == null) {
             return "ERROR - Empty Stack";
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java
index fc728960fd..eabaf46866 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java
@@ -12,7 +12,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
 
 import cpw.mods.fml.common.registry.LanguageRegistry;
-import gregtech.api.util.GT_LanguageManager;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
@@ -53,10 +52,6 @@ public class LangUtils {
         return false;
     }
 
-    public static String trans(String aNr, String aEnglish) {
-        return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_GTPP_" + aNr, aEnglish, false);
-    }
-
     /**
      * Quick Block Name Lookup that is friendly to servers and locale.
      */
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index 78e6034b06..3fdef9f94f 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -31,7 +31,6 @@ import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.StringUtils;
 import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 public class MaterialUtils {
 
@@ -75,8 +74,7 @@ public class MaterialUtils {
         }
 
         try {
-            @SuppressWarnings("deprecation")
-            String name = material.name();
+            String name = material.mName;
             final short[] rgba = (customRGB == null ? material.mRGBa : customRGB);
             final int melting = material.mMeltingPoint;
             final int boiling = material.mBlastFurnaceTemp;
@@ -178,12 +176,12 @@ public class MaterialUtils {
                 return M;
             } else {
                 Logger.DEBUG_MATERIALS(
-                        "Failed to generate GT++ material instance for " + material.name()
+                        "Failed to generate GT++ material instance for " + material.mName
                                 + " | Valid RGB? "
                                 + (hasValidRGBA(rgba)));
             }
         } catch (Throwable t) {
-            Logger.DEBUG_MATERIALS("Failed to generate GT++ material instance for " + material.name());
+            Logger.DEBUG_MATERIALS("Failed to generate GT++ material instance for " + material.mName);
             t.printStackTrace();
         }
         return null;
@@ -285,20 +283,10 @@ public class MaterialUtils {
         return null;
     }
 
-    @SuppressWarnings("deprecation")
     public static String getMaterialName(Materials mat) {
-
-        String mName = null;
-
-        try {
-            mName = (String) ReflectionUtils.getField(Materials.class, "mDefaultLocalName").get(mat);
-            if (mName == null) {
-                mName = (String) ReflectionUtils.getField(Materials.class, "mName").get(mat);
-            }
-        } catch (IllegalArgumentException | IllegalAccessException e) {}
-
+        String mName = mat.mDefaultLocalName;
         if (mName == null || mName.equals("")) {
-            mName = mat.name();
+            mName = mat.mName;
         }
         return mName;
     }
@@ -315,12 +303,6 @@ public class MaterialUtils {
             }
         }
         return aCounter.getResults();
-        /*
-         * Optional<TextureSet> r =
-         * list.stream().map(Material::getTextureSet).collect(Collectors.groupingBy(Function.identity(),
-         * Collectors.counting())).entrySet().stream().max(Map.Entry.comparingByValue()).map(Map.Entry::getKey);
-         * TextureSet o = (r != null && r.isPresent() && r.get() != null) ? r.get() : null; return o;
-         */
     }
 
     public static Materials getMaterial(String aMaterialName, String aFallbackMaterialName) {
@@ -443,7 +425,7 @@ public class MaterialUtils {
 
     public static boolean isNullGregtechMaterial(Materials aGregtechMaterial) {
         if (aGregtechMaterial == Materials._NULL || aGregtechMaterial.equals(Materials._NULL)
-                || aGregtechMaterial.name().equals(Materials._NULL.name())) {
+                || aGregtechMaterial.mName.equals(Materials._NULL.mName)) {
             return true;
         }
         return false;
diff --git a/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java b/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java
index 7730a9a522..f3452dcbe8 100644
--- a/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java
+++ b/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java
@@ -1,17 +1,14 @@
 package gtPlusPlus.core.util.player;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Properties;
 import java.util.UUID;
 
@@ -79,45 +76,6 @@ public class PlayerCache {
         }
     }
 
-    /**
-     * Reads a "properties" file, and returns it as a Map (a collection of key/value pairs).
-     *
-     * Credit due to Alvin Alexander -
-     * http://alvinalexander.com/java/java-properties-file-map-example?nocache=1#comment-8215 Changed slightly as the
-     * filename and delimiter are constant in my case.
-     *
-     * @param filename  The properties filename to read.
-     * @param delimiter The string (or character) that separates the key from the value in the properties file.
-     * @return The Map that contains the key/value pairs.
-     * @throws Exception
-     */
-    @Deprecated
-    public static Map<String, String> readPropertiesFileAsMapOld() throws Exception {
-        final String delimiter = "=";
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        final Map<String, String> map = new HashMap<>();
-        final BufferedReader reader = new BufferedReader(new FileReader(cache));
-        String line;
-        while ((line = reader.readLine()) != null) {
-            if (line.trim().length() == 0) {
-                continue;
-            }
-            if (line.charAt(0) == '#') {
-                continue;
-            }
-            // assumption here is that proper lines are like "String : <a href="http://xxx.yyy.zzz/foo/bar""
-            // title="http://xxx.yyy.zzz/foo/bar"">http://xxx.yyy.zzz/foo/bar"</a>,
-            // and the ":" is the delimiter
-            final int delimPosition = line.indexOf(delimiter);
-            final String key = line.substring(0, delimPosition - 1).trim();
-            final String value = line.substring(delimPosition + 1).trim();
-            map.put(key, value);
-        }
-        reader.close();
-        CORE.PlayerCache = map;
-        return map;
-    }
-
     public static HashMap<String, UUID> readPropertiesFileAsMap() {
         HashMap<String, UUID> map = null;
         try {
diff --git a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
index 1c238691ac..95e73a71f6 100644
--- a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
@@ -464,11 +464,6 @@ public class ReflectionUtils {
         }
     }
 
-    @Deprecated
-    public static void setFinalStatic(Field field, Object newValue) throws Exception {
-        cacheAccessor(field).setValue(null, newValue);
-    }
-
     public static void setByte(Object clazz, String fieldName, byte newValue) throws Exception {
         Field nameField = getField(clazz.getClass(), fieldName);
         cacheAccessor(nameField).setValue(null, newValue);
@@ -775,18 +770,6 @@ public class ReflectionUtils {
         }
     }
 
-    @Deprecated
-    public static Method getMethodViaReflection(final Class<?> lookupClass, final String methodName,
-            final boolean invoke) throws Exception {
-        final Class<? extends Class> lookup = lookupClass.getClass();
-        final Method m = lookup.getDeclaredMethod(methodName);
-        m.setAccessible(true); // Abracadabra
-        if (invoke) {
-            m.invoke(lookup); // now its OK
-        }
-        return m;
-    }
-
     private static Method getMethod_Internal(Class<?> aClass, String aMethodName, Class<?>... aTypes) {
         Method m = null;
         try {