From 2ea0d2fa7093b20d7718e49f6e43a31f73fde12d Mon Sep 17 00:00:00 2001 From: lclc98 Date: Sat, 5 Oct 2013 12:58:32 +1000 Subject: [PATCH] Fixed #74 --- .../crusher/TileEntityCrusherRenderer.java | 8 +- .../machines/mint/MetallurgyTradeHandler.java | 239 +++++++++--------- ...ModelCrusher.png => ModelCrusherStone.png} | Bin ...rning.png => ModelCrusherStoneBurning.png} | Bin 4 files changed, 126 insertions(+), 121 deletions(-) rename resources/assets/metallurgy/textures/blocks/machines/crusher/{ModelCrusher.png => ModelCrusherStone.png} (100%) rename resources/assets/metallurgy/textures/blocks/machines/crusher/{ModelCrusherBurning.png => ModelCrusherStoneBurning.png} (100%) diff --git a/common/rebelkeithy/mods/metallurgy/machines/crusher/TileEntityCrusherRenderer.java b/common/rebelkeithy/mods/metallurgy/machines/crusher/TileEntityCrusherRenderer.java index cde6205..b1bdd3c 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/crusher/TileEntityCrusherRenderer.java +++ b/common/rebelkeithy/mods/metallurgy/machines/crusher/TileEntityCrusherRenderer.java @@ -40,7 +40,11 @@ public void renderTileEntityCrusherAt(TileEntityCrusher par1TileEntityCrusher, d crusherModel.spin(par1TileEntityCrusher.getCrusherAngles()); String type = ""; - if (par1TileEntityCrusher.getType() == 1) + if (par1TileEntityCrusher.getType() == 0) + { + type = "Stone"; + } + else if (par1TileEntityCrusher.getType() == 1) { type = "Copper"; } @@ -61,7 +65,7 @@ else if (par1TileEntityCrusher.getType() == 4) if (par1TileEntityCrusher.isBurning()) { - texture = new ResourceLocation("Metallurgy:textures/blocks/machines/crusher/ModelCrusher" + type + "Burning.png"); + Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("Metallurgy:textures/blocks/machines/crusher/ModelCrusher" + type + "Burning.png")); // this.bindTextureByName("/mods/Metallurgy/textures/blocks/machines/crusher/ModelCrusher" // + type + "Burning.png"); } diff --git a/common/rebelkeithy/mods/metallurgy/machines/mint/MetallurgyTradeHandler.java b/common/rebelkeithy/mods/metallurgy/machines/mint/MetallurgyTradeHandler.java index 6945a80..f89b442 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/mint/MetallurgyTradeHandler.java +++ b/common/rebelkeithy/mods/metallurgy/machines/mint/MetallurgyTradeHandler.java @@ -12,129 +12,130 @@ import rebelkeithy.mods.metallurgy.metals.MetallurgyMetals; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; -public class MetallurgyTradeHandler implements IVillageTradeHandler -{ +public class MetallurgyTradeHandler implements IVillageTradeHandler { - @Override - public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) - { - if (villager.getProfession() == 0) // Farmer - { - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.appleRed, 8))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.bread, 4))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.chickenCooked, 8))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.cookie, 10))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.melon, 8))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.arrow, 5))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 27), new ItemStack(Item.flintAndSteel, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 27), new ItemStack(Item.shears, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.chickenRaw, 17), new ItemStack(MetallurgyMachines.coin, 9))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.wheat, 17), new ItemStack(MetallurgyMachines.coin, 9))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.fishRaw, 12), new ItemStack(MetallurgyMachines.coin, 9))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Block.cloth, 21), new ItemStack(MetallurgyMachines.coin, 9))); - } - else if (villager.getProfession() == 1) // Librarian - { - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Block.glass, 5))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 27), new ItemStack(Block.bookShelf, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 10), new ItemStack(Item.compass, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 10), new ItemStack(Item.pocketSundial, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.paper, 29), new ItemStack(MetallurgyMachines.coin, 9))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.book, 14), new ItemStack(MetallurgyMachines.coin, 9))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.writableBook), new ItemStack(MetallurgyMachines.coin, 9))); - } - else if (villager.getProfession() == 2) // priest - { - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.expBottle, 4))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.redstone, 4))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Block.glowStone, 3))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 10), new ItemStack(Item.eyeOfEnder, 1))); - } - if (villager.getProfession() == 3) // Blacksmith - { - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 9), new ItemStack(Item.helmetDiamond, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 19), new ItemStack(Item.plateDiamond, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 13), new ItemStack(Item.legsDiamond, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 9), new ItemStack(Item.bootsDiamond, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 13), new ItemStack(Item.swordDiamond, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 11), new ItemStack(Item.pickaxeDiamond, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 11), new ItemStack(Item.axeDiamond, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(Item.shovelDiamond, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(Item.hoeDiamond, 1))); - // Chain - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 6), new ItemStack(Item.helmetChain, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 14), new ItemStack(Item.plateChain, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 10), new ItemStack(Item.legsChain, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 6), new ItemStack(Item.bootsChain, 1))); - // Iron - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 5), new ItemStack(Item.helmetIron, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 13), new ItemStack(Item.plateIron, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 9), new ItemStack(Item.legsIron, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 5), new ItemStack(Item.bootsIron, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 10), new ItemStack(Item.swordIron, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 8), new ItemStack(Item.pickaxeIron, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(Item.axeIron, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 5), new ItemStack(Item.shovelIron, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 5), new ItemStack(Item.hoeIron, 1))); - // Bars - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.ingotIron, 1), new ItemStack(MetallurgyMachines.coin, 3, 1))); + @Override + public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) { + if (villager.getProfession() == 0) // Farmer + { + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.appleRed, 8))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.bread, 4))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.chickenCooked, 8))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.cookie, 10))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.melon, 8))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.arrow, 5))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 27), new ItemStack(Item.flintAndSteel, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 27), new ItemStack(Item.shears, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.chickenRaw, 17), new ItemStack(MetallurgyMachines.coin, 9))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.wheat, 17), new ItemStack(MetallurgyMachines.coin, 9))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.fishRaw, 12), new ItemStack(MetallurgyMachines.coin, 9))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Block.cloth, 21), new ItemStack(MetallurgyMachines.coin, 9))); + } else if (villager.getProfession() == 1) // Librarian + { + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Block.glass, 5))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 27), new ItemStack(Block.bookShelf, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 10), new ItemStack(Item.compass, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 10), new ItemStack(Item.pocketSundial, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.paper, 29), new ItemStack(MetallurgyMachines.coin, 9))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.book, 14), new ItemStack(MetallurgyMachines.coin, 9))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.writableBook), new ItemStack(MetallurgyMachines.coin, 9))); + } else if (villager.getProfession() == 2) // priest + { + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.expBottle, 4))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.redstone, 4))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Block.glowStone, 3))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 10), new ItemStack(Item.eyeOfEnder, 1))); + } + if (villager.getProfession() == 3) // Blacksmith + { + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 9), new ItemStack(Item.helmetDiamond, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 19), new ItemStack(Item.plateDiamond, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 13), new ItemStack(Item.legsDiamond, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 9), new ItemStack(Item.bootsDiamond, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 13), new ItemStack(Item.swordDiamond, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 11), new ItemStack(Item.pickaxeDiamond, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 11), new ItemStack(Item.axeDiamond, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(Item.shovelDiamond, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(Item.hoeDiamond, 1))); + // Chain + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 6), new ItemStack(Item.helmetChain, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 14), new ItemStack(Item.plateChain, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 10), new ItemStack(Item.legsChain, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 6), new ItemStack(Item.bootsChain, 1))); + // Iron + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 5), new ItemStack(Item.helmetIron, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 13), new ItemStack(Item.plateIron, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 9), new ItemStack(Item.legsIron, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 5), new ItemStack(Item.bootsIron, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 10), new ItemStack(Item.swordIron, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 8), new ItemStack(Item.pickaxeIron, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(Item.axeIron, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 5), new ItemStack(Item.shovelIron, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 5), new ItemStack(Item.hoeIron, 1))); + // Bars + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.ingotIron, 1), new ItemStack(MetallurgyMachines.coin, 3, 1))); + if (MetallurgyMetals.baseSet.getOreInfo("Tin").isEnabled()) { + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Tin").ingot, 5), new ItemStack(MetallurgyMachines.coin, 6))); + } + if (MetallurgyMetals.baseSet.getOreInfo("Manganese").isEnabled()) { + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Manganese").ingot, 5), new ItemStack(MetallurgyMachines.stack, 3, 1))); + } - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").ingot, 5), new ItemStack(MetallurgyMachines.coin, 6))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Tin").ingot, 5), new ItemStack(MetallurgyMachines.coin, 6))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").ingot, 5), new ItemStack(MetallurgyMachines.coin, 12))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Manganese").ingot, 5), - new ItemStack(MetallurgyMachines.stack, 3, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").ingot, 5), new ItemStack(MetallurgyMachines.stack, 6, 1))); + if (MetallurgyMetals.baseSet.getOreInfo("Copper").isEnabled()) { + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").ingot, 5), new ItemStack(MetallurgyMachines.coin, 6))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 3), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").helmet, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 10), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").chest, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 6), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").legs, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 3), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").boots, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 3), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").helmet, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 10), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").chest, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 6), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").legs, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 3), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").boots, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").sword, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 5), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").pickaxe, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 4), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").axe, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 2), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").shovel, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 2), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").hoe, 1))); + } + if (MetallurgyMetals.baseSet.getOreInfo("Bronze").isEnabled()) { + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").ingot, 5), new ItemStack(MetallurgyMachines.coin, 12))); + // Bronze + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 4), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").helmet, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 12), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").chest, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 8), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").legs, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 4), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").boots, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").sword, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 5), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").pickaxe, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 4), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").axe, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 2), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").shovel, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 2), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Copper").hoe, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 9), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").sword, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").pickaxe, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 6), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").axe, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 4), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").shovel, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 4), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").hoe, 1))); + } + if (MetallurgyMetals.baseSet.getOreInfo("Steel").isEnabled()) { + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").ingot, 5), new ItemStack(MetallurgyMachines.stack, 6, 1))); + // Steel + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").helmet, 1, 4))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 15), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").chest, 1, 4))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 11), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").legs, 1, 4))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").boots, 1, 4))); - // Bronze - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 4), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").helmet, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 12), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").chest, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 8), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").legs, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 4), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").boots, 1))); - - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 9), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").sword, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").pickaxe, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 6), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").axe, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 4), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").shovel, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 4), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Bronze").hoe, 1))); - - // Steel - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").helmet, 1, 4))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 15), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").chest, 1, 4))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 11), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").legs, 1, 4))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").boots, 1, 4))); - - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 12), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").sword, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 10), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").pickaxe, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 9), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").axe, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").shovel, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").hoe, 1))); - - } - if (villager.getProfession() == 4) // Butcher - { - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.beefCooked, 7))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.porkCooked, 7))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 27), new ItemStack(Item.helmetLeather, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 27), new ItemStack(Item.plateLeather, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 27), new ItemStack(Item.legsLeather, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 27), new ItemStack(Item.bootsLeather, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 64), new ItemStack(Item.saddle, 1))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.beefRaw, 17), new ItemStack(MetallurgyMachines.coin, 9))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.porkRaw, 17), new ItemStack(MetallurgyMachines.coin, 9))); - recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.coal, 23), new ItemStack(MetallurgyMachines.coin, 9))); - } - } + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 12), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").sword, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 10), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").pickaxe, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 9), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").axe, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").shovel, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.stack, 7), new ItemStack(MetallurgyMetals.baseSet.getOreInfo("Steel").hoe, 1))); + } + } + if (villager.getProfession() == 4) // Butcher + { + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.beefCooked, 7))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 9), new ItemStack(Item.porkCooked, 7))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 27), new ItemStack(Item.helmetLeather, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 27), new ItemStack(Item.plateLeather, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 27), new ItemStack(Item.legsLeather, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 27), new ItemStack(Item.bootsLeather, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(MetallurgyMachines.coin, 64), new ItemStack(Item.saddle, 1))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.beefRaw, 17), new ItemStack(MetallurgyMachines.coin, 9))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.porkRaw, 17), new ItemStack(MetallurgyMachines.coin, 9))); + recipeList.addToListWithCheck(new MerchantRecipe(new ItemStack(Item.coal, 23), new ItemStack(MetallurgyMachines.coin, 9))); + } + } } diff --git a/resources/assets/metallurgy/textures/blocks/machines/crusher/ModelCrusher.png b/resources/assets/metallurgy/textures/blocks/machines/crusher/ModelCrusherStone.png similarity index 100% rename from resources/assets/metallurgy/textures/blocks/machines/crusher/ModelCrusher.png rename to resources/assets/metallurgy/textures/blocks/machines/crusher/ModelCrusherStone.png diff --git a/resources/assets/metallurgy/textures/blocks/machines/crusher/ModelCrusherBurning.png b/resources/assets/metallurgy/textures/blocks/machines/crusher/ModelCrusherStoneBurning.png similarity index 100% rename from resources/assets/metallurgy/textures/blocks/machines/crusher/ModelCrusherBurning.png rename to resources/assets/metallurgy/textures/blocks/machines/crusher/ModelCrusherStoneBurning.png