Clean up redstone debug code, remove unimplemented r_out tunnel

Will implement redstone_out in a future version; for now, items and redstone_in should both be functional. Keeping it creative-only for now until recipes can be figured out, and beta testers can fiddle with it.

Author: robotgryphon

src/main/java/com/robotgryphon/compactmachines/api/tunnels/redstone/IRedstoneReaderTunnel.java

@@ -12,9 +12,15 @@
  */
 public interface IRedstoneReaderTunnel extends IRedstoneTunnel {
 
-    int getStrongPower(ITunnelConnectionInfo connectionInfo);
-
-    int getWeakPower(ITunnelConnectionInfo connectionInfo);
+    /**
+     * Gets the weak (passive) power level from the outside of the machine.
+     *
+     * @param connectionInfo
+     * @return
+     */
+    default int getPowerLevel(ITunnelConnectionInfo connectionInfo) {
+        return 0;
+    }
 
     /**
      * Called by the tunnel wall blocks to check if a redstone signal can be pulled
@@ -28,5 +34,5 @@ default boolean canConnectRedstone(ITunnelConnectionInfo connectionInfo) {
         return true;
     }
 
-    void onPowerChanged(ITunnelConnectionInfo connectionInfo, int latestPower);
+    default void onPowerChanged(ITunnelConnectionInfo connectionInfo, int latestPower) {}
 }

src/main/java/com/robotgryphon/compactmachines/block/BlockCompactMachine.java

@@ -90,11 +90,6 @@ public boolean canConnectRedstone(BlockState state, IBlockReader world, BlockPos
         return false;
     }
 
-    @Override
-    public int getStrongPower(BlockState blockState, IBlockReader blockAccess, BlockPos pos, Direction side) {
-        return 0;
-    }
-
     @Override
     public int getWeakPower(BlockState blockState, IBlockReader blockAccess, BlockPos pos, Direction side) {
 //        TODO Tile Entity
@@ -132,16 +127,13 @@ public void neighborChanged(BlockState state, World world, BlockPos pos, Block c
             return;
         }
 
-        CompactMachines.LOGGER.debug(changedBlock);
-
         // Determine whether it's an immediate neighbor; if so, execute ...
         Arrays.stream(Direction.values())
                 .filter(hd -> pos.offset(hd).equals(changedPos))
                 .findFirst()
                 .ifPresent(facing -> {
                     Set<BlockPos> tunnelsForMachineSide = TunnelHelper.getTunnelsForMachineSide(machine.machineId, serverWorld, facing);
                     for (BlockPos tunnelPos : tunnelsForMachineSide) {
-                        // TODO: Tunnel definition lookup, check for IRedstoneTunnel instances
                         TunnelWallTile tunnelTile = (TunnelWallTile) compactWorld.getTileEntity(tunnelPos);
                         if (tunnelTile == null) continue;
 
@@ -150,10 +142,9 @@ public void neighborChanged(BlockState state, World world, BlockPos pos, Block c
                         ITunnelConnectionInfo connInfo = TunnelHelper.generateConnectionInfo(tunnelTile);
 
                         tunnelTile.getTunnelDefinition().ifPresent(tunnelDefinition -> {
+                            // TODO: world notification interface for tunnels
                             if (tunnelDefinition instanceof IRedstoneReaderTunnel) {
                                 // Send redstone changes into machine
-
-
                                 IRedstoneReaderTunnel rrt = (IRedstoneReaderTunnel) tunnelDefinition;
                                 int latestPower = world.getRedstonePower(changedPos, facing);
                                 rrt.onPowerChanged(connInfo, latestPower);
@@ -163,44 +154,6 @@ public void neighborChanged(BlockState state, World world, BlockPos pos, Block c
                 });
     }
 
-    @Override
-    public void onNeighborChange(BlockState state, IWorldReader world, BlockPos pos, BlockPos neighbor) {
-        super.onNeighborChange(state, world, pos, neighbor);
-
-        if (world.isRemote()) {
-            return;
-        }
-
-//        TODO Tile Entity
-//        if(!(world.getTileEntity(pos) instanceof TileEntityMachine)) {
-//            return;
-//        }
-
-
-//        TODO Tile Entity and Server Stuff
-//        // Make sure we don't stack overflow when we get in a notifyBlockChange loop.
-//        // Just ensure only a single notification happens per tick.
-//        TileEntityMachine te = (TileEntityMachine) world.getTileEntity(pos);
-//        if(te.isInsideItself() || te.alreadyNotifiedOnTick) {
-//            return;
-//        }
-//
-//        ServerWorld machineWorld = DimensionTools.getServerMachineWorld();
-//        BlockPos neighborPos = te.getConnectedBlockPosition(facing);
-//        if(neighborPos != null && machineWorld.getTileEntity(neighborPos) instanceof TileEntityTunnel) {
-//            machineWorld.notifyNeighborsOfStateChange(neighborPos, Blockss.tunnel, false);
-//            te.alreadyNotifiedOnTick = true;
-//        }
-//
-//        RedstoneTunnelData tunnelData = te.getRedstoneTunnelForSide(facing);
-//        if(tunnelData != null && !tunnelData.isOutput) {
-//            BlockPos redstoneNeighborPos = tunnelData.pos;
-//            if(redstoneNeighborPos != null && machineWorld.getTileEntity(redstoneNeighborPos) instanceof TileEntityRedstoneTunnel) {
-//                machineWorld.notifyNeighborsOfStateChange(redstoneNeighborPos, Blockss.redstoneTunnel, false);
-//            }
-//        }
-    }
-
     @Override
     public ItemStack getPickBlock(BlockState state, RayTraceResult target, IBlockReader world, BlockPos pos, PlayerEntity player) {
         Block given = CompactMachineUtil.getMachineBlockBySize(this.size);

src/main/java/com/robotgryphon/compactmachines/block/walls/TunnelWallBlock.java

@@ -87,7 +87,7 @@ public int getWeakPower(BlockState state, IBlockReader world, BlockPos pos, Dire
         TunnelDefinition definition = tunnelInfo.get();
         if (definition instanceof IRedstoneReaderTunnel) {
             ITunnelConnectionInfo conn = TunnelHelper.generateConnectionInfo(world, pos);
-            int weak = ((IRedstoneReaderTunnel) definition).getWeakPower(conn);
+            int weak = ((IRedstoneReaderTunnel) definition).getPowerLevel(conn);
             return weak;
         }
 

src/main/java/com/robotgryphon/compactmachines/core/Registration.java

@@ -171,7 +171,7 @@ public class Registration {
 
     public static final RegistryObject<TunnelDefinition> REDSTONE_IN_TUNNEL = TUNNEL_DEFINITIONS.register("redstone_in", RedstoneInTunnelDefinition::new);
 
-    public static final RegistryObject<TunnelDefinition> REDSTONE_OUT_TUNNEL = TUNNEL_DEFINITIONS.register("redstone_out", RedstoneOutTunnelDefinition::new);
+    // public static final RegistryObject<TunnelDefinition> REDSTONE_OUT_TUNNEL = TUNNEL_DEFINITIONS.register("redstone_out", RedstoneOutTunnelDefinition::new);
 
     // ================================================================================================================
     //   DIMENSION

src/main/java/com/robotgryphon/compactmachines/tunnels/definitions/RedstoneInTunnelDefinition.java

@@ -34,22 +34,7 @@ public int getTunnelIndicatorColor() {
     }
 
     @Override
-    public boolean canConnectRedstone(ITunnelConnectionInfo connectionInfo) {
-        return true;
-    }
-
-    @Override
-    public void onPowerChanged(ITunnelConnectionInfo connectionInfo, int latestPower) {
-        CompactMachines.LOGGER.debug("Got power change: {}", latestPower);
-    }
-
-    @Override
-    public int getStrongPower(ITunnelConnectionInfo connectionInfo) {
-        return 0;
-    }
-
-    @Override
-    public int getWeakPower(ITunnelConnectionInfo connectionInfo) {
+    public int getPowerLevel(ITunnelConnectionInfo connectionInfo) {
         IWorldReader connectedWorld = connectionInfo.getConnectedWorld(EnumTunnelSide.OUTSIDE).orElse(null);
         if (connectedWorld instanceof ServerWorld) {
             DimensionalPosition pos = connectionInfo.getConnectedPosition(EnumTunnelSide.OUTSIDE).orElse(null);