diff --git a/src/main/scala/li/cil/oc/common/component/TerminalServer.scala b/src/main/scala/li/cil/oc/common/component/TerminalServer.scala index 81f8066e2..f0e75ede5 100644 --- a/src/main/scala/li/cil/oc/common/component/TerminalServer.scala +++ b/src/main/scala/li/cil/oc/common/component/TerminalServer.scala @@ -73,7 +73,7 @@ class TerminalServer(val rack: api.internal.Rack, val slot: Int) extends Environ // ----------------------------------------------------------------------- // // DeviceInfo - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Terminal server", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/common/component/TextBuffer.scala b/src/main/scala/li/cil/oc/common/component/TextBuffer.scala index f30dec9da..480255a3b 100644 --- a/src/main/scala/li/cil/oc/common/component/TextBuffer.scala +++ b/src/main/scala/li/cil/oc/common/component/TextBuffer.scala @@ -103,7 +103,7 @@ class TextBuffer(val host: EnvironmentHost) extends prefab.ManagedEnvironment wi relativeLitArea = -1 // Recompute lit area, avoid screens blanking out until something changes. } - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Display, DeviceAttribute.Description -> "Text buffer", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/common/tileentity/Adapter.scala b/src/main/scala/li/cil/oc/common/tileentity/Adapter.scala index 5f8b4d3e0..cbe66e75a 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Adapter.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Adapter.scala @@ -32,7 +32,7 @@ class Adapter extends traits.Environment with traits.ComponentInventory with Ana private val blocksData = Array.fill[Option[BlockData]](6)(None) - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Bus, DeviceAttribute.Description -> "Adapter", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/common/tileentity/Assembler.scala b/src/main/scala/li/cil/oc/common/tileentity/Assembler.scala index e601cfec2..f3145492f 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Assembler.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Assembler.scala @@ -35,7 +35,7 @@ class Assembler extends traits.Environment with traits.PowerAcceptor with traits var requiredEnergy = 0.0 - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Assembler", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala b/src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala index 4e24c3b78..935b92d28 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala @@ -21,7 +21,7 @@ class Capacitor extends traits.Environment with DeviceInfo { withConnector(maxCapacity). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Power, DeviceAttribute.Description -> "Battery", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/common/tileentity/Case.scala b/src/main/scala/li/cil/oc/common/tileentity/Case.scala index 79468c444..68db7bb44 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Case.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Case.scala @@ -33,7 +33,7 @@ class Case(var tier: Int) extends traits.PowerAcceptor with traits.Computer with color = Color.byTier(tier) - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.System, DeviceAttribute.Description -> "Computer", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/common/tileentity/Charger.scala b/src/main/scala/li/cil/oc/common/tileentity/Charger.scala index a5b6c630f..f73cd23cc 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Charger.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Charger.scala @@ -43,7 +43,7 @@ class Charger extends traits.Environment with traits.PowerAcceptor with traits.R var invertSignal = false - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Charger", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala b/src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala index eea4c70f0..e2e7e2172 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala @@ -49,7 +49,7 @@ class Disassembler extends traits.Environment with traits.PowerAcceptor with tra world.notifyBlocksOfNeighborChange(x, y, z, block) } - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Disassembler", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala b/src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala index 8d037094a..123c67c5b 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala @@ -37,7 +37,7 @@ class DiskDrive extends traits.Environment with traits.ComponentInventory with t case _ => None } - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Disk, DeviceAttribute.Description -> "Floppy disk drive", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala b/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala index ac1876399..f4276b1fb 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala @@ -37,7 +37,7 @@ class Hologram(var tier: Int) extends traits.Environment with SidedEnvironment w final val height = 2 * 16 // 32 bit in an int - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Display, DeviceAttribute.Description -> "Holographic projector", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala b/src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala index 88d6a3f21..f782abae2 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala @@ -52,7 +52,7 @@ class Microcontroller extends traits.PowerAcceptor with traits.Hub with traits.C override protected def runSound = None // Microcontrollers are silent. - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.System, DeviceAttribute.Description -> "Microcontroller", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/common/tileentity/MotionSensor.scala b/src/main/scala/li/cil/oc/common/tileentity/MotionSensor.scala index 5a03f9e71..e4c7cd69d 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/MotionSensor.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/MotionSensor.scala @@ -34,7 +34,7 @@ class MotionSensor extends traits.Environment with DeviceInfo { private val trackedEntities = mutable.Map.empty[EntityLivingBase, (Double, Double, Double)] - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Motion sensor", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala b/src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala index ff74a2993..3155a830b 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala @@ -20,7 +20,7 @@ class PowerConverter extends traits.PowerAcceptor with traits.Environment with t withConnector(Settings.get.bufferConverter). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Power, DeviceAttribute.Description -> "Power converter", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/common/tileentity/Printer.scala b/src/main/scala/li/cil/oc/common/tileentity/Printer.scala index f8729b5af..b33e608ee 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Printer.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Printer.scala @@ -47,7 +47,7 @@ class Printer extends traits.Environment with traits.Inventory with traits.Rotat val slotInk = 1 val slotOutput = 2 - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Printer, DeviceAttribute.Description -> "3D Printer", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/CPU.scala b/src/main/scala/li/cil/oc/server/component/CPU.scala index 8928fa84b..1d88e1193 100644 --- a/src/main/scala/li/cil/oc/server/component/CPU.scala +++ b/src/main/scala/li/cil/oc/server/component/CPU.scala @@ -17,7 +17,7 @@ class CPU(val tier: Int) extends prefab.ManagedEnvironment with DeviceInfo { override val node = Network.newNode(this, Visibility.Network). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Processor, DeviceAttribute.Description -> "CPU", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/DataCard.scala b/src/main/scala/li/cil/oc/server/component/DataCard.scala index ef619aa61..e4df559fc 100644 --- a/src/main/scala/li/cil/oc/server/component/DataCard.scala +++ b/src/main/scala/li/cil/oc/server/component/DataCard.scala @@ -77,7 +77,7 @@ object DataCard { } class Tier1 extends DataCard { - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Processor, DeviceAttribute.Description -> "Data processor card", DeviceAttribute.Vendor -> "S.C. Ltd.", @@ -138,7 +138,7 @@ object DataCard { } class Tier2 extends Tier1 { - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Processor, DeviceAttribute.Description -> "Data processor card", DeviceAttribute.Vendor -> "S.C. Ltd.", @@ -212,7 +212,7 @@ object DataCard { } class Tier3 extends Tier2 { - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Processor, DeviceAttribute.Description -> "Data processor card", DeviceAttribute.Vendor -> "S.C. Ltd.", diff --git a/src/main/scala/li/cil/oc/server/component/DiskDriveMountable.scala b/src/main/scala/li/cil/oc/server/component/DiskDriveMountable.scala index 797c877ef..1788b0265 100644 --- a/src/main/scala/li/cil/oc/server/component/DiskDriveMountable.scala +++ b/src/main/scala/li/cil/oc/server/component/DiskDriveMountable.scala @@ -44,7 +44,7 @@ class DiskDriveMountable(val rack: api.internal.Rack, val slot: Int) extends pre // ----------------------------------------------------------------------- // // DeviceInfo - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Disk, DeviceAttribute.Description -> "Floppy disk drive", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/Drive.scala b/src/main/scala/li/cil/oc/server/component/Drive.scala index 6d25cca61..1f5dc49bb 100644 --- a/src/main/scala/li/cil/oc/server/component/Drive.scala +++ b/src/main/scala/li/cil/oc/server/component/Drive.scala @@ -53,7 +53,7 @@ class Drive(val capacity: Int, val platterCount: Int, val label: Label, host: Op // ----------------------------------------------------------------------- // - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Disk, DeviceAttribute.Description -> "Hard disk drive", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/Drone.scala b/src/main/scala/li/cil/oc/server/component/Drone.scala index 927f39b45..83f2c9ad9 100644 --- a/src/main/scala/li/cil/oc/server/component/Drone.scala +++ b/src/main/scala/li/cil/oc/server/component/Drone.scala @@ -27,7 +27,7 @@ class Drone(val agent: entity.Drone) extends prefab.ManagedEnvironment with Agen withConnector(Settings.get.bufferDrone). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.System, DeviceAttribute.Description -> "Drone", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/EEPROM.scala b/src/main/scala/li/cil/oc/server/component/EEPROM.scala index e8de86db3..e8b9c41f5 100644 --- a/src/main/scala/li/cil/oc/server/component/EEPROM.scala +++ b/src/main/scala/li/cil/oc/server/component/EEPROM.scala @@ -36,7 +36,7 @@ class EEPROM extends prefab.ManagedEnvironment with DeviceInfo { // ----------------------------------------------------------------------- // - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Memory, DeviceAttribute.Description -> "EEPROM", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/FileSystem.scala b/src/main/scala/li/cil/oc/server/component/FileSystem.scala index 600da9312..62415e04d 100644 --- a/src/main/scala/li/cil/oc/server/component/FileSystem.scala +++ b/src/main/scala/li/cil/oc/server/component/FileSystem.scala @@ -45,7 +45,7 @@ class FileSystem(val fileSystem: IFileSystem, var label: Label, val host: Option // ----------------------------------------------------------------------- // - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Volume, DeviceAttribute.Description -> "Filesystem", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/Geolyzer.scala b/src/main/scala/li/cil/oc/server/component/Geolyzer.scala index 676a04da7..b7e621b00 100644 --- a/src/main/scala/li/cil/oc/server/component/Geolyzer.scala +++ b/src/main/scala/li/cil/oc/server/component/Geolyzer.scala @@ -39,7 +39,7 @@ class Geolyzer(val host: EnvironmentHost) extends prefab.ManagedEnvironment with withConnector(). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Geolyzer", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/GraphicsCard.scala b/src/main/scala/li/cil/oc/server/component/GraphicsCard.scala index 23d0763c1..70e2e4285 100644 --- a/src/main/scala/li/cil/oc/server/component/GraphicsCard.scala +++ b/src/main/scala/li/cil/oc/server/component/GraphicsCard.scala @@ -61,7 +61,7 @@ class GraphicsCard(val tier: Int) extends prefab.ManagedEnvironment with DeviceI // ----------------------------------------------------------------------- // - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Display, DeviceAttribute.Description -> "Graphics controller", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/InternetCard.scala b/src/main/scala/li/cil/oc/server/component/InternetCard.scala index d1d3ffe13..71e43aae3 100644 --- a/src/main/scala/li/cil/oc/server/component/InternetCard.scala +++ b/src/main/scala/li/cil/oc/server/component/InternetCard.scala @@ -44,7 +44,7 @@ class InternetCard extends prefab.ManagedEnvironment with DeviceInfo { // ----------------------------------------------------------------------- // - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Communication, DeviceAttribute.Description -> "Internet modem", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/Keyboard.scala b/src/main/scala/li/cil/oc/server/component/Keyboard.scala index 15e311678..860144208 100644 --- a/src/main/scala/li/cil/oc/server/component/Keyboard.scala +++ b/src/main/scala/li/cil/oc/server/component/Keyboard.scala @@ -35,7 +35,7 @@ class Keyboard(val host: EnvironmentHost) extends prefab.ManagedEnvironment with // ----------------------------------------------------------------------- // - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Input, DeviceAttribute.Description -> "Keyboard", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/LinkedCard.scala b/src/main/scala/li/cil/oc/server/component/LinkedCard.scala index 1f379b487..914183775 100644 --- a/src/main/scala/li/cil/oc/server/component/LinkedCard.scala +++ b/src/main/scala/li/cil/oc/server/component/LinkedCard.scala @@ -29,7 +29,7 @@ class LinkedCard extends prefab.ManagedEnvironment with QuantumNetwork.QuantumNo // ----------------------------------------------------------------------- // - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Network, DeviceAttribute.Description -> "Quantumnet controller", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/Memory.scala b/src/main/scala/li/cil/oc/server/component/Memory.scala index 28316eed8..71ec2df14 100644 --- a/src/main/scala/li/cil/oc/server/component/Memory.scala +++ b/src/main/scala/li/cil/oc/server/component/Memory.scala @@ -17,7 +17,7 @@ class Memory(val tier: Int) extends prefab.ManagedEnvironment with DeviceInfo { override val node = Network.newNode(this, Visibility.Network). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Memory, DeviceAttribute.Description -> "Memory bank", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/NetworkCard.scala b/src/main/scala/li/cil/oc/server/component/NetworkCard.scala index 0c7b25a29..41c9e4e4b 100644 --- a/src/main/scala/li/cil/oc/server/component/NetworkCard.scala +++ b/src/main/scala/li/cil/oc/server/component/NetworkCard.scala @@ -43,7 +43,7 @@ class NetworkCard(val host: EnvironmentHost) extends prefab.ManagedEnvironment w // ----------------------------------------------------------------------- // - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Network, DeviceAttribute.Description -> "Ethernet controller", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/Redstone.scala b/src/main/scala/li/cil/oc/server/component/Redstone.scala index 481139c0c..e772184ca 100644 --- a/src/main/scala/li/cil/oc/server/component/Redstone.scala +++ b/src/main/scala/li/cil/oc/server/component/Redstone.scala @@ -28,7 +28,7 @@ object Redstone { class BundledWireless(val redstone: EnvironmentHost with BundledRedstoneAware) extends component.RedstoneVanilla with component.RedstoneBundled with component.RedstoneWireless { - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Communication, DeviceAttribute.Description -> "Combined redstone controller", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/RedstoneBundled.scala b/src/main/scala/li/cil/oc/server/component/RedstoneBundled.scala index 47dfd3aa8..18b8a3e13 100644 --- a/src/main/scala/li/cil/oc/server/component/RedstoneBundled.scala +++ b/src/main/scala/li/cil/oc/server/component/RedstoneBundled.scala @@ -15,7 +15,7 @@ import li.cil.oc.common.tileentity.traits.BundledRedstoneAware import scala.collection.convert.WrapAsJava._ trait RedstoneBundled extends RedstoneVanilla { - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Communication, DeviceAttribute.Description -> "Advanced redstone controller", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/RedstoneVanilla.scala b/src/main/scala/li/cil/oc/server/component/RedstoneVanilla.scala index f87f13628..8238c1d09 100644 --- a/src/main/scala/li/cil/oc/server/component/RedstoneVanilla.scala +++ b/src/main/scala/li/cil/oc/server/component/RedstoneVanilla.scala @@ -25,7 +25,7 @@ trait RedstoneVanilla extends RedstoneSignaller with DeviceInfo { // ----------------------------------------------------------------------- // - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Communication, DeviceAttribute.Description -> "Redstone controller", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala b/src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala index c6d059f85..1ac05ecf7 100644 --- a/src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala +++ b/src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala @@ -36,7 +36,7 @@ trait RedstoneWireless extends RedstoneSignaller with WirelessReceivingDevice wi // ----------------------------------------------------------------------- // - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Communication, DeviceAttribute.Description -> "Wireless redstone controller", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/Robot.scala b/src/main/scala/li/cil/oc/server/component/Robot.scala index f13bf3bff..e0b9b6622 100644 --- a/src/main/scala/li/cil/oc/server/component/Robot.scala +++ b/src/main/scala/li/cil/oc/server/component/Robot.scala @@ -34,7 +34,7 @@ class Robot(val agent: tileentity.Robot) extends prefab.ManagedEnvironment with val romRobot = Option(api.FileSystem.asManagedEnvironment(api.FileSystem. fromClass(OpenComputers.getClass, Settings.resourceDomain, "lua/component/robot"), "robot")) - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.System, DeviceAttribute.Description -> "Robot", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/Server.scala b/src/main/scala/li/cil/oc/server/component/Server.scala index b73acb772..2eac77135 100644 --- a/src/main/scala/li/cil/oc/server/component/Server.scala +++ b/src/main/scala/li/cil/oc/server/component/Server.scala @@ -44,7 +44,7 @@ class Server(val rack: api.internal.Rack, val slot: Int) extends Environment wit var lastFileSystemAccess = 0L var lastNetworkActivity = 0L - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.System, DeviceAttribute.Description -> "Server", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/Tablet.scala b/src/main/scala/li/cil/oc/server/component/Tablet.scala index 90975d2f2..92aa6be82 100644 --- a/src/main/scala/li/cil/oc/server/component/Tablet.scala +++ b/src/main/scala/li/cil/oc/server/component/Tablet.scala @@ -23,7 +23,7 @@ class Tablet(val tablet: TabletWrapper) extends prefab.ManagedEnvironment with D withConnector(Settings.get.bufferTablet). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.System, DeviceAttribute.Description -> "Tablet", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/Transposer.scala b/src/main/scala/li/cil/oc/server/component/Transposer.scala index 71b3d222a..7a36cb3d0 100644 --- a/src/main/scala/li/cil/oc/server/component/Transposer.scala +++ b/src/main/scala/li/cil/oc/server/component/Transposer.scala @@ -28,7 +28,7 @@ object Transposer { withConnector(). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Transposer", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeAngel.scala b/src/main/scala/li/cil/oc/server/component/UpgradeAngel.scala index f50103397..034e5edb3 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeAngel.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeAngel.scala @@ -21,7 +21,7 @@ class UpgradeAngel extends prefab.ManagedEnvironment with DeviceInfo { withComponent("angel"). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Angel upgrade", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeBattery.scala b/src/main/scala/li/cil/oc/server/component/UpgradeBattery.scala index 44a9c3e1e..cefd6d4e8 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeBattery.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeBattery.scala @@ -18,7 +18,7 @@ class UpgradeBattery(val tier: Int) extends prefab.ManagedEnvironment with Devic withConnector(Settings.get.bufferCapacitorUpgrades(tier)). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Power, DeviceAttribute.Description -> "Battery", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeChunkloader.scala b/src/main/scala/li/cil/oc/server/component/UpgradeChunkloader.scala index 8a933d334..d476f5979 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeChunkloader.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeChunkloader.scala @@ -27,7 +27,7 @@ class UpgradeChunkloader(val host: EnvironmentHost) extends prefab.ManagedEnviro withConnector(). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "World stabilizer", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala b/src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala index 5f358221b..3ff4ce490 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala @@ -32,7 +32,7 @@ class UpgradeCrafting(val host: EnvironmentHost with internal.Robot) extends pre withComponent("crafting"). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Assembly controller", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeDatabase.scala b/src/main/scala/li/cil/oc/server/component/UpgradeDatabase.scala index 34cf41389..3e0a3644f 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeDatabase.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeDatabase.scala @@ -28,7 +28,7 @@ class UpgradeDatabase(val data: IInventory) extends prefab.ManagedEnvironment wi withComponent("database"). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Object catalogue", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeExperience.scala b/src/main/scala/li/cil/oc/server/component/UpgradeExperience.scala index a3136fd2a..df0127746 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeExperience.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeExperience.scala @@ -29,7 +29,7 @@ class UpgradeExperience(val host: EnvironmentHost with internal.Agent) extends p withConnector(30 * Settings.get.bufferPerLevel). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Knowledge database", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeGenerator.scala b/src/main/scala/li/cil/oc/server/component/UpgradeGenerator.scala index 549b65221..12a68b2ce 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeGenerator.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeGenerator.scala @@ -33,7 +33,7 @@ class UpgradeGenerator(val host: EnvironmentHost with internal.Agent) extends pr var remainingTicks = 0 - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Power, DeviceAttribute.Description -> "Generator", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeInventoryController.scala b/src/main/scala/li/cil/oc/server/component/UpgradeInventoryController.scala index 6d931e129..fe05aa9b4 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeInventoryController.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeInventoryController.scala @@ -23,7 +23,7 @@ import scala.collection.convert.WrapAsJava._ object UpgradeInventoryController { trait Common extends DeviceInfo { - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Inventory controller", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala b/src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala index 128f2baee..1b3181722 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala @@ -35,7 +35,7 @@ class UpgradeLeash(val host: Entity) extends prefab.ManagedEnvironment with trai final val MaxLeashedEntities = 8 - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Leash", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeNavigation.scala b/src/main/scala/li/cil/oc/server/component/UpgradeNavigation.scala index 7b902e144..fbb0eb6c3 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeNavigation.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeNavigation.scala @@ -35,7 +35,7 @@ class UpgradeNavigation(val host: EnvironmentHost with Rotatable) extends prefab val data = new NavigationUpgradeData() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Navigation upgrade", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradePiston.scala b/src/main/scala/li/cil/oc/server/component/UpgradePiston.scala index 11d95b6dd..b68fcd4d4 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradePiston.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradePiston.scala @@ -29,7 +29,7 @@ abstract class UpgradePiston(val host: EnvironmentHost) extends prefab.ManagedEn withConnector(). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Piston upgrade", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeSign.scala b/src/main/scala/li/cil/oc/server/component/UpgradeSign.scala index e1decceda..884af9d7c 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeSign.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeSign.scala @@ -28,7 +28,7 @@ import net.minecraftforge.event.world.BlockEvent import scala.collection.convert.WrapAsJava._ abstract class UpgradeSign extends prefab.ManagedEnvironment with DeviceInfo { - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Sign upgrade", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeSolarGenerator.scala b/src/main/scala/li/cil/oc/server/component/UpgradeSolarGenerator.scala index d277de285..e371903e1 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeSolarGenerator.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeSolarGenerator.scala @@ -26,7 +26,7 @@ class UpgradeSolarGenerator(val host: EnvironmentHost) extends prefab.ManagedEnv var isSunShining = false - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Power, DeviceAttribute.Description -> "Solar panel", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeTank.scala b/src/main/scala/li/cil/oc/server/component/UpgradeTank.scala index 315a96445..0633a112f 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeTank.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeTank.scala @@ -20,7 +20,7 @@ import scala.collection.convert.WrapAsJava._ class UpgradeTank(val owner: EnvironmentHost, val capacity: Int) extends prefab.ManagedEnvironment with IFluidTank with DeviceInfo { override val node = Network.newNode(this, Visibility.None).create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Tank upgrade", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeTankController.scala b/src/main/scala/li/cil/oc/server/component/UpgradeTankController.scala index c1de38a95..34e7a619d 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeTankController.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeTankController.scala @@ -21,7 +21,7 @@ import scala.collection.convert.WrapAsJava._ object UpgradeTankController { trait Common extends DeviceInfo { - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Tank controller", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeTractorBeam.scala b/src/main/scala/li/cil/oc/server/component/UpgradeTractorBeam.scala index 1d792ca67..6eae252a7 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeTractorBeam.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeTractorBeam.scala @@ -32,7 +32,7 @@ object UpgradeTractorBeam { private val pickupRadius = 3 - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Tractor beam", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeTrading.scala b/src/main/scala/li/cil/oc/server/component/UpgradeTrading.scala index a7e7228c8..8d40e1775 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeTrading.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeTrading.scala @@ -27,7 +27,7 @@ class UpgradeTrading(val host: EnvironmentHost) extends prefab.ManagedEnvironmen withComponent("trading"). create() - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Generic, DeviceAttribute.Description -> "Trading upgrade", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, diff --git a/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala b/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala index 812173c05..19b0bed94 100644 --- a/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala +++ b/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala @@ -30,7 +30,7 @@ class WirelessNetworkCard(host: EnvironmentHost) extends NetworkCard(host) with // ----------------------------------------------------------------------- // - private final val deviceInfo = Map( + private final lazy val deviceInfo = Map( DeviceAttribute.Class -> DeviceClass.Network, DeviceAttribute.Description -> "Wireless ethernet controller", DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor,