Fix broken compilation after Godo's API changes

perbone · perbone · commit 4b4b7ac50e89 · 2022-07-31T03:12:56.000-03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## 0.0.78 - 2022-07-31
+
+### Fixed
+
+* Fix broken compilation after Godo's API changes
+
 ## 0.0.77 - 2022-07-21
 
 ### Fixed
diff --git a/lua_script.cpp b/lua_script.cpp
@@ -260,6 +260,12 @@ bool LuaScript::is_placeholder_fallback_enabled() const {
 } // TODO
 #endif
 
+const Variant LuaScript::get_rpc_config() const {
+	print_debug("LuaScript::get_rpc_config");
+
+	return this->rpc_config;
+} // TODO
+
 Error LuaScript::load_source_code(const String &p_path) {
 	print_debug("_LuaScript::load_source_code( p_path = %s )", String(p_path).ascii().get_data());
 
@@ -307,14 +313,6 @@ void LuaScript::_placeholder_erased(PlaceHolderScriptInstance *p_placeholder) {
 }
 #endif
 
-const Vector<Multiplayer::RPCConfig> LuaScript::get_rpc_methods() const {
-	print_debug("LuaScript::get_rpc_methods");
-
-	Vector<Multiplayer::RPCConfig> rpc_methods{};
-
-	return rpc_methods;
-}
-
 Variant LuaScript::_new(const Variant **p_args, int p_argcount, Callable::CallError &r_error) { // TODO
 	print_debug("LuaScript::_new");
 
diff --git a/lua_script.h b/lua_script.h
@@ -81,7 +81,7 @@ class LuaScript : public Script {
 	bool is_placeholder_fallback_enabled() const override;
 #endif
 
-	const Vector<Multiplayer::RPCConfig> get_rpc_methods() const override;
+	const Variant get_rpc_config() const override;
 
 public:
 	Variant _new(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
@@ -112,6 +112,8 @@ class LuaScript : public Script {
 
 	HashSet<Object *> instances{};
 
+	Dictionary rpc_config;
+
 #ifdef TOOLS_ENABLED
 	bool source_changed_cache{};
 	bool placeholder_fallback_enabled{};
diff --git a/lua_script_instance.cpp b/lua_script_instance.cpp
@@ -141,10 +141,10 @@ Variant LuaScriptInstance::property_get_fallback(const StringName &p_name, bool
 	return Variant{};
 }
 
-const Vector<Multiplayer::RPCConfig> LuaScriptInstance::get_rpc_methods() const {
-	print_debug("LuaScriptInstance::get_rpc_methods");
+const Variant LuaScriptInstance::get_rpc_config() const {
+	print_debug("LuaScriptInstance::get_rpc_config");
 
-	return this->script->get_rpc_methods();
+	return this->script->get_rpc_config();
 }
 
 ScriptLanguage *LuaScriptInstance::get_language() {
diff --git a/lua_script_instance.h b/lua_script_instance.h
@@ -53,7 +53,7 @@ class LuaScriptInstance : public ScriptInstance {
 	void property_set_fallback(const StringName &p_name, const Variant &p_value, bool *r_valid) override;
 	Variant property_get_fallback(const StringName &p_name, bool *r_valid) override;
 
-	const Vector<Multiplayer::RPCConfig> get_rpc_methods() const override;
+	const Variant get_rpc_config() const override;
 
 	ScriptLanguage *get_language() override;
 
diff --git a/lua_script_resource_formate_saver.cpp b/lua_script_resource_formate_saver.cpp
@@ -29,8 +29,7 @@ LuaScriptResourceFormatSaver::LuaScriptResourceFormatSaver() {
 LuaScriptResourceFormatSaver::~LuaScriptResourceFormatSaver() {
 	print_debug("LuaScriptResourceFormatSaver::destructor");
 }
-
-Error LuaScriptResourceFormatSaver::save(const String &p_path, const Ref<Resource> &p_resource, uint32_t p_flags) {
+Error LuaScriptResourceFormatSaver::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {
 	print_debug("LuaScriptResourceFormatSaver::save( p_path = " + p_path + " )");
 
 	Ref<LuaScript> script = p_resource;
diff --git a/lua_script_resource_formate_saver.h b/lua_script_resource_formate_saver.h
@@ -26,7 +26,7 @@ class LuaScriptResourceFormatSaver : public ResourceFormatSaver {
 	LuaScriptResourceFormatSaver();
 	virtual ~LuaScriptResourceFormatSaver();
 
-	virtual Error save(const String &p_path, const Ref<Resource> &p_resource, uint32_t p_flags = 0);
-	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const;
-	virtual bool recognize(const Ref<Resource> &p_resource) const;
+	Error save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags = 0) override;
+	void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
+	bool recognize(const Ref<Resource> &p_resource) const override;
 };

Original file line number	Diff line number	Diff line change
`@@ -141,10 +141,10 @@ Variant LuaScriptInstance::property_get_fallback(const StringName &p_name, bool`
`141`	`141`	`return Variant{};`
`142`	`142`	`}`
`143`	`143`
`144`		`-const Vector<Multiplayer::RPCConfig> LuaScriptInstance::get_rpc_methods() const {`
`145`		`- print_debug("LuaScriptInstance::get_rpc_methods");`
	`144`	`+const Variant LuaScriptInstance::get_rpc_config() const {`
	`145`	`+ print_debug("LuaScriptInstance::get_rpc_config");`
`146`	`146`
`147`		`- return this->script->get_rpc_methods();`
	`147`	`+ return this->script->get_rpc_config();`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`ScriptLanguage *LuaScriptInstance::get_language() {`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@ LuaScriptResourceFormatSaver::LuaScriptResourceFormatSaver() {`
`29`	`29`	`LuaScriptResourceFormatSaver::~LuaScriptResourceFormatSaver() {`
`30`	`30`	`print_debug("LuaScriptResourceFormatSaver::destructor");`
`31`	`31`	`}`
`32`		`-`
`33`		`-Error LuaScriptResourceFormatSaver::save(const String &p_path, const Ref<Resource> &p_resource, uint32_t p_flags) {`
	`32`	`+Error LuaScriptResourceFormatSaver::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {`
`34`	`33`	`print_debug("LuaScriptResourceFormatSaver::save( p_path = " + p_path + " )");`
`35`	`34`
`36`	`35`	`Ref<LuaScript> script = p_resource;`