fix: remove changes on JvmScript::get_base_script

Author: piiertho

src/resource_format/jvm_resource_format_loader.cpp

@@ -102,7 +102,7 @@ ResourceUID::ID JvmResourceFormatLoader::get_resource_uid(const String& p_path)
     if (extension == GODOT_JVM_REGISTRATION_FILE_EXTENSION) {
         id = (JvmScript::get_script_file_name(p_path) + UUID_HASH_SEED).hash64();
         id &= 0x7FFFFFFFFFFFFFFF;
-    } else if (extension == GODOT_KOTLIN_SCRIPT_EXTENSION || extension == GODOT_JAVA_SCRIPT_EXTENSION) {
+    } else if (extension == GODOT_KOTLIN_SCRIPT_EXTENSION || extension == GODOT_JAVA_SCRIPT_EXTENSION || extension == GODOT_SCALA_SCRIPT_EXTENSION) {
         String source;
         Error error;
         id = (String(SourceScript::parse_source_to_fqdn(p_path, source, &error)) + UUID_HASH_SEED).hash64();

src/script/jvm_script.cpp

@@ -60,19 +60,7 @@ bool JvmScript::inherits_script(const Ref<Script>& p_script) const {
 Ref<Script> JvmScript::get_base_script() const {
     if (!is_valid() || kotlin_class->registered_supertypes.size() == 0) { return {}; }
     StringName parent_name = kotlin_class->registered_supertypes[0];
-
-    //TODO: Remove with 4.4 when NamedScript names are GUIDs
-    for (const Dictionary& item: ProjectSettings::get_singleton()->get_global_class_list()) {
-        String class_name = item["class"];
-        if (class_name != parent_name) {
-            continue;
-        }
-
-        String script_path = item["path"];
-        return ResourceLoader::load(script_path);
-    }
-
-    return {};
+    return JvmScriptManager::get_instance()->get_script_from_name(parent_name);
 }
 
 StringName JvmScript::get_instance_base_type() const {

src/script/jvm_script.h

@@ -3,6 +3,7 @@
 
 #include "core/object/script_language.h"
 #include "jvm_wrapper/registration/kt_class.h"
+#include "resource_format/hash.h"
 
 class JvmInstance;