cancel

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();
 				}

src/main/java/com/kitsu/medievalcraft/crafting/ForgeAnvilCrafting.java

@@ -68,7 +68,7 @@ public static final Hashtable<Integer, ItemStack> itemToGive = new Hashtable <In
 	
 	public static final Hashtable<Integer, String> toolToRepair = new Hashtable <Integer, String>(){{
 
-		put(0, "Forged Iron Pickaxe");
+		put(0, "Forged Pickaxe");
 		put(1, "Forged Shovel");
 		put(2, "Forged Lumber Axe");
 		put(3, "Leather Shears");

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

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

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