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

Fixed slab inversion

Browse source
This commit is contained in:
LemADEC 2017-05-05 11:36:54 +02:00
parent c8aa9abb75
commit 2e09407f83
2 changed files with 44 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/main/java/cr0s/warpdrive/block/hull/BlockHullSlab.java
View file

@ -168,11 +168,11 @@ public class BlockHullSlab extends BlockSlab implements IBlockBase, IDamageRecei
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) {
iconPlainFull = iconRegister.registerIcon(getTextureName() + "plain-" + BlockHullPlain.getDyeColorName(metaHull));
iconTiledFull = iconRegister.registerIcon(getTextureName() + "tiled-" + BlockHullPlain.getDyeColorName(metaHull));
public void registerBlockIcons(final IIconRegister iconRegister) {
iconPlainFull = iconRegister.registerIcon(getTextureName() + "plain-" + BlockHullPlain.getDyeColorName(metaHull));
iconTiledFull = iconRegister.registerIcon(getTextureName() + "tiled-" + BlockHullPlain.getDyeColorName(metaHull));
iconTiledHorizontal = iconRegister.registerIcon(getTextureName() + "tiled_horizontal-" + BlockHullPlain.getDyeColorName(metaHull));
iconTiledVertical = iconRegister.registerIcon(getTextureName() + "tiled_vertical-" + BlockHullPlain.getDyeColorName(metaHull));
iconTiledVertical = iconRegister.registerIcon(getTextureName() + "tiled_vertical-" + BlockHullPlain.getDyeColorName(metaHull));
}
@Override
@ -188,25 +188,25 @@ public class BlockHullSlab extends BlockSlab implements IBlockBase, IDamageRecei
} else {
switch (metadata % 6) {
case 0:
setBlockBounds(0.00F, 0.50F, 0.00F, 1.00F, 1.00F, 1.00F);
return;
case 1:
setBlockBounds(0.00F, 0.00F, 0.00F, 1.00F, 0.50F, 1.00F);
return;
case 2:
setBlockBounds(0.00F, 0.00F, 0.50F, 1.00F, 1.00F, 1.00F);
case 1:
setBlockBounds(0.00F, 0.50F, 0.00F, 1.00F, 1.00F, 1.00F);
return;
case 3:
case 2:
setBlockBounds(0.00F, 0.00F, 0.00F, 1.00F, 1.00F, 0.50F);
return;
case 4:
setBlockBounds(0.50F, 0.00F, 0.00F, 1.00F, 1.00F, 1.00F);
case 3:
setBlockBounds(0.00F, 0.00F, 0.50F, 1.00F, 1.00F, 1.00F);
return;
case 5:
case 4:
setBlockBounds(0.00F, 0.00F, 0.00F, 0.50F, 1.00F, 1.00F);
return;
case 5:
setBlockBounds(0.50F, 0.00F, 0.00F, 1.00F, 1.00F, 1.00F);
return;
default:
setBlockBounds(0.25F, 0.25F, 0.25F, 0.50F, 0.50F, 0.50F);
setBlockBounds(0.25F, 0.25F, 0.25F, 0.75F, 0.75F, 0.75F);
// return;
}
}
@ -229,7 +229,11 @@ public class BlockHullSlab extends BlockSlab implements IBlockBase, IDamageRecei
}
@Override
public int onBlockPlaced(World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) {
public int onBlockPlaced(final World world, final int x, final int y, final int z, final int side,
final float hitX, final float hitY, final float hitZ, final int metadata) {
final ForgeDirection facing = ForgeDirection.getOrientation(side);
final int variant = metadata < 6 ? 0 : metadata < 12 ? 6 : metadata;
// full block?
if (field_150004_a || metadata >= 12) {
return metadata;
@ -238,20 +242,21 @@ public class BlockHullSlab extends BlockSlab implements IBlockBase, IDamageRecei
// horizontal slab?
if (metadata == 0 || metadata == 6) {
// reuse vanilla logic
return (side != 0 && (side == 1 || hitY <= 0.5F) ? metadata + 1 : metadata);
final ForgeDirection blockFacing = (facing != ForgeDirection.DOWN && (facing == ForgeDirection.UP || hitY <= 0.5F) ? ForgeDirection.DOWN : ForgeDirection.UP);
return variant + blockFacing.ordinal();
}
// vertical slab?
if (metadata == 2 || metadata == 8) {
if (side != 0 && side != 1) {
return metadata - 2 + side;
if (facing != ForgeDirection.DOWN && facing != ForgeDirection.UP) {
return variant + facing.getOpposite().ordinal();
}
// is X the furthest away from center?
if (Math.abs(hitX - 0.5F) > Math.abs(hitZ - 0.5F)) {
// west (4) vs east (5)
return hitX > 0.5F ? metadata - 2 + 4 : metadata - 2 + 5;
return hitX > 0.5F ? variant + ForgeDirection.EAST.ordinal() : variant + ForgeDirection.WEST.ordinal();
}
// north (2) vs south (3)
return hitZ > 0.5F ? metadata - 2 + 2 : metadata - 2 + 3;
return hitZ > 0.5F ? variant + ForgeDirection.SOUTH.ordinal() : variant + ForgeDirection.NORTH.ordinal();
}
return metadata;
}

28
src/main/java/cr0s/warpdrive/block/hull/ItemBlockHullSlab.java
View file

@ -23,24 +23,31 @@ public class ItemBlockHullSlab extends ItemBlockHull {
}
@Override
public boolean onItemUse(ItemStack itemStack, EntityPlayer entityPlayer, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
public boolean onItemUse(final ItemStack itemStack, final EntityPlayer entityPlayer, final World world,
final int x, final int y, final int z, final int side,
final float hitX, final float hitY, final float hitZ) {
if (itemStack.stackSize == 0) {
return false;
}
// check if clicked block can be interacted with
final ForgeDirection facing = ForgeDirection.getOrientation(side);
final int metadataItem = itemStack.getItemDamage();
final Block blockWorld = world.getBlock(x, y, z);
final int metadataWorld = world.getBlockMetadata(x, y, z);
final int typeWorld = getType(metadataWorld);
final int typeItem = getType(metadataItem);
if (blockWorld == blockSlab && metadataItem < 12 && metadataWorld < 12 && typeWorld == typeItem) {
if ( blockWorld == blockSlab
&& metadataItem < 12
&& metadataWorld < 12
&& typeWorld == typeItem ) {
if (!entityPlayer.canPlayerEdit(x, y, z, side, itemStack)) {
return false;
}
// try to merge slabs when right-clicking directly the inner face
if (metadataWorld - typeWorld == side) {
if (metadataWorld - typeWorld == facing.getOpposite().ordinal()) {
AxisAlignedBB boundingBox = AxisAlignedBB.getBoundingBox(x, y, z, x + 1.0D, y + 1.0D, z + 1.0D);
if (world.checkNoEntityCollision(boundingBox)) {
if (typeWorld == 0) {// plain
@ -60,14 +67,17 @@ public class ItemBlockHullSlab extends ItemBlockHull {
} else {
// check is closer block can be interacted with
ForgeDirection direction = ForgeDirection.getOrientation(side);
final int xSide = x + direction.offsetX;
final int ySide = y + direction.offsetY;
final int zSide = z + direction.offsetZ;
final int xSide = x + facing.offsetX;
final int ySide = y + facing.offsetY;
final int zSide = z + facing.offsetZ;
final Block blockSide = world.getBlock(xSide, ySide, zSide);
final int metadataSide = world.getBlockMetadata(xSide, ySide, zSide);
final int typeSide = getType(metadataSide);
if (blockSide == blockSlab && metadataItem < 12 && metadataSide < 12 && typeSide == typeItem) {
if ( blockSide == blockSlab
&& metadataItem < 12
&& metadataSide < 12
&& typeSide == typeItem ) {
if (!entityPlayer.canPlayerEdit(xSide, ySide, zSide, side, itemStack)) {
return false;
}
@ -78,7 +88,7 @@ public class ItemBlockHullSlab extends ItemBlockHull {
// try to merge slabs when right-clicking on a side block
if (sidePlaced == metadataSide - typeSide) {
AxisAlignedBB boundingBox = AxisAlignedBB.getBoundingBox(xSide, ySide, zSide, xSide + 1.0D, ySide + 1.0D, zSide + 1.0D);
final AxisAlignedBB boundingBox = AxisAlignedBB.getBoundingBox(xSide, ySide, zSide, xSide + 1.0D, ySide + 1.0D, zSide + 1.0D);
if (world.checkNoEntityCollision(boundingBox)) {
if (typeSide == 0) {// plain
world.setBlock(xSide, ySide, zSide, blockSlab, 12, 3);