% Hopefully improved recipe loading by several factors.

% Re-arranged spawner code during loading.
$ Hopefully recipe Creative Tabs issues.
$ Fixed profession of one of the new villagers.

5 files changed, 26 insertions, 26 deletions

diff --git a/src/Java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java b/src/Java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java
index a74578cef4..169e0d648c 100644
--- a/src/Java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java
+++ b/src/Java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java
@@ -46,14 +46,8 @@ public class Core_VillagerAdditions implements IPlugin {
 		}
 		if (shouldLoad) {			
 			//Register Custom Villager Entity
-			EntityRegistry.registerGlobalEntityID(EntityBaseVillager.class, "VillagerV5", EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(180, 120, 120), Utils.rgbtoHexValue(0, 0, 0));
-	        
-			//Try register some test spawners
-			Utils.createNewMobSpawner(0, EntityGiantChickenBase.class);
-			Utils.createNewMobSpawner(1, EntitySickBlaze.class);
-			Utils.createNewMobSpawner(2, EntityStaballoyConstruct.class);
-
-			VillagerUtils.registerNewVillager(0, "Banker", "Banker", "Banker", "banker", new TradeHandlerBanker());
+			EntityRegistry.registerGlobalEntityID(EntityBaseVillager.class, "WiseVillager", EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(180, 120, 120), Utils.rgbtoHexValue(0, 0, 0));
+	        VillagerUtils.registerNewVillager(0, "Banker", "Banker", "Banker", "banker", new TradeHandlerBanker());
 			VillagerUtils.registerNewVillager(1, "Technician", "Technician", "Technician", "technician", new TradeHandlerTechnician());
 			VillagerUtils.registerNewVillager(2, "Trader", "Trader", "Trader", "trader", new TradeHandlerTrader());
 			
@@ -81,7 +75,8 @@ public class Core_VillagerAdditions implements IPlugin {
 						}
 					}
 				}
-			}			
+			}	
+			return true;
 		}
 		return false;
 	}
