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

1 files changed, 19 insertions, 43 deletions

diff --git a/src/Java/gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java b/src/Java/gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java
index 98e6d7ae1a..4dc5a15b4b 100644
--- a/src/Java/gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java
+++ b/src/Java/gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java
@@ -169,15 +169,10 @@ public class EntityBaseVillager extends EntityVillager {
 	 */
 
 	protected float getField_82191_bN() {
-		Field v82191;
+		Field v82191 = ReflectionUtils.getField(getClass(), "field_82191_bN");
 		try {
-			v82191 = ReflectionUtils.getField(getClass(), "field_82191_bN");
-			try {
-				return v82191 != null ? v82191.getFloat(this) : 0f;
-			} catch (IllegalArgumentException | IllegalAccessException e) {
-				return 0f;
-			}
-		} catch (NoSuchFieldException e1) {
+			return v82191 != null ? v82191.getFloat(this) : 0f;
+		} catch (IllegalArgumentException | IllegalAccessException e) {
 			return 0f;
 		}
 	}
@@ -190,15 +185,10 @@ public class EntityBaseVillager extends EntityVillager {
 	}
 
 	protected boolean getNeedsInitilization() {
-		Field v82191;
+		Field v82191 = ReflectionUtils.getField(EntityVillager.class, "needsInitilization");
 		try {
-			v82191 = ReflectionUtils.getField(EntityVillager.class, "needsInitilization");
-			try {
-				return v82191 != null ? v82191.getBoolean(this) : false;
-			} catch (IllegalArgumentException | IllegalAccessException e) {
-				return false;
-			}
-		} catch (NoSuchFieldException e1) {
+			return v82191 != null ? v82191.getBoolean(this) : false;
+		} catch (IllegalArgumentException | IllegalAccessException e) {
 			return false;
 		}
 	}
@@ -213,20 +203,16 @@ public class EntityBaseVillager extends EntityVillager {
 	protected MerchantRecipeList getBuyingList() {
 		Field v82191;
 		MerchantRecipeList o;
+		v82191 = ReflectionUtils.getField(getClass(), "buyingList");
 		try {
-			v82191 = ReflectionUtils.getField(getClass(), "buyingList");
-			try {
-				o = (MerchantRecipeList) v82191.get(this);
-				Logger.WARNING("Is BuyingList Valid? "+(v82191 != null));
-				return v82191 != null ? o : null;
-			} catch (IllegalArgumentException | IllegalAccessException e) {
-				e.printStackTrace();
-				return null;
-			}
-		} catch (NoSuchFieldException e1) {
-			e1.printStackTrace();
+			o = (MerchantRecipeList) v82191.get(this);
+			Logger.WARNING("Is BuyingList Valid? " + (v82191 != null));
+			return v82191 != null ? o : null;
+		} catch (IllegalArgumentException | IllegalAccessException e) {
+			e.printStackTrace();
 			return null;
 		}
+
 	}
 
 	protected void setBuyingList(MerchantRecipeList f) {
@@ -238,29 +224,19 @@ public class EntityBaseVillager extends EntityVillager {
 	}
 
 	protected Village getVillageObject() {
-		Field v82191;
+		Field v82191 = ReflectionUtils.getField(getClass(), "villageObj");
 		try {
-			v82191 = ReflectionUtils.getField(getClass(), "villageObj");
-			try {
-				return v82191 != null ? (Village) v82191.get(this) : null;
-			} catch (IllegalArgumentException | IllegalAccessException e) {
-				return null;
-			}
-		} catch (NoSuchFieldException e1) {
+			return v82191 != null ? (Village) v82191.get(this) : null;
+		} catch (IllegalArgumentException | IllegalAccessException e) {
 			return null;
 		}
 	}
 
 	protected String getLastBuyingPlayer() {
-		Field v82191;
+		Field v82191 = ReflectionUtils.getField(getClass(), "lastBuyingPlayer");
 		try {
-			v82191 = ReflectionUtils.getField(getClass(), "lastBuyingPlayer");
-			try {
-				return v82191 != null ? (String) v82191.get(this) : "";
-			} catch (IllegalArgumentException | IllegalAccessException e) {
-				return "";
-			}
-		} catch (NoSuchFieldException e1) {
+			return v82191 != null ? (String) v82191.get(this) : "";
+		} catch (IllegalArgumentException | IllegalAccessException e) {
 			return "";
 		}
 	}