Use the given state from getActualState instead of fetching it from the world again (SlimeKnights/TinkersConstruct#3497)

This commit is contained in:
KnightMiner committed 2019-01-03 00:02:34 -06:00
1 parent a4a1e6937b
commit 69a1c80546
2 files changed
+21 -23

No files matched your search

@@ -46,12 +46,12 @@ public class BlockConnectedTexture extends Block {
// Creates the state to use for the block. This is where we check if every side is
// connectable or not.
return state.withProperty(CONNECTED_DOWN, this.isSideConnectable(world, position, EnumFacing.DOWN))
.withProperty(CONNECTED_EAST, this.isSideConnectable(world, position, EnumFacing.EAST))
.withProperty(CONNECTED_NORTH, this.isSideConnectable(world, position, EnumFacing.NORTH))
.withProperty(CONNECTED_SOUTH, this.isSideConnectable(world, position, EnumFacing.SOUTH))
.withProperty(CONNECTED_UP, this.isSideConnectable(world, position, EnumFacing.UP))
.withProperty(CONNECTED_WEST, this.isSideConnectable(world, position, EnumFacing.WEST));
return state.withProperty(CONNECTED_DOWN, this.isSideConnectable(state, world, position, EnumFacing.DOWN))
.withProperty(CONNECTED_EAST, this.isSideConnectable(state, world, position, EnumFacing.EAST))
.withProperty(CONNECTED_NORTH, this.isSideConnectable(state, world, position, EnumFacing.NORTH))
.withProperty(CONNECTED_SOUTH, this.isSideConnectable(state, world, position, EnumFacing.SOUTH))
.withProperty(CONNECTED_UP, this.isSideConnectable(state, world, position, EnumFacing.UP))
.withProperty(CONNECTED_WEST, this.isSideConnectable(state, world, position, EnumFacing.WEST));
}
@Nonnull
@@ -70,17 +70,16 @@ public class BlockConnectedTexture extends Block {
/**
* Checks if a specific side of a block can connect to this block. For this example, a side
* is connectable if the block is the same block as this one.
*
*
* @param state Base state to check
* @param world The world to run the check in.
* @param pos The position of the block to check for.
* @param side The side of the block to check.
* @return Whether or not the side is connectable.
*/
private boolean isSideConnectable(IBlockAccess world, BlockPos pos, EnumFacing side) {
final IBlockState original = world.getBlockState(pos);
private boolean isSideConnectable(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) {
final IBlockState connected = world.getBlockState(pos.offset(side));
return original != null && connected != null && canConnect(original, connected);
return connected != null && canConnect(state, connected);
}
/**
@@ -33,15 +33,15 @@ public class EnumBlockConnectedTexture<E extends Enum<E> & EnumBlock.IEnumMeta &
}
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos position) {
public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos position) {
// Creates the state to use for the block. This is where we check if every side is
// connectable or not.
return state.withProperty(BlockConnectedTexture.CONNECTED_DOWN, this.isSideConnectable(world, position, EnumFacing.DOWN))
.withProperty(BlockConnectedTexture.CONNECTED_EAST, this.isSideConnectable(world, position, EnumFacing.EAST))
.withProperty(BlockConnectedTexture.CONNECTED_NORTH, this.isSideConnectable(world, position, EnumFacing.NORTH))
.withProperty(BlockConnectedTexture.CONNECTED_SOUTH, this.isSideConnectable(world, position, EnumFacing.SOUTH))
.withProperty(BlockConnectedTexture.CONNECTED_UP, this.isSideConnectable(world, position, EnumFacing.UP))
.withProperty(BlockConnectedTexture.CONNECTED_WEST, this.isSideConnectable(world, position, EnumFacing.WEST));
return state.withProperty(BlockConnectedTexture.CONNECTED_DOWN, this.isSideConnectable(state, world, position, EnumFacing.DOWN))
.withProperty(BlockConnectedTexture.CONNECTED_EAST, this.isSideConnectable(state, world, position, EnumFacing.EAST))
.withProperty(BlockConnectedTexture.CONNECTED_NORTH, this.isSideConnectable(state, world, position, EnumFacing.NORTH))
.withProperty(BlockConnectedTexture.CONNECTED_SOUTH, this.isSideConnectable(state, world, position, EnumFacing.SOUTH))
.withProperty(BlockConnectedTexture.CONNECTED_UP, this.isSideConnectable(state, world, position, EnumFacing.UP))
.withProperty(BlockConnectedTexture.CONNECTED_WEST, this.isSideConnectable(state, world, position, EnumFacing.WEST));
}
@Nonnull
@@ -56,17 +56,16 @@ public class EnumBlockConnectedTexture<E extends Enum<E> & EnumBlock.IEnumMeta &
/**
* Checks if a specific side of a block can connect to this block. For this example, a side
* is connectable if the block is the same block as this one.
*
*
* @param state Base state to check
* @param world The world to run the check in.
* @param pos The position of the block to check for.
* @param side The side of the block to check.
* @return Whether or not the side is connectable.
*/
private boolean isSideConnectable(IBlockAccess world, BlockPos pos, EnumFacing side) {
final IBlockState original = world.getBlockState(pos);
private boolean isSideConnectable(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) {
final IBlockState connected = world.getBlockState(pos.offset(side));
return original != null && connected != null && canConnect(original, connected);
return connected != null && canConnect(state, connected);
}
/**