dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some duplication.

Browse Source
This commit is contained in:
raoulvdberge
2020-10-24 14:42:59 +02:00
parent 3d82adac2f
commit a6773c3b79
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java
View File

@@ -39,6 +39,10 @@ public abstract class BaseBlock extends Block {
public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) { public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) {
super.onReplaced(state, world, pos, newState, isMoving); super.onReplaced(state, world, pos, newState, isMoving);
checkIfDirectionHasChanged(state, world, pos, newState);
}
protected void checkIfDirectionHasChanged(BlockState state, World world, BlockPos pos, BlockState newState) {
if (getDirection() != BlockDirection.NONE && if (getDirection() != BlockDirection.NONE &&
state.getBlock() == newState.getBlock() && state.getBlock() == newState.getBlock() &&
state.get(getDirection().getProperty()) != newState.get(getDirection().getProperty())) { state.get(getDirection().getProperty()) != newState.get(getDirection().getProperty())) {

13
src/main/java/com/refinedmods/refinedstorage/block/ColoredNetworkBlock.java
View File

@@ -9,19 +9,14 @@ public class ColoredNetworkBlock extends NetworkNodeBlock {
super(props); super(props);
} }
// Don't do block drops if we change the color.
@Override @Override
public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) { public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) {
if (state.getBlock().getClass().equals(newState.getBlock().getClass())) { if (state.getBlock().getClass().equals(newState.getBlock().getClass())) {
//From BaseBlock#onReplaced as this gets skipped otherwise checkIfDirectionHasChanged(state, world, pos, newState);
if (getDirection() != BlockDirection.NONE && } else {
state.getBlock() == newState.getBlock() && super.onReplaced(state, world, pos, newState, isMoving);
state.get(getDirection().getProperty()) != newState.get(getDirection().getProperty())) {
onDirectionChanged(world, pos, newState.get(getDirection().getProperty()));
}
return;
} }
super.onReplaced(state, world, pos, newState, isMoving);
} }
} }

8
src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java
View File

@@ -46,9 +46,9 @@ public abstract class NetworkNodeBlock extends BaseBlock {
@Override @Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) { public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) {
if (state.getBlock() != newState.getBlock()) { if (state.getBlock() != newState.getBlock()) {
TileEntity tile = worldIn.getTileEntity(pos); TileEntity tile = world.getTileEntity(pos);
if (tile instanceof NetworkNodeTile) { if (tile instanceof NetworkNodeTile) {
IItemHandler handler = ((NetworkNodeTile) tile).getNode().getDrops(); IItemHandler handler = ((NetworkNodeTile) tile).getNode().getDrops();
@@ -60,13 +60,13 @@ public abstract class NetworkNodeBlock extends BaseBlock {
drops.add(handler.getStackInSlot(i)); drops.add(handler.getStackInSlot(i));
} }
InventoryHelper.dropItems(worldIn, pos, drops); InventoryHelper.dropItems(world, pos, drops);
} }
} }
} }
// Call onReplaced after the drops check so the tile still exists // Call onReplaced after the drops check so the tile still exists
super.onReplaced(state, worldIn, pos, newState, isMoving); super.onReplaced(state, world, pos, newState, isMoving);
} }
@Override @Override