Remove some duplication.

refinedmods · Oct 24, 2020 · a6773c3 · a6773c3
1 parent 3d82ada
commit a6773c3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java
@@ -39,6 +39,10 @@ protected void onDirectionChanged(World world, BlockPos pos, Direction newDirect
     public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean 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 &&
             state.getBlock() == newState.getBlock() &&
             state.get(getDirection().getProperty()) != newState.get(getDirection().getProperty())) {

diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ColoredNetworkBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ColoredNetworkBlock.java
@@ -9,19 +9,14 @@ public ColoredNetworkBlock(Properties props) {
         super(props);
     }
 
+    // Don't do block drops if we change the color.
     @Override
     public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) {
         if (state.getBlock().getClass().equals(newState.getBlock().getClass())) {
-            //From BaseBlock#onReplaced as this gets skipped otherwise
-            if (getDirection() != BlockDirection.NONE &&
-                state.getBlock() == newState.getBlock() &&
-                state.get(getDirection().getProperty()) != newState.get(getDirection().getProperty())) {
-                onDirectionChanged(world, pos, newState.get(getDirection().getProperty()));
-            }
-            return;
+            checkIfDirectionHasChanged(state, world, pos, newState);
+        } else {
+            super.onReplaced(state, world, pos, newState, isMoving);
         }
-
-        super.onReplaced(state, world, pos, newState, isMoving);
     }
 }
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java
@@ -46,9 +46,9 @@ public void neighborChanged(BlockState state, World world, BlockPos pos, Block b
 
     @Override
     @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()) {
-            TileEntity tile = worldIn.getTileEntity(pos);
+            TileEntity tile = world.getTileEntity(pos);
 
             if (tile instanceof NetworkNodeTile) {
                 IItemHandler handler = ((NetworkNodeTile) tile).getNode().getDrops();
@@ -60,13 +60,13 @@ public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState
                         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
-        super.onReplaced(state, worldIn, pos, newState, isMoving);
+        super.onReplaced(state, world, pos, newState, isMoving);
     }
 
     @Override