Language Server & VSC extension

dependencies.gradle

@@ -265,4 +265,7 @@ minecraft {
     if (project.debug_use_examples_folder.toBoolean()) {
         extraRunJvmArguments.add('-Dgroovyscript.use_examples_folder=true')
     }
+    if (project.debug_run_ls.toBoolean()) {
+        extraRunJvmArguments.add('-Dgroovyscript.run_ls=true')
+    }
 }

gradle.properties

@@ -39,6 +39,7 @@ modGroup = com.cleanroommc.groovyscript
 modVersion = 0.8.0
 groovy_version = 4.0.13
 debug_use_examples_folder = true
+debug_run_ls = true
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = false

src/main/java/com/cleanroommc/groovyscript/GroovyScript.java

@@ -105,6 +105,10 @@ public class GroovyScript {
 
     @Mod.EventHandler
     public void onConstruction(FMLConstructionEvent event) {
+        if (Boolean.parseBoolean(System.getProperty("groovyscript.run_ls"))) {
+            new Thread(GroovyScriptLanguageServer::listen).start();
+        }
+
         MinecraftForge.EVENT_BUS.register(this);
         MinecraftForge.EVENT_BUS.register(EventHandler.class);
         NetworkHandler.init();
@@ -185,8 +189,6 @@ public void onPostInit(FMLPostInitializationEvent event) {
                                                                 .appendSibling(new TextComponentString(value).setStyle(new Style().setColor(TextFormatting.GOLD)))
                                                                 .appendSibling(new TextComponentTranslation("groovyscript.command.copy.copied_end")));
         });
-
-        if (GroovyScriptConfig.server) new Thread(GroovyScriptLanguageServer::listen).start();
     }
 
     @Mod.EventHandler

src/main/java/com/cleanroommc/groovyscript/GroovyScriptConfig.java

@@ -9,13 +9,4 @@ public class GroovyScriptConfig {
     @ApiStatus.Internal
     @Config.Comment("The current set packmode")
     public static String packmode = "";
-
-    @ApiStatus.Internal
-    @Config.Comment("Enable the language server")
-    public static boolean server = true; // TODO: change to false
-
-    @ApiStatus.Internal
-    @Config.Comment("Listening port for the language server")
-    @Config.RangeInt(min = 1, max = 65535)
-    public static int port = 8000; // TODO: change port
 }

src/main/java/com/cleanroommc/groovyscript/server/GroovyScriptLanguageServer.java

@@ -1,26 +1,23 @@
 package com.cleanroommc.groovyscript.server;
 
-import java.net.ServerSocket;
-
+import com.cleanroommc.groovyscript.GroovyScript;
+import com.cleanroommc.groovyscript.api.GroovyLog;
+import net.prominic.groovyls.GroovyLanguageServer;
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.services.LanguageClient;
 
-import com.cleanroommc.groovyscript.GroovyScript;
-import com.cleanroommc.groovyscript.GroovyScriptConfig;
-
-import net.prominic.groovyls.GroovyLanguageServer;
+import java.net.ServerSocket;
 
 public class GroovyScriptLanguageServer extends GroovyLanguageServer {
 
     @SuppressWarnings("InfiniteLoopStatement")
     public static void listen() {
+        GroovyLog.get().infoMC("Starting Language server");
         var languageServerContext = new GroovyScriptLanguageServerContext();
 
         while (true) {
-            GroovyScript.LOGGER.info("Listening on port: {}", GroovyScriptConfig.port);
-
             var server = new GroovyScriptLanguageServer(languageServerContext);
-            try (var serverSocket = new ServerSocket(GroovyScriptConfig.port);
+            try (var serverSocket = new ServerSocket(8000);
                  var socket = serverSocket.accept()) {
 
                 GroovyScript.LOGGER.info("Accepted connection from: {}", socket.getInetAddress());