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

matched code in a class to avoid future merge conflict

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2018-08-19 17:41:11 -04:00
parent 04a1a50f08
commit ba55b234b6
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kfc/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java
View File

@@ -48,13 +48,10 @@ public interface BreakerHandler {
for (int i=0; i < EnumFacing.HORIZONTALS.length; i++) { for (int i=0; i < EnumFacing.HORIZONTALS.length; i++) {
EnumFacing face = world.getBlockState(pos).getValue(CustomContainerFacing.FACING); EnumFacing face = world.getBlockState(pos).getValue(CustomContainerFacing.FACING);
if(face.equals(world.getBlockState(pos).getValue(CustomContainerFacing.FACING))){ if(face.equals(world.getBlockState(pos).getValue(CustomContainerFacing.FACING))){
Block smashBlock = world.getBlockState(pos.offset(face)).getBlock(); //Block smashBlock = world.getBlockState(pos.offset(face)).getBlock();
IBlockState smashState = world.getBlockState(pos.offset(face)); IBlockState smashState = world.getBlockState(pos.offset(face));
//Block smashBlock = world.getBlockState(pos).getBlock();
ItemStack smashStack = NBTHelper.getStackBlockNBT(world, pos, state, new ItemStack(Item.getItemFromBlock(smashBlock), 1, smashBlock.damageDropped(state)));
if(!smashState.getBlock().equals(Blocks.AIR)) { if(!smashState.getBlock().equals(Blocks.AIR)) {
ItemStack smashStack = new ItemStack(Item.getItemFromBlock(smashState.getBlock()), 1, smashState.getBlock().getMetaFromState(smashState));
for (GallagherRecipe recipe : GallagherRecipe.RECIPES) { for (GallagherRecipe recipe : GallagherRecipe.RECIPES) {
if (recipe.match(smashState)) { if (recipe.match(smashState)) {