From 83749bf3ba093cbf6ce61599c34db00e83666b8a Mon Sep 17 00:00:00 2001 From: ionut Date: Sat, 25 Apr 2026 22:37:23 +0000 Subject: [PATCH] CPU no longer boils --- .../kotlin/org/neoflock/neocomputers/block/NodeBlock.kt | 6 +----- .../org/neoflock/neocomputers/network/Networking.kt | 8 ++++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/org/neoflock/neocomputers/block/NodeBlock.kt b/src/main/kotlin/org/neoflock/neocomputers/block/NodeBlock.kt index d27eddb..d4a0b5c 100644 --- a/src/main/kotlin/org/neoflock/neocomputers/block/NodeBlock.kt +++ b/src/main/kotlin/org/neoflock/neocomputers/block/NodeBlock.kt @@ -12,9 +12,6 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload import net.minecraft.resources.ResourceLocation import net.minecraft.server.level.ServerLevel import net.minecraft.server.level.ServerPlayer - -import net.minecraft.world.entity.LivingEntity -import net.minecraft.world.item.ItemStack import net.minecraft.world.level.Level import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.EntityBlock @@ -24,7 +21,6 @@ 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.PowerRole import java.time.Duration object NodeSynchronizer { @@ -118,7 +114,7 @@ object NodeSynchronizer { override fun type() = TYPE } - val screenMap = mutableMapOf() + val screenMap = HashMap() fun playerScreenClosed(player: ServerPlayer) { screenMap.remove(player) diff --git a/src/main/kotlin/org/neoflock/neocomputers/network/Networking.kt b/src/main/kotlin/org/neoflock/neocomputers/network/Networking.kt index 867b278..8eda826 100644 --- a/src/main/kotlin/org/neoflock/neocomputers/network/Networking.kt +++ b/src/main/kotlin/org/neoflock/neocomputers/network/Networking.kt @@ -196,7 +196,7 @@ object Networking { } if(reachability == Visibility.NETWORK) { // absolute cinema - val working = mutableSetOf(); + val working = HashSet(); val pending = mutableListOf(this); var iterCount = 0; while(iterCount < maxHopCount && pending.isNotEmpty()) { @@ -246,8 +246,8 @@ object Networking { abstract fun receiveWireless(message: Message, emitter: WirelessEndpoint) } - val wirelessNodes = ThreadLocal.withInitial { mutableSetOf() } - val allNodes = ThreadLocal.withInitial { mutableMapOf() } + val wirelessNodes = ThreadLocal.withInitial { HashSet() } + val allNodes = ThreadLocal.withInitial { HashMap() } // node may differ from message.sender in the case of relays, // as they might have DIRECT reachability but @@ -326,7 +326,7 @@ object Networking { nodes.forEach { removeNode(it) } } - val channels = ThreadLocal.withInitial { mutableMapOf>() } + val channels = ThreadLocal.withInitial { HashMap>() } fun addToChannel(channel: String, node: Node) { val localChannels = channels.get()