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.

---
 src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java          | 4 ++--
 .../gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java     | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java
index c00eb5254a..c266d55cac 100644
--- a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java
+++ b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java
@@ -133,7 +133,7 @@ public class HandlerTooltip_EIO {
 		if (!BlockEventHandler.blockLimestone.isEmpty()) {
 			for (ItemStack h : BlockEventHandler.blockLimestone) {
 				if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) {
-					if (!ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) {
+					if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) {
 						event.toolTip.add("May contain Fluorite Ore");
 					}
 				}
@@ -142,7 +142,7 @@ public class HandlerTooltip_EIO {
 		if (!BlockEventHandler.oreLimestone.isEmpty()) {
 			for (ItemStack h : BlockEventHandler.oreLimestone) {
 				if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) {
-					if (!ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) {
+					if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) {
 						event.toolTip.add("May contain Fluorite Ore");
 					}
 				}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
index 1bfe20810f..22522aeecc 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
@@ -154,6 +154,7 @@ extends RenderPlayer {
 	}
 
 	private String getPlayerName(String name, String uuid) {
+		try {
 		Logger.WORLD("[Capes++] Trying to UUID check "+name+".");
 		if (uuid != null) {    		
 			if (uuid.length() > 0) {
@@ -179,6 +180,8 @@ extends RenderPlayer {
 			}    		
 		}  
 		Logger.WORLD("[Capes++] Failed UUID check for "+name+".");
+		}
+		catch (Throwable t) {}
 		return name;
 	}
 
-- 
cgit