clean code, acceptable performance

src/main/kotlin/org/neoflock/neocomputers/block/Capacitor.kt

@@ -4,38 +4,35 @@ import net.minecraft.client.player.LocalPlayer
 import net.minecraft.core.BlockPos
 import net.minecraft.core.HolderLookup
 import net.minecraft.nbt.CompoundTag
-import net.minecraft.network.chat.ChatType
 import net.minecraft.network.chat.OutgoingChatMessage
 import net.minecraft.network.chat.PlayerChatMessage
-import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.InteractionResult
 import net.minecraft.world.entity.player.Player
-import net.minecraft.world.item.Item
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.phys.BlockHitResult
 import org.neoflock.neocomputers.entity.BlockEntities
-import org.neoflock.neocomputers.network.Networking
+import org.neoflock.neocomputers.network.DeviceNode
 import org.neoflock.neocomputers.network.PowerRole
 import kotlin.math.min
 
 open class CapacitorEntity(val capacity: Long, type: BlockEntityType<*>, pos: BlockPos, state: BlockState) : NodeBlockEntity(type, pos, state) {
 
-    override val node = object : Networking.Node() {
+    override val deviceNode = object : DeviceNode() {
         override var powerRole = PowerRole.STORAGE
         override var energyCapacity: Long = capacity
     }
 
     override fun loadAdditional(compoundTag: CompoundTag, provider: HolderLookup.Provider) {
         super.loadAdditional(compoundTag, provider)
-        node.energy = min(compoundTag.getLong("energy"), node.energyCapacity)
+        deviceNode.energy = min(compoundTag.getLong("energy"), deviceNode.energyCapacity)
     }
 
     override fun saveAdditional(compoundTag: CompoundTag, provider: HolderLookup.Provider) {
         super.saveAdditional(compoundTag, provider)
-        compoundTag.putLong("energy", node.energy)
+        compoundTag.putLong("energy", deviceNode.energy)
     }
 }
 
@@ -65,8 +62,8 @@ class CapacitorBlock(val tier: Int) : NodeBlock()  {
             val p = player as LocalPlayer
             val ent = level.getBlockEntity(blockPos)
             if(ent is CapacitorEntity) {
-                if(p.isCrouching) ent.node.giveEnergy(1)
-                val msg = PlayerChatMessage.system("energy: ${ent.node.energy} / ${ent.capacity} (${ent.computeEdges().size} edges, ${ent.node.getReachable().size} connected)")
+                if(p.isCrouching) ent.deviceNode.giveEnergy(1)
+                val msg = PlayerChatMessage.system("energy: ${ent.deviceNode.energy} / ${ent.capacity} (${ent.computeEdges().size} edges, ${ent.deviceNode.getReachable().size} connected)")
                 p.sendSystemMessage(OutgoingChatMessage.create(msg).content())
             }
         }

src/main/kotlin/org/neoflock/neocomputers/block/NodeBlock.kt

@@ -21,6 +21,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.world.level.block.state.BlockState
 import org.neoflock.neocomputers.NeoComputers
 import org.neoflock.neocomputers.network.Networking
+import org.neoflock.neocomputers.network.DeviceNode
 import java.time.Duration
 
 object NodeSynchronizer {
@@ -148,30 +149,30 @@ object NodeSynchronizer {
 }
 
 abstract class NodeBlockEntity(blockEntityType: BlockEntityType<*>, blockPos: BlockPos, blockState: BlockState) : BlockEntity(blockEntityType, blockPos, blockState) {
-    abstract val node: Networking.Node
+    abstract val deviceNode: DeviceNode
 
     fun initNetworking(): NodeBlockEntity {
-        Networking.addNode(node)
+        Networking.addNode(deviceNode)
         invalidateNodeState()
         return this
     }
 
     // runs on the server, meant to encode state to send to all players
     open fun encodeDownstreamData(packet: FriendlyByteBuf) {
-        packet.writeUUID(node.address)
-        packet.writeLong(node.energy)
-        packet.writeLong(node.energyCapacity)
-        packet.writeEnum(node.reachability)
-        packet.writeEnum(node.powerRole)
+        packet.writeUUID(deviceNode.address)
+        packet.writeLong(deviceNode.energy)
+        packet.writeLong(deviceNode.energyCapacity)
+        packet.writeEnum(deviceNode.reachability)
+        packet.writeEnum(deviceNode.powerRole)
     }
 
     // runs on the client, meant to decode server state packets to synchronize client state
     open fun syncWithUpstream(packet: FriendlyByteBuf) {
-        Networking.changeNodeAddress(node, packet.readUUID())
-        node.energy = packet.readLong()
-        node.energyCapacity = packet.readLong()
-        node.reachability = packet.readEnum(node.reachability.javaClass)
-        node.powerRole = packet.readEnum(node.powerRole.javaClass)
+        Networking.changeNodeAddress(deviceNode, packet.readUUID())
+        deviceNode.energy = packet.readLong()
+        deviceNode.energyCapacity = packet.readLong()
+        deviceNode.reachability = packet.readEnum(deviceNode.reachability.javaClass)
+        deviceNode.powerRole = packet.readEnum(deviceNode.powerRole.javaClass)
     }
 
     // Encodes data meant for the associated screen of a player
@@ -223,7 +224,7 @@ abstract class NodeBlockEntity(blockEntityType: BlockEntityType<*>, blockPos: Bl
         if(!stateIsDirty) return
         stateIsDirty = false
         computeEdges().forEach {
-            node.connectTo(it.node)
+            deviceNode.connectTo(it.deviceNode)
         }
     }
 
@@ -235,7 +236,7 @@ abstract class NodeBlockEntity(blockEntityType: BlockEntityType<*>, blockPos: Bl
 
     override fun setRemoved() {
         super.setRemoved()
-        Networking.removeNode(node)
+        Networking.removeNode(deviceNode)
     }
 
     override fun clearRemoved() {
@@ -259,7 +260,7 @@ abstract class NodeBlock(properties: Properties = Properties.of()): BaseBlock(pr
         return object : BlockEntityTicker<T> {
             override fun tick(level: Level, blockPos: BlockPos, blockState: BlockState, blockEntity: T) {
                 if(blockEntity !is NodeBlockEntity) return
-                if(Networking.getNode(blockEntity.node.address) == null) blockEntity.initNetworking()
+                if(Networking.getNode(blockEntity.deviceNode.address) == null) blockEntity.initNetworking()
                 blockEntity.tickNode(level)
             }
         }

src/main/kotlin/org/neoflock/neocomputers/block/RedstoneIO.kt

@@ -7,14 +7,13 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.RedStoneWireBlock
-import net.minecraft.world.level.block.RedstoneTorchBlock
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.phys.BlockHitResult
 import org.neoflock.neocomputers.NeoComputers
 import org.neoflock.neocomputers.entity.BlockEntities
 import org.neoflock.neocomputers.network.Networking
+import org.neoflock.neocomputers.network.DeviceNode
 
 fun dirToIdx(direction: Direction) = Direction.entries.indexOf(direction)
 
@@ -23,7 +22,7 @@ class RedstoneIOEntity(blockPos: BlockPos, blockState: BlockState): NodeBlockEnt
     val redstoneOut = Array<Int>(Direction.entries.size) {0}
 
     // TODO: have redstone I/O node for component and shi
-    override val node = object : Networking.Node() {
+    override val deviceNode = object : DeviceNode() {
 
     }
 
@@ -42,7 +41,7 @@ class RedstoneIOEntity(blockPos: BlockPos, blockState: BlockState): NodeBlockEnt
     }
 
     fun onRedstoneSignalChanged(dir: Direction, oldValue: Int, newValue: Int) {
-        Networking.emitMessage(node, Networking.ComputerUncheckedSignal(node, "redstone_changed", arrayOf(node.address.toString(), dirToIdx(dir), oldValue, newValue)))
+        Networking.emitMessage(deviceNode, Networking.ComputerUncheckedSignal(deviceNode, "redstone_changed", arrayOf(deviceNode.address.toString(), dirToIdx(dir), oldValue, newValue)))
         NeoComputers.LOGGER.info("redstone in direction ${dir.name} changed from $oldValue to $newValue")
     }
 }

src/main/kotlin/org/neoflock/neocomputers/block/ScreenBlock.kt

@@ -7,32 +7,23 @@ import net.minecraft.core.Direction
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.InteractionHand
 import net.minecraft.world.InteractionResult
-import net.minecraft.world.MenuProvider
-import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.inventory.AbstractContainerMenu
-import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.context.BlockPlaceContext
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.EntityBlock
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.level.block.state.properties.BooleanProperty
 import net.minecraft.world.level.block.state.properties.EnumProperty
 import net.minecraft.world.level.block.state.properties.EnumProperty.*
 import net.minecraft.world.level.block.state.properties.IntegerProperty
 import net.minecraft.world.phys.BlockHitResult
-import org.neoflock.neocomputers.NeoComputers
 import org.neoflock.neocomputers.entity.BlockEntities
 import org.neoflock.neocomputers.entity.ScreenEntity
-import org.neoflock.neocomputers.gui.menu.Menus
 import org.neoflock.neocomputers.gui.menu.ScreenMenu
-import org.neoflock.neocomputers.network.Networking
 import kotlin.math.abs
 import kotlin.math.max
 
@@ -62,7 +53,7 @@ class ScreenBlock() : NodeBlock() {
     ): InteractionResult {
         if(!level.isClientSide) {
             val screenState = level.getBlockEntity(blockPos, BlockEntities.SCREEN_ENTITY.get()).get()
-            if(!screenState.node.consumeEnergy(ENERGY)) {
+            if(!screenState.deviceNode.consumeEnergy(ENERGY)) {
                 player.sendSystemMessage(Component.literal("Not enough power."))
                 return InteractionResult.SUCCESS
             };