From 05daa33b5603368364deded2bf461188950d85b9 Mon Sep 17 00:00:00 2001 From: Thor Date: Fri, 22 Nov 2019 23:21:57 +0100 Subject: [PATCH] Add option for disabling map configuration when building or running maps --- .../de/peeeq/wurstio/languageserver/requests/BuildMap.java | 6 ++++-- .../de/peeeq/wurstio/languageserver/requests/RunMap.java | 6 ++++-- .../src/main/java/de/peeeq/wurstscript/RunArgs.java | 6 +++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/BuildMap.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/BuildMap.java index 09d2474e7..36e1757d6 100644 --- a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/BuildMap.java +++ b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/BuildMap.java @@ -61,8 +61,10 @@ public Object execute(ModelManager modelManager) throws IOException { File targetMap = new File(buildDir, fileName.isEmpty() ? projectConfig.getProjectName() + ".w3x" : fileName + ".w3x"); File compiledScript = compileScript(modelManager, gui, targetMap); - gui.sendProgress("Applying Map Config..."); - ProjectConfigBuilder.apply(projectConfig, targetMap, compiledScript, buildDir, runArgs); + if (!runArgs.isDisableMapConfig()) { + gui.sendProgress("Applying Map Config..."); + ProjectConfigBuilder.apply(projectConfig, targetMap, compiledScript, buildDir, runArgs); + } JMpqEditor finalizer = new JMpqEditor(targetMap, MPQOpenOption.FORCE_V0); finalizer.close(); diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/RunMap.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/RunMap.java index bca3715aa..bdab11efa 100644 --- a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/RunMap.java +++ b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/RunMap.java @@ -119,8 +119,10 @@ public Object execute(ModelManager modelManager) throws IOException { mpqEditor.insertFile(mapScriptName, compiledScript); } - gui.sendProgress("Applying Map Config..."); - ProjectConfigBuilder.apply(projectConfig, testMap, compiledScript, buildDir, runArgs); + if (!runArgs.isDisableMapConfig()) { + gui.sendProgress("Applying Map Config..."); + ProjectConfigBuilder.apply(projectConfig, testMap, compiledScript, buildDir, runArgs); + } File mapCopy = copyToWarcraftMapDir(testMap); diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/RunArgs.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/RunArgs.java index 7ab58ebd6..4a4aca81c 100644 --- a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/RunArgs.java +++ b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/RunArgs.java @@ -47,6 +47,7 @@ public class RunArgs { private RunOption optionMeasureTimes; private RunOption optionHotStartmap; private RunOption optionHotReload; + private RunOption optionDisableMapConfig; private RunOption optionBuild; @@ -124,7 +125,7 @@ public RunArgs(String... args) { addOptionWithArg("workspaceroot", "The next argument should be the root folder of the project to build.", arg -> workspaceroot = arg); addOptionWithArg("inputmap", "The next argument should be the input map.", arg -> inputmap = arg); optionLua = addOption("lua", "Choose Lua as the compilation target."); - + optionDisableMapConfig = addOption("disableMapConfig", "Disable map configuration when building or running maps"); nextArg: for (int i = 0; i < args.length; i++) { @@ -344,4 +345,7 @@ public boolean isLua() { return optionLua.isSet; } + public boolean isDisableMapConfig() { + return optionDisableMapConfig.isSet; + } }