2 files changed, 48 insertions, 57 deletions
diff --git a/src/Java/vswe/stevescarts/ModuleData/GppModuleData.java b/src/Java/vswe/stevescarts/ModuleData/GppModuleData.java
new file mode 100644
index 0000000000..d7fa1d8161
--- /dev/null
+++ b/src/Java/vswe/stevescarts/ModuleData/GppModuleData.java
@@ -0,0 +1,48 @@
+package vswe.stevescarts.ModuleData;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.sc2.modules.ModuleExoticSeeds;
+import net.minecraft.init.Items;
+import vswe.stevescarts.Helpers.ComponentTypes;
+import vswe.stevescarts.Items.ModItems;
+import vswe.stevescarts.Modules.ModuleBase;
+
+public class GppModuleData extends ModuleData {
+
+	static byte ID_ExoticSeedAddon = 105;
+	public static ArrayList<ModuleData> moduleListCustom = new ArrayList<>();
+
+	public GppModuleData(int id, String name, Class<? extends ModuleBase> moduleClass, int modularCost) {
+		super(id, name, moduleClass, modularCost);
+	}
+
+	public static void loadGpp() {
+		try {
+			HashMap<Byte, ModuleData> moduleList =
+					(HashMap<Byte, ModuleData>) (ReflectionUtils.getField(ModuleData.class, "moduleList").get(ModuleData.class));
+			ModuleData netherWartModule = moduleList.get((byte)58);
+
+			ModuleDataGroup farmerGroup = netherWartModule.getRequirement().get(0);
+
+			ModuleData exoticSeedModule =
+					new ModuleData(ID_ExoticSeedAddon, "Crop: Exotic Seeds", ModuleExoticSeeds.class, 20).addRequirement(farmerGroup)
+					.addRecipe(new Object[][]{{Items.wheat_seeds},
+							{ComponentTypes.EMPTY_DISK.getItemStack()}
+					});
+
+			moduleListCustom.add(exoticSeedModule);
+
+			HashMap<Byte, Boolean> validModules =
+					(HashMap<Byte, Boolean>) (ReflectionUtils.getField(ModItems.class, "validModules").get(ModItems.class));
+
+			validModules.put(ID_ExoticSeedAddon, true);
+
+		} catch (NoSuchFieldException | IllegalAccessException e) {
+			e.printStackTrace();
+		}
+	}
+
+}
diff --git a/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java b/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java
deleted file mode 100644
index 85e91e9122..0000000000
--- a/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package vswe.stevescarts.ModuleData;
-
-import java.util.HashMap;
-
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.sc2.modules.workers.tools.ModuleExoticFarmerUpgraded;
-import vswe.stevescarts.Helpers.ComponentTypes;
-import vswe.stevescarts.Helpers.ResourceHelper;
-import vswe.stevescarts.Models.Cart.ModelCartbase;
-import vswe.stevescarts.Models.Cart.ModelFarmer;
-import vswe.stevescarts.ModuleData.ModuleData;
-import vswe.stevescarts.ModuleData.ModuleData.SIDE;
-import vswe.stevescarts.ModuleData.ModuleDataGroup;
-import vswe.stevescarts.ModuleData.ModuleDataTool;
-import vswe.stevescarts.Modules.ModuleBase;
-
-public class ModuleDataLoader {	
-
-	static int ID_ExoticFarmer = 0;
-	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) {
-			ID_ExoticFarmer= 105;
-			final ModuleDataGroup farmerGroup = new ModuleDataGroup(vswe.stevescarts.Helpers.Localization.MODULE_INFO.FARMER_GROUP);
-			final ModuleData farmerExotic = new ModuleDataTool(ID_ExoticFarmer, "Exotic Farmer",
-					(Class<? extends ModuleBase>) ModuleExoticFarmerUpgraded.class, 75, true)
-					.addSide(SIDE.FRONT).addRecipe(new Object[][]{
-						{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),
-							ComponentTypes.GRAPHICAL_INTERFACE.getItemStack()}});			
-			farmerGroup.add(farmerExotic);	
-			moduleListCustom.put((byte) ID_ExoticFarmer, farmerExotic);
-		}
-	}
-
-	public static void load2() {
-		ModuleData y = getList().get((byte) ID_ExoticFarmer);
-		if (y != null) {
-			y.addModel("Farmer",	(ModelCartbase) new ModelFarmer(ResourceHelper.getResource("/models/farmerModelGalgadorian.png"))).setModelMult(0.45f);
-			Logger.REFLECTION("Added Model Data for Exotic Farm Module.");
-		}
-		else {
-			Logger.REFLECTION("Failed getting ModuleData from Local Cache.");
-		}
-
-	}
-}