From b5d8a36adf5b886f681574338586b04e30cf55d6 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sun, 27 May 2018 22:30:15 +1000
Subject: $ Tried to fix console spam for invalid tooltip handling. $ Fixed NEI
 handler not showing % chances for recipes. (maybe?) $ Fixed Trinium not
 working correctly in GTNH. $ Fixed invalid cape lookups. % Tweaked recipe for
 Max tier Redox cells. % Tweaked name of Control Circuit.

---
 .../core/handler/events/BlockEventHandler.java     | 10 +++---
 src/Java/gtPlusPlus/core/item/ModItems.java        |  4 +--
 src/Java/gtPlusPlus/core/material/ELEMENT.java     | 39 +++++++++++++++++++---
 .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java   |  2 +-
 .../gtPlusPlus/core/util/minecraft/ItemUtils.java  |  1 +
 5 files changed, 43 insertions(+), 13 deletions(-)

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

diff --git a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
index aac26418b0..c323acf753 100644
--- a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
@@ -3,7 +3,6 @@ package gtPlusPlus.core.handler.events;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.*;
 
 import java.util.ArrayList;
-import java.util.Random;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
@@ -21,7 +20,6 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.world.BlockEvent;
 
 public class BlockEventHandler {
-	private final Random random = new Random();
 	public static ArrayList<ItemStack> oreLimestone;
 	public static ArrayList<ItemStack> blockLimestone;
 	public static ItemStack fluoriteOre;
@@ -115,14 +113,16 @@ public class BlockEventHandler {
 					ArrayList<Block> mBlockTypes = new ArrayList<Block>();
 					if (!oreLimestone.isEmpty()){
 						for (int i=0;i<oreLimestone.size();i++){
-							if (!ItemUtils.getModId(oreLimestone.get(i)).toLowerCase().contains("biomesoplenty")) {
-								mBlockTypes.add(Block.getBlockFromItem(oreLimestone.get(i).getItem()));
+							if (ItemUtils.getModId(oreLimestone.get(i)) != null && !ItemUtils.getModId(oreLimestone.get(i)).toLowerCase().contains("biomesoplenty")) {
+								if (!mBlockTypes.contains(Block.getBlockFromItem(oreLimestone.get(i).getItem()))){
+									mBlockTypes.add(Block.getBlockFromItem(oreLimestone.get(i).getItem()));
+								}
 							}
 						}
 					}
 					if (!blockLimestone.isEmpty()){
 						for (int i=0;i<blockLimestone.size();i++){
-							if (!ItemUtils.getModId(oreLimestone.get(i)).toLowerCase().contains("biomesoplenty")) {
+							if (ItemUtils.getModId(blockLimestone.get(i)) != null && !ItemUtils.getModId(blockLimestone.get(i)).toLowerCase().contains("biomesoplenty")) {
 								if (!mBlockTypes.contains(Block.getBlockFromItem(blockLimestone.get(i).getItem()))){
 									mBlockTypes.add(Block.getBlockFromItem(blockLimestone.get(i).getItem()));
 								}
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 919ad74374..785b29ff61 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -515,8 +515,8 @@ public final class ModItems {
 			//Generate Fictional Materials
 			if (!CORE.GTNH) {
 				MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM, false);
-				MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM_REFINED, false);
 			}
+			MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM_REFINED, false);
 			MaterialGenerator.generate(ALLOY.TRINIUM_TITANIUM);
 			MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH, false);
 			MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH_CARBON);			
@@ -585,7 +585,7 @@ public final class ModItems {
 		fluidFLiBeSalt = FluidUtils.generateFluid("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100});
 
 		//LFTR Control Circuit
-		itemCircuitLFTR = new CoreItem("itemCircuitLFTR", ""+EnumChatFormatting.GREEN+"Thorium Reactor Control Circuit", AddToCreativeTab.tabMisc, 1, 0,  new String[] {"Helps your LFTR not explode"}, EnumRarity.epic, EnumChatFormatting.DARK_GREEN, false, null);
+		itemCircuitLFTR = new CoreItem("itemCircuitLFTR", ""+EnumChatFormatting.GREEN+"Control Circuit", AddToCreativeTab.tabMisc, 1, 0,  new String[] {"Keeps Multiblocks Stable"}, EnumRarity.epic, EnumChatFormatting.DARK_GREEN, false, null);
 
 
 		//Zirconium
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index f399e16cca..5bb82fc38e 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -152,14 +152,43 @@ public final class ELEMENT {
 
 	public ELEMENT(){		
 		//GTNH Trinium Handling		
-		if (CORE.GTNH){
-			TRINIUM  = MaterialUtils.generateMaterialFromGtENUM(MaterialUtils.getMaterialByName("Trinium"));
-			TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material
+		if (CORE.GTNH){			
+			//yay
+			Materials a1 = MaterialUtils.getMaterialByName("Trinium");
+			Materials a2 = Materials.valueOf("Trinium");
+			Materials a3 = Materials.get("Trinium");
+			Materials a4;
+			if (a1 == null) {
+				Logger.INFO("[Material] First attempt to find Trinium failed, using backup method.");
+				if (a2 == null) {
+					Logger.INFO("[Material] Fallback attempt to find Trinium failed, using second fallback.");
+					if (a3 == null) {
+						Logger.INFO("[Material] Fallback attempt to find Trinium failed, dumping materials.");
+						for (Materials m : Materials.values()) {
+							Logger.INFO("[Material] Found "+m.mName);
+						}
+						a4 = null;
+					}
+					else {
+						Logger.INFO("[Material] a3 Found "+a3.mName);
+						a4 = a3;						
+					}
+				}
+				else {
+					Logger.INFO("[Material] a2 Found "+a2.mName);
+					a4 = a2;
+				}
+				TRINIUM  = MaterialUtils.generateMaterialFromGtENUM(a4);
+			}
+			else {
+				Logger.INFO("[Material] a1 Found "+a1.mName);
+				TRINIUM  = MaterialUtils.generateMaterialFromGtENUM(a1);				
+			}			
 		}
 		else {
 			TRINIUM = new Material("Trinium", MaterialState.SOLID, new short[]{70, 110, 30}, 604, 4057, 181, 133, false, "Ke", 0, false);//Not a GT Inherited Material
-			TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material
-		}		
+		}	
+		TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material	
 	}
 
 	public static ELEMENT getInstance(){
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 84db0bd7af..b182668539 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -769,7 +769,7 @@ public class RECIPES_GREGTECH {
 				FluidUtils.getFluidStack("radon", 4000),
 				T5, 1000, 128000);
 		addAR(T5,
-				ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 4),
+				ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 4),
 				FluidUtils.getFluidStack("molten.krypton", 500),
 				T6, 2000, 512000);
 
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 9682c673b6..58333cccda 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -642,6 +642,7 @@ public class ItemUtils {
 				}
 			}
 			catch (final Throwable t3){
+				t3.printStackTrace();
 				value = "bad modid";
 			}
 		}
-- 
cgit