From 711bc1526aa666512c2d161fdff452a471861b26 Mon Sep 17 00:00:00 2001
From: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Date: Wed, 22 Sep 2021 00:37:21 +0100
Subject: [PATCH] Fixed ntnet components not being type safe (#61426)

Co-authored-by: Watermelon914 <3052169-Watermelon914@users.noreply.gitlab.com>
---
 .../wiremod/components/ntnet/ntnet_receive.dm | 32 ++-----------------
 .../wiremod/components/ntnet/ntnet_send.dm    |  7 ++--
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/code/modules/wiremod/components/ntnet/ntnet_receive.dm b/code/modules/wiremod/components/ntnet/ntnet_receive.dm
index 17083fbb753..fc97adbf7d0 100644
--- a/code/modules/wiremod/components/ntnet/ntnet_receive.dm
+++ b/code/modules/wiremod/components/ntnet/ntnet_receive.dm
@@ -3,7 +3,6 @@
  *
  * Receives data through NTNet.
  */
-
 /obj/item/circuit_component/ntnet_receive
 	display_name = "NTNet Receiver"
 	desc = "Receives data packages through NTNet. If Encryption Key is set then only signals with the same Encryption Key will be received."
@@ -12,41 +11,17 @@
 
 	network_id = __NETWORK_CIRCUITS
 
-	var/datum/port/input/push_hid
-	var/datum/port/output/hid
+	/// Data being received
 	var/datum/port/output/data_package
-	var/datum/port/output/secondary_package
+
+	/// Encryption key
 	var/datum/port/input/enc_key
-	var/datum/port/input/option/data_type_options
-	var/datum/port/input/option/secondary_data_type_options
 
 /obj/item/circuit_component/ntnet_receive/populate_ports()
 	data_package = add_output_port("Data Package", PORT_TYPE_ANY)
-	secondary_package = add_output_port("Secondary Package", PORT_TYPE_ANY)
 	enc_key = add_input_port("Encryption Key", PORT_TYPE_STRING)
 	RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, .proc/ntnet_receive)
 
-/obj/item/circuit_component/ntnet_receive/populate_options()
-	var/static/component_options = list(
-		PORT_TYPE_ANY,
-		PORT_TYPE_STRING,
-		PORT_TYPE_NUMBER,
-		PORT_TYPE_LIST,
-		PORT_TYPE_ATOM,
-	)
-	data_type_options = add_option_port("Data Type", component_options)
-	secondary_data_type_options = add_option_port("Secondary Data Type", component_options)
-
-/obj/item/circuit_component/ntnet_receive/input_received(datum/port/input/port)
-
-	if(COMPONENT_TRIGGERED_BY(data_type_options, port))
-		data_package.set_datatype(data_type_options.value)
-
-	if(COMPONENT_TRIGGERED_BY(secondary_data_type_options, port))
-		secondary_package.set_datatype(secondary_data_type_options.value)
-
-	return TRUE
-
 /obj/item/circuit_component/ntnet_receive/proc/ntnet_receive(datum/source, datum/netdata/data)
 	SIGNAL_HANDLER
 
@@ -54,5 +29,4 @@
 		return
 
 	data_package.set_output(data.data["data"])
-	secondary_package.set_output(data.data["data_secondary"])
 	trigger_output.set_output(COMPONENT_SIGNAL)
diff --git a/code/modules/wiremod/components/ntnet/ntnet_send.dm b/code/modules/wiremod/components/ntnet/ntnet_send.dm
index fe32d0491e5..0479ab0b1b6 100644
--- a/code/modules/wiremod/components/ntnet/ntnet_send.dm
+++ b/code/modules/wiremod/components/ntnet/ntnet_send.dm
@@ -12,14 +12,15 @@
 
 	network_id = __NETWORK_CIRCUITS
 
+	/// Data being sent
 	var/datum/port/input/data_package
-	var/datum/port/input/secondary_package
+
+	/// Encryption key
 	var/datum/port/input/enc_key
 
 /obj/item/circuit_component/ntnet_send/populate_ports()
 	data_package = add_input_port("Data Package", PORT_TYPE_ANY)
-	secondary_package = add_input_port("Secondary Package", PORT_TYPE_ANY)
 	enc_key = add_input_port("Encryption Key", PORT_TYPE_STRING)
 
 /obj/item/circuit_component/ntnet_send/input_received(datum/port/input/port)
-	ntnet_send(list("data" = data_package.value, "data_secondary" = secondary_package.value, "enc_key" = enc_key.value))
+	ntnet_send(list("data" = data_package.value, "enc_key" = enc_key.value))