nmd/ForgeCraft
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master-1.12' into feature-1.12

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2018-10-18 20:01:05 -04:00
parent b7f3d04929 0e785eff57
commit b390ac48be
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kfc/gradle.properties
View File

@@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx3G
mod_group=nmd.primal.forgecraft mod_group=nmd.primal.forgecraft
mod_name=ForgeCraft mod_name=ForgeCraft
mod_version=1.6.28 mod_version=1.6.29
forge_version=14.23.4.2765 forge_version=14.23.4.2765
mcp_mappings=snapshot_20171003 mcp_mappings=snapshot_20171003
mc_version=1.12.2 mc_version=1.12.2

2
kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java
View File

@@ -22,7 +22,7 @@ public class ModInfo {
//public static final String MOD_PREFIX = MOD_ID + ":"; //public static final String MOD_PREFIX = MOD_ID + ":";
public static final String MOD_CHANNEL = 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 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,);"; public static final String DEPENDENCIES = "required-after:forge@[14.21.1.2400,);" + "required-after:primal@[0.6.69,);";

6
kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java
View File

@@ -402,12 +402,10 @@ public class Chisel extends CustomFacing implements ToolMaterialMap {
private void doMoving(World world, BlockPos pos, int toolHarvestLevel, IBlockState state, EnumFacing facing){ private void doMoving(World world, BlockPos pos, int toolHarvestLevel, IBlockState state, EnumFacing facing){
if( (world.getBlockState(pos.offset(facing, 2)).getBlock() != Blocks.AIR) ) { 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)) { (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.setBlockState(pos.offset(facing, 1), state.withProperty(FACING, state.getValue(FACING)).withProperty(PrimalAPI.States.ACTIVE, Boolean.valueOf(false)), 2);
world.setBlockToAir(pos); world.setBlockToAir(pos);
//}
} }
} else { } else {
world.destroyBlock(pos, true); world.destroyBlock(pos, true);
@@ -435,7 +433,7 @@ public class Chisel extends CustomFacing implements ToolMaterialMap {
} }
private boolean compareHarvestLevel(int inputLevel, int compareHarvest){ private boolean compareHarvestLevel(int inputLevel, int compareHarvest){
if(inputLevel >= compareHarvest && compareHarvest > 0){ if(inputLevel >= compareHarvest && inputLevel >=0){
return true; return true;
} else return false; } else return false;
} }

2
kfc/src/main/resources/mcmod.info
View File

@@ -2,7 +2,7 @@
"modid": "forgecraft", "modid": "forgecraft",
"name": "Kitsu's Forgecraft", "name": "Kitsu's Forgecraft",
"description": "Forged with sweat and blood", "description": "Forged with sweat and blood",
"version": "1.6.28", "version": "1.6.29",
"mcversion": "1.12.2", "mcversion": "1.12.2",
"url": "", "url": "",
"updateUrl": "", "updateUrl": "",