$ Adjustments to the Exotic Farmer.

3 files changed, 30 insertions, 17 deletions

diff --git a/src/Java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java b/src/Java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java
index b0c8d495d0..2bcd340025 100644
--- a/src/Java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java
+++ b/src/Java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java
@@ -13,13 +13,12 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.sc2.items.ItemCartModuleEx;
 import vswe.stevescarts.Items.ItemCartModule;
-import vswe.stevescarts.Items.ModItems;
 import vswe.stevescarts.ModuleData.ModuleData;
 import vswe.stevescarts.ModuleData.ModuleDataLoader;
 
 public class HANDLER_SC2 {
 
-	private static final String MODITEMS = "vswe.stevescarts.Items.ModItems.class";
+	private static final String MODITEMS = "vswe.stevescarts.Items.ModItems";
 	private static Class MODITEMSCLASS;
 	public static ItemCartModule modules;
 
@@ -32,6 +31,7 @@ public class HANDLER_SC2 {
 			try {
 				MODITEMSCLASS = Class.forName(MODITEMS);
 				if (MODITEMSCLASS == null) {
+					Logger.REFLECTION("Failed Registering Custom SC2 Modules. [1]");
 					return;
 				}				
 				Field validModulesField = ReflectionUtils.getField(MODITEMSCLASS, "validModules");
@@ -41,10 +41,12 @@ public class HANDLER_SC2 {
 			}
 			catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException | ClassNotFoundException e) {
 				e.printStackTrace();
+				Logger.REFLECTION("Failed Registering Custom SC2 Modules. [2]");
 				return;
 			}
 
 			if (validModulesOld == null) {
+				Logger.REFLECTION("Failed Registering Custom SC2 Modules. [3]");
 				return;
 			}
 			else {
@@ -52,6 +54,7 @@ public class HANDLER_SC2 {
 			}
 
 			if (validModulesNew == null || validModulesNew.isEmpty()) {
+				Logger.REFLECTION("Failed Registering Custom SC2 Modules. [4]");
 				return;
 			}
 
@@ -80,6 +83,10 @@ public class HANDLER_SC2 {
 				e.printStackTrace();
 			}
 		}
+		else {
+			Logger.REFLECTION("Failed Registering Custom SC2 Modules. [0]");
+			return;
+		}
 	}
 
 	public static void init(){
diff --git a/src/Java/gtPlusPlus/xmod/sc2/modules/workers/tools/ModuleExoticFarmer.java b/src/Java/gtPlusPlus/xmod/sc2/modules/workers/tools/ModuleExoticFarmer.java
index 48f8cfa9a7..4122f0bc16 100644
--- a/src/Java/gtPlusPlus/xmod/sc2/modules/workers/tools/ModuleExoticFarmer.java
+++ b/src/Java/gtPlusPlus/xmod/sc2/modules/workers/tools/ModuleExoticFarmer.java
@@ -31,7 +31,7 @@ public abstract class ModuleExoticFarmer extends ModuleFarmer {
 	protected boolean isForestryLoaded = false;
 	private final Block forestryHumus;
 
-	private ArrayList<IExoticCropModule> plantModulesExotic;
+	private ArrayList<ICropModule> plantModulesExotic;
 
 	public ModuleExoticFarmer(final MinecartModular cart) {
 		super(cart);
@@ -46,10 +46,10 @@ public abstract class ModuleExoticFarmer extends ModuleFarmer {
 
 	public void init() {
 		super.init();
-		this.plantModulesExotic = new ArrayList<IExoticCropModule>();
+		this.plantModulesExotic = new ArrayList<ICropModule>();
 		for (final ModuleBase module : this.getCart().getModules()) {
 			if (module instanceof ICropModule) {
-				this.plantModulesExotic.add((IExoticCropModule) module);
+				this.plantModulesExotic.add((ICropModule) module);
 			}
 		}
 	}
@@ -185,7 +185,7 @@ public abstract class ModuleExoticFarmer extends ModuleFarmer {
 	}
 
 	public boolean isSeedValidHandler(final ItemStack seed) {
-		for (final IExoticCropModule module : this.plantModulesExotic) {
+		for (final ICropModule module : this.plantModulesExotic) {
 			if (module.isSeedValid(seed)) {
 				return true;
 			}
@@ -194,7 +194,7 @@ public abstract class ModuleExoticFarmer extends ModuleFarmer {
 	}
 
 	protected Block getCropFromSeedHandler(final ItemStack seed) {
-		for (final IExoticCropModule module : this.plantModulesExotic) {
+		for (final ICropModule module : this.plantModulesExotic) {
 			if (module.isSeedValid(seed)) {
 				return module.getCropFromSeed(seed);
 			}
@@ -203,7 +203,7 @@ public abstract class ModuleExoticFarmer extends ModuleFarmer {
 	}
 
 	protected boolean isReadyToHarvestHandler(final int x, final int y, final int z) {
-		for (final IExoticCropModule module : this.plantModulesExotic) {
+		for (final ICropModule module : this.plantModulesExotic) {
 			if (module.isReadyToHarvest(x, y, z)) {
 				return true;
 			}
diff --git a/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java b/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java
index d2cfa52209..7ed0b0fc71 100644
--- a/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java
+++ b/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java
@@ -2,8 +2,7 @@ package vswe.stevescarts.ModuleData;
 
 import java.util.HashMap;
 
-import net.minecraft.init.Items;
-
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.sc2.modules.workers.tools.ModuleExoticFarmerUpgraded;
 import vswe.stevescarts.Helpers.ComponentTypes;
@@ -19,12 +18,12 @@ import vswe.stevescarts.Modules.ModuleBase;
 public class ModuleDataLoader {	
 
 	static int ID_ExoticFarmer = 0;
-	public static HashMap<Byte, ModuleData> moduleListCustom;
-	
+	public static HashMap<Byte, ModuleData> moduleListCustom = new HashMap<Byte, ModuleData>();
+
 	public synchronized static HashMap<Byte, ModuleData> getList() {
 		return ModuleData.getList();
 	}
-	
+
 	public static void load() {
 		HashMap<Byte, ModuleData> u = getList();
 		if (u.size() < Byte.MAX_VALUE) {
@@ -37,15 +36,22 @@ public class ModuleDataLoader {
 						{ComponentTypes.GALGADORIAN_METAL.getItemStack(),
 							ComponentTypes.GALGADORIAN_METAL.getItemStack(),
 							ComponentTypes.ENHANCED_GALGADORIAN_METAL.getItemStack()},
-					{null, ComponentTypes.HUGE_DYNAMIC_PANE.getItemStack(), null},
-					{ComponentTypes.ADVANCED_PCB.getItemStack(), ItemUtils.getItemStackOfAmountFromOreDict("blockNaquadah", 1),
+						{null, ComponentTypes.HUGE_DYNAMIC_PANE.getItemStack(), null},
+						{ComponentTypes.ADVANCED_PCB.getItemStack(), ItemUtils.getItemStackOfAmountFromOreDict("blockNaquadah", 1),
 							ComponentTypes.GRAPHICAL_INTERFACE.getItemStack()}});			
 			farmerGroup.add(farmerExotic);	
 			moduleListCustom.put((byte) ID_ExoticFarmer, farmerExotic);
 		}
 	}
-	
+
 	public static void load2() {
-		getList().get((byte) ID_ExoticFarmer).addModel("Farmer",	(ModelCartbase) new ModelFarmer(ResourceHelper.getResource("/models/farmerModelGalgadorian.png"))).setModelMult(0.75f);
+		ModuleData y = moduleListCustom.get((byte) ID_ExoticFarmer);
+		if (y != null) {
+			y.addModel("Farmer",	(ModelCartbase) new ModelFarmer(ResourceHelper.getResource("/models/farmerModelGalgadorian.png"))).setModelMult(0.75f);
+		}
+		else {
+			Logger.REFLECTION("Failed getting ModuleData from Local Cache.");
+		}
+
 	}
 }