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/xmod/gregtech/api/objects/MultiblockLayer.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/objects')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockLayer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockLayer.java
index 88b4c7bc99..c5554a6679 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockLayer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockLayer.java
@@ -17,6 +17,7 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockAir;
 import net.minecraft.init.Blocks;
@@ -124,10 +125,11 @@ public class MultiblockLayer {
 						GT_MetaTileEntity_Hatch.class
 				};
 			}
-			else {
-				try {
+			else {				
+				Class aDataHatch = ReflectionUtils.getClass("gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_DataAccess");				
+				if (aDataHatch != null) {
 					aHatchTypeClass = new Class[] {
-							Class.forName("gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_DataAccess"),
+							aDataHatch,
 							GT_MetaTileEntity_Hatch_Dynamo.class,
 							GT_MetaTileEntity_Hatch_Energy.class,
 							GT_MetaTileEntity_Hatch_Input.class,
@@ -138,7 +140,7 @@ public class MultiblockLayer {
 							GT_MetaTileEntity_Hatch_OutputBus.class,
 							GT_MetaTileEntity_Hatch.class
 					};
-				} catch (ClassNotFoundException e) {
+				} else {
 					aHatchTypeClass = new Class[] {
 							GT_MetaTileEntity_Hatch_Dynamo.class,
 							GT_MetaTileEntity_Hatch_Energy.class,
-- 
cgit