diff --git a/.gradle/gradle.log b/.gradle/gradle.log index 7598ebb9..cff992a9 100644 --- a/.gradle/gradle.log +++ b/.gradle/gradle.log @@ -1,31 +1,16 @@ -**************************** - Powered By MCP: - http://mcp.ocean-labs.de/ - Searge, ProfMobius, Fesh0r, - R4wk, ZeuX, IngisKahn, bspkrs - MCP Data version : unknown -**************************** -:compileApiJava UP-TO-DATE -:processApiResources UP-TO-DATE -:apiClasses UP-TO-DATE -:sourceMainJava UP-TO-DATE -:compileJava UP-TO-DATE -:processResources UP-TO-DATE -:classes UP-TO-DATE -: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 +FAILURE: Build failed with an exception. -Total time: 5.957 secs +* Where: +Build file '/home/kitsudesktop/Development/ForgeCraft/build.gradle' line: 40 + +* What went wrong: +A problem occurred evaluating root project 'ForgeCraft'. +> The description primalcore is invalid + +* Try: +Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output. + +BUILD FAILED + +Total time: 9.303 secs diff --git a/Reference.txt b/Reference.txt new file mode 100644 index 00000000..982e0596 --- /dev/null +++ b/Reference.txt @@ -0,0 +1,50 @@ + + public static final Hashtable pickheads = new Hashtable (){{ + + put(0, ModItems.unbreakingOneHead); + put(1, ModItems.unbreakingTwoHead); + put(2, ModItems.fortuneOneHead); + put(3, ModItems.fortuneTwoHead); + put(4, ModItems.efficOneHead); + put(5, ModItems.efficTwoHead); + put(6, ModItems.efficOneFortuneOneHead); + put(7, ModItems.unbreakingOneEfficOneHead); + put(8, ModItems.unbreakingOneFortuneOneHead); + }}; + + public static final Hashtable rods = new Hashtable (){{ + + put(0, ModItems.woodentoolHandle); + put(1, ModItems.unbreakingWoodRod); + put(2, ModItems.fortuneWoodRod); + put(3, ModItems.ironweaponHandle); + put(4, ModItems.efficIronRod); + put(5, ModItems.fortuneIronRod); + }}; + + public static final Hashtable spadeheads = new Hashtable (){{ + + put(0, ModItems.unbreakingOneSpade); + put(1, ModItems.unbreakingTwoSpade); + put(2, ModItems.fortuneOneSpade); + put(3, ModItems.fortuneTwoSpade); + put(4, ModItems.efficOneSpade); + put(5, ModItems.efficTwoSpade); + put(6, ModItems.efficOneFortuneOneSpade); + put(7, ModItems.unbreakingOneEfficOneSpade); + put(8, ModItems.unbreakingOneFortuneOneSpade); + + }}; + public static final Hashtable lumberaxeheads = new Hashtable (){{ + + put(0, ModItems.unbreakingOneLumberAxe); + put(1, ModItems.unbreakingTwoLumberAxe); + put(2, ModItems.fortuneOneLumberAxe); + put(3, ModItems.fortuneTwoLumberAxe); + put(4, ModItems.efficOneLumberAxe); + put(5, ModItems.efficTwoLumberAxe); + put(6, ModItems.efficOneFortuneOneLumberAxe); + put(7, ModItems.unbreakingOneEfficOneLumberAxe); + put(8, ModItems.unbreakingOneFortuneOneLumberAxe); + + }}; diff --git a/bin/assets/kitsumedievalcraft/lang/en_US.lang b/bin/assets/kitsumedievalcraft/lang/en_US.lang index da5ce5b4..74660ba4 100644 --- a/bin/assets/kitsumedievalcraft/lang/en_US.lang +++ b/bin/assets/kitsumedievalcraft/lang/en_US.lang @@ -90,13 +90,6 @@ item.ironSharpTipForm.name=Iron Sharp Tip Form item.ironRingForm.name=Iron Ring Form item.ironHandleForm.name=Iron Handle Form -item.customIronPick.name=Forged Pickaxe -item.customStrongIronPick.name=Forged Pickaxe -item.customWeakIronPick.name=Forged Pickaxe -item.customHandleStrongIronPick.name=Forged Pickaxe -item.customHandleIronPick.name=Forged Pickaxe -item.customIronHoe.name=Forged Hoe - item.silkTouchIronHead.name=Emerald Tipped Pickaxe Head item.unbreakingOneHead.name=Diamond Tip Pickaxe Head item.unbreakingTwoHead.name=Diamond Tipped Pickaxe Head @@ -132,11 +125,48 @@ item.unbreakingWoodRod.name=Diamond Inlayed Wood Handle item.fortuneIronRod.name=Lapis Inlayed Iron Handle item.efficIronRod.name=Redstone Inlayed Iron Handle +item.customIronPick.name=Forged Pickaxe +item.customStrongIronPick.name=Forged Pickaxe +item.customWeakIronPick.name=Forged Pickaxe +item.customHandleStrongIronPick.name=Forged Pickaxe +item.customHandleIronPick.name=Forged Pickaxe +item.customIronHoe.name=Forged Hoe +item.customIronPick1.name=Forged Pickaxe +item.customIronPick2.name=Forged Pickaxe +item.customIronPick3.name=Forged Pickaxe +item.customIronPick4.name=Forged Pickaxe +item.customIronPickCase0.name=Forged Pickaxe +item.customHandleIronPickCase0.name=Forged Pickaxe +item.customIronPickCase1.name=Forged Pickaxe +item.customIronPickCase2.name=Forged Pickaxe +item.customIronPickCase3.name=Forged Pickaxe +item.customIronPickCase4.name=Forged Pickaxe +item.customIronPickCase5.name=Forged Pickaxe +item.customIronPickCase6.name=Forged Pickaxe +item.customIronPickCase7.name=Forged Pickaxe +item.customIronPickCase8.name=Forged Pickaxe +item.customIronPickCase9.name=Forged Pickaxe +item.customIronPickCase10.name=Forged Pickaxe +item.customIronPickCase11.name=Forged Pickaxe +item.customIronPickCase12.name=Forged Pickaxe + +item.customIronLumberAxe0.name=Forged Lumber Axe +item.customIronLumberAxe1.name=Forged Lumber Axe +item.customIronLumberAxe2.name=Forged Lumber Axe +item.customIronLumberAxe3.name=Forged Lumber Axe + item.customIronLumberAxe.name=Forged Lumber Axe item.customStrongIronLumberAxe.name=Forged Lumber Axe item.customWeakIronLumberAxe.name=Forged Lumber Axe item.customHandleIronLumberAxe.name=Forged Lumber Axe item.customHandleStrongIronLumberAxe.name=Forged Lumber Axe + + +item.customIronShovel0.name=Forged Shovel +item.customIronShovel1.name=Forged Shovel +item.customIronShovel2.name=Forged Shovel +item.customIronShovel3.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/customHandleIronPickCase0.png b/bin/assets/kitsumedievalcraft/textures/items/customHandleIronPickCase0.png new file mode 100644 index 00000000..e0846137 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customHandleIronPickCase0.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPick1.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPick1.png index 0d751d52..1f627dd9 100644 Binary files a/bin/assets/kitsumedievalcraft/textures/items/customIronPick1.png and b/bin/assets/kitsumedievalcraft/textures/items/customIronPick1.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPick2.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPick2.png index 19380c2f..dc6a9690 100644 Binary files a/bin/assets/kitsumedievalcraft/textures/items/customIronPick2.png and b/bin/assets/kitsumedievalcraft/textures/items/customIronPick2.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPick3.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPick3.png index 771b2e13..da4f645a 100644 Binary files a/bin/assets/kitsumedievalcraft/textures/items/customIronPick3.png and b/bin/assets/kitsumedievalcraft/textures/items/customIronPick3.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPick4.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPick4.png index efdd6a5c..64a0b19a 100644 Binary files a/bin/assets/kitsumedievalcraft/textures/items/customIronPick4.png and b/bin/assets/kitsumedievalcraft/textures/items/customIronPick4.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase0.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase0.png new file mode 100644 index 00000000..44c72129 Binary files /dev/null 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 new file mode 100644 index 00000000..6f71092d Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase1.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase10.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase10.png new file mode 100644 index 00000000..c969b2e1 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase10.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase11.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase11.png new file mode 100644 index 00000000..b1b0f5f1 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase11.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase12.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase12.png new file mode 100644 index 00000000..8c022db1 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase12.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase2.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase2.png new file mode 100644 index 00000000..df4b9bc7 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase2.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase3.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase3.png new file mode 100644 index 00000000..6a86afe3 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase3.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase4.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase4.png new file mode 100644 index 00000000..01d122ae Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase4.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase5.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase5.png new file mode 100644 index 00000000..cff84e79 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase5.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase6.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase6.png new file mode 100644 index 00000000..51eed467 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase6.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase7.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase7.png new file mode 100644 index 00000000..b94bcd4e Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase7.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase8.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase8.png new file mode 100644 index 00000000..e35ed6a5 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase8.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase9.png b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase9.png new file mode 100644 index 00000000..1a6a283d Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/items/customIronPickCase9.png differ diff --git a/bin/com/kitsu/medievalcraft/block/crucible/empty/TanWaterCrucible.class b/bin/com/kitsu/medievalcraft/block/crucible/empty/TanWaterCrucible.class index 31f2b2e4..94588a2b 100644 Binary files a/bin/com/kitsu/medievalcraft/block/crucible/empty/TanWaterCrucible.class and b/bin/com/kitsu/medievalcraft/block/crucible/empty/TanWaterCrucible.class differ diff --git a/bin/com/kitsu/medievalcraft/crafting/ForgeAnvilCrafting$4.class b/bin/com/kitsu/medievalcraft/crafting/ForgeAnvilCrafting$4.class index bc43d791..b31b0f76 100644 Binary files a/bin/com/kitsu/medievalcraft/crafting/ForgeAnvilCrafting$4.class and b/bin/com/kitsu/medievalcraft/crafting/ForgeAnvilCrafting$4.class differ diff --git a/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class b/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class index 47bb5d95..4ccac672 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 916986fa..03469574 100644 Binary files a/bin/com/kitsu/medievalcraft/item/ModItems.class and b/bin/com/kitsu/medievalcraft/item/ModItems.class differ diff --git a/build.gradle b/build.gradle index a74b8208..9d16731b 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,8 @@ buildscript { name = "sonatype" url = "https://oss.sonatype.org/content/repositories/snapshots/" } + + } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' @@ -35,7 +37,7 @@ dependencies { // real examples //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - + compile 'primalcore' // for more info... // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html // http://www.gradle.org/docs/current/userguide/dependency_management.html diff --git a/src/main/java/com/kitsu/medievalcraft/block/crucible/empty/TanWaterCrucible.java b/src/main/java/com/kitsu/medievalcraft/block/crucible/empty/TanWaterCrucible.java index a45d41ab..9dff69f0 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/crucible/empty/TanWaterCrucible.java +++ b/src/main/java/com/kitsu/medievalcraft/block/crucible/empty/TanWaterCrucible.java @@ -44,7 +44,7 @@ public class TanWaterCrucible extends BlockContainer { ItemStack tan = new ItemStack(ModItems.tanninBucket, 1); player.inventory.consumeInventoryItem(player.inventory.getStackInSlot(a).getItem()); player.inventory.addItemStackToInventory(tan); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.woodPulp, 2 + world.rand.nextInt(6))); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.woodPulp, 6 + world.rand.nextInt(4))); world.setBlock(x, y, z, ModBlocks.emptyCookedCrucible, 0, 2); player.inventoryContainer.detectAndSendChanges(); } diff --git a/src/main/java/com/kitsu/medievalcraft/crafting/ForgeAnvilCrafting.java b/src/main/java/com/kitsu/medievalcraft/crafting/ForgeAnvilCrafting.java index 75d93b7d..bb011c3a 100644 --- a/src/main/java/com/kitsu/medievalcraft/crafting/ForgeAnvilCrafting.java +++ b/src/main/java/com/kitsu/medievalcraft/crafting/ForgeAnvilCrafting.java @@ -68,7 +68,7 @@ public static final Hashtable itemToGive = new Hashtable toolToRepair = new Hashtable (){{ - put(0, "Forged Iron Pickaxe"); + put(0, "Forged Pickaxe"); put(1, "Forged Shovel"); put(2, "Forged Lumber Axe"); put(3, "Leather Shears"); diff --git a/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java b/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java index cd18515f..72add414 100644 --- a/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java +++ b/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java @@ -70,16 +70,8 @@ public final class ModCrafting { }}; - //ItemStack a = new ItemStack(Items.iron_pickaxe); - public static final void init() { - //GameRegistry.addRecipe(new ItemStack(ModBlocks.tutorialBlock), new Object[] {"##", "##", '#', ModItems.tutorialItem}); - //GameRegistry.addShapelessRecipe(new ItemStack(ModItems.tutorialItem), new Object[] {Items.redstone, new ItemStack(Items.dye, 1, 4)}); - //GameRegistry.addSmelting(Items.diamond, new ItemStack(ModItems.tutorialItem), 1.0F); - //GameRegistry.addRecipe(new ItemStack(Items.chainmail_boots), new Object[] {" ", " # ", " ", '#', Items.iron_ingot}); - //GameRegistry.addRecipe(new ItemStack(ModItems.longSword), new Object[]{"x", "x", "z", 'x', ModItems.ironBlade, 'z', Items.stick}); - GameRegistry.addRecipe(new ItemStack(Items.iron_horse_armor), new Object[] {"jjj", "lll", "www", 'j', Items.iron_ingot, 'l', ModItems.wovenLeather, 'w', Blocks.wool}); GameRegistry.addRecipe(new ItemStack(Items.golden_horse_armor), new Object[] {"jjj", "lll", "www", 'j', Items.gold_ingot, 'l', ModItems.wovenLeather, 'w', Blocks.wool}); GameRegistry.addRecipe(new ItemStack(ModItems.wovenLeather), new Object[] {"sss", "sss", "sss", 's', ModItems.leatherStrap}); @@ -349,83 +341,96 @@ public final class ModCrafting { for (int j = 0; j < rods.size(); j++) { //UNBREAKING 1 if ((i == 0 && j == 0)){ - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase0); 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 == 0 && j == 3)){ - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPickCase0); 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 //UNBREAKING 2 ((i == 0 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase1); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 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 //CUSTOMSTRONGIRONPICK - ((i == 1 && j == 0) || (i == 1 && j == 3)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customStrongIronPick); + ((i == 1 && j == 0)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase2); + enchantedSwitch.addEnchantment(Enchantment.unbreaking, 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 == 1 && j == 3)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase3); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 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 == 1 && j == 3)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleStrongIronPick); - enchantedSwitch.addEnchantment(Enchantment.unbreaking, 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 //UNBREAKING 3 ((i == 1 && j == 1)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customStrongIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase4); enchantedSwitch.addEnchantment(Enchantment.unbreaking, 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 //FORTUNE 1 ((i == 2 && j == 0)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase5); 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 == 2 && j == 3)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase6); 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 2 - ((i == 3 && j == 0) || (i == 2 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronPick); + ((i == 3 && j == 0)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase7); enchantedSwitch.addEnchantment(Enchantment.fortune, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', pickheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if - - ((i == 3 && j == 3) || (i == 2 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ((i == 2 && j == 2)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase8); + enchantedSwitch.addEnchantment(Enchantment.fortune, 2); + GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, + new Object[]{"a", "c", "b", 'a', pickheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); + } else if + + ((i == 3 && j == 3)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase9); + enchantedSwitch.addEnchantment(Enchantment.fortune, 2); + GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, + new Object[]{"a", "c", "b", 'a', pickheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); + } else if + ((i == 2 && j == 5)) { + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase10); enchantedSwitch.addEnchantment(Enchantment.fortune, 2); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', pickheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); } else if //FORTUNE 3 ((i == 3 && j == 2)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customWeakIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase11); enchantedSwitch.addEnchantment(Enchantment.fortune, 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 - + //FORTUNE 3 ((i == 3 && j == 5)) { - ItemStack enchantedSwitch = new ItemStack(ModItems.customHandleIronPick); + ItemStack enchantedSwitch = new ItemStack(ModItems.customIronPickCase12); enchantedSwitch.addEnchantment(Enchantment.fortune, 3); GameRegistry.addRecipe(new ShapedOreRecipe(enchantedSwitch, new Object[]{"a", "c", "b", 'a', pickheads.get(i), 'b', rods.get(j), Character.valueOf('c'), "strapLeather"})); diff --git a/src/main/java/com/kitsu/medievalcraft/item/ModItems.java b/src/main/java/com/kitsu/medievalcraft/item/ModItems.java index 9883f16b..4a76f79c 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/ModItems.java +++ b/src/main/java/com/kitsu/medievalcraft/item/ModItems.java @@ -167,6 +167,20 @@ public final class ModItems { public static Item customIronPick2; public static Item customIronPick3; public static Item customIronPick4; + public static Item customIronPickCase0; + public static Item customHandleIronPickCase0; + public static Item customIronPickCase1; + public static Item customIronPickCase2; + public static Item customIronPickCase3; + public static Item customIronPickCase4; + public static Item customIronPickCase5; + public static Item customIronPickCase6; + public static Item customIronPickCase7; + public static Item customIronPickCase8; + public static Item customIronPickCase9; + public static Item customIronPickCase10; + public static Item customIronPickCase11; + public static Item customIronPickCase12; public static Item customStrongIronPick; public static Item customWeakIronPick; @@ -760,33 +774,49 @@ public final class ModItems { GameRegistry.registerItem(heavyMace = new ItemHeavyMace("heavyMace", heavymacemat), "heavyMace"); GameRegistry.registerItem(battleAxe = new ItemBattleAxe("battleAxe", heavymacemat), "battleAxe"); - + //PICKAXES //Silk Touch GameRegistry.registerItem(customIronPick1 = new CustomIronPick("customIronPick1", customWoodWeak), "customIronPick1"); GameRegistry.registerItem(customIronPick2 = new CustomIronPick("customIronPick2", customWoodNormal), "customIronPick2"); GameRegistry.registerItem(customIronPick3 = new CustomIronPick("customIronPick3", customIronToolRodWeak), "customIronPick3"); GameRegistry.registerItem(customIronPick4 = new CustomIronPick("customIronPick4", customIronToolRodWeak), "customIronPick4"); + //Pickaxe Casetypes + GameRegistry.registerItem(customIronPickCase0 = new CustomIronPick("customIronPickCase0", customWoodNormal), "customIronPickCase0"); + GameRegistry.registerItem(customHandleIronPickCase0 = new CustomIronPick("customHandleIronPickCase0", customIronToolRodNormal), "customHandleIronPickCase0"); + GameRegistry.registerItem(customIronPickCase1 = new CustomIronPick("customIronPickCase1", customWoodNormal), "customIronPickCase1"); + GameRegistry.registerItem(customIronPickCase2 = new CustomIronPick("customIronPickCase2", customWoodNormal), "customIronPickCase2"); + GameRegistry.registerItem(customIronPickCase3 = new CustomIronPick("customIronPickCase3", customIronToolRodNormal), "customIronPickCase3"); + GameRegistry.registerItem(customIronPickCase4 = new CustomIronPick("customIronPickCase4", customWoodStrong), "customIronPickCase4"); + GameRegistry.registerItem(customIronPickCase5 = new CustomIronPick("customIronPickCase5", customWoodWeak), "customIronPickCase5"); + GameRegistry.registerItem(customIronPickCase6 = new CustomIronPick("customIronPickCase6", customIronToolRodWeak), "customIronPickCase6"); + GameRegistry.registerItem(customIronPickCase7 = new CustomIronPick("customIronPickCase7", customWoodWeak), "customIronPickCase7"); + GameRegistry.registerItem(customIronPickCase8 = new CustomIronPick("customIronPickCase8", customWoodWeak), "customIronPickCase8"); + GameRegistry.registerItem(customIronPickCase9 = new CustomIronPick("customIronPickCase9", customIronToolRodWeak), "customIronPickCase9"); + 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(customIronPick = new CustomIronPick("customIronPick", customWoodNormal), "customIronPick"); GameRegistry.registerItem(customStrongIronPick = new CustomIronPick("customStrongIronPick", customWoodStrong), "customStrongIronPick"); GameRegistry.registerItem(customWeakIronPick = new CustomIronPick("customWeakIronPick", customWoodWeak), "customWeakIronPick"); GameRegistry.registerItem(customHandleIronPick = new CustomIronPick("customHandleIronPick", customIronToolRodNormal), "customHandleIronPick"); GameRegistry.registerItem(customHandleStrongIronPick = new CustomIronPick("customHandleStrongIronPick", customIronToolRodStrong), "customHandleStrongIronPick"); + //SHOVELS //SilkTouch Numbers GameRegistry.registerItem(customIronShovel0 = new CustomIronShovel("customIronShovel0", customWoodWeak), "customIronShovel0"); GameRegistry.registerItem(customIronShovel1 = new CustomIronShovel("customIronShovel1", customIronToolRodWeak), "customIronShovel1"); GameRegistry.registerItem(customIronShovel2 = new CustomIronShovel("customIronShovel2", customWoodNormal), "customIronShovel2"); GameRegistry.registerItem(customIronShovel3 = new CustomIronShovel("customIronShovel3", customIronToolRodWeak), "customIronShovel3"); - - GameRegistry.registerItem(customIronShovel = new CustomIronShovel("customIronShovel", customWoodNormal), "customIronShovel"); GameRegistry.registerItem(customStrongIronShovel = new CustomIronShovel("customStrongIronShovel", customWoodStrong), "customStrongIronShovel"); GameRegistry.registerItem(customWeakIronShovel = new CustomIronShovel("customWeakIronShovel", customWoodWeak), "customWeakIronShovel"); GameRegistry.registerItem(customHandleIronShovel = new CustomIronShovel("customHandleIronShovel", customIronToolRodNormal), "customHandleIronShovel"); GameRegistry.registerItem(customHandleStrongIronShovel = new CustomIronShovel("customHandleStrongIronShovel", customIronToolRodStrong), "customHandleStrongIronShovel"); + //LUMBERAXE //Silk Touch GameRegistry.registerItem(customIronLumberAxe0 = new CustomIronLumberAxe("customIronLumberAxe0", customWoodWeak), "customIronLumberAxe0"); GameRegistry.registerItem(customIronLumberAxe1 = new CustomIronLumberAxe("customIronLumberAxe1", customWoodNormal), "customIronLumberAxe1"); diff --git a/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang b/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang index da5ce5b4..74660ba4 100644 --- a/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang +++ b/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang @@ -90,13 +90,6 @@ item.ironSharpTipForm.name=Iron Sharp Tip Form item.ironRingForm.name=Iron Ring Form item.ironHandleForm.name=Iron Handle Form -item.customIronPick.name=Forged Pickaxe -item.customStrongIronPick.name=Forged Pickaxe -item.customWeakIronPick.name=Forged Pickaxe -item.customHandleStrongIronPick.name=Forged Pickaxe -item.customHandleIronPick.name=Forged Pickaxe -item.customIronHoe.name=Forged Hoe - item.silkTouchIronHead.name=Emerald Tipped Pickaxe Head item.unbreakingOneHead.name=Diamond Tip Pickaxe Head item.unbreakingTwoHead.name=Diamond Tipped Pickaxe Head @@ -132,11 +125,48 @@ item.unbreakingWoodRod.name=Diamond Inlayed Wood Handle item.fortuneIronRod.name=Lapis Inlayed Iron Handle item.efficIronRod.name=Redstone Inlayed Iron Handle +item.customIronPick.name=Forged Pickaxe +item.customStrongIronPick.name=Forged Pickaxe +item.customWeakIronPick.name=Forged Pickaxe +item.customHandleStrongIronPick.name=Forged Pickaxe +item.customHandleIronPick.name=Forged Pickaxe +item.customIronHoe.name=Forged Hoe +item.customIronPick1.name=Forged Pickaxe +item.customIronPick2.name=Forged Pickaxe +item.customIronPick3.name=Forged Pickaxe +item.customIronPick4.name=Forged Pickaxe +item.customIronPickCase0.name=Forged Pickaxe +item.customHandleIronPickCase0.name=Forged Pickaxe +item.customIronPickCase1.name=Forged Pickaxe +item.customIronPickCase2.name=Forged Pickaxe +item.customIronPickCase3.name=Forged Pickaxe +item.customIronPickCase4.name=Forged Pickaxe +item.customIronPickCase5.name=Forged Pickaxe +item.customIronPickCase6.name=Forged Pickaxe +item.customIronPickCase7.name=Forged Pickaxe +item.customIronPickCase8.name=Forged Pickaxe +item.customIronPickCase9.name=Forged Pickaxe +item.customIronPickCase10.name=Forged Pickaxe +item.customIronPickCase11.name=Forged Pickaxe +item.customIronPickCase12.name=Forged Pickaxe + +item.customIronLumberAxe0.name=Forged Lumber Axe +item.customIronLumberAxe1.name=Forged Lumber Axe +item.customIronLumberAxe2.name=Forged Lumber Axe +item.customIronLumberAxe3.name=Forged Lumber Axe + item.customIronLumberAxe.name=Forged Lumber Axe item.customStrongIronLumberAxe.name=Forged Lumber Axe item.customWeakIronLumberAxe.name=Forged Lumber Axe item.customHandleIronLumberAxe.name=Forged Lumber Axe item.customHandleStrongIronLumberAxe.name=Forged Lumber Axe + + +item.customIronShovel0.name=Forged Shovel +item.customIronShovel1.name=Forged Shovel +item.customIronShovel2.name=Forged Shovel +item.customIronShovel3.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/customHandleIronPickCase0.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customHandleIronPickCase0.png new file mode 100644 index 00000000..e0846137 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customHandleIronPickCase0.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick1.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick1.png index 0d751d52..1f627dd9 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick1.png and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick1.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick2.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick2.png index 19380c2f..dc6a9690 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick2.png and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick2.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick3.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick3.png index 771b2e13..da4f645a 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick3.png and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick3.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick4.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick4.png index efdd6a5c..64a0b19a 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick4.png and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPick4.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase0.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase0.png new file mode 100644 index 00000000..44c72129 Binary files /dev/null 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 new file mode 100644 index 00000000..6f71092d Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase1.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase10.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase10.png new file mode 100644 index 00000000..c969b2e1 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase10.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase11.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase11.png new file mode 100644 index 00000000..b1b0f5f1 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase11.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase12.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase12.png new file mode 100644 index 00000000..8c022db1 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase12.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase2.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase2.png new file mode 100644 index 00000000..df4b9bc7 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase2.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase3.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase3.png new file mode 100644 index 00000000..6a86afe3 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase3.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase4.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase4.png new file mode 100644 index 00000000..01d122ae Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase4.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase5.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase5.png new file mode 100644 index 00000000..cff84e79 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase5.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase6.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase6.png new file mode 100644 index 00000000..51eed467 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase6.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase7.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase7.png new file mode 100644 index 00000000..b94bcd4e Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase7.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase8.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase8.png new file mode 100644 index 00000000..e35ed6a5 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase8.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase9.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase9.png new file mode 100644 index 00000000..1a6a283d Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/items/customIronPickCase9.png differ