From ae8a4b14a0de47c081d518681647d14122163f8e Mon Sep 17 00:00:00 2001
From: Draknyte1 <Draknyte1@hotmail.com>
Date: Wed, 23 Nov 2016 21:53:04 +1000
Subject: $ Heavily improved the code for item replacements in CoreItem.java. +
 Added handlers in Material.java for materials with invalid names. % Changed
 logging on some math related functions in Utils.java. + Added an extra case
 for Infused dusts into MaterialUtils.java.

---
 src/Java/gtPlusPlus/core/util/Utils.java                   | 6 +++---
 src/Java/gtPlusPlus/core/util/item/ItemUtils.java          | 4 ++--
 src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index 36a0b717aa..99b5a30827 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -411,7 +411,7 @@ public class Utils {
 			code = code+code+code;
 			int  i = Integer.parseInt(code);
 			hexColorMap.put(a,Integer.toHexString( 0x1000000 | i).substring(1).toUpperCase());
-			Utils.LOG_INFO(""+Integer.toHexString( 0x1000000 | i).substring(1).toUpperCase());
+			Utils.LOG_WARNING(""+Integer.toHexString( 0x1000000 | i).substring(1).toUpperCase());
 		}
 		return hexColorMap;
 	}
@@ -445,7 +445,7 @@ public class Utils {
 	public static Integer appenedHexNotationToInteger(int hexAsStringOrInt){
 		String hexChar = "0x";
 		String result;
-		Utils.LOG_INFO(String.valueOf(hexAsStringOrInt));
+		Utils.LOG_WARNING(String.valueOf(hexAsStringOrInt));
 		result = hexChar+String.valueOf(hexAsStringOrInt);
 		return Integer.getInteger(result);
 	}
@@ -481,7 +481,7 @@ public class Utils {
 			methode.setAccessible(true);
 			Utils.LOG_WARNING("7 "+methode.isAccessible());
 			ItemStack temp = (ItemStack) methode.invoke(item, cellID++, yourName, new Block[0]);
-			Utils.LOG_INFO("Successfully created "+temp.getDisplayName()+"s.");
+			Utils.LOG_WARNING("Successfully created "+temp.getDisplayName()+"s.");
 			FluidContainerRegistry.registerFluidContainer(FluidUtils.getFluidStack(s.toLowerCase(), 0), temp.copy(), Ic2Items.cell.copy());
 			ItemUtils.addItemToOreDictionary(temp.copy(), "cell"+s);
 			return temp;
diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
index f78c09152e..24875748bc 100644
--- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
@@ -296,8 +296,8 @@ public class ItemUtils {
 	}
 	
 	public static Item[] generateSpecialUseDusts(Material material, boolean onlyLargeDust){
-		String unlocalizedName = material.getUnlocalizedName();
-		String materialName = material.getUnlocalizedName();
+		String materialName = material.getLocalizedName();
+		String unlocalizedName = Utils.sanitizeString(materialName);
 		int Colour = material.getRgbAsHex();
 		Item[] output = null;
 		if (onlyLargeDust == false){
diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
index d72af46c8a..d96d813e6f 100644
--- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
@@ -55,8 +55,8 @@ public class MaterialUtils {
 		int radioactivity = 0;
 		if (material.isRadioactive()){
 			radioactivity = 1;
-		}
-		if (hasValidRGBA(rgba) || element == Element.H){
+		}		
+		if (hasValidRGBA(rgba) || element == Element.H || (material == Materials.InfusedAir || material == Materials.InfusedFire || material == Materials.InfusedEarth || material == Materials.InfusedWater)){
 			//ModItems.itemBaseDecidust = UtilsItems.generateDecidust(material);
 			//ModItems.itemBaseCentidust = UtilsItems.generateCentidust(material);
 			return new Material(name, rgba, melting, boiling, protons, neutrons, blastFurnace, chemicalFormula, radioactivity);
-- 
cgit