@@ -89,7 +84,6 @@ public class Core_VillagerAdditions implements IPlugin {
 	@Override
 	public boolean init() {
 		if (shouldLoad) {
-			ModBlocks.blockCustomMobSpawner = new BlockGenericSpawner();
 			return true;
 		}
 		return false;
diff --git a/src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java b/src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java
index 8f47cb0243..9507371fb1 100644
--- a/src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java
+++ b/src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java
@@ -3,20 +3,20 @@ package gtPlusPlus.plugin.villagers;
 import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.plugin.villagers.entity.EntityBaseVillager;
 import net.minecraft.util.ResourceLocation;
 
 public class VillagerObject {
 
 	public final int mID;
 	public final String mName;
+	public final IVillageTradeHandler mCustomTrade;
 
 
 	public VillagerObject(int aID, String aName, Object aProfession, Object aCareer, Object aSkin, IVillageTradeHandler aCustomTrade) {
 
 		mID = aID;
 		mName = aName;
+		mCustomTrade = aCustomTrade;
 
 		//Register Custom Trade to Registry.
 		if (aCustomTrade != null) {
diff --git a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java
index 1b08d90978..d85f86ad57 100644
--- a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java
+++ b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java
@@ -14,12 +14,14 @@ public class TradeHandlerBanker extends TradeHandlerBase {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) {
-		recipeList.add(new MerchantRecipe(CI.electricMotor_LV, CI.electricPiston_LV, CI.robotArm_LV));
-		recipeList.add(new MerchantRecipe(CI.electricMotor_MV, CI.electricPiston_MV, CI.robotArm_MV));
-		recipeList.add(new MerchantRecipe(CI.electricMotor_HV, CI.electricPiston_HV, CI.robotArm_HV));
-		recipeList.add(new MerchantRecipe(CI.electricMotor_EV, CI.electricPiston_EV, CI.robotArm_EV));
-		recipeList.add(new MerchantRecipe(CI.electricMotor_IV, CI.electricPiston_IV, CI.robotArm_IV));
-		Collections.shuffle(recipeList);		
+		if (villager.getProfession() == 7735) {
+			recipeList.add(new MerchantRecipe(CI.electricMotor_LV, CI.electricPiston_LV, CI.robotArm_LV));
+			recipeList.add(new MerchantRecipe(CI.electricMotor_MV, CI.electricPiston_MV, CI.robotArm_MV));
+			recipeList.add(new MerchantRecipe(CI.electricMotor_HV, CI.electricPiston_HV, CI.robotArm_HV));
+			recipeList.add(new MerchantRecipe(CI.electricMotor_EV, CI.electricPiston_EV, CI.robotArm_EV));
+			recipeList.add(new MerchantRecipe(CI.electricMotor_IV, CI.electricPiston_IV, CI.robotArm_IV));
+			Collections.shuffle(recipeList);
+		}			
 	}
 	
 }
diff --git a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java
index 9d27962f22..cc77aa69cf 100644
--- a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java
+++ b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java
@@ -14,12 +14,14 @@ public class TradeHandlerTechnician extends TradeHandlerBase {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) {
-		recipeList.add(new MerchantRecipe(CI.machineHull_LV, CI.electricMotor_LV, CI.machineHull_LV));
-		recipeList.add(new MerchantRecipe(CI.machineHull_MV, CI.electricMotor_MV, CI.machineHull_MV));
-		recipeList.add(new MerchantRecipe(CI.machineHull_HV, CI.electricMotor_HV, CI.machineHull_HV));
-		recipeList.add(new MerchantRecipe(CI.machineHull_EV, CI.electricMotor_EV, CI.machineHull_EV));
-		recipeList.add(new MerchantRecipe(CI.machineHull_IV, CI.electricMotor_IV, CI.machineHull_IV));
-		Collections.shuffle(recipeList);		
+		if (villager.getProfession() == 7737) {
+			recipeList.add(new MerchantRecipe(CI.machineHull_LV, CI.electricMotor_LV, CI.machineHull_LV));
+			recipeList.add(new MerchantRecipe(CI.machineHull_MV, CI.electricMotor_MV, CI.machineHull_MV));
+			recipeList.add(new MerchantRecipe(CI.machineHull_HV, CI.electricMotor_HV, CI.machineHull_HV));
+			recipeList.add(new MerchantRecipe(CI.machineHull_EV, CI.electricMotor_EV, CI.machineHull_EV));
+			recipeList.add(new MerchantRecipe(CI.machineHull_IV, CI.electricMotor_IV, CI.machineHull_IV));
+			Collections.shuffle(recipeList);	
+		}
 	}
-	
+
 }
diff --git a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java
index 885c0400d8..508ecd9e83 100644
--- a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java
+++ b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java
@@ -15,12 +15,14 @@ public class TradeHandlerTrader extends TradeHandlerBase {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) {
+		if (villager.getProfession() == 7736) {
 		recipeList.add(new MerchantRecipe(ItemUtils.getItemStackOfAmountFromOreDict("logWood", 32), ELEMENT.getInstance().IRON.getOre(1)));
 		recipeList.add(new MerchantRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustRawMeat", 32), ELEMENT.getInstance().COPPER.getOre(1)));
 		recipeList.add(new MerchantRecipe(ItemUtils.getSimpleStack(Blocks.obsidian, 6), ELEMENT.getInstance().TIN.getOre(1)));
 		recipeList.add(new MerchantRecipe(ItemUtils.getSimpleStack(Blocks.glowstone, 32), ELEMENT.getInstance().SILICON.getOre(1)));
 		recipeList.add(new MerchantRecipe(ItemUtils.getSimpleStack(Blocks.piston, 32), ELEMENT.getInstance().ALUMINIUM.getOre(1)));
-		Collections.shuffle(recipeList);		
+		Collections.shuffle(recipeList);	
+		}
 	}
 	
 }