From aff2e47bff7bb70c068772d5bb49b57a2acd19aa Mon Sep 17 00:00:00 2001
From: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
Date: Sat, 4 May 2024 13:20:14 +0200
Subject: [C#] Unexpose `GodotSharp`

This class seems to have been exposed accidentally, and breaks
documentation on non-mono builds, requiring hacks
---
 modules/mono/doc_classes/CSharpScript.xml     |  1 -
 modules/mono/doc_classes/GodotSharp.xml       | 20 --------------------
 modules/mono/editor/editor_internal_calls.cpp |  2 +-
 modules/mono/mono_gd/gd_mono.cpp              | 11 +----------
 modules/mono/mono_gd/gd_mono.h                |  8 ++------
 modules/mono/register_types.cpp               |  3 ---
 6 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 modules/mono/doc_classes/GodotSharp.xml

(limited to 'modules')

diff --git a/modules/mono/doc_classes/CSharpScript.xml b/modules/mono/doc_classes/CSharpScript.xml
index b559ca20b2..7e14259d5a 100644
--- a/modules/mono/doc_classes/CSharpScript.xml
+++ b/modules/mono/doc_classes/CSharpScript.xml
@@ -5,7 +5,6 @@
 	</brief_description>
 	<description>
 		This class represents a C# script. It is the C# equivalent of the [GDScript] class and is only available in Mono-enabled Godot builds.
-		See also [GodotSharp].
 	</description>
 	<tutorials>
 		<link title="C# documentation index">$DOCS_URL/tutorials/scripting/c_sharp/index.html</link>
diff --git a/modules/mono/doc_classes/GodotSharp.xml b/modules/mono/doc_classes/GodotSharp.xml
deleted file mode 100644
index 969ca14350..0000000000
--- a/modules/mono/doc_classes/GodotSharp.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="GodotSharp" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
-	<brief_description>
-		Bridge between Godot and the Mono runtime (Mono-enabled builds only).
-	</brief_description>
-	<description>
-		This class is a bridge between Godot and the Mono runtime. It exposes several low-level operations and is only available in Mono-enabled Godot builds.
-		See also [CSharpScript].
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-		<method name="is_runtime_initialized">
-			<return type="bool" />
-			<description>
-				Returns [code]true[/code] if the .NET runtime is initialized, [code]false[/code] otherwise.
-			</description>
-		</method>
-	</methods>
-</class>
diff --git a/modules/mono/editor/editor_internal_calls.cpp b/modules/mono/editor/editor_internal_calls.cpp
index 05dacd28fb..03d8b4eab6 100644
--- a/modules/mono/editor/editor_internal_calls.cpp
+++ b/modules/mono/editor/editor_internal_calls.cpp
@@ -143,7 +143,7 @@ bool godot_icall_Internal_IsAssembliesReloadingNeeded() {
 
 void godot_icall_Internal_ReloadAssemblies(bool p_soft_reload) {
 #ifdef GD_MONO_HOT_RELOAD
-	mono_bind::GodotSharp::get_singleton()->call_deferred(SNAME("_reload_assemblies"), (bool)p_soft_reload);
+	callable_mp(mono_bind::GodotSharp::get_singleton(), &mono_bind::GodotSharp::reload_assemblies).call_deferred(p_soft_reload);
 #endif
 }
 
diff --git a/modules/mono/mono_gd/gd_mono.cpp b/modules/mono/mono_gd/gd_mono.cpp
index 0e34616951..48caae8523 100644
--- a/modules/mono/mono_gd/gd_mono.cpp
+++ b/modules/mono/mono_gd/gd_mono.cpp
@@ -564,11 +564,7 @@ namespace mono_bind {
 
 GodotSharp *GodotSharp::singleton = nullptr;
 
-bool GodotSharp::_is_runtime_initialized() {
-	return GDMono::get_singleton() != nullptr && GDMono::get_singleton()->is_runtime_initialized();
-}
-
-void GodotSharp::_reload_assemblies(bool p_soft_reload) {
+void GodotSharp::reload_assemblies(bool p_soft_reload) {
 #ifdef GD_MONO_HOT_RELOAD
 	CRASH_COND(CSharpLanguage::get_singleton() == nullptr);
 	// This method may be called more than once with `call_deferred`, so we need to check
@@ -579,11 +575,6 @@ void GodotSharp::_reload_assemblies(bool p_soft_reload) {
 #endif
 }
 
-void GodotSharp::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("is_runtime_initialized"), &GodotSharp::_is_runtime_initialized);
-	ClassDB::bind_method(D_METHOD("_reload_assemblies"), &GodotSharp::_reload_assemblies);
-}
-
 GodotSharp::GodotSharp() {
 	singleton = this;
 }
diff --git a/modules/mono/mono_gd/gd_mono.h b/modules/mono/mono_gd/gd_mono.h
index 0cb087db57..614bfc63fb 100644
--- a/modules/mono/mono_gd/gd_mono.h
+++ b/modules/mono/mono_gd/gd_mono.h
@@ -167,18 +167,14 @@ namespace mono_bind {
 class GodotSharp : public Object {
 	GDCLASS(GodotSharp, Object);
 
-	friend class GDMono;
-
-	void _reload_assemblies(bool p_soft_reload);
-	bool _is_runtime_initialized();
-
 protected:
 	static GodotSharp *singleton;
-	static void _bind_methods();
 
 public:
 	static GodotSharp *get_singleton() { return singleton; }
 
+	void reload_assemblies(bool p_soft_reload);
+
 	GodotSharp();
 	~GodotSharp();
 };
diff --git a/modules/mono/register_types.cpp b/modules/mono/register_types.cpp
index beaa50ecb2..4d5426d96f 100644
--- a/modules/mono/register_types.cpp
+++ b/modules/mono/register_types.cpp
@@ -49,9 +49,6 @@ void initialize_mono_module(ModuleInitializationLevel p_level) {
 
 	_godotsharp = memnew(mono_bind::GodotSharp);
 
-	GDREGISTER_CLASS(mono_bind::GodotSharp);
-	Engine::get_singleton()->add_singleton(Engine::Singleton("GodotSharp", mono_bind::GodotSharp::get_singleton()));
-
 	script_language_cs = memnew(CSharpLanguage);
 	script_language_cs->set_language_index(ScriptServer::get_language_count());
 	ScriptServer::register_language(script_language_cs);
-- 
cgit v1.2.3