Fix extension for 4.0

- The `.mono` folder was moved to `.godot/mono` - The `--remote-debug` argument now requires the protocol
godotengine · Feb 15, 2022 · f68fd19 · f68fd19
1 parent aedd1af
commit f68fd19
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/GodotDebugSession/GodotDebuggerSession.cs b/GodotDebugSession/GodotDebuggerSession.cs
@@ -89,12 +89,25 @@ protected override async void OnRun(DebuggerStartInfo startInfo)
                         string host = "127.0.0.1";
                         int remoteDebugPort = ((IPEndPoint)remoteDebugListener.LocalEndpoint).Port;
 
+                        // Construct the --remote-debug parameter for the found version of Godot
+
+                        var versionCommand = Command.Run(godotStartInfo.GodotExecutablePath, new[] { "--version" }).Result;
+                        string versionOutput = versionCommand.StandardOutput;
+                        int versionFirstDot = versionOutput.IndexOf('.');
+                        if (versionFirstDot == -1 || !int.TryParse(versionOutput.Substring(0, versionFirstDot), out int versionMajor))
+                        {
+                            Logger.Log($"Godot launch request failed: Godot version unrecognized: {versionOutput}.");
+                            Exit();
+                            return;
+                        }
+                        string remoteDebugAddress = versionMajor >= 4 ? $"tcp://{host}:{remoteDebugPort}" : $"{host}:{remoteDebugPort}";
+
                         // Launch Godot to run the game and connect to our remote debugger
 
                         var args = new List<string>()
                         {
                             "--path", workingDir,
-                            "--remote-debug", $"{host}:{remoteDebugPort}",
+                            "--remote-debug", remoteDebugAddress,
                         };
                         args.AddRange(godotStartInfo.ExecutableArguments);
 

diff --git a/src/godot-tools-messaging/client.ts b/src/godot-tools-messaging/client.ts
@@ -225,7 +225,11 @@ export class Client implements Disposable {
         this.logger = logger;
 
         this.projectDir = godotProjectDir;
-        this.projectMetadataDir = path.join(godotProjectDir, '.mono', 'metadata');
+        this.projectMetadataDir = path.join(godotProjectDir, '.godot', 'mono', 'metadata');
+        if (!fs.existsSync(this.projectMetadataDir)) {
+            // Fallback for 3.x projects
+            this.projectMetadataDir = path.join(godotProjectDir, '.mono', 'metadata');
+        }
 
         this.metaFilePath = path.join(this.projectMetadataDir, GodotIdeMetadata.defaultFileName);
     }