Allow game exe override

Supports specifying a specific file that will be run for the runmap commands, overriding other config

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/WurstCommands.java

@@ -100,10 +100,11 @@ private static CompletableFuture<Object> startMap(WurstLanguageServer server, Ex
         JsonObject options = (JsonObject) params.getArguments().get(0);
         Optional<String> mapPath = getString(options,  "mappath");
         Optional<String> wc3Path = getString(options, "wc3path");
+        Optional<String> gameExePath = getString(options, "gameExePath");
 
         Optional<File> map = mapPath.map(File::new);
         List<String> compileArgs = getCompileArgs(workspaceRoot, additionalArgs);
-        return server.worker().handle(new RunMap(server, workspaceRoot, wc3Path, map, compileArgs)).thenApply(x -> x);
+        return server.worker().handle(new RunMap(server, workspaceRoot, wc3Path, map, compileArgs, gameExePath)).thenApply(x -> x);
     }
 
     private static Optional<String> getString(JsonObject options, String key) {

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/BuildMap.java

@@ -27,7 +27,7 @@ public class BuildMap extends MapRequest {
 
     public BuildMap(WurstLanguageServer languageServer, WFile workspaceRoot, Optional<String> wc3Path, Optional<File> map,
                     List<String> compileArgs) {
-        super(languageServer, map, compileArgs, workspaceRoot, wc3Path);
+        super(languageServer, map, compileArgs, workspaceRoot, wc3Path, Optional.empty());
     }
 
     @Override

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/MapRequest.java

@@ -28,16 +28,15 @@
 import de.peeeq.wurstscript.parser.WPos;
 import de.peeeq.wurstscript.utils.LineOffsets;
 import de.peeeq.wurstscript.utils.Utils;
-import net.moonlightflower.wc3libs.bin.Wc3BinOutputStream;
 import net.moonlightflower.wc3libs.bin.app.W3I;
+import net.moonlightflower.wc3libs.port.GameVersion;
 import net.moonlightflower.wc3libs.port.Orient;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.lsp4j.MessageParams;
 import org.eclipse.lsp4j.MessageType;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -88,14 +87,18 @@ public static class CompilationResult {
     }
 
     public MapRequest(WurstLanguageServer langServer, Optional<File> map, List<String> compileArgs, WFile workspaceRoot,
-                      Optional<String> wc3Path) {
+                      Optional<String> wc3Path, Optional<String> gameExePath) {
         this.langServer = langServer;
         this.map = map;
         this.compileArgs = compileArgs;
         this.workspaceRoot = workspaceRoot;
         this.runArgs = new RunArgs(compileArgs);
         this.wc3Path = wc3Path;
-        this.w3data = getBestW3InstallationData();
+        if (gameExePath.isPresent() && StringUtils.isNotBlank(gameExePath.get())) {
+            this.w3data = new W3InstallationData(Optional.of(new File(gameExePath.get())), Optional.of(GameVersion.VERSION_1_29));
+        } else {
+            this.w3data = getBestW3InstallationData();
+        }
         if (runArgs.isMeasureTimes()) {
             this.timeTaker = new TimeTaker.Recording();
         } else {

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/RunMap.java

@@ -45,8 +45,8 @@ public class RunMap extends MapRequest {
 
 
     public RunMap(WurstLanguageServer langServer, WFile workspaceRoot, Optional<String> wc3Path, Optional<File> map,
-                  List<String> compileArgs) {
-        super(langServer, map, compileArgs, workspaceRoot, wc3Path);
+                  List<String> compileArgs, Optional<String> gameExePath) {
+        super(langServer, map, compileArgs, workspaceRoot, wc3Path, gameExePath);
         safeCompilation = SafetyLevel.QuickAndDirty;
     }