moreicons

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

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, 2);
-					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 + WOOD/IRON
-				((i == 6 && j == 1)) {
+				((i == 6 && j == 0)) {
-					ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPick);
+					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, 

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");

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);
+				//player.worldObj.playSoundAtEntity(player, Main.MODID + ":anvilhammer", 1.0F, 1.0F);
-				for(int i=0; i < player.worldObj.playerEntities.size(); i++){
+				/*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;

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