+ Exotic Farmer Work.

+ Added A Texture for the EFM.

4 files changed, 16 insertions, 13 deletions

diff --git a/src/Java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java b/src/Java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java
index 2bcd340025..9791e0b5ac 100644
--- a/src/Java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java
+++ b/src/Java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java
@@ -58,8 +58,8 @@ public class HANDLER_SC2 {
 				return;
 			}
 
-			modules = new ItemCartModuleEx();
-			GameRegistry.registerItem((Item) modules, "CartModule++");
+			modules = vswe.stevescarts.Items.ModItems.modules;
+			//GameRegistry.registerItem((Item) modules, "CartModule++");
 			ModuleDataLoader.load();
 			for (final ModuleData module : ModuleDataLoader.moduleListCustom.values()) {
 				if (!module.getIsLocked()) {
diff --git a/src/Java/gtPlusPlus/xmod/sc2/items/ItemCartModuleEx.java b/src/Java/gtPlusPlus/xmod/sc2/items/ItemCartModuleEx.java
index 8ffb3988c8..3da3225360 100644
--- a/src/Java/gtPlusPlus/xmod/sc2/items/ItemCartModuleEx.java
+++ b/src/Java/gtPlusPlus/xmod/sc2/items/ItemCartModuleEx.java
@@ -1,11 +1,8 @@
 package gtPlusPlus.xmod.sc2.items;
 
-import vswe.stevescarts.Modules.ModuleBase;
-import net.minecraft.nbt.NBTTagCompound;
 import vswe.stevescarts.TileEntities.TileEntityCartAssembler;
 import net.minecraft.entity.player.EntityPlayer;
 import java.util.List;
-import java.util.Iterator;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -14,17 +11,20 @@ import vswe.stevescarts.ModuleData.ModuleDataLoader;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.creativetab.CreativeTabs;
-import vswe.stevescarts.StevesCarts;
 import vswe.stevescarts.Items.ItemCartModule;
 
 import net.minecraft.util.IIcon;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+
 import net.minecraft.item.Item;
 
 public class ItemCartModuleEx extends ItemCartModule {
 	IIcon unknownIcon;
 
 	public ItemCartModuleEx() {
-		
+		this.setCreativeTab(AddToCreativeTab.tabMisc);
 	}
 
 	public String getName(final ItemStack par1ItemStack) {
@@ -46,17 +46,19 @@ public class ItemCartModuleEx extends ItemCartModule {
 
 	@SideOnly(Side.CLIENT)
 	public void registerIcons(final IIconRegister register) {
-		for (final ModuleData module : ModuleData.getList().values()) {
+		for (final ModuleData module : ModuleDataLoader.moduleListCustom.values()) {			
+			final StringBuilder sb = new StringBuilder();
+			String x = (sb.append("stevescarts").append(":").append(module.getRawName()).append("_icon").toString());
+			Logger.REFLECTION("Icon Path for Module: "+x);
 			module.createIcon(register);
 		}
 		final StringBuilder sb = new StringBuilder();
-		StevesCarts.instance.getClass();
 		this.unknownIcon = register
 				.registerIcon(sb.append("stevescarts").append(":").append("unknown_icon").toString());
 	}
 
 	public String getUnlocalizedName() {
-		return "item.SC2:unknownmodule";
+		return "item.SC2:unknownexoticmodule";
 	}
 
 	public String getUnlocalizedName(final ItemStack item) {
@@ -85,7 +87,7 @@ public class ItemCartModuleEx extends ItemCartModule {
 		} else if (par1ItemStack != null && par1ItemStack.getItem() instanceof ItemCartModuleEx) {
 			par3List.add("Module id " + par1ItemStack.getItemDamage());
 		} else {
-			par3List.add("Unknown module id");
+			par3List.add("Unknown exotic module id");
 		}
 	}
 
diff --git a/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java b/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java
index 7ed0b0fc71..bc57f8a500 100644
--- a/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java
+++ b/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java
@@ -45,9 +45,10 @@ public class ModuleDataLoader {
 	}
 
 	public static void load2() {
-		ModuleData y = moduleListCustom.get((byte) ID_ExoticFarmer);
+		ModuleData y = getList().get((byte) ID_ExoticFarmer);
 		if (y != null) {
-			y.addModel("Farmer",	(ModelCartbase) new ModelFarmer(ResourceHelper.getResource("/models/farmerModelGalgadorian.png"))).setModelMult(0.75f);
+			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.");
diff --git a/src/resources/assets/stevescarts/items/exotic_farmer_icon.png b/src/resources/assets/stevescarts/items/exotic_farmer_icon.png
new file mode 100644
index 0000000000..63e0593119
--- /dev/null
+++ b/src/resources/assets/stevescarts/items/exotic_farmer_icon.png