+ 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.

2 files changed, 4 insertions, 9 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
index 0178bac4da..bda75be793 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
@@ -23,6 +23,7 @@ import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaWirelessCharger;
 import ic2.api.info.Info;
 import ic2.api.item.ElectricItem;
@@ -291,12 +292,11 @@ public class ChargingHelper {
 					}
 
 					//Try get charge direct from NBT for GT and IC2 stacks
-					try { 
 						Logger.WARNING("3");						
 						if (mTemp.getItem() instanceof GT_MetaGenerated_Tool_01 
 								|| mTemp.getItem() instanceof GT_MetaGenerated_Item_01 
 								|| mTemp.getItem() instanceof GT_MetaGenerated_Item_02 
-								|| Class.forName("gregtech.common.items.GT_MetaGenerated_Item_03").isInstance(mTemp.getItem()) 
+								|| ReflectionUtils.getClass("gregtech.common.items.GT_MetaGenerated_Item_03").isInstance(mTemp.getItem()) 
 								|| mTemp.getItem().getClass().getName().toLowerCase().equals(("gregtech.common.items.GT_MetaGenerated_Tool_01").toLowerCase())){
 							if (!NBTUtils.hasKey(mTemp, "GT.ItemCharge")){
 								if (!mTemp.getDisplayName().toLowerCase().contains("battery")){
@@ -314,10 +314,7 @@ public class ChargingHelper {
 						}
 						else if (mTemp.getItem() instanceof IElectricItem){
 							mitemCurrentCharge = NBTUtils.getLong(mTemp, "charge");
-						}
-					} catch (ClassNotFoundException e) {
-
-					}				
+						}			
 
 					double mVoltageIncrease;
 					if (mItemEuTLimit >= mVoltage){
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
index 2bfb07ff4a..3c60ae664e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
@@ -321,14 +321,12 @@ public class TreeFarmHelper {
 			return blockHumus;
 		}
 		else if (ReflectionUtils.doesClassExist("forestry.core.blocks.BlockSoil")){
-			try {
-				final Class<?> humusClass = Class.forName("forestry.core.blocks.BlockSoil");
+				final Class<?> humusClass = ReflectionUtils.getClass("forestry.core.blocks.BlockSoil");
 				final ItemStack humusStack = ItemUtils.getCorrectStacktype("Forestry:soil", 1);
 				if (humusClass != null){
 					blockHumus = Block.getBlockFromItem(humusStack.getItem());
 					return Block.getBlockFromItem(humusStack.getItem());
 				}
-			} catch (final ClassNotFoundException e) {}
 		}
 		return null;
 	}