change default port to 25564

CleanroomMC · Mar 13, 2024 · 5e03fc1 · 5e03fc1
1 parent 12be3a6
commit 5e03fc1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/editors/vscode/package.json b/editors/vscode/package.json
@@ -32,12 +32,10 @@
       "title": "GroovyScript",
       "properties": {
         "groovyscript.port": {
-          "type": [
-            "number"
-          ],
-          "default": 8000,
+          "type": "number",
+          "default": 25564,
           "title": "Language server port",
-          "description": "Port specified in config of GroovyScript Language Server"
+          "description": "Port to connect to GroovyScript mod"
         }
       }
     },

diff --git a/editors/vscode/src/main.ts b/editors/vscode/src/main.ts
@@ -10,7 +10,7 @@ let traceOutputChannel = vscode.window.createOutputChannel("GroovyScript Languag
 async function startClient() {
 	const serverOptions = () => {
 		const configuration = vscode.workspace.getConfiguration("groovyscript");
-        const port = configuration.get<number>("port", 8000);
+        let port = configuration.get<number>("port", 25564);
         outputChannel.appendLine(`Connecting to GroovyScript Language Server at port ${port}`);
         let socket = net.connect({port: port});
         socket.on("error", (err) => {

diff --git a/src/main/java/com/cleanroommc/groovyscript/GroovyScriptConfig.java b/src/main/java/com/cleanroommc/groovyscript/GroovyScriptConfig.java
@@ -9,4 +9,7 @@ public class GroovyScriptConfig {
     @ApiStatus.Internal
     @Config.Comment("The current set packmode")
     public static String packmode = "";
+
+    @Config.Comment("Port for the VSC connection. Default: 25564")
+    public static int languageServerPort = 25564;
 }
diff --git a/src/main/java/com/cleanroommc/groovyscript/server/GroovyScriptLanguageServer.java b/src/main/java/com/cleanroommc/groovyscript/server/GroovyScriptLanguageServer.java
@@ -1,6 +1,7 @@
 package com.cleanroommc.groovyscript.server;
 
 import com.cleanroommc.groovyscript.GroovyScript;
+import com.cleanroommc.groovyscript.GroovyScriptConfig;
 import com.cleanroommc.groovyscript.api.GroovyLog;
 import net.prominic.groovyls.GroovyLanguageServer;
 import org.eclipse.lsp4j.jsonrpc.Launcher;
@@ -17,7 +18,7 @@ public static void listen() {
 
         while (true) {
             var server = new GroovyScriptLanguageServer(languageServerContext);
-            try (var serverSocket = new ServerSocket(8000);
+            try (var serverSocket = new ServerSocket(GroovyScriptConfig.languageServerPort);
                  var socket = serverSocket.accept()) {
 
                 GroovyScript.LOGGER.info("Accepted connection from: {}", socket.getInetAddress());