diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock index 9f995d22..189cdfff 100644 Binary files a/.gradle/2.0/taskArtifacts/cache.properties.lock and b/.gradle/2.0/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin index 6fd00c02..d421afeb 100644 Binary files a/.gradle/2.0/taskArtifacts/fileHashes.bin and b/.gradle/2.0/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin index ebabaef6..3b296fd0 100644 Binary files a/.gradle/2.0/taskArtifacts/fileSnapshots.bin and b/.gradle/2.0/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.0/taskArtifacts/outputFileStates.bin b/.gradle/2.0/taskArtifacts/outputFileStates.bin index 19f38329..3885907a 100644 Binary files a/.gradle/2.0/taskArtifacts/outputFileStates.bin and b/.gradle/2.0/taskArtifacts/outputFileStates.bin differ diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin index 36840d0d..31f47706 100644 Binary files a/.gradle/2.0/taskArtifacts/taskArtifacts.bin and b/.gradle/2.0/taskArtifacts/taskArtifacts.bin differ diff --git a/.gradle/gradle.log b/.gradle/gradle.log index b71f4844..3b444d72 100644 --- a/.gradle/gradle.log +++ b/.gradle/gradle.log @@ -5,11 +5,33 @@ R4wk, ZeuX, IngisKahn, bspkrs MCP Data version : unknown **************************** -:eclipseClasspath -:eclipseJdt -:eclipseProject -:eclipse +:compileApiJava UP-TO-DATE +:processApiResources UP-TO-DATE +:apiClasses UP-TO-DATE +:sourceMainJava +:compileJavawarning: [options] bootstrap class path not set in conjunction with -source 1.6 +Note: Some input files use or override a deprecated API. +Note: Recompile with -Xlint:deprecation for details. +Note: Some input files use unchecked or unsafe operations. +Note: Recompile with -Xlint:unchecked for details. +1 warning + +:processResources +:classes +:jar +:compileTestJava UP-TO-DATE +:processTestResources UP-TO-DATE +:testClasses UP-TO-DATE +:test UP-TO-DATE +:extractMcpData UP-TO-DATE +:getVersionJson +:extractUserDev UP-TO-DATE +:genSrgs SKIPPED +:reobf +:assemble +:check UP-TO-DATE +:build BUILD SUCCESSFUL -Total time: 15.227 secs +Total time: 9.983 secs diff --git a/bin/assets/kitsumedievalcraft/lang/en_US.lang b/bin/assets/kitsumedievalcraft/lang/en_US.lang index 9660ef2e..4ac49300 100644 --- a/bin/assets/kitsumedievalcraft/lang/en_US.lang +++ b/bin/assets/kitsumedievalcraft/lang/en_US.lang @@ -179,6 +179,16 @@ item.customIronPickCase39.name=Forged Pickaxe item.customIronPickCase40.name=Forged Pickaxe item.customIronPickCase41.name=Forged Pickaxe item.customIronPickCase42.name=Forged Pickaxe +item.customIronPickCase43.name=Forged Pickaxe +item.customIronPickCase44.name=Forged Pickaxe +item.customIronPickCase45.name=Forged Pickaxe +item.customIronPickCase46.name=Forged Pickaxe +item.customIronPickCase47.name=Forged Pickaxe +item.customIronPickCase48.name=Forged Pickaxe +item.customIronPickCase49.name=Forged Pickaxe +item.customIronPickCase50.name=Forged Pickaxe +item.customIronPickCase51.name=Forged Pickaxe +item.customIronPickCase52.name=Forged Pickaxe item.customIronLumberAxe0.name=Forged Lumber Axe item.customIronLumberAxe1.name=Forged Lumber Axe @@ -197,6 +207,62 @@ item.customIronShovel1.name=Forged Shovel item.customIronShovel2.name=Forged Shovel item.customIronShovel3.name=Forged Shovel +item.customIronShovelCase0.name=Forged Shovel +item.customIronShovelCase00.name=Forged Shovel +item.customIronShovelCase1.name=Forged Shovel +item.customIronShovelCase2.name=Forged Shovel +item.customIronShovelCase3.name=Forged Shovel +item.customIronShovelCase4.name=Forged Shovel +item.customIronShovelCase5.name=Forged Shovel +item.customIronShovelCase6.name=Forged Shovel +item.customIronShovelCase7.name=Forged Shovel +item.customIronShovelCase8.name=Forged Shovel +item.customIronShovelCase9.name=Forged Shovel +item.customIronShovelCase10.name=Forged Shovel +item.customIronShovelCase11.name=Forged Shovel +item.customIronShovelCase12.name=Forged Shovel +item.customIronShovelCase13.name=Forged Shovel +item.customIronShovelCase14.name=Forged Shovel +item.customIronShovelCase15.name=Forged Shovel +item.customIronShovelCase16.name=Forged Shovel +item.customIronShovelCase17.name=Forged Shovel +item.customIronShovelCase18.name=Forged Shovel +item.customIronShovelCase19.name=Forged Shovel +item.customIronShovelCase20.name=Forged Shovel +item.customIronShovelCase21.name=Forged Shovel +item.customIronShovelCase22.name=Forged Shovel +item.customIronShovelCase23.name=Forged Shovel +item.customIronShovelCase24.name=Forged Shovel +item.customIronShovelCase25.name=Forged Shovel +item.customIronShovelCase26.name=Forged Shovel +item.customIronShovelCase27.name=Forged Shovel +item.customIronShovelCase28.name=Forged Shovel +item.customIronShovelCase29.name=Forged Shovel +item.customIronShovelCase30.name=Forged Shovel +item.customIronShovelCase31.name=Forged Shovel +item.customIronShovelCase32.name=Forged Shovel +item.customIronShovelCase33.name=Forged Shovel +item.customIronShovelCase34.name=Forged Shovel +item.customIronShovelCase35.name=Forged Shovel +item.customIronShovelCase36.name=Forged Shovel +item.customIronShovelCase37.name=Forged Shovel +item.customIronShovelCase38.name=Forged Shovel +item.customIronShovelCase39.name=Forged Shovel +item.customIronShovelCase40.name=Forged Shovel +item.customIronShovelCase41.name=Forged Shovel +item.customIronShovelCase42.name=Forged Shovel +item.customIronShovelCase43.name=Forged Shovel +item.customIronShovelCase44.name=Forged Shovel +item.customIronShovelCase45.name=Forged Shovel +item.customIronShovelCase46.name=Forged Shovel +item.customIronShovelCase47.name=Forged Shovel +item.customIronShovelCase48.name=Forged Shovel +item.customIronShovelCase49.name=Forged Shovel +item.customIronShovelCase50.name=Forged Shovel +item.customIronShovelCase51.name=Forged Shovel +item.customIronShovelCase52.name=Forged Shovel + + item.customIronShovel.name=Forged Shovel item.customHandleIronShovel.name=Forged Shovel item.customHandleStrongIronShovel.name=Forged Shovel diff --git a/bin/assets/kitsumedievalcraft/textures/items/ShovelPartIcons.xcf b/bin/assets/kitsumedievalcraft/textures/items/ShovelPartIcons.xcf new file mode 100644 index 00000000..7ffb4d13 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/ShovelPartIcons.xcf differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase0.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase0.png index 44c72129..451e66ec 100644 Binary files a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase0.png and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase0.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase1.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase1.png index 6f71092d..8bf53271 100644 Binary files a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase1.png and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase1.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase2.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase2.png index df4b9bc7..c244b3a7 100644 Binary files a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase2.png and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase2.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase32.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase32.png index 73f66972..dbfd7fed 100644 Binary files a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase32.png and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase32.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase43.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase43.png new file mode 100644 index 00000000..17459baa Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase43.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase44.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase44.png new file mode 100644 index 00000000..8dffe0ff Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase44.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase45.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase45.png new file mode 100644 index 00000000..b9bf81e0 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase45.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase46.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase46.png new file mode 100644 index 00000000..4013621e Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase46.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase47.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase47.png new file mode 100644 index 00000000..fdc4691b Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase47.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase48.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase48.png new file mode 100644 index 00000000..bee90528 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase48.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase49.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase49.png new file mode 100644 index 00000000..cdd63ae4 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase49.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase50.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase50.png new file mode 100644 index 00000000..bd3fa679 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase50.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase51.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase51.png new file mode 100644 index 00000000..92a754cc Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase51.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase0.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase0.png new file mode 100644 index 00000000..bd15e13a Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase0.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase00.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase00.png new file mode 100644 index 00000000..b2268790 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase00.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase1.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase1.png new file mode 100644 index 00000000..5858a119 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase1.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase10.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase10.png new file mode 100644 index 00000000..016287bf Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase10.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase11.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase11.png new file mode 100644 index 00000000..302562f8 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase11.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase12.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase12.png new file mode 100644 index 00000000..f548568e Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase12.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase13.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase13.png new file mode 100644 index 00000000..3012c2cb Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase13.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase14.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase14.png new file mode 100644 index 00000000..2a537e05 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase14.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase15.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase15.png new file mode 100644 index 00000000..13e08493 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase15.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase16.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase16.png new file mode 100644 index 00000000..8d144d98 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase16.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase17.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase17.png new file mode 100644 index 00000000..11644980 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase17.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase18.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase18.png new file mode 100644 index 00000000..1f701a24 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase18.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase2.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase2.png new file mode 100644 index 00000000..3e4611d9 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase2.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase3.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase3.png new file mode 100644 index 00000000..04c80bb1 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase3.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase4.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase4.png new file mode 100644 index 00000000..34f89c19 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase4.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase5.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase5.png new file mode 100644 index 00000000..90a9e065 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase5.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase6.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase6.png new file mode 100644 index 00000000..6e52b64a Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase6.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase7.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase7.png new file mode 100644 index 00000000..6eaf0bec Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase7.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase8.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase8.png new file mode 100644 index 00000000..79047ed1 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase8.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase9.png b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase9.png new file mode 100644 index 00000000..6e432672 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronShovelCase9.png differ diff --git a/bin/com/kitsu/medievalcraft/Main.class b/bin/com/kitsu/medievalcraft/Main.class index dab6691f..9a868d7d 100644 Binary files a/bin/com/kitsu/medievalcraft/Main.class and b/bin/com/kitsu/medievalcraft/Main.class differ diff --git a/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class b/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class index e2f606a9..c8f9ab79 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 188e5f14..fad1a9a3 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/ForgeHammer.class b/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class index b09dd731..4b157766 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/mcmod.info b/bin/mcmod.info index fe8ed724..82c5f886 100644 --- a/bin/mcmod.info +++ b/bin/mcmod.info @@ -3,7 +3,7 @@ "modid": "kitsumedievalcraft", "name": "ForgeCraft", "description": "ForgeCraft", - "version": "{2.2.3}", + "version": "{2.2.4}", "mcversion": "{1.7.10}", "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging", "updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads", diff --git a/src/main/java/com/kitsu/medievalcraft/Main.java b/src/main/java/com/kitsu/medievalcraft/Main.java index f3ecc1aa..3a82356c 100644 --- a/src/main/java/com/kitsu/medievalcraft/Main.java +++ b/src/main/java/com/kitsu/medievalcraft/Main.java @@ -55,7 +55,7 @@ public class Main { public static final String MODID = "kitsumedievalcraft"; public static final String MODNAME = "ForgeCraft"; - public static final String VERSION = "2.2.3"; + public static final String VERSION = "2.2.4"; public static SimpleNetworkWrapper sNet; diff --git a/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java b/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java index afe2c7ad..c5ba8cf2 100644 --- a/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java +++ b/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java @@ -663,7 +663,7 @@ public final class ModCrafting { } else if //UNBREAKONEEFFICONE + unbreaking ((i == 7 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase43); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -671,7 +671,7 @@ public final class ModCrafting { } else if //UNBREAKONEEFFICONE + fortune ((i == 7 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase44); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); @@ -679,7 +679,7 @@ public final class ModCrafting { new Object[]{"a", "c", "b", 'a', pickheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if ((i == 7 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase45); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); @@ -688,7 +688,7 @@ public final class ModCrafting { } else if //UNBREAKONEEFFICONE + effic ((i == 7 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase46); enchantedSwitch.addEnchantment(Enchantment.efficiency, 2); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -696,14 +696,14 @@ public final class ModCrafting { } else if //UNBREAKONEFORTUNEONE + wood/iron ((i == 8 && j == 0)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase47); 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 == 8 && j == 3)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase48); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -711,14 +711,14 @@ public final class ModCrafting { } else if //UNBREAKONEFORTUNEONE + fortune ((i == 8 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase49); enchantedSwitch.addEnchantment(Enchantment.fortune, 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 ((i == 8 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase50); enchantedSwitch.addEnchantment(Enchantment.fortune, 2); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -726,7 +726,7 @@ public final class ModCrafting { } else if //UNBREAKONEFORTUNEONE + unbreaking ((i == 8 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase51); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -734,7 +734,7 @@ public final class ModCrafting { } else if //UNBREAKONEFORTUNEONE + effic ((i == 8 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase52); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); @@ -749,133 +749,150 @@ public final class ModCrafting { for (int j = 0; j < rods.size(); j++) { //UNBREAKING 1 if ((i == 0 && j == 0)){ - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase0); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if - ((i == 0 && j == 3)){ - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase00); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if //UNBREAKING 2 ((i == 0 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if - //CUSTOMSTRONGIronShovel - ((i == 1 && j == 0) || (i == 1 && j == 3)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customStrongIronShovel); + //CUSTOMSTRONGIRONPICK + ((i == 1 && j == 0)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase2); + enchantedSwitch.addEnchantment(Enchantment.unbreaking, 2); + GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, + new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); + } else if + + ((i == 1 && j == 3)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase3); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if - ((i == 1 && j == 3)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleStrongIronShovel); - enchantedSwitch.addEnchantment(Enchantment.unbreaking, 2); - GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, - new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); - } else if //UNBREAKING 3 ((i == 1 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customStrongIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase4); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 3); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if //FORTUNE 1 ((i == 2 && j == 0)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase5); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if ((i == 2 && j == 3)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase6); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if //FORTUNE 2 - ((i == 3 && j == 0) || (i == 2 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronShovel); + ((i == 3 && j == 0)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase7); enchantedSwitch.addEnchantment(Enchantment.fortune, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if - - ((i == 3 && j == 3) || (i == 2 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ((i == 2 && j == 2)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase8); + enchantedSwitch.addEnchantment(Enchantment.fortune, 2); + GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, + new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); + } else if + + ((i == 3 && j == 3)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase9); + enchantedSwitch.addEnchantment(Enchantment.fortune, 2); + GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, + new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); + } else if + ((i == 2 && j == 5)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase10); enchantedSwitch.addEnchantment(Enchantment.fortune, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if //FORTUNE 3 ((i == 3 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase11); enchantedSwitch.addEnchantment(Enchantment.fortune, 3); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if - + //FORTUNE 3 ((i == 3 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase12); enchantedSwitch.addEnchantment(Enchantment.fortune, 3); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if //EFFIC 1 ((i == 4 && j == 0)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase13); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if ((i == 4 && j == 3)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase14); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if //EFFIC 2 ((i == 5 && j == 0)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase15); enchantedSwitch.addEnchantment(Enchantment.efficiency, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.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.customHandleIronShovel); + ((i == 5 && j == 3)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase16); + enchantedSwitch.addEnchantment(Enchantment.efficiency, 2); + GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, + new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); + } else if + ((i == 4 && j == 4)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase17); enchantedSwitch.addEnchantment(Enchantment.efficiency, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if //EFFIC 3 ((i == 5 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase18); enchantedSwitch.addEnchantment(Enchantment.efficiency, 3); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.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.customIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase19); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if ((i == 0 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase20); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -883,7 +900,7 @@ public final class ModCrafting { } else if //UNBREAKING ONE + EFFIC ONE ((i == 0 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase21); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -891,14 +908,14 @@ public final class ModCrafting { } else if //UNBREAKING TWO + FORTUNE ONE ((i == 1 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customStrongIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase22); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 2); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if ((i == 1 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleStrongIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase23); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 2); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -906,7 +923,7 @@ public final class ModCrafting { } else if //UNBREAKING TWO + EFFIC ONE ((i == 1 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleStrongIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase24); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 2); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -914,7 +931,7 @@ public final class ModCrafting { } else if //FORTUNE ONE + UNBREAKING ((i == 2 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase25); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -922,15 +939,15 @@ public final class ModCrafting { } else if //FORTUNE ONE + EFFIC ONE ((i == 2 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase26); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.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.customIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase27); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -938,7 +955,7 @@ public final class ModCrafting { } else if //FORTUNE TWO + EFFIC ONE ((i == 3 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase28); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -946,7 +963,7 @@ public final class ModCrafting { } else if //EFFIC ONE + UNBREAKING ((i == 4 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase29); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -954,14 +971,14 @@ public final class ModCrafting { } else if //EFFIC ONE + FORTUNE ((i == 4 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase30); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if ((i == 4 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase31); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -969,61 +986,61 @@ public final class ModCrafting { } else if //EFFIC TWO + UNBREAKING ((i == 5 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase32); enchantedSwitch.addEnchantment(Enchantment.efficiency, 2); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.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.customWeakIronShovel); + ((i == 5 && j == 2)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase33); 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', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if ((i == 5 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase34); 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', spadeheads.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.customWeakIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase35); 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', spadeheads.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.customIronShovel); + ((i == 6 && j == 0)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase36); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if + ((i == 6 && j == 1)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase37); + 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', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); + } else if ((i == 6 && j == 3)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase38); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if //EFFIC ONEFORTUNE + FORTUNE - ((i == 6 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronShovel); - enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); - enchantedSwitch.addEnchantment(Enchantment.fortune, 2); - GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, - new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); - } else if ((i == 6 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase39); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -1031,7 +1048,7 @@ public final class ModCrafting { } else if //EFFIC ONEFORTUNE + EFFIC ((i == 6 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase40); enchantedSwitch.addEnchantment(Enchantment.efficiency, 2); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -1039,14 +1056,14 @@ public final class ModCrafting { } else if //UNBREAKONEEFFICONE + WOOD/IRON ((i == 7 && j == 0)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase41); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if ((i == 7 && j == 3)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase42); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -1054,7 +1071,7 @@ public final class ModCrafting { } else if //UNBREAKONEEFFICONE + unbreaking ((i == 7 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase43); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -1062,7 +1079,7 @@ public final class ModCrafting { } else if //UNBREAKONEEFFICONE + fortune ((i == 7 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase44); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); @@ -1070,7 +1087,7 @@ public final class ModCrafting { new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if ((i == 7 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase45); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); @@ -1079,7 +1096,7 @@ public final class ModCrafting { } else if //UNBREAKONEEFFICONE + effic ((i == 7 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase46); enchantedSwitch.addEnchantment(Enchantment.efficiency, 2); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -1087,14 +1104,14 @@ public final class ModCrafting { } else if //UNBREAKONEFORTUNEONE + wood/iron ((i == 8 && j == 0)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase47); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if ((i == 8 && j == 3)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase48); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -1102,14 +1119,14 @@ public final class ModCrafting { } else if //UNBREAKONEFORTUNEONE + fortune ((i == 8 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase49); enchantedSwitch.addEnchantment(Enchantment.fortune, 2); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', spadeheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if ((i == 8 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase50); enchantedSwitch.addEnchantment(Enchantment.fortune, 2); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -1117,7 +1134,7 @@ public final class ModCrafting { } else if //UNBREAKONEFORTUNEONE + unbreaking ((i == 8 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase51); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, @@ -1125,7 +1142,7 @@ public final class ModCrafting { } else if //UNBREAKONEFORTUNEONE + effic ((i == 8 && j == 4)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronShovel); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronShovelCase52); enchantedSwitch.addEnchantment(Enchantment.fortune, 1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 1); enchantedSwitch.addEnchantment(Enchantment.efficiency, 1); diff --git a/src/main/java/com/kitsu/medievalcraft/item/ModItems.java b/src/main/java/com/kitsu/medievalcraft/item/ModItems.java index c099109d..9247e561 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/ModItems.java +++ b/src/main/java/com/kitsu/medievalcraft/item/ModItems.java @@ -220,6 +220,7 @@ public final class ModItems { public static Item customIronPickCase49; public static Item customIronPickCase50; public static Item customIronPickCase51; + public static Item customIronPickCase52; public static Item customStrongIronPick; @@ -231,6 +232,63 @@ public final class ModItems { public static Item customIronShovel1; public static Item customIronShovel2; public static Item customIronShovel3; + public static Item customIronShovelCase0; + public static Item customIronShovelCase00; + public static Item customIronShovelCase1; + public static Item customIronShovelCase2; + public static Item customIronShovelCase3; + public static Item customIronShovelCase4; + public static Item customIronShovelCase5; + public static Item customIronShovelCase6; + public static Item customIronShovelCase7; + public static Item customIronShovelCase8; + public static Item customIronShovelCase9; + public static Item customIronShovelCase10; + public static Item customIronShovelCase11; + public static Item customIronShovelCase12; + public static Item customIronShovelCase13; + public static Item customIronShovelCase14; + public static Item customIronShovelCase15; + public static Item customIronShovelCase16; + public static Item customIronShovelCase17; + public static Item customIronShovelCase18; + public static Item customIronShovelCase19; + public static Item customIronShovelCase20; + public static Item customIronShovelCase21; + public static Item customIronShovelCase22; + public static Item customIronShovelCase23; + public static Item customIronShovelCase24; + public static Item customIronShovelCase25; + public static Item customIronShovelCase26; + public static Item customIronShovelCase27; + public static Item customIronShovelCase28; + public static Item customIronShovelCase29; + public static Item customIronShovelCase30; + public static Item customIronShovelCase31; + public static Item customIronShovelCase32; + public static Item customIronShovelCase33; + public static Item customIronShovelCase34; + public static Item customIronShovelCase35; + public static Item customIronShovelCase36; + public static Item customIronShovelCase37; + public static Item customIronShovelCase38; + public static Item customIronShovelCase39; + public static Item customIronShovelCase40; + public static Item customIronShovelCase41; + public static Item customIronShovelCase42; + public static Item customIronShovelCase43; + public static Item customIronShovelCase44; + public static Item customIronShovelCase45; + public static Item customIronShovelCase46; + public static Item customIronShovelCase47; + public static Item customIronShovelCase48; + public static Item customIronShovelCase49; + public static Item customIronShovelCase50; + public static Item customIronShovelCase51; + public static Item customIronShovelCase52; + public static Item customIronShovelCase53; + + public static Item customIronShovel; public static Item customStrongIronShovel; @@ -866,6 +924,16 @@ public final class ModItems { 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(customIronPickCase43 = new CustomIronPick("customIronPickCase43", customWoodNormal), "customIronPickCase43"); + GameRegistry.registerItem(customIronPickCase44 = new CustomIronPick("customIronPickCase44", customWoodWeak), "customIronPickCase44"); + GameRegistry.registerItem(customIronPickCase45 = new CustomIronPick("customIronPickCase45", customIronToolRodWeak), "customIronPickCase45"); + GameRegistry.registerItem(customIronPickCase46 = new CustomIronPick("customIronPickCase46", customIronToolRodWeak), "customIronPickCase46"); + GameRegistry.registerItem(customIronPickCase47 = new CustomIronPick("customIronPickCase47", customWoodNormal), "customIronPickCase47"); + GameRegistry.registerItem(customIronPickCase48 = new CustomIronPick("customIronPickCase48", customIronToolRodNormal), "customIronPickCase48"); + GameRegistry.registerItem(customIronPickCase49 = new CustomIronPick("customIronPickCase49", customWoodWeak), "customIronPickCase49"); + GameRegistry.registerItem(customIronPickCase50 = new CustomIronPick("customIronPickCase50", customIronToolRodWeak), "customIronPickCase50"); + GameRegistry.registerItem(customIronPickCase51 = new CustomIronPick("customIronPickCase51", customWoodNormal), "customIronPickCase51"); + GameRegistry.registerItem(customIronPickCase52 = new CustomIronPick("customIronPickCase52", customIronToolRodWeak), "customIronPickCase52"); GameRegistry.registerItem(customIronPick = new CustomIronPick("customIronPick", customWoodNormal), "customIronPick"); @@ -881,6 +949,63 @@ public final class ModItems { GameRegistry.registerItem(customIronShovel2 = new CustomIronShovel("customIronShovel2", customWoodNormal), "customIronShovel2"); GameRegistry.registerItem(customIronShovel3 = new CustomIronShovel("customIronShovel3", customIronToolRodWeak), "customIronShovel3"); + GameRegistry.registerItem(customIronShovelCase0 = new CustomIronShovel("customIronShovelCase0", customWoodNormal), "customIronShovelCase0"); + GameRegistry.registerItem(customIronShovelCase00 = new CustomIronShovel("customIronShovelCase00", customIronToolRodNormal), "customIronShovelCase00"); + GameRegistry.registerItem(customIronShovelCase1 = new CustomIronShovel("customIronShovelCase1", customWoodNormal), "customIronShovelCase1"); + GameRegistry.registerItem(customIronShovelCase2 = new CustomIronShovel("customIronShovelCase2", customWoodNormal), "customIronShovelCase2"); + GameRegistry.registerItem(customIronShovelCase3 = new CustomIronShovel("customIronShovelCase3", customIronToolRodNormal), "customIronShovelCase3"); + GameRegistry.registerItem(customIronShovelCase4 = new CustomIronShovel("customIronShovelCase4", customWoodStrong), "customIronShovelCase4"); + GameRegistry.registerItem(customIronShovelCase5 = new CustomIronShovel("customIronShovelCase5", customWoodWeak), "customIronShovelCase5"); + GameRegistry.registerItem(customIronShovelCase6 = new CustomIronShovel("customIronShovelCase6", customIronToolRodWeak), "customIronShovelCase6"); + GameRegistry.registerItem(customIronShovelCase7 = new CustomIronShovel("customIronShovelCase7", customWoodWeak), "customIronShovelCase7"); + GameRegistry.registerItem(customIronShovelCase8 = new CustomIronShovel("customIronShovelCase8", customWoodWeak), "customIronShovelCase8"); + GameRegistry.registerItem(customIronShovelCase9 = new CustomIronShovel("customIronShovelCase9", customIronToolRodWeak), "customIronShovelCase9"); + GameRegistry.registerItem(customIronShovelCase10 = new CustomIronShovel("customIronShovelCase10", customIronToolRodWeak), "customIronShovelCase10"); + GameRegistry.registerItem(customIronShovelCase11 = new CustomIronShovel("customIronShovelCase11", customWoodWeak), "customIronShovelCase11"); + GameRegistry.registerItem(customIronShovelCase12 = new CustomIronShovel("customIronShovelCase12", customIronToolRodWeak), "customIronShovelCase12"); + GameRegistry.registerItem(customIronShovelCase13 = new CustomIronShovel("customIronShovelCase13", customWoodNormal), "customIronShovelCase13"); + GameRegistry.registerItem(customIronShovelCase14 = new CustomIronShovel("customIronShovelCase14", customIronToolRodNormal), "customIronShovelCase14"); + GameRegistry.registerItem(customIronShovelCase15 = new CustomIronShovel("customIronShovelCase15", customWoodWeak), "customIronShovelCase15"); + GameRegistry.registerItem(customIronShovelCase16 = new CustomIronShovel("customIronShovelCase16", customIronToolRodWeak), "customIronShovelCase16"); + GameRegistry.registerItem(customIronShovelCase17 = new CustomIronShovel("customIronShovelCase17", customIronToolRodWeak), "customIronShovelCase17"); + GameRegistry.registerItem(customIronShovelCase18 = new CustomIronShovel("customIronShovelCase18", customIronToolRodWeak), "customIronShovelCase18"); + GameRegistry.registerItem(customIronShovelCase19 = new CustomIronShovel("customIronShovelCase19", customWoodNormal), "customIronShovelCase19"); + GameRegistry.registerItem(customIronShovelCase20 = new CustomIronShovel("customIronShovelCase20", customIronToolRodNormal), "customIronShovelCase20"); + GameRegistry.registerItem(customIronShovelCase21 = new CustomIronShovel("customIronShovelCase21", customIronToolRodNormal), "customIronShovelCase21"); + GameRegistry.registerItem(customIronShovelCase22 = new CustomIronShovel("customIronShovelCase22", customWoodNormal), "customIronShovelCase22"); + GameRegistry.registerItem(customIronShovelCase23 = new CustomIronShovel("customIronShovelCase23", customIronToolRodStrong), "customIronShovelCase23"); + GameRegistry.registerItem(customIronShovelCase24 = new CustomIronShovel("customIronShovelCase24", customIronToolRodStrong), "customIronShovelCase24"); + GameRegistry.registerItem(customIronShovelCase25 = new CustomIronShovel("customIronShovelCase25", customWoodNormal), "customIronShovelCase25"); + GameRegistry.registerItem(customIronShovelCase26 = new CustomIronShovel("customIronShovelCase26", customIronToolRodWeak), "customIronShovelCase26"); + GameRegistry.registerItem(customIronShovelCase27 = new CustomIronShovel("customIronShovelCase27", customWoodNormal), "customIronShovelCase27"); + GameRegistry.registerItem(customIronShovelCase28 = new CustomIronShovel("customIronShovelCase28", customIronToolRodWeak), "customIronShovelCase28"); + GameRegistry.registerItem(customIronShovelCase29 = new CustomIronShovel("customIronShovelCase29", customWoodNormal), "customIronShovelCase29"); + GameRegistry.registerItem(customIronShovelCase30 = new CustomIronShovel("customIronShovelCase30", customWoodWeak), "customIronShovelCase30"); + GameRegistry.registerItem(customIronShovelCase31 = new CustomIronShovel("customIronShovelCase31", customIronToolRodWeak), "customIronShovelCase31"); + GameRegistry.registerItem(customIronShovelCase32 = new CustomIronShovel("customIronShovelCase32", customWoodNormal), "customIronShovelCase32"); + GameRegistry.registerItem(customIronShovelCase33 = new CustomIronShovel("customIronShovelCase33", customWoodWeak), "customIronShovelCase33"); + GameRegistry.registerItem(customIronShovelCase34 = new CustomIronShovel("customIronShovelCase34", customIronToolRodWeak), "customIronShovelCase34"); + GameRegistry.registerItem(customIronShovelCase35 = new CustomIronShovel("customIronShovelCase35", customWoodWeak), "customIronShovelCase35"); + GameRegistry.registerItem(customIronShovelCase36 = new CustomIronShovel("customIronShovelCase36", customWoodWeak), "customIronShovelCase36"); + GameRegistry.registerItem(customIronShovelCase37 = new CustomIronShovel("customIronShovelCase37", customWoodNormal), "customIronShovelCase37"); + GameRegistry.registerItem(customIronShovelCase38 = new CustomIronShovel("customIronShovelCase38", customIronToolRodWeak), "customIronShovelCase38"); + GameRegistry.registerItem(customIronShovelCase39 = new CustomIronShovel("customIronShovelCase39", customIronToolRodWeak), "customIronShovelCase39"); + GameRegistry.registerItem(customIronShovelCase40 = new CustomIronShovel("customIronShovelCase40", customIronToolRodWeak), "customIronShovelCase40"); + GameRegistry.registerItem(customIronShovelCase41 = new CustomIronShovel("customIronShovelCase41", customWoodNormal), "customIronShovelCase41"); + GameRegistry.registerItem(customIronShovelCase42 = new CustomIronShovel("customIronShovelCase42", customIronToolRodNormal), "customIronShovelCase42"); + GameRegistry.registerItem(customIronShovelCase43 = new CustomIronShovel("customIronShovelCase43", customWoodNormal), "customIronShovelCase43"); + GameRegistry.registerItem(customIronShovelCase44 = new CustomIronShovel("customIronShovelCase44", customWoodWeak), "customIronShovelCase44"); + GameRegistry.registerItem(customIronShovelCase45 = new CustomIronShovel("customIronShovelCase45", customIronToolRodWeak), "customIronShovelCase45"); + GameRegistry.registerItem(customIronShovelCase46 = new CustomIronShovel("customIronShovelCase46", customIronToolRodWeak), "customIronShovelCase46"); + GameRegistry.registerItem(customIronShovelCase47 = new CustomIronShovel("customIronShovelCase47", customWoodNormal), "customIronShovelCase47"); + GameRegistry.registerItem(customIronShovelCase48 = new CustomIronShovel("customIronShovelCase48", customIronToolRodNormal), "customIronShovelCase48"); + GameRegistry.registerItem(customIronShovelCase49 = new CustomIronShovel("customIronShovelCase49", customWoodWeak), "customIronShovelCase49"); + GameRegistry.registerItem(customIronShovelCase50 = new CustomIronShovel("customIronShovelCase50", customIronToolRodWeak), "customIronShovelCase50"); + GameRegistry.registerItem(customIronShovelCase51 = new CustomIronShovel("customIronShovelCase51", customWoodNormal), "customIronShovelCase51"); + GameRegistry.registerItem(customIronShovelCase52 = new CustomIronShovel("customIronShovelCase52", customIronToolRodWeak), "customIronShovelCase52"); + + + GameRegistry.registerItem(customIronShovel = new CustomIronShovel("customIronShovel", customWoodNormal), "customIronShovel"); GameRegistry.registerItem(customStrongIronShovel = new CustomIronShovel("customStrongIronShovel", customWoodStrong), "customStrongIronShovel"); GameRegistry.registerItem(customWeakIronShovel = new CustomIronShovel("customWeakIronShovel", customWoodWeak), "customWeakIronShovel"); 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 17199bd8..427f9f91 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java +++ b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java @@ -271,7 +271,6 @@ public class ForgeHammer extends Item implements AnvilUtil{ Block block = world.getBlock(x, y, z); Block anvil = world.getBlock(x, y-1, z); if(!world.isRemote){ - System.out.println("Item Use"); onClick(block, anvil, world, x, y, z, player, stack, world.rand); } 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 9660ef2e..4ac49300 100644 --- a/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang +++ b/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang @@ -179,6 +179,16 @@ item.customIronPickCase39.name=Forged Pickaxe item.customIronPickCase40.name=Forged Pickaxe item.customIronPickCase41.name=Forged Pickaxe item.customIronPickCase42.name=Forged Pickaxe +item.customIronPickCase43.name=Forged Pickaxe +item.customIronPickCase44.name=Forged Pickaxe +item.customIronPickCase45.name=Forged Pickaxe +item.customIronPickCase46.name=Forged Pickaxe +item.customIronPickCase47.name=Forged Pickaxe +item.customIronPickCase48.name=Forged Pickaxe +item.customIronPickCase49.name=Forged Pickaxe +item.customIronPickCase50.name=Forged Pickaxe +item.customIronPickCase51.name=Forged Pickaxe +item.customIronPickCase52.name=Forged Pickaxe item.customIronLumberAxe0.name=Forged Lumber Axe item.customIronLumberAxe1.name=Forged Lumber Axe @@ -197,6 +207,62 @@ item.customIronShovel1.name=Forged Shovel item.customIronShovel2.name=Forged Shovel item.customIronShovel3.name=Forged Shovel +item.customIronShovelCase0.name=Forged Shovel +item.customIronShovelCase00.name=Forged Shovel +item.customIronShovelCase1.name=Forged Shovel +item.customIronShovelCase2.name=Forged Shovel +item.customIronShovelCase3.name=Forged Shovel +item.customIronShovelCase4.name=Forged Shovel +item.customIronShovelCase5.name=Forged Shovel +item.customIronShovelCase6.name=Forged Shovel +item.customIronShovelCase7.name=Forged Shovel +item.customIronShovelCase8.name=Forged Shovel +item.customIronShovelCase9.name=Forged Shovel +item.customIronShovelCase10.name=Forged Shovel +item.customIronShovelCase11.name=Forged Shovel +item.customIronShovelCase12.name=Forged Shovel +item.customIronShovelCase13.name=Forged Shovel +item.customIronShovelCase14.name=Forged Shovel +item.customIronShovelCase15.name=Forged Shovel +item.customIronShovelCase16.name=Forged Shovel +item.customIronShovelCase17.name=Forged Shovel +item.customIronShovelCase18.name=Forged Shovel +item.customIronShovelCase19.name=Forged Shovel +item.customIronShovelCase20.name=Forged Shovel +item.customIronShovelCase21.name=Forged Shovel +item.customIronShovelCase22.name=Forged Shovel +item.customIronShovelCase23.name=Forged Shovel +item.customIronShovelCase24.name=Forged Shovel +item.customIronShovelCase25.name=Forged Shovel +item.customIronShovelCase26.name=Forged Shovel +item.customIronShovelCase27.name=Forged Shovel +item.customIronShovelCase28.name=Forged Shovel +item.customIronShovelCase29.name=Forged Shovel +item.customIronShovelCase30.name=Forged Shovel +item.customIronShovelCase31.name=Forged Shovel +item.customIronShovelCase32.name=Forged Shovel +item.customIronShovelCase33.name=Forged Shovel +item.customIronShovelCase34.name=Forged Shovel +item.customIronShovelCase35.name=Forged Shovel +item.customIronShovelCase36.name=Forged Shovel +item.customIronShovelCase37.name=Forged Shovel +item.customIronShovelCase38.name=Forged Shovel +item.customIronShovelCase39.name=Forged Shovel +item.customIronShovelCase40.name=Forged Shovel +item.customIronShovelCase41.name=Forged Shovel +item.customIronShovelCase42.name=Forged Shovel +item.customIronShovelCase43.name=Forged Shovel +item.customIronShovelCase44.name=Forged Shovel +item.customIronShovelCase45.name=Forged Shovel +item.customIronShovelCase46.name=Forged Shovel +item.customIronShovelCase47.name=Forged Shovel +item.customIronShovelCase48.name=Forged Shovel +item.customIronShovelCase49.name=Forged Shovel +item.customIronShovelCase50.name=Forged Shovel +item.customIronShovelCase51.name=Forged Shovel +item.customIronShovelCase52.name=Forged Shovel + + item.customIronShovel.name=Forged Shovel item.customHandleIronShovel.name=Forged Shovel item.customHandleStrongIronShovel.name=Forged Shovel diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/ShovelPartIcons.xcf b/src/main/resources/assets/kitsumedievalcraft/textures/items/ShovelPartIcons.xcf new file mode 100644 index 00000000..7ffb4d13 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/ShovelPartIcons.xcf differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase0.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase0.png index 44c72129..451e66ec 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase0.png and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase0.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase1.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase1.png index 6f71092d..8bf53271 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase1.png and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase1.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase2.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase2.png index df4b9bc7..c244b3a7 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase2.png and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase2.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase32.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase32.png index 73f66972..dbfd7fed 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase32.png and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase32.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase43.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase43.png new file mode 100644 index 00000000..17459baa Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase43.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase44.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase44.png new file mode 100644 index 00000000..8dffe0ff Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase44.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase45.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase45.png new file mode 100644 index 00000000..b9bf81e0 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase45.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase46.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase46.png new file mode 100644 index 00000000..4013621e Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase46.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase47.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase47.png new file mode 100644 index 00000000..fdc4691b Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase47.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase48.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase48.png new file mode 100644 index 00000000..bee90528 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase48.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase49.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase49.png new file mode 100644 index 00000000..cdd63ae4 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase49.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase50.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase50.png new file mode 100644 index 00000000..bd3fa679 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase50.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase51.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase51.png new file mode 100644 index 00000000..92a754cc Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase51.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase0.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase0.png new file mode 100644 index 00000000..bd15e13a Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase0.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase00.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase00.png new file mode 100644 index 00000000..b2268790 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase00.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase1.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase1.png new file mode 100644 index 00000000..5858a119 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase1.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase10.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase10.png new file mode 100644 index 00000000..016287bf Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase10.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase11.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase11.png new file mode 100644 index 00000000..302562f8 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase11.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase12.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase12.png new file mode 100644 index 00000000..f548568e Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase12.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase13.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase13.png new file mode 100644 index 00000000..3012c2cb Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase13.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase14.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase14.png new file mode 100644 index 00000000..2a537e05 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase14.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase15.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase15.png new file mode 100644 index 00000000..13e08493 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase15.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase16.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase16.png new file mode 100644 index 00000000..8d144d98 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase16.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase17.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase17.png new file mode 100644 index 00000000..11644980 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase17.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase18.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase18.png new file mode 100644 index 00000000..1f701a24 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase18.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase2.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase2.png new file mode 100644 index 00000000..3e4611d9 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase2.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase3.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase3.png new file mode 100644 index 00000000..04c80bb1 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase3.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase4.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase4.png new file mode 100644 index 00000000..34f89c19 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase4.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase5.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase5.png new file mode 100644 index 00000000..90a9e065 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase5.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase6.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase6.png new file mode 100644 index 00000000..6e52b64a Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase6.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase7.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase7.png new file mode 100644 index 00000000..6eaf0bec Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase7.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase8.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase8.png new file mode 100644 index 00000000..79047ed1 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase8.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase9.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase9.png new file mode 100644 index 00000000..6e432672 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronShovelCase9.png differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index fe8ed724..82c5f886 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "kitsumedievalcraft", "name": "ForgeCraft", "description": "ForgeCraft", - "version": "{2.2.3}", + "version": "{2.2.4}", "mcversion": "{1.7.10}", "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging", "updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads",