From b767e7ad3b3e6387dbd90038b7453b4a1e366d31 Mon Sep 17 00:00:00 2001
From: Jordan Byrne <draknyte1@hotmail.com>
Date: Fri, 23 Feb 2018 18:47:40 +1000
Subject: $ Actually fixed the issue with OreDictGrabber failing. % Fixed
 Ordering of tooltips on Material Dusts.

---
 src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java |  6 +++---
 src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java     | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index 030eefc76d..d2bc12a197 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -131,12 +131,12 @@ public class BaseItemDust extends Item{
 		if (stack.getDisplayName().equalsIgnoreCase("fluorite")){
 			list.add("Mined from Sandstone and Limestone.");
 		}
-		if (this.sRadiation > 0){
-			list.add(CORE.GT_Tooltip_Radioactive);
-		}
 		if (this.dustInfo != null){
 			list.add(this.dustInfo.vChemicalFormula);
 		}
+		if (this.sRadiation > 0){
+			list.add(CORE.GT_Tooltip_Radioactive);
+		}
 
 
 		//}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 627400f401..97a448707a 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -266,25 +266,25 @@ public class ItemUtils {
 		}			
 		//Use Cache		
 		if (mOreDictCache.containsKey(mTemp) && mOreDictCache.get(mTemp) != null) {
-			Logger.INFO("[ODC] Returning mOreDictCache value.");
+			//Logger.INFO("[ODC] Returning mOreDictCache value.");
 			return getCachedValue(mTemp, amount);
 		}
 		else if (mDustCache.containsKey(oredictName) && mDustCache.get(mTemp) != null) {
-			Logger.INFO("[ODC] Returning mDustCache value.");
+			//Logger.INFO("[ODC] Returning mDustCache value.");
 			return getSimpleStack(mDustCache.get(oredictName), amount);
 		}
 		else {
-			Logger.INFO("[ODC] Setting mOreDictCache value.");
+			//Logger.INFO("[ODC] Setting mOreDictCache value.");
 			final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(mTemp);
 			if (!oreDictList.isEmpty()){
 				final ItemStack returnValue = oreDictList.get(0).copy();
 				returnValue.stackSize = amount;
 				setCachedValue(mTemp, returnValue);
-				Logger.INFO("[ODC] Setting and Returning mOreDictCache value.");
+				//Logger.INFO("[ODC] Setting and Returning mOreDictCache value.");
 				return returnValue;
 			}
 			setCachedValue(oredictName, getSimpleStack(ModItems.AAA_Broken));
-			Logger.INFO("[ODC] Returning AAA_Broken.");
+			//Logger.INFO("[ODC] Returning AAA_Broken.");
 			return getSimpleStack(ModItems.AAA_Broken, amount);
 		}
 		
@@ -703,7 +703,7 @@ public class ItemUtils {
 			ItemStack returnvalue;
 			for (int xrc=0;xrc<oreDictList.size();xrc++){
 				final String modid = getModId(oreDictList.get(xrc).getItem());
-				if (modid.equals("gregtech") || modid.equals(CORE.MODID)){
+				if (modid != null && (modid.equals("gregtech") || modid.equals(CORE.MODID))){
 					returnvalue = oreDictList.get(xrc).copy();
 					mDustCache.put(oredictName, returnvalue);
 					returnvalue.stackSize = amount;
@@ -726,7 +726,7 @@ public class ItemUtils {
 			ItemStack returnvalue;
 			for (int xrc=0;xrc<oreDictList.size();xrc++){
 				final String modid = getModId(oreDictList.get(xrc).getItem());
-				if (!modid.equals("tconstruct")){
+				if (modid  != null && !modid.equals("tconstruct")){
 					returnvalue = oreDictList.get(xrc).copy();
 					mDustCache.put(oredictName, returnvalue);
 					returnvalue.stackSize = amount;
-- 
cgit