[Net] Refactor RPCs, remove RSETs

In this PR:
- Removed rset
- rpc_config can now optionally configure transfer mode
  (reliable/unreliable/ordered) and channel (channels are not actually
  implemented yet.)
- Refactor how the RPC id is computed to minimize the logic in Node and
  scripts that now only needs a single `get_rpc_methods` function.

14 files changed, 66 insertions, 872 deletions

diff --git a/modules/gdnative/nativescript/godot_nativescript.cpp b/modules/gdnative/nativescript/godot_nativescript.cpp
index b2abf8b8ae..b10a747568 100644
--- a/modules/gdnative/nativescript/godot_nativescript.cpp
+++ b/modules/gdnative/nativescript/godot_nativescript.cpp
@@ -70,8 +70,7 @@ void GDAPI godot_nativescript_register_class(void *p_gdnative_handle, const char
 
 		const NativeScriptDesc *b = desc.base_data;
 		while (b) {
-			desc.rpc_count += b->rpc_count;
-			desc.rset_count += b->rset_count;
+			desc.rpc_methods.append_array(b->rpc_methods);
 			b = b->base_data;
 		}
 
@@ -94,8 +93,6 @@ void GDAPI godot_nativescript_register_tool_class(void *p_gdnative_handle, const
 	desc.destroy_func = p_destroy_func;
 	desc.is_tool = true;
 	desc.base = p_base;
-	desc.rpc_count = 0;
-	desc.rset_count = 0;
 
 	if (classes->has(p_base)) {
 		desc.base_data = &(*classes)[p_base];
@@ -103,8 +100,7 @@ void GDAPI godot_nativescript_register_tool_class(void *p_gdnative_handle, const
 
 		const NativeScriptDesc *b = desc.base_data;
 		while (b) {
-			desc.rpc_count += b->rpc_count;
-			desc.rset_count += b->rset_count;
+			desc.rpc_methods.append_array(b->rpc_methods);
 			b = b->base_data;
 		}
 
@@ -126,13 +122,16 @@ void GDAPI godot_nativescript_register_method(void *p_gdnative_handle, const cha
 	method.method = p_method;
 	method.rpc_mode = p_attr.rpc_type;
 	method.rpc_method_id = UINT16_MAX;
-	if (p_attr.rpc_type != GODOT_METHOD_RPC_MODE_DISABLED) {
-		method.rpc_method_id = E->get().rpc_count;
-		E->get().rpc_count += 1;
-	}
 	method.info = MethodInfo(p_function_name);
 
 	E->get().methods.insert(p_function_name, method);
+
+	if (p_attr.rpc_type != GODOT_METHOD_RPC_MODE_DISABLED) {
+		MultiplayerAPI::RPCConfig nd;
+		nd.name = String(p_name);
+		nd.rpc_mode = MultiplayerAPI::RPCMode(p_attr.rpc_type);
+		E->get().rpc_methods.push_back(nd);
+	}
 }
 
 void GDAPI godot_nativescript_register_property(void *p_gdnative_handle, const char *p_name, const char *p_path, godot_nativescript_property_attributes *p_attr, godot_nativescript_property_set_func p_set_func, godot_nativescript_property_get_func p_get_func) {
@@ -144,11 +143,6 @@ void GDAPI godot_nativescript_register_property(void *p_gdnative_handle, const c
 	NativeScriptDesc::Property property;
 	property.default_value = *(Variant *)&p_attr->default_value;
 	property.getter = p_get_func;
-	property.rset_mode = p_attr->rset_type;
-	if (p_attr->rset_type != GODOT_METHOD_RPC_MODE_DISABLED) {
-		property.rset_property_id = E->get().rset_count;
-		E->get().rset_count += 1;
-	}
 	property.setter = p_set_func;
 	property.info = PropertyInfo((Variant::Type)p_attr->type,
 			p_path,
diff --git a/modules/gdnative/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp
index 46af70f73c..03e25f49e6 100644
--- a/modules/gdnative/nativescript/nativescript.cpp
+++ b/modules/gdnative/nativescript/nativescript.cpp
@@ -415,245 +415,11 @@ void NativeScript::get_script_property_list(List<PropertyInfo> *p_list) const {
 	}
 }
 
-Vector<ScriptNetData> NativeScript::get_rpc_methods() const {
-	Vector<ScriptNetData> v;
-
-	NativeScriptDesc *script_data = get_script_desc();
-
-	while (script_data) {
-		for (Map<StringName, NativeScriptDesc::Method>::Element *E = script_data->methods.front(); E; E = E->next()) {
-			if (E->get().rpc_mode != GODOT_METHOD_RPC_MODE_DISABLED) {
-				ScriptNetData nd;
-				nd.name = E->key();
-				nd.mode = MultiplayerAPI::RPCMode(E->get().rpc_mode);
-				v.push_back(nd);
-			}
-		}
-
-		script_data = script_data->base_data;
-	}
-
-	return v;
-}
-
-uint16_t NativeScript::get_rpc_method_id(const StringName &p_method) const {
-	NativeScriptDesc *script_data = get_script_desc();
-
-	while (script_data) {
-		Map<StringName, NativeScriptDesc::Method>::Element *E = script_data->methods.find(p_method);
-		if (E) {
-			return E->get().rpc_method_id;
-		}
-
-		script_data = script_data->base_data;
-	}
-
-	return UINT16_MAX;
-}
-
-StringName NativeScript::get_rpc_method(uint16_t p_id) const {
-	ERR_FAIL_COND_V(p_id == UINT16_MAX, StringName());
-
+const Vector<MultiplayerAPI::RPCConfig> NativeScript::get_rpc_methods() const {
 	NativeScriptDesc *script_data = get_script_desc();
+	ERR_FAIL_COND_V(!script_data, Vector<MultiplayerAPI::RPCConfig>());
 
-	while (script_data) {
-		for (Map<StringName, NativeScriptDesc::Method>::Element *E = script_data->methods.front(); E; E = E->next()) {
-			if (E->get().rpc_method_id == p_id) {
-				return E->key();
-			}
-		}
-
-		script_data = script_data->base_data;
-	}
-
-	return StringName();
-}
-
-MultiplayerAPI::RPCMode NativeScript::get_rpc_mode_by_id(uint16_t p_id) const {
-	ERR_FAIL_COND_V(p_id == UINT16_MAX, MultiplayerAPI::RPC_MODE_DISABLED);
-
-	NativeScriptDesc *script_data = get_script_desc();
-
-	while (script_data) {
-		for (Map<StringName, NativeScriptDesc::Method>::Element *E = script_data->methods.front(); E; E = E->next()) {
-			if (E->get().rpc_method_id == p_id) {
-				switch (E->get().rpc_mode) {
-					case GODOT_METHOD_RPC_MODE_DISABLED:
-						return MultiplayerAPI::RPC_MODE_DISABLED;
-					case GODOT_METHOD_RPC_MODE_REMOTE:
-						return MultiplayerAPI::RPC_MODE_REMOTE;
-					case GODOT_METHOD_RPC_MODE_MASTER:
-						return MultiplayerAPI::RPC_MODE_MASTER;
-					case GODOT_METHOD_RPC_MODE_PUPPET:
-						return MultiplayerAPI::RPC_MODE_PUPPET;
-					case GODOT_METHOD_RPC_MODE_REMOTESYNC:
-						return MultiplayerAPI::RPC_MODE_REMOTESYNC;
-					case GODOT_METHOD_RPC_MODE_MASTERSYNC:
-						return MultiplayerAPI::RPC_MODE_MASTERSYNC;
-					case GODOT_METHOD_RPC_MODE_PUPPETSYNC:
-						return MultiplayerAPI::RPC_MODE_PUPPETSYNC;
-					default:
-						return MultiplayerAPI::RPC_MODE_DISABLED;
-				}
-			}
-		}
-
-		script_data = script_data->base_data;
-	}
-
-	return MultiplayerAPI::RPC_MODE_DISABLED;
-}
-
-MultiplayerAPI::RPCMode NativeScript::get_rpc_mode(const StringName &p_method) const {
-	NativeScriptDesc *script_data = get_script_desc();
-
-	while (script_data) {
-		Map<StringName, NativeScriptDesc::Method>::Element *E = script_data->methods.find(p_method);
-		if (E) {
-			switch (E->get().rpc_mode) {
-				case GODOT_METHOD_RPC_MODE_DISABLED:
-					return MultiplayerAPI::RPC_MODE_DISABLED;
-				case GODOT_METHOD_RPC_MODE_REMOTE:
-					return MultiplayerAPI::RPC_MODE_REMOTE;
-				case GODOT_METHOD_RPC_MODE_MASTER:
-					return MultiplayerAPI::RPC_MODE_MASTER;
-				case GODOT_METHOD_RPC_MODE_PUPPET:
-					return MultiplayerAPI::RPC_MODE_PUPPET;
-				case GODOT_METHOD_RPC_MODE_REMOTESYNC:
-					return MultiplayerAPI::RPC_MODE_REMOTESYNC;
-				case GODOT_METHOD_RPC_MODE_MASTERSYNC:
-					return MultiplayerAPI::RPC_MODE_MASTERSYNC;
-				case GODOT_METHOD_RPC_MODE_PUPPETSYNC:
-					return MultiplayerAPI::RPC_MODE_PUPPETSYNC;
-				default:
-					return MultiplayerAPI::RPC_MODE_DISABLED;
-			}
-		}
-
-		script_data = script_data->base_data;
-	}
-
-	return MultiplayerAPI::RPC_MODE_DISABLED;
-}
-
-Vector<ScriptNetData> NativeScript::get_rset_properties() const {
-	Vector<ScriptNetData> v;
-
-	NativeScriptDesc *script_data = get_script_desc();
-
-	while (script_data) {
-		for (OrderedHashMap<StringName, NativeScriptDesc::Property>::Element E = script_data->properties.front(); E; E = E.next()) {
-			if (E.get().rset_mode != GODOT_METHOD_RPC_MODE_DISABLED) {
-				ScriptNetData nd;
-				nd.name = E.key();
-				nd.mode = MultiplayerAPI::RPCMode(E.get().rset_mode);
-				v.push_back(nd);
-			}
-		}
-		script_data = script_data->base_data;
-	}
-
-	return v;
-}
-
-uint16_t NativeScript::get_rset_property_id(const StringName &p_variable) const {
-	NativeScriptDesc *script_data = get_script_desc();
-
-	while (script_data) {
-		OrderedHashMap<StringName, NativeScriptDesc::Property>::Element E = script_data->properties.find(p_variable);
-		if (E) {
-			return E.get().rset_property_id;
-		}
-
-		script_data = script_data->base_data;
-	}
-
-	return UINT16_MAX;
-}
-
-StringName NativeScript::get_rset_property(uint16_t p_id) const {
-	ERR_FAIL_COND_V(p_id == UINT16_MAX, StringName());
-
-	NativeScriptDesc *script_data = get_script_desc();
-
-	while (script_data) {
-		for (OrderedHashMap<StringName, NativeScriptDesc::Property>::Element E = script_data->properties.front(); E; E = E.next()) {
-			if (E.get().rset_property_id == p_id) {
-				return E.key();
-			}
-		}
-
-		script_data = script_data->base_data;
-	}
-
-	return StringName();
-}
-
-MultiplayerAPI::RPCMode NativeScript::get_rset_mode_by_id(uint16_t p_id) const {
-	ERR_FAIL_COND_V(p_id == UINT16_MAX, MultiplayerAPI::RPC_MODE_DISABLED);
-
-	NativeScriptDesc *script_data = get_script_desc();
-
-	while (script_data) {
-		for (OrderedHashMap<StringName, NativeScriptDesc::Property>::Element E = script_data->properties.front(); E; E = E.next()) {
-			if (E.get().rset_property_id == p_id) {
-				switch (E.get().rset_mode) {
-					case GODOT_METHOD_RPC_MODE_DISABLED:
-						return MultiplayerAPI::RPC_MODE_DISABLED;
-					case GODOT_METHOD_RPC_MODE_REMOTE:
-						return MultiplayerAPI::RPC_MODE_REMOTE;
-					case GODOT_METHOD_RPC_MODE_MASTER:
-						return MultiplayerAPI::RPC_MODE_MASTER;
-					case GODOT_METHOD_RPC_MODE_PUPPET:
-						return MultiplayerAPI::RPC_MODE_PUPPET;
-					case GODOT_METHOD_RPC_MODE_REMOTESYNC:
-						return MultiplayerAPI::RPC_MODE_REMOTESYNC;
-					case GODOT_METHOD_RPC_MODE_MASTERSYNC:
-						return MultiplayerAPI::RPC_MODE_MASTERSYNC;
-					case GODOT_METHOD_RPC_MODE_PUPPETSYNC:
-						return MultiplayerAPI::RPC_MODE_PUPPETSYNC;
-					default:
-						return MultiplayerAPI::RPC_MODE_DISABLED;
-				}
-			}
-		}
-
-		script_data = script_data->base_data;
-	}
-
-	return MultiplayerAPI::RPC_MODE_DISABLED;
-}
-
-MultiplayerAPI::RPCMode NativeScript::get_rset_mode(const StringName &p_variable) const {
-	NativeScriptDesc *script_data = get_script_desc();
-
-	while (script_data) {
-		OrderedHashMap<StringName, NativeScriptDesc::Property>::Element E = script_data->properties.find(p_variable);
-		if (E) {
-			switch (E.get().rset_mode) {
-				case GODOT_METHOD_RPC_MODE_DISABLED:
-					return MultiplayerAPI::RPC_MODE_DISABLED;
-				case GODOT_METHOD_RPC_MODE_REMOTE:
-					return MultiplayerAPI::RPC_MODE_REMOTE;
-				case GODOT_METHOD_RPC_MODE_MASTER:
-					return MultiplayerAPI::RPC_MODE_MASTER;
-				case GODOT_METHOD_RPC_MODE_PUPPET:
-					return MultiplayerAPI::RPC_MODE_PUPPET;
-				case GODOT_METHOD_RPC_MODE_REMOTESYNC:
-					return MultiplayerAPI::RPC_MODE_REMOTESYNC;
-				case GODOT_METHOD_RPC_MODE_MASTERSYNC:
-					return MultiplayerAPI::RPC_MODE_MASTERSYNC;
-				case GODOT_METHOD_RPC_MODE_PUPPETSYNC:
-					return MultiplayerAPI::RPC_MODE_PUPPETSYNC;
-				default:
-					return MultiplayerAPI::RPC_MODE_DISABLED;
-			}
-		}
-
-		script_data = script_data->base_data;
-	}
-
-	return MultiplayerAPI::RPC_MODE_DISABLED;
+	return script_data->rpc_methods;
 }
 
 String NativeScript::get_class_documentation() const {
@@ -1046,46 +812,10 @@ Ref<Script> NativeScriptInstance::get_script() const {
 	return script;
 }
 
-Vector<ScriptNetData> NativeScriptInstance::get_rpc_methods() const {
+const Vector<MultiplayerAPI::RPCConfig> NativeScriptInstance::get_rpc_methods() const {
 	return script->get_rpc_methods();
 }
 
-uint16_t NativeScriptInstance::get_rpc_method_id(const StringName &p_method) const {
-	return script->get_rpc_method_id(p_method);
-}
-
-StringName NativeScriptInstance::get_rpc_method(uint16_t p_id) const {
-	return script->get_rpc_method(p_id);
-}
-
-MultiplayerAPI::RPCMode NativeScriptInstance::get_rpc_mode_by_id(uint16_t p_id) const {
-	return script->get_rpc_mode_by_id(p_id);
-}
-
-MultiplayerAPI::RPCMode NativeScriptInstance::get_rpc_mode(const StringName &p_method) const {
-	return script->get_rpc_mode(p_method);
-}
-
-Vector<ScriptNetData> NativeScriptInstance::get_rset_properties() const {
-	return script->get_rset_properties();
-}
-
-uint16_t NativeScriptInstance::get_rset_property_id(const StringName &p_variable) const {
-	return script->get_rset_property_id(p_variable);
-}
-
-StringName NativeScriptInstance::get_rset_property(uint16_t p_id) const {
-	return script->get_rset_property(p_id);
-}
-
-MultiplayerAPI::RPCMode NativeScriptInstance::get_rset_mode_by_id(uint16_t p_id) const {
-	return script->get_rset_mode_by_id(p_id);
-}
-
-MultiplayerAPI::RPCMode NativeScriptInstance::get_rset_mode(const StringName &p_variable) const {
-	return script->get_rset_mode(p_variable);
-}
-
 ScriptLanguage *NativeScriptInstance::get_language() {
 	return NativeScriptLanguage::get_singleton();
 }
diff --git a/modules/gdnative/nativescript/nativescript.h b/modules/gdnative/nativescript/nativescript.h
index ca5e76e43e..1756321281 100644
--- a/modules/gdnative/nativescript/nativescript.h
+++ b/modules/gdnative/nativescript/nativescript.h
@@ -62,8 +62,6 @@ struct NativeScriptDesc {
 		godot_nativescript_property_get_func getter;
 		PropertyInfo info;
 		Variant default_value;
-		int rset_mode = 0;
-		uint16_t rset_property_id;
 		String documentation;
 	};
 
@@ -72,9 +70,8 @@ struct NativeScriptDesc {
 		String documentation;
 	};
 
-	uint16_t rpc_count = 0;
 	Map<StringName, Method> methods;
-	uint16_t rset_count = 0;
+	Vector<MultiplayerAPI::RPCConfig> rpc_methods;
 	OrderedHashMap<StringName, Property> properties;
 	Map<StringName, Signal> signals_; // QtCreator doesn't like the name signals
 	StringName base;
@@ -178,17 +175,7 @@ public:
 	virtual void get_script_method_list(List<MethodInfo> *p_list) const override;
 	virtual void get_script_property_list(List<PropertyInfo> *p_list) const override;
 
-	virtual Vector<ScriptNetData> get_rpc_methods() const override;
-	virtual uint16_t get_rpc_method_id(const StringName &p_method) const override;
-	virtual StringName get_rpc_method(uint16_t p_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(uint16_t p_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const override;
-
-	virtual Vector<ScriptNetData> get_rset_properties() const override;
-	virtual uint16_t get_rset_property_id(const StringName &p_variable) const override;
-	virtual StringName get_rset_property(uint16_t p_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(uint16_t p_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const override;
+	virtual const Vector<MultiplayerAPI::RPCConfig> get_rpc_methods() const override;
 
 	String get_class_documentation() const;
 	String get_method_documentation(const StringName &p_method) const;
@@ -226,17 +213,7 @@ public:
 	String to_string(bool *r_valid);
 	virtual Ref<Script> get_script() const;
 
-	virtual Vector<ScriptNetData> get_rpc_methods() const;
-	virtual uint16_t get_rpc_method_id(const StringName &p_method) const;
-	virtual StringName get_rpc_method(uint16_t p_id) const;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(uint16_t p_id) const;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const;
-
-	virtual Vector<ScriptNetData> get_rset_properties() const;
-	virtual uint16_t get_rset_property_id(const StringName &p_variable) const;
-	virtual StringName get_rset_property(uint16_t p_id) const;
-	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(uint16_t p_id) const;
-	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const;
+	virtual const Vector<MultiplayerAPI::RPCConfig> get_rpc_methods() const;
 
 	virtual ScriptLanguage *get_language();
 
diff --git a/modules/gdnative/pluginscript/pluginscript_instance.cpp b/modules/gdnative/pluginscript/pluginscript_instance.cpp
index 7f8dba0906..ed1c0af3ed 100644
--- a/modules/gdnative/pluginscript/pluginscript_instance.cpp
+++ b/modules/gdnative/pluginscript/pluginscript_instance.cpp
@@ -100,46 +100,10 @@ String PluginScriptInstance::to_string(bool *r_valid) {
 	return str_ret;
 }
 
-Vector<ScriptNetData> PluginScriptInstance::get_rpc_methods() const {
+const Vector<MultiplayerAPI::RPCConfig> PluginScriptInstance::get_rpc_methods() const {
 	return _script->get_rpc_methods();
 }
 
-uint16_t PluginScriptInstance::get_rpc_method_id(const StringName &p_variable) const {
-	return _script->get_rpc_method_id(p_variable);
-}
-
-StringName PluginScriptInstance::get_rpc_method(uint16_t p_id) const {
-	return _script->get_rpc_method(p_id);
-}
-
-MultiplayerAPI::RPCMode PluginScriptInstance::get_rpc_mode_by_id(uint16_t p_id) const {
-	return _script->get_rpc_mode_by_id(p_id);
-}
-
-MultiplayerAPI::RPCMode PluginScriptInstance::get_rpc_mode(const StringName &p_method) const {
-	return _script->get_rpc_mode(p_method);
-}
-
-Vector<ScriptNetData> PluginScriptInstance::get_rset_properties() const {
-	return _script->get_rset_properties();
-}
-
-uint16_t PluginScriptInstance::get_rset_property_id(const StringName &p_variable) const {
-	return _script->get_rset_property_id(p_variable);
-}
-
-StringName PluginScriptInstance::get_rset_property(uint16_t p_id) const {
-	return _script->get_rset_property(p_id);
-}
-
-MultiplayerAPI::RPCMode PluginScriptInstance::get_rset_mode_by_id(uint16_t p_id) const {
-	return _script->get_rset_mode_by_id(p_id);
-}
-
-MultiplayerAPI::RPCMode PluginScriptInstance::get_rset_mode(const StringName &p_variable) const {
-	return _script->get_rset_mode(p_variable);
-}
-
 void PluginScriptInstance::refcount_incremented() {
 	if (_desc->refcount_decremented) {
 		_desc->refcount_incremented(_data);
diff --git a/modules/gdnative/pluginscript/pluginscript_instance.h b/modules/gdnative/pluginscript/pluginscript_instance.h
index b263c0e62c..25b62ae8ab 100644
--- a/modules/gdnative/pluginscript/pluginscript_instance.h
+++ b/modules/gdnative/pluginscript/pluginscript_instance.h
@@ -71,17 +71,7 @@ public:
 
 	void set_path(const String &p_path);
 
-	virtual Vector<ScriptNetData> get_rpc_methods() const;
-	virtual uint16_t get_rpc_method_id(const StringName &p_method) const;
-	virtual StringName get_rpc_method(uint16_t p_id) const;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(uint16_t p_id) const;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const;
-
-	virtual Vector<ScriptNetData> get_rset_properties() const;
-	virtual uint16_t get_rset_property_id(const StringName &p_variable) const;
-	virtual StringName get_rset_property(uint16_t p_id) const;
-	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(uint16_t p_id) const;
-	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const;
+	virtual const Vector<MultiplayerAPI::RPCConfig> get_rpc_methods() const;
 
 	virtual void refcount_incremented();
 	virtual bool refcount_decremented();
diff --git a/modules/gdnative/pluginscript/pluginscript_script.cpp b/modules/gdnative/pluginscript/pluginscript_script.cpp
index a48245814f..6bb11d3e8f 100644
--- a/modules/gdnative/pluginscript/pluginscript_script.cpp
+++ b/modules/gdnative/pluginscript/pluginscript_script.cpp
@@ -312,10 +312,9 @@ Error PluginScript::reload(bool p_keep_state) {
 	}
 	Array *methods = (Array *)&manifest.methods;
 	_rpc_methods.clear();
-	_rpc_variables.clear();
 	if (_ref_base_parent.is_valid()) {
+		/// XXX TODO Should this be _rpc_methods.append_array(...)
 		_rpc_methods = _ref_base_parent->get_rpc_methods();
-		_rpc_variables = _ref_base_parent->get_rset_properties();
 	}
 	for (int i = 0; i < methods->size(); ++i) {
 		Dictionary v = (*methods)[i];
@@ -324,9 +323,10 @@ Error PluginScript::reload(bool p_keep_state) {
 		// rpc_mode is passed as an optional field and is not part of MethodInfo
 		Variant var = v["rpc_mode"];
 		if (var != Variant()) {
-			ScriptNetData nd;
+			MultiplayerAPI::RPCConfig nd;
 			nd.name = mi.name;
-			nd.mode = MultiplayerAPI::RPCMode(int(var));
+			nd.rpc_mode = MultiplayerAPI::RPCMode(int(var));
+			// TODO Transfer Channel
 			if (_rpc_methods.find(nd) == -1) {
 				_rpc_methods.push_back(nd);
 			}
@@ -334,7 +334,7 @@ Error PluginScript::reload(bool p_keep_state) {
 	}
 
 	// Sort so we are 100% that they are always the same.
-	_rpc_methods.sort_custom<SortNetData>();
+	_rpc_methods.sort_custom<MultiplayerAPI::SortRPCConfig>();
 
 	Array *signals = (Array *)&manifest.signals;
 	for (int i = 0; i < signals->size(); ++i) {
@@ -348,21 +348,8 @@ Error PluginScript::reload(bool p_keep_state) {
 		PropertyInfo pi = PropertyInfo::from_dict(v);
 		_properties_info[pi.name] = pi;
 		_properties_default_values[pi.name] = v["default_value"];
-		// rset_mode is passed as an optional field and is not part of PropertyInfo
-		Variant var = v["rset_mode"];
-		if (var != Variant()) {
-			ScriptNetData nd;
-			nd.name = pi.name;
-			nd.mode = MultiplayerAPI::RPCMode(int(var));
-			if (_rpc_variables.find(nd) == -1) {
-				_rpc_variables.push_back(nd);
-			}
-		}
 	}
 
-	// Sort so we are 100% that they are always the same.
-	_rpc_variables.sort_custom<SortNetData>();
-
 #ifdef TOOLS_ENABLED
 /*for (Set<PlaceHolderScriptInstance*>::Element *E=placeholders.front();E;E=E->next()) {
 
@@ -486,76 +473,10 @@ int PluginScript::get_member_line(const StringName &p_member) const {
 	return -1;
 }
 
-Vector<ScriptNetData> PluginScript::get_rpc_methods() const {
+const Vector<MultiplayerAPI::RPCConfig> PluginScript::get_rpc_methods() const {
 	return _rpc_methods;
 }
 
-uint16_t PluginScript::get_rpc_method_id(const StringName &p_method) const {
-	ASSERT_SCRIPT_VALID_V(UINT16_MAX);
-	for (int i = 0; i < _rpc_methods.size(); i++) {
-		if (_rpc_methods[i].name == p_method) {
-			return i;
-		}
-	}
-	return UINT16_MAX;
-}
-
-StringName PluginScript::get_rpc_method(const uint16_t p_rpc_method_id) const {
-	ASSERT_SCRIPT_VALID_V(StringName());
-	if (p_rpc_method_id >= _rpc_methods.size()) {
-		return StringName();
-	}
-	return _rpc_methods[p_rpc_method_id].name;
-}
-
-MultiplayerAPI::RPCMode PluginScript::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const {
-	ASSERT_SCRIPT_VALID_V(MultiplayerAPI::RPC_MODE_DISABLED);
-	if (p_rpc_method_id >= _rpc_methods.size()) {
-		return MultiplayerAPI::RPC_MODE_DISABLED;
-	}
-	return _rpc_methods[p_rpc_method_id].mode;
-}
-
-MultiplayerAPI::RPCMode PluginScript::get_rpc_mode(const StringName &p_method) const {
-	ASSERT_SCRIPT_VALID_V(MultiplayerAPI::RPC_MODE_DISABLED);
-	return get_rpc_mode_by_id(get_rpc_method_id(p_method));
-}
-
-Vector<ScriptNetData> PluginScript::get_rset_properties() const {
-	return _rpc_variables;
-}
-
-uint16_t PluginScript::get_rset_property_id(const StringName &p_property) const {
-	ASSERT_SCRIPT_VALID_V(UINT16_MAX);
-	for (int i = 0; i < _rpc_variables.size(); i++) {
-		if (_rpc_variables[i].name == p_property) {
-			return i;
-		}
-	}
-	return UINT16_MAX;
-}
-
-StringName PluginScript::get_rset_property(const uint16_t p_rset_property_id) const {
-	ASSERT_SCRIPT_VALID_V(StringName());
-	if (p_rset_property_id >= _rpc_variables.size()) {
-		return StringName();
-	}
-	return _rpc_variables[p_rset_property_id].name;
-}
-
-MultiplayerAPI::RPCMode PluginScript::get_rset_mode_by_id(const uint16_t p_rset_property_id) const {
-	ASSERT_SCRIPT_VALID_V(MultiplayerAPI::RPC_MODE_DISABLED);
-	if (p_rset_property_id >= _rpc_variables.size()) {
-		return MultiplayerAPI::RPC_MODE_DISABLED;
-	}
-	return _rpc_variables[p_rset_property_id].mode;
-}
-
-MultiplayerAPI::RPCMode PluginScript::get_rset_mode(const StringName &p_variable) const {
-	ASSERT_SCRIPT_VALID_V(MultiplayerAPI::RPC_MODE_DISABLED);
-	return get_rset_mode_by_id(get_rset_property_id(p_variable));
-}
-
 PluginScript::PluginScript() :
 		_script_list(this) {
 }
diff --git a/modules/gdnative/pluginscript/pluginscript_script.h b/modules/gdnative/pluginscript/pluginscript_script.h
index 1c86f2056d..97989a19d8 100644
--- a/modules/gdnative/pluginscript/pluginscript_script.h
+++ b/modules/gdnative/pluginscript/pluginscript_script.h
@@ -61,8 +61,7 @@ private:
 	Map<StringName, PropertyInfo> _properties_info;
 	Map<StringName, MethodInfo> _signals_info;
 	Map<StringName, MethodInfo> _methods_info;
-	Vector<ScriptNetData> _rpc_methods;
-	Vector<ScriptNetData> _rpc_variables;
+	Vector<MultiplayerAPI::RPCConfig> _rpc_methods;
 
 	Set<Object *> _instances;
 	//exported members
@@ -137,17 +136,7 @@ public:
 
 	virtual int get_member_line(const StringName &p_member) const override;
 
-	virtual Vector<ScriptNetData> get_rpc_methods() const override;
-	virtual uint16_t get_rpc_method_id(const StringName &p_method) const override;
-	virtual StringName get_rpc_method(const uint16_t p_rpc_method_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const override;
-
-	virtual Vector<ScriptNetData> get_rset_properties() const override;
-	virtual uint16_t get_rset_property_id(const StringName &p_property) const override;
-	virtual StringName get_rset_property(const uint16_t p_rset_property_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_rpc_method_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const override;
+	virtual const Vector<MultiplayerAPI::RPCConfig> get_rpc_methods() const override;
 
 	PluginScript();
 	void init(PluginScriptLanguage *language);
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp
index d7814e85b0..e99c3d6cca 100644
--- a/modules/gdscript/gdscript.cpp
+++ b/modules/gdscript/gdscript.cpp
@@ -897,68 +897,10 @@ void GDScript::get_members(Set<StringName> *p_members) {
 	}
 }
 
-Vector<ScriptNetData> GDScript::get_rpc_methods() const {
+const Vector<MultiplayerAPI::RPCConfig> GDScript::get_rpc_methods() const {
 	return rpc_functions;
 }
 
-uint16_t GDScript::get_rpc_method_id(const StringName &p_method) const {
-	for (int i = 0; i < rpc_functions.size(); i++) {
-		if (rpc_functions[i].name == p_method) {
-			return i;
-		}
-	}
-	return UINT16_MAX;
-}
-
-StringName GDScript::get_rpc_method(const uint16_t p_rpc_method_id) const {
-	if (p_rpc_method_id >= rpc_functions.size()) {
-		return StringName();
-	}
-	return rpc_functions[p_rpc_method_id].name;
-}
-
-MultiplayerAPI::RPCMode GDScript::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const {
-	if (p_rpc_method_id >= rpc_functions.size()) {
-		return MultiplayerAPI::RPC_MODE_DISABLED;
-	}
-	return rpc_functions[p_rpc_method_id].mode;
-}
-
-MultiplayerAPI::RPCMode GDScript::get_rpc_mode(const StringName &p_method) const {
-	return get_rpc_mode_by_id(get_rpc_method_id(p_method));
-}
-
-Vector<ScriptNetData> GDScript::get_rset_properties() const {
-	return rpc_variables;
-}
-
-uint16_t GDScript::get_rset_property_id(const StringName &p_variable) const {
-	for (int i = 0; i < rpc_variables.size(); i++) {
-		if (rpc_variables[i].name == p_variable) {
-			return i;
-		}
-	}
-	return UINT16_MAX;
-}
-
-StringName GDScript::get_rset_property(const uint16_t p_rset_member_id) const {
-	if (p_rset_member_id >= rpc_variables.size()) {
-		return StringName();
-	}
-	return rpc_variables[p_rset_member_id].name;
-}
-
-MultiplayerAPI::RPCMode GDScript::get_rset_mode_by_id(const uint16_t p_rset_member_id) const {
-	if (p_rset_member_id >= rpc_variables.size()) {
-		return MultiplayerAPI::RPC_MODE_DISABLED;
-	}
-	return rpc_variables[p_rset_member_id].mode;
-}
-
-MultiplayerAPI::RPCMode GDScript::get_rset_mode(const StringName &p_variable) const {
-	return get_rset_mode_by_id(get_rset_property_id(p_variable));
-}
-
 Variant GDScript::call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
 	GDScript *top = this;
 	while (top) {
@@ -1210,10 +1152,8 @@ void GDScript::_save_orphaned_subclasses() {
 void GDScript::_init_rpc_methods_properties() {
 	// Copy the base rpc methods so we don't mask their IDs.
 	rpc_functions.clear();
-	rpc_variables.clear();
 	if (base.is_valid()) {
 		rpc_functions = base->rpc_functions;
-		rpc_variables = base->rpc_variables;
 	}
 
 	GDScript *cscript = this;
@@ -1222,25 +1162,17 @@ void GDScript::_init_rpc_methods_properties() {
 		// RPC Methods
 		for (Map<StringName, GDScriptFunction *>::Element *E = cscript->member_functions.front(); E; E = E->next()) {
 			if (E->get()->get_rpc_mode() != MultiplayerAPI::RPC_MODE_DISABLED) {
-				ScriptNetData nd;
+				MultiplayerAPI::RPCConfig nd;
 				nd.name = E->key();
-				nd.mode = E->get()->get_rpc_mode();
+				nd.rpc_mode = E->get()->get_rpc_mode();
+				// TODO
+				nd.transfer_mode = NetworkedMultiplayerPeer::TRANSFER_MODE_RELIABLE;
+				nd.channel = 0;
 				if (-1 == rpc_functions.find(nd)) {
 					rpc_functions.push_back(nd);
 				}
 			}
 		}
-		// RSet
-		for (Map<StringName, MemberInfo>::Element *E = cscript->member_indices.front(); E; E = E->next()) {
-			if (E->get().rpc_mode != MultiplayerAPI::RPC_MODE_DISABLED) {
-				ScriptNetData nd;
-				nd.name = E->key();
-				nd.mode = E->get().rpc_mode;
-				if (-1 == rpc_variables.find(nd)) {
-					rpc_variables.push_back(nd);
-				}
-			}
-		}
 
 		if (cscript != this) {
 			sub_E = sub_E->next();
@@ -1254,8 +1186,7 @@ void GDScript::_init_rpc_methods_properties() {
 	}
 
 	// Sort so we are 100% that they are always the same.
-	rpc_functions.sort_custom<SortNetData>();
-	rpc_variables.sort_custom<SortNetData>();
+	rpc_functions.sort_custom<MultiplayerAPI::SortRPCConfig>();
 }
 
 GDScript::~GDScript() {
@@ -1611,46 +1542,10 @@ ScriptLanguage *GDScriptInstance::get_language() {
 	return GDScriptLanguage::get_singleton();
 }
 
-Vector<ScriptNetData> GDScriptInstance::get_rpc_methods() const {
+const Vector<MultiplayerAPI::RPCConfig> GDScriptInstance::get_rpc_methods() const {
 	return script->get_rpc_methods();
 }
 
-uint16_t GDScriptInstance::get_rpc_method_id(const StringName &p_method) const {
-	return script->get_rpc_method_id(p_method);
-}
-
-StringName GDScriptInstance::get_rpc_method(const uint16_t p_rpc_method_id) const {
-	return script->get_rpc_method(p_rpc_method_id);
-}
-
-MultiplayerAPI::RPCMode GDScriptInstance::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const {
-	return script->get_rpc_mode_by_id(p_rpc_method_id);
-}
-
-MultiplayerAPI::RPCMode GDScriptInstance::get_rpc_mode(const StringName &p_method) const {
-	return script->get_rpc_mode(p_method);
-}
-
-Vector<ScriptNetData> GDScriptInstance::get_rset_properties() const {
-	return script->get_rset_properties();
-}
-
-uint16_t GDScriptInstance::get_rset_property_id(const StringName &p_variable) const {
-	return script->get_rset_property_id(p_variable);
-}
-
-StringName GDScriptInstance::get_rset_property(const uint16_t p_rset_member_id) const {
-	return script->get_rset_property(p_rset_member_id);
-}
-
-MultiplayerAPI::RPCMode GDScriptInstance::get_rset_mode_by_id(const uint16_t p_rset_member_id) const {
-	return script->get_rset_mode_by_id(p_rset_member_id);
-}
-
-MultiplayerAPI::RPCMode GDScriptInstance::get_rset_mode(const StringName &p_variable) const {
-	return script->get_rset_mode(p_variable);
-}
-
 void GDScriptInstance::reload_members() {
 #ifdef DEBUG_ENABLED
 
diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h
index 6df66e876d..8b1b859ca2 100644
--- a/modules/gdscript/gdscript.h
+++ b/modules/gdscript/gdscript.h
@@ -86,8 +86,7 @@ class GDScript : public Script {
 	Map<StringName, MemberInfo> member_indices; //members are just indices to the instanced script.
 	Map<StringName, Ref<GDScript>> subclasses;
 	Map<StringName, Vector<StringName>> _signals;
-	Vector<ScriptNetData> rpc_functions;
-	Vector<ScriptNetData> rpc_variables;
+	Vector<MultiplayerAPI::RPCConfig> rpc_functions;
 
 #ifdef TOOLS_ENABLED
 
@@ -247,17 +246,7 @@ public:
 	virtual void get_constants(Map<StringName, Variant> *p_constants) override;
 	virtual void get_members(Set<StringName> *p_members) override;
 
-	virtual Vector<ScriptNetData> get_rpc_methods() const override;
-	virtual uint16_t get_rpc_method_id(const StringName &p_method) const override;
-	virtual StringName get_rpc_method(const uint16_t p_rpc_method_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const override;
-
-	virtual Vector<ScriptNetData> get_rset_properties() const override;
-	virtual uint16_t get_rset_property_id(const StringName &p_variable) const override;
-	virtual StringName get_rset_property(const uint16_t p_variable_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_variable_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const override;
+	virtual const Vector<MultiplayerAPI::RPCConfig> get_rpc_methods() const override;
 
 #ifdef TOOLS_ENABLED
 	virtual bool is_placeholder_fallback_enabled() const override { return placeholder_fallback_enabled; }
@@ -310,17 +299,7 @@ public:
 
 	void reload_members();
 
-	virtual Vector<ScriptNetData> get_rpc_methods() const;
-	virtual uint16_t get_rpc_method_id(const StringName &p_method) const;
-	virtual StringName get_rpc_method(const uint16_t p_rpc_method_id) const;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const;
-
-	virtual Vector<ScriptNetData> get_rset_properties() const;
-	virtual uint16_t get_rset_property_id(const StringName &p_variable) const;
-	virtual StringName get_rset_property(const uint16_t p_variable_id) const;
-	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_variable_id) const;
-	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const;
+	virtual const Vector<MultiplayerAPI::RPCConfig> get_rpc_methods() const;
 
 	GDScriptInstance();
 	~GDScriptInstance();
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index b6a7a7579c..57421e7853 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -2105,46 +2105,10 @@ bool CSharpInstance::refcount_decremented() {
 	return ref_dying;
 }
 
-Vector<ScriptNetData> CSharpInstance::get_rpc_methods() const {
+const Vector<MultiplayerAPI::RPCConfig> CSharpInstance::get_rpc_methods() const {
 	return script->get_rpc_methods();
 }
 
-uint16_t CSharpInstance::get_rpc_method_id(const StringName &p_method) const {
-	return script->get_rpc_method_id(p_method);
-}
-
-StringName CSharpInstance::get_rpc_method(const uint16_t p_rpc_method_id) const {
-	return script->get_rpc_method(p_rpc_method_id);
-}
-
-MultiplayerAPI::RPCMode CSharpInstance::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const {
-	return script->get_rpc_mode_by_id(p_rpc_method_id);
-}
-
-MultiplayerAPI::RPCMode CSharpInstance::get_rpc_mode(const StringName &p_method) const {
-	return script->get_rpc_mode(p_method);
-}
-
-Vector<ScriptNetData> CSharpInstance::get_rset_properties() const {
-	return script->get_rset_properties();
-}
-
-uint16_t CSharpInstance::get_rset_property_id(const StringName &p_variable) const {
-	return script->get_rset_property_id(p_variable);
-}
-
-StringName CSharpInstance::get_rset_property(const uint16_t p_rset_member_id) const {
-	return script->get_rset_property(p_rset_member_id);
-}
-
-MultiplayerAPI::RPCMode CSharpInstance::get_rset_mode_by_id(const uint16_t p_rset_member_id) const {
-	return script->get_rset_mode_by_id(p_rset_member_id);
-}
-
-MultiplayerAPI::RPCMode CSharpInstance::get_rset_mode(const StringName &p_variable) const {
-	return script->get_rset_mode(p_variable);
-}
-
 void CSharpInstance::notification(int p_notification) {
 	GD_MONO_SCOPE_THREAD_ATTACH;
 
@@ -3046,7 +3010,6 @@ void CSharpScript::update_script_class_info(Ref<CSharpScript> p_script) {
 	p_script->script_class->fetch_methods_with_godot_api_checks(p_script->native);
 
 	p_script->rpc_functions.clear();
-	p_script->rpc_variables.clear();
 
 	GDMonoClass *top = p_script->script_class;
 	while (top && top != p_script->native) {
@@ -3060,9 +3023,12 @@ void CSharpScript::update_script_class_info(Ref<CSharpScript> p_script) {
 				if (!methods[i]->is_static()) {
 					MultiplayerAPI::RPCMode mode = p_script->_member_get_rpc_mode(methods[i]);
 					if (MultiplayerAPI::RPC_MODE_DISABLED != mode) {
-						ScriptNetData nd;
+						MultiplayerAPI::RPCConfig nd;
 						nd.name = methods[i]->get_name();
-						nd.mode = mode;
+						nd.rpc_mode = mode;
+						// TODO Transfer mode, channel
+						nd.transfer_mode = NetworkedMultiplayerPeer::TRANSFER_MODE_RELIABLE;
+						nd.channel = 0;
 						if (-1 == p_script->rpc_functions.find(nd)) {
 							p_script->rpc_functions.push_back(nd);
 						}
@@ -3071,46 +3037,11 @@ void CSharpScript::update_script_class_info(Ref<CSharpScript> p_script) {
 			}
 		}
 
-		{
-			Vector<GDMonoField *> fields = top->get_all_fields();
-			for (int i = 0; i < fields.size(); i++) {
-				if (!fields[i]->is_static()) {
-					MultiplayerAPI::RPCMode mode = p_script->_member_get_rpc_mode(fields[i]);
-					if (MultiplayerAPI::RPC_MODE_DISABLED != mode) {
-						ScriptNetData nd;
-						nd.name = fields[i]->get_name();
-						nd.mode = mode;
-						if (-1 == p_script->rpc_variables.find(nd)) {
-							p_script->rpc_variables.push_back(nd);
-						}
-					}
-				}
-			}
-		}
-
-		{
-			Vector<GDMonoProperty *> properties = top->get_all_properties();
-			for (int i = 0; i < properties.size(); i++) {
-				if (!properties[i]->is_static()) {
-					MultiplayerAPI::RPCMode mode = p_script->_member_get_rpc_mode(properties[i]);
-					if (MultiplayerAPI::RPC_MODE_DISABLED != mode) {
-						ScriptNetData nd;
-						nd.name = properties[i]->get_name();
-						nd.mode = mode;
-						if (-1 == p_script->rpc_variables.find(nd)) {
-							p_script->rpc_variables.push_back(nd);
-						}
-					}
-				}
-			}
-		}
-
 		top = top->get_parent_class();
 	}
 
 	// Sort so we are 100% that they are always the same.
-	p_script->rpc_functions.sort_custom<SortNetData>();
-	p_script->rpc_variables.sort_custom<SortNetData>();
+	p_script->rpc_functions.sort_custom<MultiplayerAPI::SortRPCConfig>();
 
 	p_script->load_script_signals(p_script->script_class, p_script->native);
 }
@@ -3543,60 +3474,10 @@ MultiplayerAPI::RPCMode CSharpScript::_member_get_rpc_mode(IMonoClassMember *p_m
 	return MultiplayerAPI::RPC_MODE_DISABLED;
 }
 
-Vector<ScriptNetData> CSharpScript::get_rpc_methods() const {
+const Vector<MultiplayerAPI::RPCConfig> CSharpScript::get_rpc_methods() const {
 	return rpc_functions;
 }
 
-uint16_t CSharpScript::get_rpc_method_id(const StringName &p_method) const {
-	for (int i = 0; i < rpc_functions.size(); i++) {
-		if (rpc_functions[i].name == p_method) {
-			return i;
-		}
-	}
-	return UINT16_MAX;
-}
-
-StringName CSharpScript::get_rpc_method(const uint16_t p_rpc_method_id) const {
-	ERR_FAIL_COND_V(p_rpc_method_id >= rpc_functions.size(), StringName());
-	return rpc_functions[p_rpc_method_id].name;
-}
-
-MultiplayerAPI::RPCMode CSharpScript::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const {
-	ERR_FAIL_COND_V(p_rpc_method_id >= rpc_functions.size(), MultiplayerAPI::RPC_MODE_DISABLED);
-	return rpc_functions[p_rpc_method_id].mode;
-}
-
-MultiplayerAPI::RPCMode CSharpScript::get_rpc_mode(const StringName &p_method) const {
-	return get_rpc_mode_by_id(get_rpc_method_id(p_method));
-}
-
-Vector<ScriptNetData> CSharpScript::get_rset_properties() const {
-	return rpc_variables;
-}
-
-uint16_t CSharpScript::get_rset_property_id(const StringName &p_variable) const {
-	for (int i = 0; i < rpc_variables.size(); i++) {
-		if (rpc_variables[i].name == p_variable) {
-			return i;
-		}
-	}
-	return UINT16_MAX;
-}
-
-StringName CSharpScript::get_rset_property(const uint16_t p_rset_member_id) const {
-	ERR_FAIL_COND_V(p_rset_member_id >= rpc_variables.size(), StringName());
-	return rpc_variables[p_rset_member_id].name;
-}
-
-MultiplayerAPI::RPCMode CSharpScript::get_rset_mode_by_id(const uint16_t p_rset_member_id) const {
-	ERR_FAIL_COND_V(p_rset_member_id >= rpc_functions.size(), MultiplayerAPI::RPC_MODE_DISABLED);
-	return rpc_functions[p_rset_member_id].mode;
-}
-
-MultiplayerAPI::RPCMode CSharpScript::get_rset_mode(const StringName &p_variable) const {
-	return get_rset_mode_by_id(get_rset_property_id(p_variable));
-}
-
 Error CSharpScript::load_source_code(const String &p_path) {
 	Error ferr = read_all_file_utf8(p_path, source);
 
diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h
index 992c7e93c8..abdb4585b2 100644
--- a/modules/mono/csharp_script.h
+++ b/modules/mono/csharp_script.h
@@ -136,8 +136,7 @@ private:
 	Map<StringName, EventSignal> event_signals;
 	bool signals_invalidated = true;
 
-	Vector<ScriptNetData> rpc_functions;
-	Vector<ScriptNetData> rpc_variables;
+	Vector<MultiplayerAPI::RPCConfig> rpc_functions;
 
 #ifdef TOOLS_ENABLED
 	List<PropertyInfo> exported_members_cache; // members_cache
@@ -235,17 +234,7 @@ public:
 
 	int get_member_line(const StringName &p_member) const override;
 
-	Vector<ScriptNetData> get_rpc_methods() const override;
-	uint16_t get_rpc_method_id(const StringName &p_method) const override;
-	StringName get_rpc_method(const uint16_t p_rpc_method_id) const override;
-	MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const override;
-	MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const override;
-
-	Vector<ScriptNetData> get_rset_properties() const override;
-	uint16_t get_rset_property_id(const StringName &p_variable) const override;
-	StringName get_rset_property(const uint16_t p_variable_id) const override;
-	MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_variable_id) const override;
-	MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const override;
+	const Vector<MultiplayerAPI::RPCConfig> get_rpc_methods() const override;
 
 #ifdef TOOLS_ENABLED
 	bool is_placeholder_fallback_enabled() const override { return placeholder_fallback_enabled; }
@@ -322,17 +311,7 @@ public:
 	void refcount_incremented() override;
 	bool refcount_decremented() override;
 
-	Vector<ScriptNetData> get_rpc_methods() const override;
-	uint16_t get_rpc_method_id(const StringName &p_method) const override;
-	StringName get_rpc_method(const uint16_t p_rpc_method_id) const override;
-	MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const override;
-	MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const override;
-
-	Vector<ScriptNetData> get_rset_properties() const override;
-	uint16_t get_rset_property_id(const StringName &p_variable) const override;
-	StringName get_rset_property(const uint16_t p_variable_id) const override;
-	MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_variable_id) const override;
-	MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const override;
+	const Vector<MultiplayerAPI::RPCConfig> get_rpc_methods() const override;
 
 	void notification(int p_notification) override;
 	void _call_notification(int p_notification);
diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp
index b863f622bd..c9ed912ac1 100644
--- a/modules/visual_script/visual_script.cpp
+++ b/modules/visual_script/visual_script.cpp
@@ -954,60 +954,10 @@ bool VisualScript::are_subnodes_edited() const {
 }
 #endif
 
-Vector<ScriptNetData> VisualScript::get_rpc_methods() const {
+const Vector<MultiplayerAPI::RPCConfig> VisualScript::get_rpc_methods() const {
 	return rpc_functions;
 }
 
-uint16_t VisualScript::get_rpc_method_id(const StringName &p_method) const {
-	for (int i = 0; i < rpc_functions.size(); i++) {
-		if (rpc_functions[i].name == p_method) {
-			return i;
-		}
-	}
-	return UINT16_MAX;
-}
-
-StringName VisualScript::get_rpc_method(const uint16_t p_rpc_method_id) const {
-	ERR_FAIL_COND_V(p_rpc_method_id >= rpc_functions.size(), StringName());
-	return rpc_functions[p_rpc_method_id].name;
-}
-
-MultiplayerAPI::RPCMode VisualScript::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const {
-	ERR_FAIL_COND_V(p_rpc_method_id >= rpc_functions.size(), MultiplayerAPI::RPC_MODE_DISABLED);
-	return rpc_functions[p_rpc_method_id].mode;
-}
-
-MultiplayerAPI::RPCMode VisualScript::get_rpc_mode(const StringName &p_method) const {
-	return get_rpc_mode_by_id(get_rpc_method_id(p_method));
-}
-
-Vector<ScriptNetData> VisualScript::get_rset_properties() const {
-	return rpc_variables;
-}
-
-uint16_t VisualScript::get_rset_property_id(const StringName &p_variable) const {
-	for (int i = 0; i < rpc_variables.size(); i++) {
-		if (rpc_variables[i].name == p_variable) {
-			return i;
-		}
-	}
-	return UINT16_MAX;
-}
-
-StringName VisualScript::get_rset_property(const uint16_t p_rset_property_id) const {
-	ERR_FAIL_COND_V(p_rset_property_id >= rpc_variables.size(), StringName());
-	return rpc_variables[p_rset_property_id].name;
-}
-
-MultiplayerAPI::RPCMode VisualScript::get_rset_mode_by_id(const uint16_t p_rset_variable_id) const {
-	ERR_FAIL_COND_V(p_rset_variable_id >= rpc_variables.size(), MultiplayerAPI::RPC_MODE_DISABLED);
-	return rpc_variables[p_rset_variable_id].mode;
-}
-
-MultiplayerAPI::RPCMode VisualScript::get_rset_mode(const StringName &p_variable) const {
-	return get_rset_mode_by_id(get_rset_property_id(p_variable));
-}
-
 void VisualScript::_set_data(const Dictionary &p_data) {
 	Dictionary d = p_data;
 	if (d.has("base_type")) {
@@ -1065,7 +1015,6 @@ void VisualScript::_set_data(const Dictionary &p_data) {
 
 	// Takes all the rpc methods.
 	rpc_functions.clear();
-	rpc_variables.clear();
 	List<StringName> fns;
 	functions.get_key_list(&fns);
 	for (const List<StringName>::Element *E = fns.front(); E; E = E->next()) {
@@ -1073,9 +1022,10 @@ void VisualScript::_set_data(const Dictionary &p_data) {
 			Ref<VisualScriptFunction> vsf = nodes[functions[E->get()].func_id].node;
 			if (vsf.is_valid()) {
 				if (vsf->get_rpc_mode() != MultiplayerAPI::RPC_MODE_DISABLED) {
-					ScriptNetData nd;
+					MultiplayerAPI::RPCConfig nd;
 					nd.name = E->get();
-					nd.mode = vsf->get_rpc_mode();
+					nd.rpc_mode = vsf->get_rpc_mode();
+					nd.transfer_mode = NetworkedMultiplayerPeer::TRANSFER_MODE_RELIABLE; // TODO
 					if (rpc_functions.find(nd) == -1) {
 						rpc_functions.push_back(nd);
 					}
@@ -1085,7 +1035,7 @@ void VisualScript::_set_data(const Dictionary &p_data) {
 	}
 
 	// Sort so we are 100% that they are always the same.
-	rpc_functions.sort_custom<SortNetData>();
+	rpc_functions.sort_custom<MultiplayerAPI::SortRPCConfig>();
 }
 
 Dictionary VisualScript::_get_data() const {
@@ -1882,46 +1832,10 @@ Ref<Script> VisualScriptInstance::get_script() const {
 	return script;
 }
 
-Vector<ScriptNetData> VisualScriptInstance::get_rpc_methods() const {
+const Vector<MultiplayerAPI::RPCConfig> VisualScriptInstance::get_rpc_methods() const {
 	return script->get_rpc_methods();
 }
 
-uint16_t VisualScriptInstance::get_rpc_method_id(const StringName &p_method) const {
-	return script->get_rpc_method_id(p_method);
-}
-
-StringName VisualScriptInstance::get_rpc_method(const uint16_t p_rpc_method_id) const {
-	return script->get_rpc_method(p_rpc_method_id);
-}
-
-MultiplayerAPI::RPCMode VisualScriptInstance::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const {
-	return script->get_rpc_mode_by_id(p_rpc_method_id);
-}
-
-MultiplayerAPI::RPCMode VisualScriptInstance::get_rpc_mode(const StringName &p_method) const {
-	return script->get_rpc_mode(p_method);
-}
-
-Vector<ScriptNetData> VisualScriptInstance::get_rset_properties() const {
-	return script->get_rset_properties();
-}
-
-uint16_t VisualScriptInstance::get_rset_property_id(const StringName &p_variable) const {
-	return script->get_rset_property_id(p_variable);
-}
-
-StringName VisualScriptInstance::get_rset_property(const uint16_t p_rset_property_id) const {
-	return script->get_rset_property(p_rset_property_id);
-}
-
-MultiplayerAPI::RPCMode VisualScriptInstance::get_rset_mode_by_id(const uint16_t p_rset_variable_id) const {
-	return script->get_rset_mode_by_id(p_rset_variable_id);
-}
-
-MultiplayerAPI::RPCMode VisualScriptInstance::get_rset_mode(const StringName &p_variable) const {
-	return script->get_rset_mode(p_variable);
-}
-
 void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_owner) {
 	script = p_script;
 	owner = p_owner;
diff --git a/modules/visual_script/visual_script.h b/modules/visual_script/visual_script.h
index cc78b3242d..3c4a26a2a3 100644
--- a/modules/visual_script/visual_script.h
+++ b/modules/visual_script/visual_script.h
@@ -234,8 +234,7 @@ private:
 	HashMap<StringName, Function> functions;
 	HashMap<StringName, Variable> variables;
 	Map<StringName, Vector<Argument>> custom_signals;
-	Vector<ScriptNetData> rpc_functions;
-	Vector<ScriptNetData> rpc_variables;
+	Vector<MultiplayerAPI::RPCConfig> rpc_functions;
 
 	Map<Object *, VisualScriptInstance *> instances;
 
@@ -363,17 +362,7 @@ public:
 
 	virtual int get_member_line(const StringName &p_member) const override;
 
-	virtual Vector<ScriptNetData> get_rpc_methods() const override;
-	virtual uint16_t get_rpc_method_id(const StringName &p_method) const override;
-	virtual StringName get_rpc_method(const uint16_t p_rpc_method_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const override;
-
-	virtual Vector<ScriptNetData> get_rset_properties() const override;
-	virtual uint16_t get_rset_property_id(const StringName &p_property) const override;
-	virtual StringName get_rset_property(const uint16_t p_rset_property_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_rpc_method_id) const override;
-	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const override;
+	virtual const Vector<MultiplayerAPI::RPCConfig> get_rpc_methods() const override;
 
 #ifdef TOOLS_ENABLED
 	virtual bool are_subnodes_edited() const;
@@ -454,17 +443,7 @@ public:
 
 	virtual ScriptLanguage *get_language();
 
-	virtual Vector<ScriptNetData> get_rpc_methods() const;
-	virtual uint16_t get_rpc_method_id(const StringName &p_method) const;
-	virtual StringName get_rpc_method(const uint16_t p_rpc_method_id) const;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const;
-	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const;
-
-	virtual Vector<ScriptNetData> get_rset_properties() const;
-	virtual uint16_t get_rset_property_id(const StringName &p_property) const;
-	virtual StringName get_rset_property(const uint16_t p_rset_property_id) const;
-	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_rpc_method_id) const;
-	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const;
+	virtual const Vector<MultiplayerAPI::RPCConfig> get_rpc_methods() const;
 
 	VisualScriptInstance();
 	~VisualScriptInstance();
diff --git a/modules/visual_script/visual_script_func_nodes.cpp b/modules/visual_script/visual_script_func_nodes.cpp
index 9310b86627..a0ba7b1962 100644
--- a/modules/visual_script/visual_script_func_nodes.cpp
+++ b/modules/visual_script/visual_script_func_nodes.cpp
@@ -737,20 +737,22 @@ public:
 		}
 
 		int to_id = 0;
-		bool reliable = true;
+		//bool reliable = true;
 
 		if (rpc_mode >= VisualScriptFunctionCall::RPC_RELIABLE_TO_ID) {
 			to_id = *p_args[0];
 			p_args += 1;
 			p_argcount -= 1;
-			if (rpc_mode == VisualScriptFunctionCall::RPC_UNRELIABLE_TO_ID) {
-				reliable = false;
-			}
-		} else if (rpc_mode == VisualScriptFunctionCall::RPC_UNRELIABLE) {
-			reliable = false;
+			//if (rpc_mode == VisualScriptFunctionCall::RPC_UNRELIABLE_TO_ID) {
+			//reliable = false;
+			//}
 		}
+		//else if (rpc_mode == VisualScriptFunctionCall::RPC_UNRELIABLE) {
+		//reliable = false;
+		//}
 
-		node->rpcp(to_id, !reliable, function, p_args, p_argcount);
+		// TODO reliable?
+		node->rpcp(to_id, function, p_args, p_argcount);
 
 		return true;
 	}