From 050e6401ce42f9b6a42d9ea385c88237890bac8a Mon Sep 17 00:00:00 2001
From: Jordan Byrne <draknyte1@hotmail.com>
Date: Sun, 1 Apr 2018 05:44:06 +1000
Subject: + More work to the Exotic Farmer Module for SC2.

---
 .../stevescarts/ModuleData/ModuleDataLoader.java   | 32 ++++++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

(limited to 'src/Java/vswe/stevescarts/ModuleData')

diff --git a/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java b/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java
index 88ba6f062b..d2cfa52209 100644
--- a/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java
+++ b/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java
@@ -2,7 +2,14 @@ package vswe.stevescarts.ModuleData;
 
 import java.util.HashMap;
 
+import net.minecraft.init.Items;
+
+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;
@@ -11,21 +18,34 @@ import vswe.stevescarts.Modules.ModuleBase;
 
 public class ModuleDataLoader {	
 
-	private static HashMap<Byte, ModuleData> moduleListEx;
+	static int ID_ExoticFarmer = 0;
+	public static HashMap<Byte, ModuleData> moduleListCustom;
 	
-	public static HashMap<Byte, ModuleData> getList() {
-		return moduleListEx;
+	public synchronized static HashMap<Byte, ModuleData> getList() {
+		return ModuleData.getList();
 	}
 	
 	public static void load() {
-		HashMap<Byte, ModuleData> u = ModuleData.getList();
+		HashMap<Byte, ModuleData> u = getList();
 		if (u.size() < Byte.MAX_VALUE) {
 			int mNextFreeID = u.size()+1;
+			ID_ExoticFarmer= 105;
 			final ModuleDataGroup farmerGroup = new ModuleDataGroup(vswe.stevescarts.Helpers.Localization.MODULE_INFO.FARMER_GROUP);
 			final ModuleData farmerExotic = new ModuleDataTool(mNextFreeID, "Exotic Farmer",
 					(Class<? extends ModuleBase>) ModuleExoticFarmerUpgraded.class, 75, true)
-					.addSide(SIDE.FRONT);			
-			farmerGroup.add(farmerExotic);			
+					.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() {
+		getList().get((byte) ID_ExoticFarmer).addModel("Farmer",	(ModelCartbase) new ModelFarmer(ResourceHelper.getResource("/models/farmerModelGalgadorian.png"))).setModelMult(0.75f);
+	}
 }
-- 
cgit