diff --git a/kfc/gradle.properties b/kfc/gradle.properties index 97a7a017..b205ed37 100644 --- a/kfc/gradle.properties +++ b/kfc/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.4.02 +mod_version=1.4.03 forge_version=14.23.0.2517 mcp_mappings=snapshot_20171003 mc_version=1.12.2 diff --git a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java index fd336672..29bd07f4 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -17,7 +17,7 @@ public class ModInfo { public static final String MOD_CONFIG = "primal/" + MOD_ID; //public static final String MOD_PREFIX = MOD_ID + ":"; public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "1.4.02"; + public static final String MOD_VERSION = "1.4.03"; public static final String MC_VERSIONS = "[1.12.0, 1.13.0)"; public static final String DEPENDENCIES = "required-after:forge@[14.21.1.2400,);" + "required-after:primal@[0.6.0,);"; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeAxe.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeAxe.java index 4c29efc7..6049b45a 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeAxe.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeAxe.java @@ -127,8 +127,10 @@ public class BronzeAxe extends ItemAxe implements ToolNBT { setLapisLevel(item, 0); setModifiers(item, 0); } + //this.setDamage(item, this.getMaxDamage(item) -2); if( this.getMaxDamage(item) - this.getDamage(item) <= 1 ){ - PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.bronzeaxehead, 1)); + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokenbronzetool, 1)); + ((EntityPlayer) player).inventory.deleteStack(item); } } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeHoe.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeHoe.java index a4dde0b7..fbd89e9f 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeHoe.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeHoe.java @@ -130,7 +130,8 @@ public class BronzeHoe extends ItemHoe implements ToolNBT { } if( this.getMaxDamage(item) - this.getDamage(item) <= 1 ){ - PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.bronzehoehead, 1)); + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokenbronzetool, 1)); + ((EntityPlayer) player).inventory.deleteStack(item); } } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzePickaxe.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzePickaxe.java index 4e1fbde3..615ef331 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzePickaxe.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzePickaxe.java @@ -131,7 +131,8 @@ public class BronzePickaxe extends ItemPickaxe implements ToolNBT{ } if( this.getMaxDamage(item) - this.getDamage(item) <= 1 ){ - PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.bronzepickaxehead, 1)); + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokenbronzetool, 1)); + ((EntityPlayer) player).inventory.deleteStack(item); } } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeShovel.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeShovel.java index 3cbdda23..a8d16f74 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeShovel.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeShovel.java @@ -133,7 +133,8 @@ Item drop; } if( this.getMaxDamage(item) - this.getDamage(item) <= 1 ){ - PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.bronzeshovelhead, 1)); + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokenbronzetool, 1)); + ((EntityPlayer) player).inventory.deleteStack(item); } } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java index eca3b6dd..9b59eb7f 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java @@ -18,8 +18,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.util.ToolNBT; import javax.annotation.Nullable; @@ -269,6 +271,20 @@ public class CustomAxe extends ItemAxe implements ToolNBT { setLapisLevel(item, 0); setModifiers(item, 0); } + + if( this.getMaxDamage(item) - this.getDamage(item) <= 1 ){ + + if(this.toolMaterial == PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON){ + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokenwroughtirontool, 1)); + } + if(this.toolMaterial == PrimalAPI.ToolMaterials.TOOL_CLEAN_IRON){ + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokencleanirontool, 1)); + } + if(this.toolMaterial == PrimalAPI.ToolMaterials.TOOL_BASIC_STEEL){ + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokensteeltool, 1)); + } + ((EntityPlayer) player).inventory.deleteStack(item); + } } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomHoe.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomHoe.java index 19361fad..965eaa49 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomHoe.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomHoe.java @@ -19,8 +19,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.util.ToolNBT; import javax.annotation.Nullable; @@ -266,6 +268,21 @@ public class CustomHoe extends ItemHoe implements ToolNBT { setModifiers(item, 0); } + + if( this.getMaxDamage(item) - this.getDamage(item) <= 1 ){ + + if(this.toolMaterial == PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON){ + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokenwroughtirontool, 1)); + } + if(this.toolMaterial == PrimalAPI.ToolMaterials.TOOL_CLEAN_IRON){ + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokencleanirontool, 1)); + } + if(this.toolMaterial == PrimalAPI.ToolMaterials.TOOL_BASIC_STEEL){ + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokensteeltool, 1)); + } + ((EntityPlayer) player).inventory.deleteStack(item); + } + } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java index 069cf354..3c4c16cd 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java @@ -18,8 +18,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.util.ToolNBT; import javax.annotation.Nullable; @@ -269,6 +271,22 @@ public class CustomPickaxe extends ItemPickaxe implements ToolNBT{ setModifiers(item, 0); } + + //this.setDamage(item, this.getMaxDamage(item) -2); + if( this.getMaxDamage(item) - this.getDamage(item) <= 1 ){ + + if(this.toolMaterial == PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON){ + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokenwroughtirontool, 1)); + } + if(this.toolMaterial == PrimalAPI.ToolMaterials.TOOL_CLEAN_IRON){ + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokencleanirontool, 1)); + } + if(this.toolMaterial == PrimalAPI.ToolMaterials.TOOL_BASIC_STEEL){ + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokensteeltool, 1)); + } + ((EntityPlayer) player).inventory.deleteStack(item); + } + } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java index 5f1b0d01..c38d9516 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java @@ -20,8 +20,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.util.ToolNBT; import javax.annotation.Nullable; @@ -269,6 +271,22 @@ public class CustomShovel extends ItemSpade implements ToolNBT { setModifiers(item, 0); } + + + if( this.getMaxDamage(item) - this.getDamage(item) <= 1 ){ + + if(this.toolMaterial == PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON){ + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokenwroughtirontool, 1)); + } + if(this.toolMaterial == PrimalAPI.ToolMaterials.TOOL_CLEAN_IRON){ + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokencleanirontool, 1)); + } + if(this.toolMaterial == PrimalAPI.ToolMaterials.TOOL_BASIC_STEEL){ + PlayerHelper.spawnItemOnPlayer(world, (EntityPlayer) player, new ItemStack(ModItems.brokensteeltool, 1)); + } + ((EntityPlayer) player).inventory.deleteStack(item); + } + } } diff --git a/kfc/src/main/resources/assets/forgecraft/lang/en_us.lang b/kfc/src/main/resources/assets/forgecraft/lang/en_us.lang index ef11f7d5..ecb62089 100644 --- a/kfc/src/main/resources/assets/forgecraft/lang/en_us.lang +++ b/kfc/src/main/resources/assets/forgecraft/lang/en_us.lang @@ -86,6 +86,12 @@ tile.steelchunk.name=Steel Chunk tile.wootzball.name=Damascus Steel Ingot tile.wootzchunk.name=Damascus Steel Chunk +item.brokenbronzetool.name=Broken Bronze Tool +item.brokenwroughtirontool.name=Broken Wrought Iron Tool +item.brokencleanirontool.name=Broken Clean Iron Tool +item.brokensteeltool.name=Broken Steel Tool +item.brokenwootztool.name=Broken Damascus Tool + item.unstrunglongbow.name=Unstrung Longbow item.longbow.name=Longbow item.rawlongbow.name=Raw Longbow diff --git a/kfc/src/main/resources/mcmod.info b/kfc/src/main/resources/mcmod.info index 226b8ef8..6f867f4d 100644 --- a/kfc/src/main/resources/mcmod.info +++ b/kfc/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ "modid": "forgecraft", "name": "Kitsu's Forgecraft", "description": "Forged with sweat and blood", - "version": "1.4.02", + "version": "1.4.03", "mcversion": "1.12.1", "url": "", "updateUrl": "",