Anvilcraft/aether-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Added log axis property

Browse source
This commit is contained in:
Kino 2017-02-20 23:03:40 -05:00
parent b8c756bcc6
commit 71b97fc930
6 changed files with 109 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/legacy/aether/client/renders/blocks/BlockRendering.java
View file

@ -111,7 +111,7 @@ public class BlockRendering
register(BlocksAether.holiday_leaves, meta, EnumHolidayType.getType(meta).getName());
}
for (int meta = 0; meta < EnumLogType.values().length + 2; ++meta)
for (int meta = 0; meta < 16; ++meta)
{
register(BlocksAether.aether_log, meta, EnumLogType.getType(meta).getName());
}

69
src/main/java/com/legacy/aether/server/blocks/natural/BlockAetherLog.java
View file

@ -45,19 +45,36 @@ public class BlockAetherLog extends BlockLog implements IAetherMeta
public static final PropertyBool double_drop = PropertyBool.create(Aether.doubleDropNotifier());
public BlockAetherLog()
public BlockAetherLog()
{
super();
this.setHardness(2.0F);
this.setSoundType(SoundType.WOOD);
this.setCreativeTab(AetherCreativeTabs.blocks);
this.setDefaultState(this.getDefaultState().withProperty(wood_type, EnumLogType.Skyroot).withProperty(double_drop, Boolean.TRUE));
this.setDefaultState(this.getDefaultState().withProperty(wood_type, EnumLogType.Skyroot).withProperty(double_drop, Boolean.TRUE).withProperty(LOG_AXIS, BlockLog.EnumAxis.Y));
}
@Override
public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
{
return this.getStateFromMeta(meta).withProperty(wood_type, EnumLogType.getType(meta)).withProperty(double_drop, Boolean.FALSE);
return this.getStateFromMeta(meta).withProperty(wood_type, EnumLogType.getType(meta)).withProperty(double_drop, Boolean.FALSE).withProperty(LOG_AXIS, BlockLog.EnumAxis.fromFacingAxis(facing.getAxis()));
}
@Override
public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
{
if (worldIn.isAreaLoaded(pos.add(-5, -5, -5), pos.add(5, 5, 5)))
{
for (BlockPos blockpos : BlockPos.getAllInBox(pos.add(-4, -4, -4), pos.add(4, 4, 4)))
{
IBlockState iblockstate = worldIn.getBlockState(blockpos);
if (iblockstate.getBlock().isLeaves(iblockstate, worldIn, blockpos))
{
iblockstate.getBlock().beginLeavesDecay(iblockstate, worldIn, blockpos);
}
}
}
}
@Override
@ -97,12 +114,6 @@ public class BlockAetherLog extends BlockLog implements IAetherMeta
}
}
@Override
public IBlockState withRotation(IBlockState state, Rotation rot)
{
return state;
}
@Override
public String getMetaName(ItemStack stack)
{
@ -117,17 +128,33 @@ public class BlockAetherLog extends BlockLog implements IAetherMeta
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
public void getSubBlocks(Item itemIn, CreativeTabs tab, List<ItemStack> list)
{
list.add(new ItemStack(this, 1, 0));
list.add(new ItemStack(this, 1, 2));
list.add(new ItemStack(this, 1, 1));
}
@Override
public IBlockState getStateFromMeta(int meta)
{
return this.getDefaultState().withProperty(wood_type, EnumLogType.getType(meta)).withProperty(double_drop, Boolean.valueOf((meta % 2) == 0));
IBlockState iblockstate = this.getDefaultState().withProperty(wood_type, EnumLogType.getType(meta)).withProperty(double_drop, Boolean.valueOf((meta % 4) < 2));
switch (meta & 12)
{
case 0:
iblockstate = iblockstate.withProperty(LOG_AXIS, BlockLog.EnumAxis.Y);
break;
case 4:
iblockstate = iblockstate.withProperty(LOG_AXIS, BlockLog.EnumAxis.X);
break;
case 8:
iblockstate = iblockstate.withProperty(LOG_AXIS, BlockLog.EnumAxis.Z);
break;
default:
iblockstate = iblockstate.withProperty(LOG_AXIS, BlockLog.EnumAxis.NONE);
}
return iblockstate;
}
@Override
@ -141,6 +168,20 @@ public class BlockAetherLog extends BlockLog implements IAetherMeta
meta |= 2;
}
switch ((BlockLog.EnumAxis)state.getValue(LOG_AXIS))
{
case Y:
break;
case X:
meta |= 4;
break;
case Z:
meta |= 8;
break;
case NONE:
meta |= 12;
}
return meta;
}
@ -153,7 +194,7 @@ public class BlockAetherLog extends BlockLog implements IAetherMeta
@Override
protected BlockStateContainer createBlockState()
{
return new BlockStateContainer(this, new IProperty[] {wood_type, double_drop});
return new BlockStateContainer(this, new IProperty[] {wood_type, double_drop, LOG_AXIS});
}
}

