mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-09 10:09:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add conversion for sync and slave GDScript keywords

Browse Source
This commit is contained in:
Raul Santos 2022-08-06 03:51:00 +02:00
parent c80540f9a2
commit 6b56474911
No known key found for this signature in database
GPG Key ID: B532473AE3A803E4
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
editor/project_converter_3_to_4.cpp
View File

@ -2045,6 +2045,8 @@ bool ProjectConverter3To4::test_conversion(const RegExContainer &reg_container)
valid = valid & test_conversion_single_additional("\n\ntool", "\n\n@tool", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
valid = valid & test_conversion_single_additional("\n\nremote func", "\n\n@rpc(any_peer) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
valid = valid & test_conversion_single_additional("\n\nremotesync func", "\n\n@rpc(any_peer, call_local) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
valid = valid & test_conversion_single_additional("\n\nsync func", "\n\n@rpc(any_peer, call_local) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
valid = valid & test_conversion_single_additional("\n\nslave func", "\n\n@rpc func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
valid = valid & test_conversion_single_additional("\n\npuppet func", "\n\n@rpc func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
valid = valid & test_conversion_single_additional("\n\npuppetsync func", "\n\n@rpc(call_local) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
valid = valid & test_conversion_single_additional("\n\nmaster func", "\n\nThe master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using get_multiplayer().get_remote_sender_id()\n@rpc func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
@ -3236,6 +3238,22 @@ void ProjectConverter3To4::rename_gdscript_keywords(String &file_content) {
CRASH_COND(!reg_second.is_valid());
file_content = reg_second.sub(file_content, "@rpc(any_peer, call_local) func", true);
}
{
RegEx reg_first = RegEx("([\n]+)sync func");
CRASH_COND(!reg_first.is_valid());
file_content = reg_first.sub(file_content, "$1@rpc(any_peer, call_local) func", true);
RegEx reg_second = RegEx("^sync func");
CRASH_COND(!reg_second.is_valid());
file_content = reg_second.sub(file_content, "@rpc(any_peer, call_local) func", true);
}
{
RegEx reg_first = RegEx("([\n]+)slave func");
CRASH_COND(!reg_first.is_valid());
file_content = reg_first.sub(file_content, "$1@rpc func", true);
RegEx reg_second = RegEx("^slave func");
CRASH_COND(!reg_second.is_valid());
file_content = reg_second.sub(file_content, "@rpc func", true);
}
{
RegEx reg_first = RegEx("([\n]+)puppet func");
CRASH_COND(!reg_first.is_valid());
@ -3327,6 +3345,24 @@ Vector<String> ProjectConverter3To4::check_for_rename_gdscript_keywords(Vector<S
found_things.append(line_formatter(current_line, "remotesync func", "@rpc(any_peer, call_local)) func", line));
}
old = line;
{
RegEx regex = RegEx("^sync func");
CRASH_COND(!regex.is_valid());
line = regex.sub(line, "@rpc(any_peer, call_local)) func", true);
}
if (old != line) {
found_things.append(line_formatter(current_line, "sync func", "@rpc(any_peer, call_local)) func", line));
}
old = line;
{
RegEx regex = RegEx("^slave func");
CRASH_COND(!regex.is_valid());
line = regex.sub(line, "@rpc func", true);
}
if (old != line) {
found_things.append(line_formatter(current_line, "slave func", "@rpc func", line));
}
old = line;
{
RegEx regex = RegEx("^puppet func");
CRASH_COND(!regex.is_valid());