Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/origin/master' into WIP

Browse source
This commit is contained in:
Mathijs Riezebos 2017-01-12 12:44:49 +01:00
commit ba6bf6be5a
1 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/com/zixiken/dimdoors/blocks/BlockDimWall.java
View file

@ -13,6 +13,7 @@ import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -21,6 +22,7 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.Explosion; import net.minecraft.world.Explosion;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
@ -52,6 +54,12 @@ public class BlockDimWall extends Block {
else return getDefaultState(); else return getDefaultState();
} }
@Override
public boolean isReplaceable(IBlockAccess world, BlockPos pos) {
if(world.getBlockState(pos).getValue(TYPE) == 1) return false;
return true;
}
@Override @Override
public int getMetaFromState(IBlockState state) {return state.getValue(TYPE);} public int getMetaFromState(IBlockState state) {return state.getValue(TYPE);}
@ -101,23 +109,4 @@ public class BlockDimWall extends Block {
{ {
return 0; return 0;
} }
/**
* replaces the block clicked with the held block, instead of placing the block on top of it. Shift click to disable.
*/
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, @Nullable ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
//Check if the metadata value is 0 -- we don't want the user to replace Ancient Fabric
if (heldItem != null && state.getValue(TYPE) != 1) {
Block block = Block.getBlockFromItem(heldItem.getItem());
if (!state.isNormalCube() || block instanceof BlockContainer || block == this)
return false;
if (!world.isRemote) {
if (!player.capabilities.isCreativeMode) heldItem.stackSize--;
world.setBlockState(pos, state);
}
return true;
}
return false;
}
} }