From 0e785eff573f33ac04276cc4a84a5586e82ef890 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Thu, 18 Oct 2018 20:00:00 -0400 Subject: [PATCH] bugfix for chisel --- kfc/gradle.properties | 2 +- kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java | 2 +- kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java | 6 ++---- kfc/src/main/resources/mcmod.info | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/kfc/gradle.properties b/kfc/gradle.properties index 830698d2..a6f9570e 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.6.28 +mod_version=1.6.29 forge_version=14.23.4.2765 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 ddc5763c..50a62617 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -22,7 +22,7 @@ public class ModInfo { //public static final String MOD_PREFIX = MOD_ID + ":"; public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "1.6.28"; + public static final String MOD_VERSION = "1.6.29"; 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.69,);"; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java index 7908da40..122f45d8 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java @@ -402,12 +402,10 @@ public class Chisel extends CustomFacing implements ToolMaterialMap { private void doMoving(World world, BlockPos pos, int toolHarvestLevel, IBlockState state, EnumFacing facing){ if( (world.getBlockState(pos.offset(facing, 2)).getBlock() != Blocks.AIR) ) { - if ((compareHarvestLevel(toolHarvestLevel, world.getBlockState(pos.offset(facing, 1)).getBlock().getHarvestLevel(world.getBlockState(pos.offset(facing, 1))))) || + if ((compareHarvestLevel(toolHarvestLevel, world.getBlockState(pos.offset(facing, 1)).getBlock().getHarvestLevel(world.getBlockState(pos.offset(facing, 1))))) && (world.getBlockState(pos.offset(facing, 1)).getBlock() == Blocks.AIR)) { - //if(state.getBlock().getBlockHardness(state, world, pos.offset(facing, 1)) > 0) { world.setBlockState(pos.offset(facing, 1), state.withProperty(FACING, state.getValue(FACING)).withProperty(PrimalAPI.States.ACTIVE, Boolean.valueOf(false)), 2); world.setBlockToAir(pos); - //} } } else { world.destroyBlock(pos, true); @@ -435,7 +433,7 @@ public class Chisel extends CustomFacing implements ToolMaterialMap { } private boolean compareHarvestLevel(int inputLevel, int compareHarvest){ - if(inputLevel >= compareHarvest && compareHarvest > 0){ + if(inputLevel >= compareHarvest && inputLevel >=0){ return true; } else return false; } diff --git a/kfc/src/main/resources/mcmod.info b/kfc/src/main/resources/mcmod.info index 2d6352ac..c7cb570d 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.6.28", + "version": "1.6.29", "mcversion": "1.12.2", "url": "", "updateUrl": "",