From 4f435ae75b176a9d90c7afa6b1ff40e9ba9c286a Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 28 Feb 2019 20:06:01 +0000
Subject: + Added a new debug tool. + Added support for Crops++. + Added Custom
 Crops & framework to support more in future. + Added basic support for all
 GT++ Materials within Tinkers Construct. [WIP] + Moderately bad attempt at
 generating custom Plasma Cooling recipes in the Adv. Vacuum Freezer. [WIP
 #424] % Reworked logic for Material.java handling Durability, Tool Quality &
 Harvest Level. % Adjusted frequency of structural checks on the Cyclotron,
 Now 100x less frequent. % Cleaned up ReflectionUtils.java and made all
 getters cache their results, for much faster access. % Attempted to adjust
 logic of FFPP, but I probably broke it. [WIP] % Moved static array of Element
 Names from IonParticles.java -> ELEMENT.java. $ Greatly improved reflective
 performance across the mod.

---
 .../gtPlusPlus/core/item/general/books/ItemBaseBook.java    |  5 +++--
 .../core/item/general/capture/ItemEntityCatcher.java        | 13 +++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

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

diff --git a/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java b/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
index 7f6a52f135..2f49ac1287 100644
--- a/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
+++ b/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
@@ -27,6 +27,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.handler.BookHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 public class ItemBaseBook extends ItemWritableBook{
 
@@ -113,11 +114,11 @@ public class ItemBaseBook extends ItemWritableBook{
 		
 		if (player.worldObj.isRemote){
 			try {
-				Class<?> clazz = Class.forName("net.minecraft.client.gui.GuiScreenBook");
+				Class<?> clazz = ReflectionUtils.getClass("net.minecraft.client.gui.GuiScreenBook");
 				Constructor<?> ctor = clazz.getConstructor(EntityPlayer.class, ItemStack.class, boolean.class);
 				Object object = ctor.newInstance(new Object[] { player, bookstack, false });
 				Minecraft.getMinecraft().displayGuiScreen((GuiScreen) object);
-			} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+			} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
diff --git a/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java b/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java
index 592b68d06a..a95fab4b6c 100644
--- a/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java
+++ b/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java
@@ -21,6 +21,7 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 public class ItemEntityCatcher extends Item implements IEntityCatcher {
 
@@ -117,14 +118,10 @@ public class ItemEntityCatcher extends Item implements IEntityCatcher {
 		}
 		Class<? extends Entity> mEntityClass;
 		String mClassName;
-		mClassName = NBTUtils.getString(aStack,"mClassName");
-		try {
-			mEntityClass = (Class<? extends Entity>) Class.forName(mClassName);
-			if (mEntityClass != null) {
-				return mEntityClass;
-			}
-		}
-		catch (ClassNotFoundException e) {
+		mClassName = NBTUtils.getString(aStack, "mClassName");
+		mEntityClass = (Class<? extends Entity>) ReflectionUtils.getClass(mClassName);
+		if (mEntityClass != null) {
+			return mEntityClass;
 		}
 		return null;
 	}
-- 
cgit