diff --git a/bin/assets/kitsumedievalcraft/lang/en_US.lang b/bin/assets/kitsumedievalcraft/lang/en_US.lang index 74660ba4..ec444c50 100644 --- a/bin/assets/kitsumedievalcraft/lang/en_US.lang +++ b/bin/assets/kitsumedievalcraft/lang/en_US.lang @@ -149,6 +149,29 @@ item.customIronPickCase9.name=Forged Pickaxe item.customIronPickCase10.name=Forged Pickaxe item.customIronPickCase11.name=Forged Pickaxe item.customIronPickCase12.name=Forged Pickaxe +item.customIronPickCase13.name=Forged Pickaxe +item.customIronPickCase14.name=Forged Pickaxe +item.customIronPickCase15.name=Forged Pickaxe +item.customIronPickCase16.name=Forged Pickaxe +item.customIronPickCase17.name=Forged Pickaxe +item.customIronPickCase18.name=Forged Pickaxe +item.customIronPickCase19.name=Forged Pickaxe +item.customIronPickCase20.name=Forged Pickaxe +item.customIronPickCase21.name=Forged Pickaxe +item.customIronPickCase22.name=Forged Pickaxe +item.customIronPickCase23.name=Forged Pickaxe +item.customIronPickCase24.name=Forged Pickaxe +item.customIronPickCase25.name=Forged Pickaxe +item.customIronPickCase26.name=Forged Pickaxe +item.customIronPickCase27.name=Forged Pickaxe +item.customIronPickCase28.name=Forged Pickaxe +item.customIronPickCase29.name=Forged Pickaxe +item.customIronPickCase30.name=Forged Pickaxe +item.customIronPickCase31.name=Forged Pickaxe +item.customIronPickCase32.name=Forged Pickaxe +item.customIronPickCase33.name=Forged Pickaxe +item.customIronPickCase34.name=Forged Pickaxe +item.customIronPickCase35.name=Forged Pickaxe item.customIronLumberAxe0.name=Forged Lumber Axe item.customIronLumberAxe1.name=Forged Lumber Axe diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase13.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase13.png new file mode 100644 index 00000000..157f69c7 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase13.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase14.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase14.png new file mode 100644 index 00000000..c1a12f6c Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase14.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase15.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase15.png new file mode 100644 index 00000000..3f06b8fc Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase15.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase16.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase16.png new file mode 100644 index 00000000..9c81b34b Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase16.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase17.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase17.png new file mode 100644 index 00000000..862c64ea Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase17.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase18.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase18.png new file mode 100644 index 00000000..c4adc52c Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase18.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase19.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase19.png new file mode 100644 index 00000000..25715cf6 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase19.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase20.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase20.png new file mode 100644 index 00000000..eb93f36e Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase20.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase21.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase21.png new file mode 100644 index 00000000..a17c52c8 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase21.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase22.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase22.png new file mode 100644 index 00000000..6e40364f Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase22.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase23.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase23.png new file mode 100644 index 00000000..aedaee39 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase23.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase24.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase24.png new file mode 100644 index 00000000..db7cf7fc Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase24.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase25.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase25.png new file mode 100644 index 00000000..b82d312b Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase25.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase26.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase26.png new file mode 100644 index 00000000..f63a71eb Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase26.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase27.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase27.png new file mode 100644 index 00000000..fba6a981 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase27.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase28.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase28.png new file mode 100644 index 00000000..40fb61a1 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase28.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase29.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase29.png new file mode 100644 index 00000000..43eb8748 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase29.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase30.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase30.png new file mode 100644 index 00000000..3947477c Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase30.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase31.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase31.png new file mode 100644 index 00000000..4fca7c94 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase31.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase32.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase32.png new file mode 100644 index 00000000..73f66972 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase32.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase33.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase33.png new file mode 100644 index 00000000..8a5e4424 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase33.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase34.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase34.png new file mode 100644 index 00000000..05eb1440 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase34.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase35.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase35.png new file mode 100644 index 00000000..c6594188 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase35.png differ diff --git a/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class b/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class index 4ccac672..98b08f48 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 03469574..4c56b1ba 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 f15dd847..b535fdea 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/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class b/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class index 8841fc6e..b09dd731 100644 Binary files a/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class and b/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class differ diff --git a/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class b/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class index 250fd39d..9af1a83b 100644 Binary files a/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class and b/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.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 72add414..15e57c1d 100644 --- a/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java +++ b/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java @@ -437,49 +437,54 @@ public final class ModCrafting { } else if //EFFIC 1 ((i == 4 && j == 0)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase13); enchantedSwitch.addEnchantment(Enchantment.efficiency, 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 == 4 && j == 3)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase14); enchantedSwitch.addEnchantment(Enchantment.efficiency, 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 2 ((i == 5 && j == 0)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase15); enchantedSwitch.addEnchantment(Enchantment.efficiency, 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 == 5 && j == 3) || (i == 4 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ((i == 5 && j == 3)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase16); + enchantedSwitch.addEnchantment(Enchantment.efficiency, 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 == 4 && j == 4)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase17); enchantedSwitch.addEnchantment(Enchantment.efficiency, 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 3 ((i == 5 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase18); enchantedSwitch.addEnchantment(Enchantment.efficiency, 3); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', pickheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if //UNBREAKING ONE + FORTUNE ONE - ((i == 0 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase19); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 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 == 0 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase20); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -487,7 +492,7 @@ public final class ModCrafting { } else if //UNBREAKING ONE + EFFIC ONE ((i == 0 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase21); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -495,14 +500,14 @@ public final class ModCrafting { } else if //UNBREAKING TWO + FORTUNE ONE ((i == 1 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customStrongIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase22); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 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 ((i == 1 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleStrongIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase23); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 2); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -510,7 +515,7 @@ public final class ModCrafting { } else if //UNBREAKING TWO + EFFIC ONE ((i == 1 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleStrongIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase24); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 2); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -518,7 +523,7 @@ public final class ModCrafting { } else if //FORTUNE ONE + UNBREAKING ((i == 2 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase25); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -526,15 +531,15 @@ public final class ModCrafting { } else if //FORTUNE ONE + EFFIC ONE ((i == 2 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase26); 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 - //FORTUNE TWO + UNBREAKING ONE + //FORTUNE TWO + UNBREAKING ONE ((i == 3 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase27); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -542,7 +547,7 @@ public final class ModCrafting { } else if //FORTUNE TWO + EFFIC ONE ((i == 3 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase28); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -550,7 +555,7 @@ public final class ModCrafting { } else if //EFFIC ONE + UNBREAKING ((i == 4 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase29); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -558,14 +563,14 @@ public final class ModCrafting { } else if //EFFIC ONE + FORTUNE ((i == 4 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase30); 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 == 4 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase31); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -573,30 +578,30 @@ public final class ModCrafting { } else if //EFFIC TWO + UNBREAKING ((i == 5 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase32); enchantedSwitch.addEnchantment(Enchantment.efficiency, 2); 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 //EFFIC TWO + FORTUNE - ((i == 5 && j == 2) || (i == 5 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronPick); + ((i == 5 && j == 2)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase33); enchantedSwitch.addEnchantment(Enchantment.efficiency, 2); - enchantedSwitch.addEnchantment(Enchantment.unbreaking, 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 == 5 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase34); enchantedSwitch.addEnchantment(Enchantment.efficiency, 2); - enchantedSwitch.addEnchantment(Enchantment.unbreaking, 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 ONE + FORTUNE + UNBREAKING ((i == 6 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase35); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); diff --git a/src/main/java/com/kitsu/medievalcraft/item/ModItems.java b/src/main/java/com/kitsu/medievalcraft/item/ModItems.java index 4a76f79c..cb4044b2 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/ModItems.java +++ b/src/main/java/com/kitsu/medievalcraft/item/ModItems.java @@ -181,6 +181,46 @@ public final class ModItems { public static Item customIronPickCase10; public static Item customIronPickCase11; public static Item customIronPickCase12; + public static Item customIronPickCase13; + public static Item customIronPickCase14; + public static Item customIronPickCase15; + public static Item customIronPickCase16; + public static Item customIronPickCase17; + public static Item customIronPickCase18; + public static Item customIronPickCase19; + public static Item customIronPickCase20; + public static Item customIronPickCase21; + public static Item customIronPickCase22; + public static Item customIronPickCase23; + public static Item customIronPickCase24; + public static Item customIronPickCase25; + public static Item customIronPickCase26; + public static Item customIronPickCase27; + public static Item customIronPickCase28; + public static Item customIronPickCase29; + public static Item customIronPickCase30; + public static Item customIronPickCase31; + public static Item customIronPickCase32; + public static Item customIronPickCase33; + public static Item customIronPickCase34; + public static Item customIronPickCase35; + public static Item customIronPickCase36; + public static Item customIronPickCase37; + public static Item customIronPickCase38; + public static Item customIronPickCase39; + public static Item customIronPickCase40; + public static Item customIronPickCase41; + public static Item customIronPickCase42; + public static Item customIronPickCase43; + public static Item customIronPickCase44; + public static Item customIronPickCase45; + public static Item customIronPickCase46; + public static Item customIronPickCase47; + public static Item customIronPickCase48; + public static Item customIronPickCase49; + public static Item customIronPickCase50; + public static Item customIronPickCase51; + public static Item customStrongIronPick; public static Item customWeakIronPick; @@ -796,6 +836,29 @@ public final class ModItems { GameRegistry.registerItem(customIronPickCase10 = new CustomIronPick("customIronPickCase10", customIronToolRodWeak), "customIronPickCase10"); GameRegistry.registerItem(customIronPickCase11 = new CustomIronPick("customIronPickCase11", customWoodWeak), "customIronPickCase11"); GameRegistry.registerItem(customIronPickCase12 = new CustomIronPick("customIronPickCase12", customIronToolRodWeak), "customIronPickCase12"); + GameRegistry.registerItem(customIronPickCase13 = new CustomIronPick("customIronPickCase13", customWoodNormal), "customIronPickCase13"); + GameRegistry.registerItem(customIronPickCase14 = new CustomIronPick("customIronPickCase14", customIronToolRodNormal), "customIronPickCase14"); + GameRegistry.registerItem(customIronPickCase15 = new CustomIronPick("customIronPickCase15", customWoodWeak), "customIronPickCase15"); + GameRegistry.registerItem(customIronPickCase16 = new CustomIronPick("customIronPickCase16", customIronToolRodWeak), "customIronPickCase16"); + GameRegistry.registerItem(customIronPickCase17 = new CustomIronPick("customIronPickCase17", customIronToolRodWeak), "customIronPickCase17"); + GameRegistry.registerItem(customIronPickCase18 = new CustomIronPick("customIronPickCase18", customIronToolRodWeak), "customIronPickCase18"); + GameRegistry.registerItem(customIronPickCase19 = new CustomIronPick("customIronPickCase19", customWoodNormal), "customIronPickCase19"); + GameRegistry.registerItem(customIronPickCase20 = new CustomIronPick("customIronPickCase20", customIronToolRodNormal), "customIronPickCase20"); + GameRegistry.registerItem(customIronPickCase21 = new CustomIronPick("customIronPickCase21", customIronToolRodNormal), "customIronPickCase21"); + GameRegistry.registerItem(customIronPickCase22 = new CustomIronPick("customIronPickCase22", customWoodNormal), "customIronPickCase22"); + GameRegistry.registerItem(customIronPickCase23 = new CustomIronPick("customIronPickCase23", customIronToolRodStrong), "customIronPickCase23"); + GameRegistry.registerItem(customIronPickCase24 = new CustomIronPick("customIronPickCase24", customIronToolRodStrong), "customIronPickCase24"); + GameRegistry.registerItem(customIronPickCase25 = new CustomIronPick("customIronPickCase25", customWoodNormal), "customIronPickCase25"); + GameRegistry.registerItem(customIronPickCase26 = new CustomIronPick("customIronPickCase26", customIronToolRodWeak), "customIronPickCase26"); + GameRegistry.registerItem(customIronPickCase27 = new CustomIronPick("customIronPickCase27", customWoodNormal), "customIronPickCase27"); + GameRegistry.registerItem(customIronPickCase28 = new CustomIronPick("customIronPickCase28", customIronToolRodWeak), "customIronPickCase28"); + GameRegistry.registerItem(customIronPickCase29 = new CustomIronPick("customIronPickCase29", customWoodNormal), "customIronPickCase29"); + GameRegistry.registerItem(customIronPickCase30 = new CustomIronPick("customIronPickCase30", customWoodWeak), "customIronPickCase30"); + GameRegistry.registerItem(customIronPickCase31 = new CustomIronPick("customIronPickCase31", customIronToolRodWeak), "customIronPickCase31"); + GameRegistry.registerItem(customIronPickCase32 = new CustomIronPick("customIronPickCase32", customWoodNormal), "customIronPickCase32"); + 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(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 a498c74e..334cad4a 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/FireBow.java +++ b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/FireBow.java @@ -7,6 +7,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.Vec3; import net.minecraft.world.World; import com.kitsu.medievalcraft.Main; @@ -42,6 +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++){ + 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/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java index 56e2c298..17199bd8 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java +++ b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java @@ -77,7 +77,7 @@ public class ForgeHammer extends Item implements AnvilUtil{ } private void onClick(Block block, Block blockSub, World world, int x, int y, int z, EntityPlayer p, ItemStack stack, Random rand){ - System.out.println("Layer 1"); + //System.out.println("Layer 1"); if(block == ModBlocks.refinedIron){ tileRefIngot = (TileMyIronIngot) world.getTileEntity(x, y, z); } @@ -124,7 +124,7 @@ public class ForgeHammer extends Item implements AnvilUtil{ //IRON FORMS if(tileEnt.getStackInSlot(0)!=null){ if((tileEnt.getStackInSlot(0).getItem() instanceof IronForms)&&(tile.hot==true)){ - System.out.println("working"); + //System.out.println("working"); p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); Main.sNet.sendToAll(new MsgPacket(true)); Main.sNet.sendToAll(new MsgPacketLocX(x)); diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java index 8c9ca222..f77b6554 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java @@ -264,10 +264,10 @@ public class TileForge extends TileEntity implements IInventory{ double burnTime = 1.5*(this.getItemBurnTime(stack)+((fuelMulti(stack.stackSize, stack)*this.getItemBurnTime(stack)))); //System.out.println(this.ticks+" "+ burnTime+" "+this.getStackInSlot(0).stackSize); if(time >= burnTime){ - if(this.getStackInSlot(0).stackSize==1){ - this.setInventorySlotContents(0, null); + if(this.getStackInSlot(1).stackSize==1){ + this.setInventorySlotContents(1, null); } - decrStackSize(0, 1); + decrStackSize(1, 1); this.ticks=0; } markForUpdate(); diff --git a/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang b/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang index 74660ba4..ec444c50 100644 --- a/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang +++ b/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang @@ -149,6 +149,29 @@ item.customIronPickCase9.name=Forged Pickaxe item.customIronPickCase10.name=Forged Pickaxe item.customIronPickCase11.name=Forged Pickaxe item.customIronPickCase12.name=Forged Pickaxe +item.customIronPickCase13.name=Forged Pickaxe +item.customIronPickCase14.name=Forged Pickaxe +item.customIronPickCase15.name=Forged Pickaxe +item.customIronPickCase16.name=Forged Pickaxe +item.customIronPickCase17.name=Forged Pickaxe +item.customIronPickCase18.name=Forged Pickaxe +item.customIronPickCase19.name=Forged Pickaxe +item.customIronPickCase20.name=Forged Pickaxe +item.customIronPickCase21.name=Forged Pickaxe +item.customIronPickCase22.name=Forged Pickaxe +item.customIronPickCase23.name=Forged Pickaxe +item.customIronPickCase24.name=Forged Pickaxe +item.customIronPickCase25.name=Forged Pickaxe +item.customIronPickCase26.name=Forged Pickaxe +item.customIronPickCase27.name=Forged Pickaxe +item.customIronPickCase28.name=Forged Pickaxe +item.customIronPickCase29.name=Forged Pickaxe +item.customIronPickCase30.name=Forged Pickaxe +item.customIronPickCase31.name=Forged Pickaxe +item.customIronPickCase32.name=Forged Pickaxe +item.customIronPickCase33.name=Forged Pickaxe +item.customIronPickCase34.name=Forged Pickaxe +item.customIronPickCase35.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/customIronPickCase13.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase13.png new file mode 100644 index 00000000..157f69c7 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase13.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase14.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase14.png new file mode 100644 index 00000000..c1a12f6c Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase14.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase15.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase15.png new file mode 100644 index 00000000..3f06b8fc Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase15.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase16.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase16.png new file mode 100644 index 00000000..9c81b34b Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase16.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase17.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase17.png new file mode 100644 index 00000000..862c64ea Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase17.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase18.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase18.png new file mode 100644 index 00000000..c4adc52c Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase18.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase19.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase19.png new file mode 100644 index 00000000..25715cf6 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase19.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase20.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase20.png new file mode 100644 index 00000000..eb93f36e Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase20.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase21.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase21.png new file mode 100644 index 00000000..a17c52c8 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase21.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase22.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase22.png new file mode 100644 index 00000000..6e40364f Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase22.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase23.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase23.png new file mode 100644 index 00000000..aedaee39 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase23.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase24.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase24.png new file mode 100644 index 00000000..db7cf7fc Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase24.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase25.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase25.png new file mode 100644 index 00000000..b82d312b Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase25.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase26.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase26.png new file mode 100644 index 00000000..f63a71eb Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase26.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase27.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase27.png new file mode 100644 index 00000000..fba6a981 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase27.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase28.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase28.png new file mode 100644 index 00000000..40fb61a1 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase28.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase29.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase29.png new file mode 100644 index 00000000..43eb8748 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase29.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase30.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase30.png new file mode 100644 index 00000000..3947477c Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase30.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase31.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase31.png new file mode 100644 index 00000000..4fca7c94 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase31.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase32.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase32.png new file mode 100644 index 00000000..73f66972 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase32.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase33.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase33.png new file mode 100644 index 00000000..8a5e4424 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase33.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase34.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase34.png new file mode 100644 index 00000000..05eb1440 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase34.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase35.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase35.png new file mode 100644 index 00000000..c6594188 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase35.png differ