2
src/main/java/com/legacy/aether/server/blocks/util/EnumLogType.java
View file

@ -19,7 +19,7 @@ public enum EnumLogType implements IStringSerializable
public static EnumLogType getType(int meta)
{
return meta == 0 || meta == 1 ? Skyroot : Oak;
return (meta % 2) == 0 ? Skyroot : Oak;
}
public int getMeta()

44
src/main/resources/assets/aether_legacy/blockstates/aether_log.json
View file

@ -1,16 +1,52 @@
{
"variants": {
"aether_legacy_double_drops=true,aether_logs=golden_oak_log": {
"aether_legacy_double_drops=true,aether_logs=golden_oak_log,axis=x": {
"model": "aether_legacy:golden_oak_log", "x": 90, "y": 90
},
"aether_legacy_double_drops=true,aether_logs=golden_oak_log,axis=y": {
"model": "aether_legacy:golden_oak_log"
},
"aether_legacy_double_drops=false,aether_logs=golden_oak_log": {
"aether_legacy_double_drops=true,aether_logs=golden_oak_log,axis=z": {
"model": "aether_legacy:golden_oak_log", "x": 90
},
"aether_legacy_double_drops=true,aether_logs=golden_oak_log,axis=none": {
"model": "aether_legacy:golden_oak_log_bark"
},
"aether_legacy_double_drops=false,aether_logs=golden_oak_log,axis=x": {
"model": "aether_legacy:golden_oak_log", "x": 90, "y": 90
},
"aether_legacy_double_drops=false,aether_logs=golden_oak_log,axis=y": {
"model": "aether_legacy:golden_oak_log"
},
"aether_legacy_double_drops=true,aether_logs=skyroot_log": {
"aether_legacy_double_drops=false,aether_logs=golden_oak_log,axis=z": {
"model": "aether_legacy:golden_oak_log", "x": 90
},
"aether_legacy_double_drops=false,aether_logs=golden_oak_log,axis=none": {
"model": "aether_legacy:golden_oak_log_bark"
},
"aether_legacy_double_drops=true,aether_logs=skyroot_log,axis=x": {
"model": "aether_legacy:skyroot_log", "x": 90, "y": 90
},
"aether_legacy_double_drops=true,aether_logs=skyroot_log,axis=y": {
"model": "aether_legacy:skyroot_log"
},
"aether_legacy_double_drops=false,aether_logs=skyroot_log": {
"aether_legacy_double_drops=true,aether_logs=skyroot_log,axis=z": {
"model": "aether_legacy:skyroot_log", "x": 90
},
"aether_legacy_double_drops=true,aether_logs=skyroot_log,axis=none": {
"model": "aether_legacy:skyroot_log_bark"
},
"aether_legacy_double_drops=false,aether_logs=skyroot_log,axis=x": {
"model": "aether_legacy:skyroot_log", "x": 90, "y": 90
},
"aether_legacy_double_drops=false,aether_logs=skyroot_log,axis=y": {
"model": "aether_legacy:skyroot_log"
},
"aether_legacy_double_drops=false,aether_logs=skyroot_log,axis=z": {
"model": "aether_legacy:skyroot_log", "x": 90
},
"aether_legacy_double_drops=false,aether_logs=skyroot_log,axis=none": {
"model": "aether_legacy:skyroot_log_bark"
}
}
}

6
src/main/resources/assets/aether_legacy/models/block/golden_oak_log_bark.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "aether_legacy:blocks/golden_oak_log_side"
}
}

6
src/main/resources/assets/aether_legacy/models/block/skyroot_log_bark.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "aether_legacy:blocks/skyroot_log_side"
}
}