From a8b45c6565ddde6ea07ac9a6b87b780e6a6a0d1d Mon Sep 17 00:00:00 2001 From: ionut Date: Sat, 25 Apr 2026 19:32:33 +0000 Subject: [PATCH] I plead oopsie daisy --- src/main/kotlin/org/neoflock/neocomputers/item/CBUSItem.kt | 2 +- src/main/kotlin/org/neoflock/neocomputers/item/CPUItem.kt | 2 +- src/main/kotlin/org/neoflock/neocomputers/item/DataCard.kt | 6 +++--- .../kotlin/org/neoflock/neocomputers/item/EEPROMItem.kt | 6 +++--- src/main/kotlin/org/neoflock/neocomputers/item/GPUCard.kt | 6 +++--- src/main/kotlin/org/neoflock/neocomputers/item/HDDItem.kt | 6 +++--- .../kotlin/org/neoflock/neocomputers/item/InternetCard.kt | 6 +++--- .../kotlin/org/neoflock/neocomputers/item/MemoryItem.kt | 2 +- .../kotlin/org/neoflock/neocomputers/item/NetworkCard.kt | 6 +++--- .../kotlin/org/neoflock/neocomputers/item/RedstoneCard.kt | 6 +++--- .../kotlin/org/neoflock/neocomputers/item/TunnelCard.kt | 6 +++--- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/main/kotlin/org/neoflock/neocomputers/item/CBUSItem.kt b/src/main/kotlin/org/neoflock/neocomputers/item/CBUSItem.kt index d633e2d..57f7e9d 100644 --- a/src/main/kotlin/org/neoflock/neocomputers/item/CBUSItem.kt +++ b/src/main/kotlin/org/neoflock/neocomputers/item/CBUSItem.kt @@ -13,7 +13,7 @@ open class CBUSItem(val tier: Int, val maxComponents: Int): Item(Item.Properties override fun getComponentCapacity(itemStack: ItemStack): Int = maxComponents - override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity): Networking.Node? = null + override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity?): Networking.Node? = null } class CBUS0: CBUSItem(1, 8) class CBUS1: CBUSItem(2, 12) diff --git a/src/main/kotlin/org/neoflock/neocomputers/item/CPUItem.kt b/src/main/kotlin/org/neoflock/neocomputers/item/CPUItem.kt index 7ec8de4..70285d4 100644 --- a/src/main/kotlin/org/neoflock/neocomputers/item/CPUItem.kt +++ b/src/main/kotlin/org/neoflock/neocomputers/item/CPUItem.kt @@ -15,7 +15,7 @@ open class CPUItem(val tier: Int, val maxComponents: Int): Item(Item.Properties( override fun getArchitecturesProvided(itemStack: ItemStack): Set = setOf("Lua 5.3") - override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity): Networking.Node? = null + override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity?): Networking.Node? = null } class CPU0: CPUItem(1, 8) diff --git a/src/main/kotlin/org/neoflock/neocomputers/item/DataCard.kt b/src/main/kotlin/org/neoflock/neocomputers/item/DataCard.kt index 951da69..32c6b28 100644 --- a/src/main/kotlin/org/neoflock/neocomputers/item/DataCard.kt +++ b/src/main/kotlin/org/neoflock/neocomputers/item/DataCard.kt @@ -16,13 +16,13 @@ open class DataCard(val tier: Int, val limit: Long): Item(Properties()), Compone override fun getComponentTier(itemStack: ItemStack): Int = tier - override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) { - ensureHasAddress(itemStack) + override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) { + if(machine != null) ensureHasAddress(itemStack) super.whenComponentPlaced(itemStack, machine, newRole) } // TODO: Modem Component - override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity): Networking.Node? = null + override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity?): Networking.Node? = null override fun appendHoverText( itemStack: ItemStack, diff --git a/src/main/kotlin/org/neoflock/neocomputers/item/EEPROMItem.kt b/src/main/kotlin/org/neoflock/neocomputers/item/EEPROMItem.kt index 2252887..c5c7872 100644 --- a/src/main/kotlin/org/neoflock/neocomputers/item/EEPROMItem.kt +++ b/src/main/kotlin/org/neoflock/neocomputers/item/EEPROMItem.kt @@ -27,12 +27,12 @@ open class EEPROMItem(val tier: Int, val codeCapacity: Int, val dataCapacity: In override fun getComponentCapacity(itemStack: ItemStack): Int = 0 - override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) { - ensureHasAddress(itemStack) + override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) { + if(machine != null) ensureHasAddress(itemStack) super.whenComponentPlaced(itemStack, machine, newRole) } - override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity): Networking.Node? = null + override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity?): Networking.Node? = null override fun appendHoverText( itemStack: ItemStack, diff --git a/src/main/kotlin/org/neoflock/neocomputers/item/GPUCard.kt b/src/main/kotlin/org/neoflock/neocomputers/item/GPUCard.kt index 3f10eee..a4d85a6 100644 --- a/src/main/kotlin/org/neoflock/neocomputers/item/GPUCard.kt +++ b/src/main/kotlin/org/neoflock/neocomputers/item/GPUCard.kt @@ -15,13 +15,13 @@ open class GPUCard(val tier: Int, val vram: Long): Item(Properties()), Component override fun getComponentTier(itemStack: ItemStack): Int = tier - override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) { - ensureHasAddress(itemStack) + override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) { + if(machine != null) ensureHasAddress(itemStack) super.whenComponentPlaced(itemStack, machine, newRole) } // TODO: GPU Component - override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity): Networking.Node? = null + override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity?): Networking.Node? = null override fun appendHoverText( itemStack: ItemStack, diff --git a/src/main/kotlin/org/neoflock/neocomputers/item/HDDItem.kt b/src/main/kotlin/org/neoflock/neocomputers/item/HDDItem.kt index 8b27cdf..93a4e6a 100644 --- a/src/main/kotlin/org/neoflock/neocomputers/item/HDDItem.kt +++ b/src/main/kotlin/org/neoflock/neocomputers/item/HDDItem.kt @@ -23,12 +23,12 @@ open class HardDiskItem(val tier: Int, val capacity: Long): Item(getDiskProperti override fun getComponentCapacity(itemStack: ItemStack): Int = 0 - override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) { - ensureHasAddress(itemStack) + override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) { + if(machine != null) ensureHasAddress(itemStack) super.whenComponentPlaced(itemStack, machine, newRole) } - override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity): Networking.Node? = null + override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity?): Networking.Node? = null override fun appendHoverText( itemStack: ItemStack, diff --git a/src/main/kotlin/org/neoflock/neocomputers/item/InternetCard.kt b/src/main/kotlin/org/neoflock/neocomputers/item/InternetCard.kt index 51cd08e..cee91d8 100644 --- a/src/main/kotlin/org/neoflock/neocomputers/item/InternetCard.kt +++ b/src/main/kotlin/org/neoflock/neocomputers/item/InternetCard.kt @@ -14,13 +14,13 @@ class InternetCard: Item(Item.Properties()), ComponentItem { override fun getComponentTier(itemStack: ItemStack): Int = 1 - override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) { - ensureHasAddress(itemStack) + override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) { + if(machine != null) ensureHasAddress(itemStack) super.whenComponentPlaced(itemStack, machine, newRole) } // TODO: Internet Component - override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity): Networking.Node? = null + override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity?): Networking.Node? = null override fun appendHoverText( itemStack: ItemStack, diff --git a/src/main/kotlin/org/neoflock/neocomputers/item/MemoryItem.kt b/src/main/kotlin/org/neoflock/neocomputers/item/MemoryItem.kt index 9b381e2..943cffe 100644 --- a/src/main/kotlin/org/neoflock/neocomputers/item/MemoryItem.kt +++ b/src/main/kotlin/org/neoflock/neocomputers/item/MemoryItem.kt @@ -19,7 +19,7 @@ open class MemoryItem(val tier: Int, val capacity: Int): Item(Item.Properties(). override fun getComponentCapacity(itemStack: ItemStack): Int = 0 // no node for memory - override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity): Networking.Node? = null + override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity?): Networking.Node? = null override fun appendHoverText( itemStack: ItemStack, diff --git a/src/main/kotlin/org/neoflock/neocomputers/item/NetworkCard.kt b/src/main/kotlin/org/neoflock/neocomputers/item/NetworkCard.kt index 512a2c0..96457c1 100644 --- a/src/main/kotlin/org/neoflock/neocomputers/item/NetworkCard.kt +++ b/src/main/kotlin/org/neoflock/neocomputers/item/NetworkCard.kt @@ -13,13 +13,13 @@ open class NetworkCard(val tier: Int, val maxRange: Int, val isWired: Boolean): override fun getComponentTier(itemStack: ItemStack): Int = tier - override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) { - ensureHasAddress(itemStack) + override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) { + if(machine != null) ensureHasAddress(itemStack) super.whenComponentPlaced(itemStack, machine, newRole) } // TODO: Modem Component - override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity): Networking.Node? = null + override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity?): Networking.Node? = null override fun appendHoverText( itemStack: ItemStack, diff --git a/src/main/kotlin/org/neoflock/neocomputers/item/RedstoneCard.kt b/src/main/kotlin/org/neoflock/neocomputers/item/RedstoneCard.kt index 85bb387..2b2a519 100644 --- a/src/main/kotlin/org/neoflock/neocomputers/item/RedstoneCard.kt +++ b/src/main/kotlin/org/neoflock/neocomputers/item/RedstoneCard.kt @@ -15,13 +15,13 @@ open class RedstoneCard(val tier: Int): Item(Properties()), ComponentItem { override fun getComponentTier(itemStack: ItemStack): Int = tier - override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) { - ensureHasAddress(itemStack) + override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) { + if(machine != null) ensureHasAddress(itemStack) super.whenComponentPlaced(itemStack, machine, newRole) } // TODO: Redstone Component - override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity): Networking.Node? = null + override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity?): Networking.Node? = null override fun appendHoverText( itemStack: ItemStack, diff --git a/src/main/kotlin/org/neoflock/neocomputers/item/TunnelCard.kt b/src/main/kotlin/org/neoflock/neocomputers/item/TunnelCard.kt index 872c99a..3e21327 100644 --- a/src/main/kotlin/org/neoflock/neocomputers/item/TunnelCard.kt +++ b/src/main/kotlin/org/neoflock/neocomputers/item/TunnelCard.kt @@ -14,13 +14,13 @@ class TunnelCard: Item(Properties().component(DataComponents.TUNNEL_CHANNEL, "cr override fun getComponentTier(itemStack: ItemStack): Int = 3 - override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) { - ensureHasAddress(itemStack) + override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) { + if(machine != null) ensureHasAddress(itemStack) super.whenComponentPlaced(itemStack, machine, newRole) } // TODO: Tunnel Component - override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity): Networking.Node? = null + override fun toComponentNode(itemStack: ItemStack, machine: MachineEntity?): Networking.Node? = null override fun appendHoverText( itemStack: ItemStack,