lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finished adding the standard blocks and localized them - pillars are next

Browse source
This commit is contained in:
WayofTime 2016-09-04 18:09:04 -04:00
parent d52240813e
commit 1286efbca7
10 changed files with 285 additions and 33 deletions
src/main/java/WayofTime/bloodmagic/block/base
BlockStringPillar.java

32
src/main/java/WayofTime/bloodmagic/block/base/BlockStringPillar.java
View file

@ -6,11 +6,9 @@ import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.Rotation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@ -29,16 +27,6 @@ public class BlockStringPillar extends BlockString
this(material, values, "type");
}
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
{
// System.out.println(state);
return false;
}
/**
* Convert the given metadata into a BlockState for this Block
*/
@Override
public IBlockState getStateFromMeta(int meta)
{
@ -60,8 +48,6 @@ public class BlockStringPillar extends BlockString
break;
}
// System.out.println(iblockstate);
return iblockstate;
}
@ -70,18 +56,16 @@ public class BlockStringPillar extends BlockString
public int getMetaFromState(IBlockState state)
{
int i = 0;
i = i | this.getValues().indexOf(String.valueOf(state.getValue(this.getStringProp())));
i = this.getValues().indexOf(String.valueOf(state.getValue(this.getStringProp())));
switch ((EnumFacing.Axis) state.getValue(BlockRotatedPillar.AXIS))
{
case X:
i |= 4;
i = i + 4;
break;
case Z:
i |= 8;
i = i + 8;
break;
// case NONE:
// i |= 12;
}
return i;
@ -90,8 +74,8 @@ public class BlockStringPillar extends BlockString
@Override
public boolean rotateBlock(net.minecraft.world.World world, BlockPos pos, EnumFacing axis)
{
net.minecraft.block.state.IBlockState state = world.getBlockState(pos);
for (net.minecraft.block.properties.IProperty<?> prop : state.getProperties().keySet())
IBlockState state = world.getBlockState(pos);
for (IProperty<?> prop : state.getProperties().keySet())
{
if (prop == BlockRotatedPillar.AXIS)
{
@ -153,4 +137,10 @@ public class BlockStringPillar extends BlockString
{
return super.onBlockPlaced(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer).withProperty(BlockRotatedPillar.AXIS, facing.getAxis());
}
@Override
public int damageDropped(IBlockState state)
{
return this.getValues().indexOf(String.valueOf(state.getValue(this.getStringProp())));
}
}