From a6bb1b33da251f4a2ec7a6d6facb4864e9905341 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Fri, 20 Jan 2017 02:07:40 +1000 Subject: + Added a power cost of 32eu/action for the Tree Farmer. (Will eventually get a config option). % Moved the internal power buffer variable out of the cut method into the class. % Massive project tidy up, lots of old unused code removed or tidied up. $ Fixed lots of String comparisons that used == instead of .equals(). $ Fixed Double/Triple/Quad null checks in certain places. $ Fixed returns that set values at the same time. $ Swapped 3.14 and 1.57 to Math.PI and Math.PI/2. $ Fixed possible cases where a NPE may be thrown, by calling logging outside of null checks. + Added PI to CORE.java, since it's a double and MC uses it as a float in each instance. - Stripped 95% of the useless code out of Meta_GT_Proxy.java --- .../gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/enums') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java index d283cece3c..b830f9fd5a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -230,11 +230,6 @@ public enum GregtechOrePrefixes { return true; } - public boolean isIgnored(GT_Materials aMaterial) { - if (aMaterial != null && (!aMaterial.mUnificatable || aMaterial != aMaterial.mMaterialInto)) return true; - return mIgnoredMaterials.contains(aMaterial); - } - public boolean addFamiliarPrefix(GregtechOrePrefixes aPrefix) { if (aPrefix == null || mFamiliarPrefixes.contains(aPrefix) || aPrefix == this) return false; return mFamiliarPrefixes.add(aPrefix); @@ -530,7 +525,7 @@ public enum GregtechOrePrefixes { public static GT_Materials get(String aMaterialName) { Object tObject = GT_Utility.getFieldContent(GT_Materials.class, aMaterialName, false, false); - if (tObject != null && tObject instanceof Materials) return (GT_Materials) tObject; + if (tObject != null && tObject instanceof GT_Materials) return (GT_Materials) tObject; return _NULL; } -- cgit