Merge pull request #12 from GTNewHorizons/selectable_ores

Selectable ores - Inspired by Gregicality

3 files changed, 13 insertions, 17 deletions

diff --git a/src/main/java/com/detrav/items/tools/DetravProPick.java b/src/main/java/com/detrav/items/tools/DetravProspector.java
index 9d3b2de50c..b06d083a87 100644
--- a/src/main/java/com/detrav/items/tools/DetravProPick.java
+++ b/src/main/java/com/detrav/items/tools/DetravProspector.java
@@ -1,18 +1,17 @@
 package com.detrav.items.tools;
 
 import com.detrav.enums.Textures01;
-import com.detrav.items.behaviours.BehaviourDetravToolProPick;
+import com.detrav.items.behaviours.BehaviourDetravToolProspector;
 
-import cpw.mods.fml.common.FMLLog;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.items.GT_MetaGenerated_Tool;
 import net.minecraft.item.ItemStack;
 
-public class DetravProPick extends DetravToolElectricProPickBase {
+public class DetravProspector extends DetravToolElectricProspectorBase {
 	
-		private int tier;
+		private final int tier;
 	
-		public DetravProPick(int tier) {
+		public DetravProspector(int tier) {
 			this.tier=tier;
 		}
 	
@@ -20,10 +19,7 @@ public class DetravProPick extends DetravToolElectricProPickBase {
 	        return tier;
 	    }
 	    public float getMaxDurabilityMultiplier() {
-	    	/*if (tier == 0)
-	    		return 0.02F;
-	        return ((float) Math.pow(tier,((float)tier/5F)))/24F;*/
-	    	double x = tier+1;
+	    	double x = tier + 1;
 	    	return (float) (((float) 0.005D+Math.tanh(Math.pow(x,(x/8D))/25D)*(x/6D))*1.25);
 	    }
 
@@ -32,6 +28,6 @@ public class DetravProPick extends DetravToolElectricProPickBase {
 	    }
 	    
 	    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-	        aItem.addItemBehavior(aID, new BehaviourDetravToolProPick(100));
+	        aItem.addItemBehavior(aID, new BehaviourDetravToolProspector(100));
 	    }
 }
diff --git a/src/main/java/com/detrav/items/tools/DetravToolElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java
index 6d1140038b..d2bc52b61b 100644
--- a/src/main/java/com/detrav/items/tools/DetravToolElectricProPick.java
+++ b/src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java
@@ -7,11 +7,11 @@ import net.minecraft.item.ItemStack;
 /**
  * Created by wital_000 on 19.03.2016.
  */
-public class DetravToolElectricProPick extends DetravToolElectricProPickBase {
+public class DetravToolElectricProspector extends DetravToolElectricProspectorBase {
 	
-	private int tier;
+	private final int tier;
 	
-    public DetravToolElectricProPick(int tier) {
+    public DetravToolElectricProspector(int tier) {
 		this.tier=tier;
 	}
 	public int getBaseQuality() {
diff --git a/src/main/java/com/detrav/items/tools/DetravToolElectricProPickBase.java b/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java
index 12a28e343c..d2d3cd108a 100644
--- a/src/main/java/com/detrav/items/tools/DetravToolElectricProPickBase.java
+++ b/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java
@@ -1,7 +1,7 @@
 package com.detrav.items.tools;
 
 import com.detrav.enums.Textures01;
-import com.detrav.items.behaviours.BehaviourDetravToolElectricProPick;
+import com.detrav.items.behaviours.BehaviourDetravToolElectricProspector;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.damagesources.GT_DamageSources;
@@ -28,7 +28,7 @@ import java.util.List;
  * Created by wital_000 on 19.03.2016.
  * modified by bartimaeusnek on 05.06.2018
  */
-public class DetravToolElectricProPickBase implements IToolStats {
+public class DetravToolElectricProspectorBase implements IToolStats {
 	
     public int getToolDamagePerBlockBreak() {
         return GT_Mod.gregtechproxy.mHardRock ? 50 : 100;
@@ -81,7 +81,7 @@ public class DetravToolElectricProPickBase implements IToolStats {
     }
 
     public String getBreakingSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));
+        return (String) GregTech_API.sSoundList.get(0);
     }
 
     @Override
@@ -169,7 +169,7 @@ public class DetravToolElectricProPickBase implements IToolStats {
     }
 
     public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new BehaviourDetravToolElectricProPick(getToolDamagePerBlockBreak()));
+        aItem.addItemBehavior(aID, new BehaviourDetravToolElectricProspector(getToolDamagePerBlockBreak()));
     }
 
     public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {