diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-07-06 23:49:27 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-07-06 23:49:27 +1000 |
| commit | 0d30becbc219fc2c86234e84dae306276dafe4c6 (patch) | |
| tree | 8761781cdddb6dcc54f37a7fe66311c2e29c88c3 /src/Java/gtPlusPlus/plugin/villagers/trade | |
| parent | c37b091b581a838c49a63911d2cda6324d029e10 (diff) | |
| download | GT5-Unofficial-0d30becbc219fc2c86234e84dae306276dafe4c6.tar.gz GT5-Unofficial-0d30becbc219fc2c86234e84dae306276dafe4c6.tar.bz2 GT5-Unofficial-0d30becbc219fc2c86234e84dae306276dafe4c6.zip | |
+ Added a new Dimension, Australia.
% Stopped Custom Villagers spawning as professions that aren't custom.
% Trade improvements for some Villagers.
$ Fixed a bug in AutoMap mapping to internal name map.
Diffstat (limited to 'src/Java/gtPlusPlus/plugin/villagers/trade')
| -rw-r--r-- | src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerAboriginal.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerAboriginal.java b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerAboriginal.java index a2959bb025..3baca10792 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerAboriginal.java +++ b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerAboriginal.java @@ -60,7 +60,7 @@ public class TradeHandlerAboriginal extends TradeHandlerBase { mOutputs.put(ItemUtils.getSimpleStack(Items.leather, 0)); mOutputs.put(ItemUtils.getSimpleStack(Items.melon_seeds, 0)); mOutputs.put(ItemUtils.getSimpleStack(Items.reeds, 0)); - mInputs.put(ItemUtils.getSimpleStack(Blocks.wooden_door)); + mInputs.put(ItemUtils.getSimpleStack(Items.wooden_door)); mInputs.put(ItemUtils.getSimpleStack(Blocks.log)); mInputs.put(ItemUtils.getSimpleStack(Blocks.log2)); mInputs.put(ItemUtils.getSimpleStack(Blocks.planks)); diff --git a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java index 9b75b54cfa..9b66c98be2 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java +++ b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java @@ -20,17 +20,12 @@ public class TradeHandlerTrader extends TradeHandlerBase { @SuppressWarnings("unchecked") @Override public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) { - - Logger.INFO("Trying to manipulate trade for villager."); - - //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); - //} + 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))); + Collections.shuffle(recipeList); } } |