Skip to content

Add option for disabling map configuration when building or running maps #907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Thorminator wants to merge 1 commit into from
Closed

Add option for disabling map configuration when building or running maps #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/BuildMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 4 additions & 2 deletions de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/RunMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 5 additions & 1 deletion de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/RunArgs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public class RunArgs {
private RunOption optionMeasureTimes;
private RunOption optionHotStartmap;
private RunOption optionHotReload;
private RunOption optionDisableMapConfig;

private RunOption optionBuild;

Expand Down Expand Up @@ -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++) {
Expand Down Expand Up @@ -344,4 +345,7 @@ public boolean isLua() {
return optionLua.isSet;
}

public boolean isDisableMapConfig() {
return optionDisableMapConfig.isSet;
}
}