From f5c94fb03a6a0558fc42853fcde7fe17a2eb98c6 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Mon, 7 Jan 2019 16:59:22 +0000
Subject: + Added several new Materials and Alloys. (Nitinol 60, Adv. Nitinol,
 Hypogen, Titansteel, Arcanite, Octiron, Tungsten Titanium Carbide, Astral
 Titanium, Celestial Tungsten, Chronomatic Glass). + Added Carbon nanotubes,
 Carbyne and associated materials required to create them. + Added Hypervisor
 Matrix (Fusion), a core component for the MK4. % Tweaked recipes for the MK4
 Fusion Reactor and components, making it significantly harder. $ Fixed some
 base elements not generating correctly due to inverted logic for detection. $
 Fixed rare chance for an invalid compressor recipe to generate. $ Fixed
 Voltages and tiering of all materials, resolves many recipe issues within the
 EBF and ABS. $ Fixed invalid compound tooltips on all ore materials.

---
 .../core/util/minecraft/MaterialUtils.java         | 70 ++++++++++++----------
 1 file changed, 40 insertions(+), 30 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/util')

diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index 32607e1247..f3dccf1390 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -215,7 +215,11 @@ public class MaterialUtils {
 	}
 
 	public static int getTierOfMaterial(final int aMeltingPoint){
-		if ((aMeltingPoint >= 0) && (aMeltingPoint <= 1000)){
+		
+		return aMeltingPoint < 1000 ? 0 : (Math.round(aMeltingPoint/1000));
+		
+		
+		/*if ((aMeltingPoint >= 0) && (aMeltingPoint <= 1000)){
 			return 1;
 		}
 		else if((aMeltingPoint >= 1001) && (aMeltingPoint <= 2000)){
@@ -247,43 +251,49 @@ public class MaterialUtils {
 		}
 		else {
 			return 0;
-		}
+		}*/
 	}
 
-	public static int getVoltageForTier(final int aTier) {
+	public static int getVoltageForTier(int aTier) {
+		aTier += 1;
 		if (aTier == 0) {
 			return 16;
-		}
-		if (aTier == 1) {
+		} else if (aTier == 1) {
 			return 30;
-		}
-		if (aTier == 2) {
+		} else if (aTier == 2) {
 			return 120;
-		}
-		if (aTier == 3) {
+		} else if (aTier == 3) {
 			return 480;
+		} else if (aTier == 4) {
+			return 1920;
+		} else if (aTier == 5) {
+			return 7680;
+		} else if (aTier == 6) {
+			return 30720;
+		} else if (aTier == 7) {
+			return 122880;
+		} else if (aTier == 8) {
+			return 491520;
+		} else if (aTier == 9) {
+			return 1966080;
+		} else if (aTier == 10) {
+			return 7864320;
+		} else if (aTier == 11) {
+			return 31457280;
+		} else if (aTier == 12) {
+			return 125829120;
+		} else if (aTier == 13) {
+			return 503316480;
+		} else if (aTier == 14) {
+			return 2013265920;
+		} else {
+			return Integer.MAX_VALUE;
 		}
-		if (aTier == 4) {
-			return 1600;
-		}
-		if (aTier == 5) {
-			return 6400;
-		}
-		if (aTier == 6) {
-			return 25000;
-		}
-		if (aTier == 7) {
-			return 100000;
-		}
-		if (aTier == 8) {
-			return 400000;
-		}
-		if (aTier == 9) {
-			return 1600000;
-		}
-
-
-		return 120;
+		
+		/*else {
+			int newTier = aTier - 1;
+			return (int) ((4*(Math.pow(4, newTier)))*7.5);
+		}*/
 	}
 
 	private static Materials getMaterialByName(String materialName) {
-- 
cgit