+ 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

1 files changed, 8 insertions, 9 deletions

diff --git a/src/Java/gtPlusPlus/core/util/player/UtilsMining.java b/src/Java/gtPlusPlus/core/util/player/UtilsMining.java
index 9147f4195c..8468c4b3a2 100644
--- a/src/Java/gtPlusPlus/core/util/player/UtilsMining.java
+++ b/src/Java/gtPlusPlus/core/util/player/UtilsMining.java
@@ -2,7 +2,6 @@ package gtPlusPlus.core.util.player;
 
 import gtPlusPlus.core.util.Utils;
 import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
@@ -44,7 +43,7 @@ public class UtilsMining {
 		}
 	}
 
-	public static void customMine(World world, String FACING, EntityPlayer aPlayer){
+	/*public static void customMine(World world, String FACING, EntityPlayer aPlayer){
 
 		float DURABILITY_LOSS = 0;
 		if (!world.isRemote){
@@ -71,10 +70,10 @@ public class UtilsMining {
 				for(int i = -2; i < 3; i++) {
 					for(int j = -2; j < 3; j++) {
 						for(int k = -2; k < 3; k++) {
-/*//							float dur = calculateDurabilityLoss(world, X + i, Y + k, Z + j);
+//							float dur = calculateDurabilityLoss(world, X + i, Y + k, Z + j);
 //							DURABILITY_LOSS = (DURABILITY_LOSS + dur);	
 //							Utils.LOG_WARNING("Added Loss: "+dur);
-*/							removeBlockAndDropAsItem(world, X + i, Y + k, Z + j);
+							removeBlockAndDropAsItem(world, X + i, Y + k, Z + j);
 						}
 					}
 				}
@@ -95,9 +94,9 @@ public class UtilsMining {
 				for(int i = -1; i < 2; i++) {
 					for(int j = -1; j < 2; j++) {
 						for(int k = -1; k < 2; k++) {
-							/*float dur = calculateDurabilityLoss(world, X+k, Y + i, Z + j);
+							float dur = calculateDurabilityLoss(world, X+k, Y + i, Z + j);
 							DURABILITY_LOSS = (DURABILITY_LOSS + dur);
-							Utils.LOG_WARNING("Added Loss: "+dur);*/
+							Utils.LOG_WARNING("Added Loss: "+dur);
 							removeBlockAndDropAsItem(world, X+k, Y + i, Z + j);
 						}
 					}
@@ -119,9 +118,9 @@ public class UtilsMining {
 				for(int i = -1; i < 2; i++) {
 					for(int j = -1; j < 2; j++) {
 						for(int k = -1; k < 2; k++) {
-							/*float dur = calculateDurabilityLoss(world, X + j, Y + i, Z+k);
+							float dur = calculateDurabilityLoss(world, X + j, Y + i, Z+k);
 							DURABILITY_LOSS = (DURABILITY_LOSS + dur);
-							Utils.LOG_WARNING("Added Loss: "+dur);*/
+							Utils.LOG_WARNING("Added Loss: "+dur);
 							removeBlockAndDropAsItem(world, X + j, Y + i, Z+k);
 						}
 					}
@@ -137,7 +136,7 @@ public class UtilsMining {
 			}
 			DURABILITY_LOSS = 0;
 		}
-	}
+	}*/
 	
 	
 	public static boolean getBlockType(Block block, World world, int[] xyz, int miningLevel){