Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-06-09 00:41:36 +02:00
Code Issues Projects Releases Wiki Activity

Closes #816 and #819 (#838)

Browse source 
Align lamps properly with docs
Make light updates smoother as well, and use a better access to the needed blockstate.
This commit is contained in:
Brennan Ward 2017-07-08 05:04:57 -04:00 committed by Ellpeck
parent 0787f6eb6c
commit 9698d345a2
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java
View file

@ -68,10 +68,9 @@ public class BlockColoredLamp extends BlockBase{
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ){ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ){
ItemStack stack = player.getHeldItem(hand); ItemStack stack = player.getHeldItem(hand);
//Turning On //Turning On
if(player.isSneaking()){ if(stack.isEmpty() && player.isSneaking()){
if(!world.isRemote){ world.setBlockState(pos, (this.isOn ? InitBlocks.blockColoredLamp : InitBlocks.blockColoredLampOn).getDefaultState().withProperty(TYPE, state.getValue(TYPE)), 2);
world.setBlockState(pos, (this.isOn ? InitBlocks.blockColoredLamp : InitBlocks.blockColoredLampOn).getStateFromMeta(this.getMetaFromState(state)), 2); world.notifyLightSet(pos);
}
return true; return true;
} }
@ -96,13 +95,12 @@ public class BlockColoredLamp extends BlockBase{
} }
} }
} }
return false; return false;
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubBlocks(CreativeTabs tab, NonNullList list){ public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list){
for(int j = 0; j < ALL_LAMP_TYPES.length; j++){ for(int j = 0; j < ALL_LAMP_TYPES.length; j++){
list.add(new ItemStack(this, 1, j)); list.add(new ItemStack(this, 1, j));
} }
@ -168,4 +166,4 @@ public class BlockColoredLamp extends BlockBase{
return InitBlocks.blockColoredLamp.getUnlocalizedName()+"_"+ALL_LAMP_TYPES[stack.getItemDamage()].regName; return InitBlocks.blockColoredLamp.getUnlocalizedName()+"_"+ALL_LAMP_TYPES[stack.getItemDamage()].regName;
} }
} }
} }