From cc6572aecbd6a58b67989f62589bb00aa8e731c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Fri, 25 Dec 2020 20:15:14 +0100
Subject: [PATCH] Small rename.

---
 .../block/entity/ComputerTileEntity.java      |  4 ++--
 .../bus/AbstractDeviceBusController.java      | 19 +++++++++++++------
 .../bus/TileEntityDeviceBusElement.java       | 18 ++++++++++--------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java b/src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java
index 354732c0..aec4c1be 100644
--- a/src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java
+++ b/src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java
@@ -457,7 +457,7 @@ public final class ComputerTileEntity extends AbstractTileEntity implements ITic
         }
 
         @Override
-        protected void onDevicesInvalid() {
+        protected void onBeforeScan() {
             if (runState == RunState.RUNNING) {
                 runState = RunState.LOADING_DEVICES;
             }
@@ -466,7 +466,7 @@ public final class ComputerTileEntity extends AbstractTileEntity implements ITic
         }
 
         @Override
-        protected void onDevicesValid(final boolean didDevicesChange) {
+        protected void onAfterDeviceScan(final boolean didDevicesChange) {
             virtualMachine.rpcAdapter.resume(didDevicesChange);
         }
 
diff --git a/src/main/java/li/cil/oc2/common/bus/AbstractDeviceBusController.java b/src/main/java/li/cil/oc2/common/bus/AbstractDeviceBusController.java
index 8bb474b6..aa791d6d 100644
--- a/src/main/java/li/cil/oc2/common/bus/AbstractDeviceBusController.java
+++ b/src/main/java/li/cil/oc2/common/bus/AbstractDeviceBusController.java
@@ -61,15 +61,13 @@ public abstract class AbstractDeviceBusController implements DeviceBusController
 
     @Override
     public void scheduleBusScan() {
-        onDevicesInvalid();
-
         scanDelay = 0; // scan as soon as possible
         state = BusState.SCAN_PENDING;
     }
 
     @Override
     public void scanDevices() {
-        onDevicesInvalid();
+        onBeforeScan();
 
         final HashSet<Device> newDevices = new HashSet<>();
         final HashMap<Device, Set<UUID>> newDeviceIds = new HashMap<>();
@@ -106,7 +104,7 @@ public abstract class AbstractDeviceBusController implements DeviceBusController
             deviceIds.putAll(newDeviceIds);
         }
 
-        onDevicesValid(didDevicesChange || didDeviceIdsChange);
+        onAfterDeviceScan(didDevicesChange || didDeviceIdsChange);
     }
 
     @Override
@@ -196,6 +194,8 @@ public abstract class AbstractDeviceBusController implements DeviceBusController
             optional.addListener(unused -> scheduleBusScan());
         }
 
+        onAfterBusScan();
+
         scanDevices();
 
         state = BusState.READY;
@@ -203,10 +203,17 @@ public abstract class AbstractDeviceBusController implements DeviceBusController
 
     ///////////////////////////////////////////////////////////////////
 
-    protected void onDevicesInvalid() {
+    protected Collection<DeviceBusElement> getElements() {
+        return elements;
     }
 
-    protected void onDevicesValid(final boolean didDevicesChange) {
+    protected void onAfterBusScan() {
+    }
+
+    protected void onBeforeScan() {
+    }
+
+    protected void onAfterDeviceScan(final boolean didDevicesChange) {
     }
 
     protected void onDevicesAdded(final Collection<Device> devices) {
diff --git a/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java b/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java
index 3b8e86a1..e736e9cd 100644
--- a/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java
+++ b/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java
@@ -73,14 +73,6 @@ public class TileEntityDeviceBusElement extends AbstractGroupingBlockDeviceBusEl
         return Optional.of(neighbors);
     }
 
-    public boolean canConnectToSide(@Nullable final Direction direction) {
-        return true;
-    }
-
-    public boolean hasInterfaceOnSide(@Nullable final Direction direction) {
-        return canConnectToSide(direction);
-    }
-
     public void handleNeighborChanged(final BlockPos pos) {
         final World world = tileEntity.getWorld();
         if (world == null || world.isRemote()) {
@@ -124,6 +116,16 @@ public class TileEntityDeviceBusElement extends AbstractGroupingBlockDeviceBusEl
 
     ///////////////////////////////////////////////////////////////////
 
+    protected boolean canConnectToSide(@Nullable final Direction direction) {
+        return true;
+    }
+
+    protected boolean hasInterfaceOnSide(@Nullable final Direction direction) {
+        return canConnectToSide(direction);
+    }
+
+    ///////////////////////////////////////////////////////////////////
+
     private void scanNeighborsForDevices() {
         for (final Direction direction : Direction.values()) {
             handleNeighborChanged(tileEntity.getPos().offset(direction));