[FIX] Adds GDNative to GDExtension migration changes

Author: why-try313

javascript_language.cpp

@@ -18,7 +18,7 @@ static void free_callback(void *p_token, void *p_instance, void *p_binding) {
 	}
 }
 
-static GDNativeBool reference_callback(void *p_token, void *p_binding, GDNativeBool p_reference) {
+static GDExtensionBool reference_callback(void *p_token, void *p_binding, GDExtensionBool p_reference) {
 	if (JavaScriptBinder *binder = JavaScriptLanguage::get_singleton()->get_thread_binder(Thread::get_caller_id())) {
 		if (p_reference) {
 			binder->godot_refcount_incremented(static_cast<JavaScriptGCHandler *>(p_binding));

javascript_language.h

@@ -21,7 +21,7 @@ class JavaScriptLanguage : public ScriptLanguage {
 	static JavaScriptLanguage *singleton;
 	JavaScriptBinder *main_binder;
 	HashMap<Thread::ID, JavaScriptBinder *> thread_binder_map;
-	GDNativeInstanceBindingCallbacks instance_binding_callbacks;
+	GDExtensionInstanceBindingCallbacks instance_binding_callbacks;
 
 	CallableMiddleman *callable_middleman;
 #ifdef TOOLS_ENABLED
@@ -43,7 +43,7 @@ class JavaScriptLanguage : public ScriptLanguage {
 	}
 
 	_FORCE_INLINE_ virtual String get_name() const override { return "JavaScript"; }
-	const GDNativeInstanceBindingCallbacks *get_instance_binding_callbacks() const { return &instance_binding_callbacks; }
+	const GDExtensionInstanceBindingCallbacks *get_instance_binding_callbacks() const { return &instance_binding_callbacks; }
 #ifdef TOOLS_ENABLED
 	_FORCE_INLINE_ HashSet<Ref<JavaScript> > &get_scripts() { return scripts; }
 #endif

register_types.cpp

@@ -44,32 +44,34 @@ class EditorExportJavaScript : public EditorExportPlugin {
 
 public:
 	virtual void _export_file(const String &p_path, const String &p_type, const HashSet<String> &p_features) override {
-		int script_mode = EditorExportPreset::MODE_SCRIPT_COMPILED;
+		String script_key;
+		// int script_mode = EditorExportPreset::MODE_SCRIPT_COMPILED;
 		const Ref<EditorExportPreset> &preset = get_export_preset();
 
-		if (preset.is_valid()) {
-			script_mode = preset->get_script_export_mode();
-		}
+		// if (preset.is_valid()) {
+		// 	script_mode = preset->get_file_export_mode(p_path);
+		// }
 
-		if (script_mode == EditorExportPreset::MODE_SCRIPT_TEXT)
-			return;
+		// if (script_mode == EditorExportPreset::MODE_SCRIPT_TEXT)
+		// 	return;
 
 		String extension = p_path.get_extension();
 		if (extension != EXT_JSCLASS && extension != EXT_JSMODULE)
 			return;
 
-		if (script_mode == EditorExportPreset::ScriptExportMode::MODE_SCRIPT_COMPILED) {
-#if 0 // Disable compile to bytecode as it is not battle tested on all platform
-			Error err;
-			String code = FileAccess::get_file_as_string(p_path, &err);
-			ERR_FAIL_COND(err != OK);
-
-			Vector<uint8_t> file;
-			ERR_FAIL_COND(JavaScriptLanguage::get_singleton()->get_main_binder()->compile_to_bytecode(code, p_path, file) != OK);
-			add_file(p_path.get_basename() + "." + extension + "b", file, true);
-#endif
-		}
+// 		if (script_mode == EditorExportPreset::FileExportMode::MODE_SCRIPT_COMPILED) {
+// #if 0 // Disable compile to bytecode as it is not battle tested on all platform
+// 			Error err;
+// 			String code = FileAccess::get_file_as_string(p_path, &err);
+// 			ERR_FAIL_COND(err != OK);
+
+// 			Vector<uint8_t> file;
+// 			ERR_FAIL_COND(JavaScriptLanguage::get_singleton()->get_main_binder()->compile_to_bytecode(code, p_path, file) != OK);
+// 			add_file(p_path.get_basename() + "." + extension + "b", file, true);
+// #endif
+// 		}
 	}
+	virtual String _get_name() const override { return "JavaScript"; }
 };
 
 #endif