I plead oopsie daisy
This commit is contained in:
@@ -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 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 CBUS0: CBUSItem(1, 8)
|
||||||
class CBUS1: CBUSItem(2, 12)
|
class CBUS1: CBUSItem(2, 12)
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ open class CPUItem(val tier: Int, val maxComponents: Int): Item(Item.Properties(
|
|||||||
|
|
||||||
override fun getArchitecturesProvided(itemStack: ItemStack): Set<String> = setOf("Lua 5.3")
|
override fun getArchitecturesProvided(itemStack: ItemStack): Set<String> = 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)
|
class CPU0: CPUItem(1, 8)
|
||||||
|
|||||||
@@ -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 getComponentTier(itemStack: ItemStack): Int = tier
|
||||||
|
|
||||||
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) {
|
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) {
|
||||||
ensureHasAddress(itemStack)
|
if(machine != null) ensureHasAddress(itemStack)
|
||||||
super.whenComponentPlaced(itemStack, machine, newRole)
|
super.whenComponentPlaced(itemStack, machine, newRole)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Modem Component
|
// 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(
|
override fun appendHoverText(
|
||||||
itemStack: ItemStack,
|
itemStack: ItemStack,
|
||||||
|
|||||||
@@ -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 getComponentCapacity(itemStack: ItemStack): Int = 0
|
||||||
|
|
||||||
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) {
|
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) {
|
||||||
ensureHasAddress(itemStack)
|
if(machine != null) ensureHasAddress(itemStack)
|
||||||
super.whenComponentPlaced(itemStack, machine, newRole)
|
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(
|
override fun appendHoverText(
|
||||||
itemStack: ItemStack,
|
itemStack: ItemStack,
|
||||||
|
|||||||
@@ -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 getComponentTier(itemStack: ItemStack): Int = tier
|
||||||
|
|
||||||
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) {
|
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) {
|
||||||
ensureHasAddress(itemStack)
|
if(machine != null) ensureHasAddress(itemStack)
|
||||||
super.whenComponentPlaced(itemStack, machine, newRole)
|
super.whenComponentPlaced(itemStack, machine, newRole)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: GPU Component
|
// 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(
|
override fun appendHoverText(
|
||||||
itemStack: ItemStack,
|
itemStack: ItemStack,
|
||||||
|
|||||||
@@ -23,12 +23,12 @@ open class HardDiskItem(val tier: Int, val capacity: Long): Item(getDiskProperti
|
|||||||
|
|
||||||
override fun getComponentCapacity(itemStack: ItemStack): Int = 0
|
override fun getComponentCapacity(itemStack: ItemStack): Int = 0
|
||||||
|
|
||||||
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) {
|
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) {
|
||||||
ensureHasAddress(itemStack)
|
if(machine != null) ensureHasAddress(itemStack)
|
||||||
super.whenComponentPlaced(itemStack, machine, newRole)
|
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(
|
override fun appendHoverText(
|
||||||
itemStack: ItemStack,
|
itemStack: ItemStack,
|
||||||
|
|||||||
@@ -14,13 +14,13 @@ class InternetCard: Item(Item.Properties()), ComponentItem {
|
|||||||
|
|
||||||
override fun getComponentTier(itemStack: ItemStack): Int = 1
|
override fun getComponentTier(itemStack: ItemStack): Int = 1
|
||||||
|
|
||||||
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) {
|
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) {
|
||||||
ensureHasAddress(itemStack)
|
if(machine != null) ensureHasAddress(itemStack)
|
||||||
super.whenComponentPlaced(itemStack, machine, newRole)
|
super.whenComponentPlaced(itemStack, machine, newRole)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Internet Component
|
// 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(
|
override fun appendHoverText(
|
||||||
itemStack: ItemStack,
|
itemStack: ItemStack,
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ open class MemoryItem(val tier: Int, val capacity: Int): Item(Item.Properties().
|
|||||||
override fun getComponentCapacity(itemStack: ItemStack): Int = 0
|
override fun getComponentCapacity(itemStack: ItemStack): Int = 0
|
||||||
|
|
||||||
// no node for memory
|
// 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(
|
override fun appendHoverText(
|
||||||
itemStack: ItemStack,
|
itemStack: ItemStack,
|
||||||
|
|||||||
@@ -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 getComponentTier(itemStack: ItemStack): Int = tier
|
||||||
|
|
||||||
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) {
|
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) {
|
||||||
ensureHasAddress(itemStack)
|
if(machine != null) ensureHasAddress(itemStack)
|
||||||
super.whenComponentPlaced(itemStack, machine, newRole)
|
super.whenComponentPlaced(itemStack, machine, newRole)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Modem Component
|
// 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(
|
override fun appendHoverText(
|
||||||
itemStack: ItemStack,
|
itemStack: ItemStack,
|
||||||
|
|||||||
@@ -15,13 +15,13 @@ open class RedstoneCard(val tier: Int): Item(Properties()), ComponentItem {
|
|||||||
|
|
||||||
override fun getComponentTier(itemStack: ItemStack): Int = tier
|
override fun getComponentTier(itemStack: ItemStack): Int = tier
|
||||||
|
|
||||||
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) {
|
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) {
|
||||||
ensureHasAddress(itemStack)
|
if(machine != null) ensureHasAddress(itemStack)
|
||||||
super.whenComponentPlaced(itemStack, machine, newRole)
|
super.whenComponentPlaced(itemStack, machine, newRole)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Redstone Component
|
// 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(
|
override fun appendHoverText(
|
||||||
itemStack: ItemStack,
|
itemStack: ItemStack,
|
||||||
|
|||||||
@@ -14,13 +14,13 @@ class TunnelCard: Item(Properties().component(DataComponents.TUNNEL_CHANNEL, "cr
|
|||||||
|
|
||||||
override fun getComponentTier(itemStack: ItemStack): Int = 3
|
override fun getComponentTier(itemStack: ItemStack): Int = 3
|
||||||
|
|
||||||
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) {
|
override fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) {
|
||||||
ensureHasAddress(itemStack)
|
if(machine != null) ensureHasAddress(itemStack)
|
||||||
super.whenComponentPlaced(itemStack, machine, newRole)
|
super.whenComponentPlaced(itemStack, machine, newRole)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Tunnel Component
|
// 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(
|
override fun appendHoverText(
|
||||||
itemStack: ItemStack,
|
itemStack: ItemStack,
|
||||||
|
|||||||
Reference in New Issue
Block a user