From 0b14ec3f1d19c936819316ba924074dc8de4cb2e Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sun, 8 Jul 2018 22:11:27 +1000
Subject: + Added various structures for the new villagers in Australia. $
 Fixed an issue with the Trader's Trade Handler.

---
 .../plugin/villagers/trade/TradeHandlerTrader.java     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/Java/gtPlusPlus/plugin')

diff --git a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java
index 9b66c98be2..0025c054bd 100644
--- a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java
+++ b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java
@@ -8,6 +8,7 @@ import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
 import net.minecraft.village.MerchantRecipe;
 import net.minecraft.village.MerchantRecipeList;
 
@@ -20,11 +21,24 @@ public class TradeHandlerTrader extends TradeHandlerBase {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) {
+		ItemStack Ore1 = null, Ore2 = null;
+		if (Ore1 == null) {
+			Ore1 = ELEMENT.getInstance().SILICON.getOre(1);
+		}
+		if (Ore2 == null) {
+			Ore2 = ELEMENT.getInstance().ALUMINIUM.getOre(1);
+		}
+		if (Ore1 == null) {
+			Ore1 = ELEMENT.getInstance().GOLD.getOre(1);
+		}
+		if (Ore2 == null) {
+			Ore2 = ELEMENT.getInstance().LEAD.getOre(1);
+		}		
 		recipeList.add(new MerchantRecipe(ItemUtils.getItemStackOfAmountFromOreDict("logWood", 32), ELEMENT.getInstance().IRON.getOre(1)));
 		recipeList.add(new MerchantRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 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)));
+		recipeList.add(new MerchantRecipe(ItemUtils.getSimpleStack(Blocks.glowstone, 32), Ore1));
+		recipeList.add(new MerchantRecipe(ItemUtils.getSimpleStack(Blocks.piston, 32), Ore2));
 		Collections.shuffle(recipeList);	
 	}
 
-- 
cgit