diff --git a/bin/assets/kitsumedievalcraft/lang/en_US.lang b/bin/assets/kitsumedievalcraft/lang/en_US.lang index ec444c50..9660ef2e 100644 --- a/bin/assets/kitsumedievalcraft/lang/en_US.lang +++ b/bin/assets/kitsumedievalcraft/lang/en_US.lang @@ -172,6 +172,13 @@ item.customIronPickCase32.name=Forged Pickaxe item.customIronPickCase33.name=Forged Pickaxe item.customIronPickCase34.name=Forged Pickaxe item.customIronPickCase35.name=Forged Pickaxe +item.customIronPickCase36.name=Forged Pickaxe +item.customIronPickCase37.name=Forged Pickaxe +item.customIronPickCase38.name=Forged Pickaxe +item.customIronPickCase39.name=Forged Pickaxe +item.customIronPickCase40.name=Forged Pickaxe +item.customIronPickCase41.name=Forged Pickaxe +item.customIronPickCase42.name=Forged Pickaxe item.customIronLumberAxe0.name=Forged Lumber Axe item.customIronLumberAxe1.name=Forged Lumber Axe diff --git a/bin/assets/kitsumedievalcraft/textures/items/charcoalLeafPellet.png b/bin/assets/kitsumedievalcraft/textures/items/charcoalLeafPellet.png index fa538479..d85d2dd9 100644 Binary files a/bin/assets/kitsumedievalcraft/textures/items/charcoalLeafPellet.png and b/bin/assets/kitsumedievalcraft/textures/items/charcoalLeafPellet.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPick2.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPick2.png index dc6a9690..bdbd8201 100644 Binary files a/bin/assets/kitsumedievalcraft/textures/items/customIronPick2.png and b/bin/assets/kitsumedievalcraft/textures/items/customIronPick2.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase35.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase35.png index c6594188..01f51571 100644 Binary files a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase35.png and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase35.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase36.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase36.png new file mode 100644 index 00000000..83a6b3ea Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase36.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase37.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase37.png new file mode 100644 index 00000000..d9e1f55f Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase37.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase38.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase38.png new file mode 100644 index 00000000..81731153 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase38.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase39.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase39.png new file mode 100644 index 00000000..af4369c1 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase39.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase40.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase40.png new file mode 100644 index 00000000..c462a75e Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase40.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase42.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase42.png new file mode 100644 index 00000000..bb64610b Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase42.png differ diff --git a/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class b/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class index 98b08f48..e2f606a9 100644 Binary files a/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class and b/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class differ diff --git a/bin/com/kitsu/medievalcraft/item/ModItems.class b/bin/com/kitsu/medievalcraft/item/ModItems.class index 4c56b1ba..188e5f14 100644 Binary files a/bin/com/kitsu/medievalcraft/item/ModItems.class and b/bin/com/kitsu/medievalcraft/item/ModItems.class differ diff --git a/bin/com/kitsu/medievalcraft/item/craftingtools/FireBow.class b/bin/com/kitsu/medievalcraft/item/craftingtools/FireBow.class index b535fdea..c4129e2a 100644 Binary files a/bin/com/kitsu/medievalcraft/item/craftingtools/FireBow.class and b/bin/com/kitsu/medievalcraft/item/craftingtools/FireBow.class differ diff --git a/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java b/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java index 15e57c1d..afe2c7ad 100644 --- a/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java +++ b/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java @@ -599,40 +599,40 @@ public final class ModCrafting { GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', pickheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if - //EFFIC ONE + FORTUNE + UNBREAKING + //EFFIC ONE + FORTUNE ((i == 6 && j == 2)) { ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase35); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); - enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); - enchantedSwitch.addEnchantment(Enchantment.fortune, 1); + enchantedSwitch.addEnchantment(Enchantment.fortune, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', pickheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if //EFFIC ONEFORTUNE + WOOD/IRON - ((i == 6 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPick); + ((i == 6 && j == 0)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase36); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', pickheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if + ((i == 6 && j == 1)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase37); + enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); + enchantedSwitch.addEnchantment(Enchantment.fortune, 1); + enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); + GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, + new Object[]{"a", "c", "b", 'a', pickheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); + } else if ((i == 6 && j == 3)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase38); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', pickheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if //EFFIC ONEFORTUNE + FORTUNE - ((i == 6 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronPick); - enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); - enchantedSwitch.addEnchantment(Enchantment.fortune, 2); - GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, - new Object[]{"a", "c", "b", 'a', pickheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); - } else if ((i == 6 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase39); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -640,7 +640,7 @@ public final class ModCrafting { } else if //EFFIC ONEFORTUNE + EFFIC ((i == 6 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase40); enchantedSwitch.addEnchantment(Enchantment.efficiency, 2); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -648,14 +648,14 @@ public final class ModCrafting { } else if //UNBREAKONEEFFICONE + WOOD/IRON ((i == 7 && j == 0)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase41); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', pickheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if ((i == 7 && j == 3)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase42); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, diff --git a/src/main/java/com/kitsu/medievalcraft/item/ModItems.java b/src/main/java/com/kitsu/medievalcraft/item/ModItems.java index cb4044b2..c099109d 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/ModItems.java +++ b/src/main/java/com/kitsu/medievalcraft/item/ModItems.java @@ -859,6 +859,14 @@ public final class ModItems { GameRegistry.registerItem(customIronPickCase33 = new CustomIronPick("customIronPickCase33", customWoodWeak), "customIronPickCase33"); GameRegistry.registerItem(customIronPickCase34 = new CustomIronPick("customIronPickCase34", customIronToolRodWeak), "customIronPickCase34"); GameRegistry.registerItem(customIronPickCase35 = new CustomIronPick("customIronPickCase35", customWoodWeak), "customIronPickCase35"); + GameRegistry.registerItem(customIronPickCase36 = new CustomIronPick("customIronPickCase36", customWoodWeak), "customIronPickCase36"); + GameRegistry.registerItem(customIronPickCase37 = new CustomIronPick("customIronPickCase37", customWoodNormal), "customIronPickCase37"); + GameRegistry.registerItem(customIronPickCase38 = new CustomIronPick("customIronPickCase38", customIronToolRodWeak), "customIronPickCase38"); + GameRegistry.registerItem(customIronPickCase39 = new CustomIronPick("customIronPickCase39", customIronToolRodWeak), "customIronPickCase39"); + GameRegistry.registerItem(customIronPickCase40 = new CustomIronPick("customIronPickCase40", customIronToolRodWeak), "customIronPickCase40"); + GameRegistry.registerItem(customIronPickCase41 = new CustomIronPick("customIronPickCase41", customWoodNormal), "customIronPickCase41"); + GameRegistry.registerItem(customIronPickCase42 = new CustomIronPick("customIronPickCase42", customIronToolRodNormal), "customIronPickCase42"); + GameRegistry.registerItem(customIronPick = new CustomIronPick("customIronPick", customWoodNormal), "customIronPick"); GameRegistry.registerItem(customStrongIronPick = new CustomIronPick("customStrongIronPick", customWoodStrong), "customStrongIronPick"); diff --git a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/FireBow.java b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/FireBow.java index 334cad4a..9ba8abfe 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/FireBow.java +++ b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/FireBow.java @@ -43,15 +43,15 @@ public class FireBow extends Item { if(rand.nextInt(5) == 0){ world.setBlock(x, y + 1, z , Blocks.fire); stack.damageItem(1, player); - player.worldObj.playSoundAtEntity(player, Main.MODID + ":anvilhammer", 1.0F, 1.0F); - for(int i=0; i < player.worldObj.playerEntities.size(); i++){ + //player.worldObj.playSoundAtEntity(player, Main.MODID + ":anvilhammer", 1.0F, 1.0F); + /*for(int i=0; i < player.worldObj.playerEntities.size(); i++){ EntityPlayer test = (EntityPlayer) player.worldObj.playerEntities.get(i); Vec3 vecTest = Vec3.createVectorHelper(test.posX, test.posY, test.posZ); Vec3 vecPlayer = Vec3.createVectorHelper(player.posX, player.posY, player.posZ); if(vecPlayer.distanceTo(vecTest)>10f && vecPlayer.distanceTo(vecTest)<100f){ test.worldObj.playSoundAtEntity(test, Main.MODID + ":anvilhammer", 1.0F, 1.0F); } - } + }*/ } } return true; diff --git a/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang b/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang index ec444c50..9660ef2e 100644 --- a/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang +++ b/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang @@ -172,6 +172,13 @@ item.customIronPickCase32.name=Forged Pickaxe item.customIronPickCase33.name=Forged Pickaxe item.customIronPickCase34.name=Forged Pickaxe item.customIronPickCase35.name=Forged Pickaxe +item.customIronPickCase36.name=Forged Pickaxe +item.customIronPickCase37.name=Forged Pickaxe +item.customIronPickCase38.name=Forged Pickaxe +item.customIronPickCase39.name=Forged Pickaxe +item.customIronPickCase40.name=Forged Pickaxe +item.customIronPickCase41.name=Forged Pickaxe +item.customIronPickCase42.name=Forged Pickaxe item.customIronLumberAxe0.name=Forged Lumber Axe item.customIronLumberAxe1.name=Forged Lumber Axe diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/charcoalLeafPellet.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/charcoalLeafPellet.png index fa538479..d85d2dd9 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/items/charcoalLeafPellet.png and b/src/main/resources/assets/kitsumedievalcraft/textures/items/charcoalLeafPellet.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick2.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick2.png index dc6a9690..bdbd8201 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick2.png and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick2.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase35.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase35.png index c6594188..01f51571 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase35.png and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase35.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase36.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase36.png new file mode 100644 index 00000000..83a6b3ea Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase36.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase37.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase37.png new file mode 100644 index 00000000..d9e1f55f Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase37.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase38.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase38.png new file mode 100644 index 00000000..81731153 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase38.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase39.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase39.png new file mode 100644 index 00000000..af4369c1 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase39.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase40.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase40.png new file mode 100644 index 00000000..c462a75e Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase40.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase42.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase42.png new file mode 100644 index 00000000..bb64610b Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase42.png differ