Validate wire layout prototypes and remove invalid WiresComponents (#26682)

Validate wire layout prototypes; delete invalid wirescomponents.

Content.Server/Wires/WiresComponent.cs

@@ -1,4 +1,5 @@
 using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Wires;
 
@@ -15,7 +16,7 @@ public sealed partial class WiresComponent : Component
     ///     The layout ID of this entity's wires.
     /// </summary>
     [DataField(required: true)]
-    public string LayoutId { get; set; } = default!;
+    public ProtoId<WireLayoutPrototype> LayoutId { get; set; } = default!;
 
     /// <summary>
     ///     The serial number of this board. Randomly generated upon start,

Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml

@@ -102,8 +102,6 @@
   - type: BorgChassis
   - type: WiresPanel
   - type: ActivatableUIRequiresPanel
-  - type: Wires
-    layoutId: Borg
   - type: NameIdentifier
     group: Silicon
   - type: ContainerContainer

Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml

@@ -163,9 +163,6 @@
   - type: Appearance
   - type: WiresVisuals
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-dawinstrument
-    layoutId: DawInstrument
   - type: Machine
     board: DawInstrumentMachineCircuitboard
   - type: Instrument

Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml

@@ -66,9 +66,6 @@
     bodyType: KinematicController
   - type: Clickable
   - type: WiresPanel
-  - type: Wires #we just want the panel
-    boardName: wires-board-name-mech
-    layoutId: Mech
   - type: Fixtures
     fixtures:
       fix1:

Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml

@@ -71,5 +71,4 @@
       beakerSlot: !type:ContainerSlot
   - type: StaticPrice
     price: 1000
-  - type: Wires
   - type: WiresPanel

Resources/Prototypes/Entities/Structures/Dispensers/booze.yml

@@ -19,9 +19,6 @@
     noRot: false
   - type: Machine
     board: BoozeDispenserMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-booze
-    layoutId: BoozeDispenser
   - type: GuideHelp
     guides:
     - Bartender

Resources/Prototypes/Entities/Structures/Dispensers/chem.yml

@@ -31,9 +31,6 @@
         acts: ["Destruction"]
   - type: Machine
     board: ChemDispenserMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-chemdispenser
-    layoutId: ChemDispenser
   - type: GuideHelp
     guides:
     - Chemicals

Resources/Prototypes/Entities/Structures/Dispensers/soda.yml

@@ -19,9 +19,6 @@
     noRot: false
   - type: Machine
     board: SodaDispenserMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-soda
-    layoutId: SodaDispenser
   - type: GuideHelp
     guides:
     - Bartender

Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml

@@ -22,7 +22,7 @@
     - type: RCDDeconstructable
       cost: 4
       delay: 6
-      fx: EffectRCDDeconstruct6  
+      fx: EffectRCDDeconstruct6
     - type: Destructible
       thresholds:
       - trigger:
@@ -87,9 +87,6 @@
     - type: Appearance
     - type: WiresVisuals
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-firelock
-      layoutId: Firelock
     - type: UserInterface
       interfaces:
         - key: enum.WiresUiKey.Key

Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml

@@ -29,8 +29,6 @@
           components:
           - FitsInDispenser
   - type: Machine
-  - type: Wires
-    layoutId: chem
   - type: WiresPanel
   - type: WiresVisuals
   - type: ContainerContainer

Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml

@@ -37,9 +37,6 @@
     color: "#fca3c0"
   - type: Appearance
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-vessel
-    layoutId: Vessel
   - type: AmbientSound
     enabled: false
     range: 3
@@ -198,9 +195,6 @@
   - type: Appearance
   - type: WiresPanel
   - type: WiresVisuals
-  - type: Wires
-    boardName: wires-board-name-ape
-    layoutId: Ape
   - type: GenericVisualizer
     visuals:
       enum.PowerDeviceVisuals.Powered:
@@ -290,9 +284,6 @@
     fuelCost: 10
     doAfterDelay: 5
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-anomalygenerator
-    layoutId: AnomalyGenerator
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml

@@ -143,9 +143,6 @@
         Blunt: 10
   - type: Machine
     board: ArtifactCrusherMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-crusher
-    layoutId: Crusher
   - type: WiresPanel
   - type: Sprite
     sprite: Structures/Machines/artifact_crusher.rsi

Resources/Prototypes/Entities/Structures/Machines/chem_master.yml

@@ -63,9 +63,6 @@
           False: { visible: false }
   # Machine / Construction stuff
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-chemmaster
-    layoutId: chem_master
   - type: Machine
     board: ChemMasterMachineCircuitboard
   - type: ContainerContainer

Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml

@@ -52,9 +52,6 @@
     materialWhiteList:
     - Biomass
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-cloningpod
-    layoutId: CloningPod
   - type: ApcPowerReceiver
     powerLoad: 200 #Receives most of its power from the console
   - type: Appearance

Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml

@@ -98,9 +98,6 @@
   - type: Machine
     board: FatExtractorMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-fatextractor
-    layoutId: FatExtractor
   - type: Appearance
   - type: Speech
     speechVerb: Robotic

Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml

@@ -52,9 +52,6 @@
       path: /Audio/Items/rped.ogg
   - type: WiresPanel
   - type: WiresVisuals
-  - type: Wires
-    boardName: wires-board-name-flatpacker
-    layoutId: Flatpacker
   - type: Appearance
   - type: ActivatableUI
     key: enum.FlatpackCreatorUIKey.Key

Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml

@@ -120,9 +120,6 @@
             min: 1
             max: 1
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-minigravitygenerator
-    layoutId: MiniGravityGenerator
   - type: Machine
     board: MiniGravityGeneratorCircuitboard
   - type: ApcPowerReceiver

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -33,9 +33,6 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-autolathe
-    layoutId: Autolathe
   - type: ActivatableUI
     key: enum.LatheUiKey.Key
   - type: ActivatableUIRequiresPower
@@ -239,9 +236,6 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Machine
     board: ProtolatheMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-protolathe
-    layoutId: Protolathe
   - type: MaterialStorage
     whitelist:
       tags:

Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml

@@ -61,9 +61,6 @@
   - type: Machine
     board: MaterialReclaimerMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-reclaimer
-    layoutId: Reclaimer
   - type: MaterialReclaimer
     whitelist:
       components:

Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml

@@ -69,9 +69,6 @@
   - type: Machine
     board: MedicalScannerMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-medicalscanner
-    layoutId: MedicalScanner
   - type: Appearance
   - type: Climbable
   - type: ApcPowerReceiver

Resources/Prototypes/Entities/Structures/Machines/research.yml

@@ -23,8 +23,6 @@
     priority: Low
   - type: ExtensionCableReceiver
   - type: WiresPanel
-  - type: Wires
-    layoutId: rndserver
   - type: WiresVisuals
   - type: Machine
     board: ResearchAndDevelopmentServerMachineCircuitboard

Resources/Prototypes/Entities/Structures/Machines/telecomms.yml

@@ -51,9 +51,6 @@
   - type: Machine
     board: TelecomServerCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-telecomserver
-    layoutId: TelecomServer
   - type: Transform
     anchored: true
   - type: Pullable

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml

@@ -245,9 +245,6 @@
       inHandsOnly: false
       key: enum.ThermomachineUiKey.Key
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-thermomachine
-      layoutId: Thermomachine
     - type: WiresVisuals
     - type: NodeContainer
       nodes:
@@ -430,9 +427,6 @@
   - type: Machine
     board: CondenserMachineCircuitBoard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-condenser
-    layoutId: Condenser
   - type: WiresVisuals
   - type: Destructible
     thresholds:

Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml

@@ -42,9 +42,6 @@
 
     # Construction, interaction
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-generator
-      layoutId: Generator
     - type: UserInterface
       interfaces:
         - key: enum.GeneratorComponentUiKey.Key
@@ -356,4 +353,4 @@
             damage: 75
           behaviors:
             - !type:SolutionExplosionBehavior
-              solution: tank
+              solution: tank

Resources/Prototypes/Entities/Structures/Power/apc.yml

@@ -97,9 +97,6 @@
     supplyRampRate: 500
   - type: WallMount
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-apc
-    layoutId: APC
   - type: WiresVisuals
   - type: Damageable
     damageContainer: Inorganic

Resources/Prototypes/Entities/Structures/Power/chargers.yml

@@ -83,9 +83,6 @@
       visible: false
   - type: Machine
     board: CellRechargerCircuitboard
-  - type: Wires
-    boardName: wires-board-name-recharger
-    layoutId: Recharger
   - type: WiresPanel
   - type: GenericVisualizer
     visuals:
@@ -250,8 +247,6 @@
     - machine_parts
     - machine_board
     - entity_storage
-  - type: Wires
-    layoutId: borgcharger
   - type: WiresPanel
   - type: WiresVisuals
   - type: Machine

Resources/Prototypes/Entities/Structures/Power/smes.yml

@@ -67,9 +67,6 @@
       color: "#c9c042"
       castShadows: false
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-smes
-      layoutId: SMES
     - type: Machine
       board: SMESMachineCircuitboard
     - type: StationInfiniteBatteryTarget

Resources/Prototypes/Entities/Structures/Power/substation.yml

@@ -92,9 +92,6 @@
     intensitySlope: 2
     totalIntensity: 200
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-substation
-    layoutId: Substation
   - type: Machine
     board: SubstationMachineCircuitboard
   - type: StationInfiniteBatteryTarget

Resources/Prototypes/Entities/Structures/hydro_tray.yml

@@ -81,9 +81,6 @@
   - type: Machine
     board: HydroponicsTrayMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-hydroponicstray
-    layoutId: HydroponicsTray
   - type: AmbientSound
     volume: -9
     range: 5