From bd6f01c2448a527db2808bf9aaa2638a3bf43f17 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Fri, 21 Sep 2018 11:03:10 -0400 Subject: [PATCH] working on copper tools and weapons / weapon upgrades --- .../main/java/nmd/primal/forgecraft/init/ModItems.java | 8 ++++---- .../primal/forgecraft/init/recipes/CauldronRecipes.java | 3 ++- .../nmd/primal/forgecraft/items/weapons/CustomSword.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 5375823e..36889de9 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -34,7 +34,7 @@ public class ModItems { public static Item softcrucible; //public static Item stonetongs; public static Item castingmud; - public static Item rawbronzegladius; + //public static Item rawbronzegladius; public static Item bronzeingotball; public static Item bronzechunk; @@ -210,7 +210,7 @@ public class ModItems { /********** WEAPONS **********/ - rawbronzegladius = new Item().setRegistryName("rawbronzegladius").setUnlocalizedName("rawbronzegladius"); + //rawbronzegladius = new Item().setRegistryName("rawbronzegladius").setUnlocalizedName("rawbronzegladius"); bronzegladius = new CustomSword("bronzegladius", PrimalAPI.ToolMaterials.TOOL_BRONZE, 5.5D, 2D); wroughtirongladius = new CustomSword("wroughtirongladius", PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON, 4.5D, -1.85D); @@ -344,7 +344,7 @@ public class ModItems { /********** WEAPONS **********/ - ForgeRegistries.ITEMS.register(rawbronzegladius); + //ForgeRegistries.ITEMS.register(rawbronzegladius); ForgeRegistries.ITEMS.register(wroughtirongladius); ForgeRegistries.ITEMS.register(bronzegladius); @@ -467,7 +467,7 @@ public class ModItems { **********/ registerRender(wroughtironshield); - registerRender(rawbronzegladius); + //registerRender(rawbronzegladius); registerRender(bronzegladius); registerRender(wroughtirongladius); diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/CauldronRecipes.java b/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/CauldronRecipes.java index 530ac108..c9abae0d 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/CauldronRecipes.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/CauldronRecipes.java @@ -42,7 +42,7 @@ public class CauldronRecipes - +/* recipes.register(new CauldronRecipe( 5, FluidRegistry.getFluidStack("water", 1000), @@ -54,5 +54,6 @@ public class CauldronRecipes lapisBronze, ItemStack.EMPTY).setRecipeName("finishedGladius") ); + */ } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/CustomSword.java b/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/CustomSword.java index 98a420fc..0c6750c4 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/CustomSword.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/CustomSword.java @@ -85,7 +85,7 @@ public class CustomSword extends ItemSword { //tooltip.add(ChatFormatting.GRAY + "Damage: " + item.getItemDamage() ); if(item.hasTagCompound()) { - tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " ); + tooltip.add(ChatFormatting.GRAY + "Upgrades: " ); tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); } }