From b13a2c0f899407d1868046c9c41ad829571ab956 Mon Sep 17 00:00:00 2001 From: Frotty Date: Mon, 28 Dec 2020 02:14:02 +0100 Subject: [PATCH 1/2] set loadingscreen correctly --- de.peeeq.wurstscript/build.gradle | 2 +- .../languageserver/ProjectConfigBuilder.java | 2 ++ .../peeeq/wurstio/mpq/Jmpq3BasedEditor.java | 22 ++++++------------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/de.peeeq.wurstscript/build.gradle b/de.peeeq.wurstscript/build.gradle index 047a8de17..5db4df660 100644 --- a/de.peeeq.wurstscript/build.gradle +++ b/de.peeeq.wurstscript/build.gradle @@ -108,7 +108,7 @@ dependencies { compile 'com.github.inwc3:jmpq3:1.7.14' // Water's wc3 libs - compile 'com.github.inwc3:wc3libs:f29e038ced' + compile 'com.github.inwc3:wc3libs:86f3db6854' // The setup tool for wurst.build handling compile 'com.github.wurstscript:wurstsetup:376ce9a330' diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/ProjectConfigBuilder.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/ProjectConfigBuilder.java index 954722a6b..c05df8fd5 100644 --- a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/ProjectConfigBuilder.java +++ b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/ProjectConfigBuilder.java @@ -14,6 +14,7 @@ import net.moonlightflower.wc3libs.bin.app.W3I.Force; import net.moonlightflower.wc3libs.bin.app.W3I.Player; import net.moonlightflower.wc3libs.dataTypes.app.Controller; +import net.moonlightflower.wc3libs.dataTypes.app.LoadingScreenBackground; import net.moonlightflower.wc3libs.port.GameVersion; import org.apache.commons.lang.StringUtils; import org.eclipse.lsp4j.MessageType; @@ -145,6 +146,7 @@ private static void applyScenarioData(W3I w3I, WurstProjectBuildMapData buildMap private static void applyLoadingScreen(W3I w3I, WurstProjectBuildLoadingScreenData loadingScreen) { w3I.setLoadingScreenModel(loadingScreen.getModel()); + w3I.getLoadingScreen().setBackground(LoadingScreenBackground.PresetBackground.findByName()); w3I.getLoadingScreen().setTitle(loadingScreen.getTitle()); w3I.getLoadingScreen().setSubtitle(loadingScreen.getSubTitle()); w3I.getLoadingScreen().setText(loadingScreen.getText()); diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/mpq/Jmpq3BasedEditor.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/mpq/Jmpq3BasedEditor.java index 8986843f6..b1958a90f 100644 --- a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/mpq/Jmpq3BasedEditor.java +++ b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/mpq/Jmpq3BasedEditor.java @@ -12,12 +12,9 @@ class Jmpq3BasedEditor implements MpqEditor { - private JMpqEditor editor; + private final JMpqEditor editor; private JMpqEditor getEditor() { - if (editor == null) { - throw new RuntimeException("editor already closed"); - } return editor; } @@ -56,13 +53,10 @@ public void deleteFile(String filenameInMpq) { @Override public void close() throws IOException { - if (editor != null) { - try { - editor.close(); - } catch (JMpqException e) { - throw new IOException(e); - } - editor = null; + try { + editor.close(); + } catch (JMpqException e) { + throw new IOException(e); } } @@ -78,9 +72,7 @@ public void setKeepHeaderOffset(boolean flag) { @Override protected void finalize() throws Throwable { - if (editor != null) { - WLogger.severe("JMPQ editor not closed normally"); - editor.close(); - } + WLogger.severe("JMPQ editor not closed normally"); + editor.close(); } } From bd651f591a8def08d901f0145494d12e152f3934 Mon Sep 17 00:00:00 2001 From: Frotty Date: Mon, 28 Dec 2020 02:44:58 +0100 Subject: [PATCH 2/2] use background var from new setup daos --- de.peeeq.wurstscript/build.gradle | 2 +- .../peeeq/wurstio/languageserver/ProjectConfigBuilder.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/de.peeeq.wurstscript/build.gradle b/de.peeeq.wurstscript/build.gradle index 5db4df660..1b0140bdc 100644 --- a/de.peeeq.wurstscript/build.gradle +++ b/de.peeeq.wurstscript/build.gradle @@ -111,7 +111,7 @@ dependencies { compile 'com.github.inwc3:wc3libs:86f3db6854' // The setup tool for wurst.build handling - compile 'com.github.wurstscript:wurstsetup:376ce9a330' + compile 'com.github.wurstscript:wurstsetup:4c65824b40' compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/ProjectConfigBuilder.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/ProjectConfigBuilder.java index c05df8fd5..8c46dcb3c 100644 --- a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/ProjectConfigBuilder.java +++ b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/ProjectConfigBuilder.java @@ -145,8 +145,10 @@ private static void applyScenarioData(W3I w3I, WurstProjectBuildMapData buildMap } private static void applyLoadingScreen(W3I w3I, WurstProjectBuildLoadingScreenData loadingScreen) { - w3I.setLoadingScreenModel(loadingScreen.getModel()); - w3I.getLoadingScreen().setBackground(LoadingScreenBackground.PresetBackground.findByName()); + if (StringUtils.isNotBlank(loadingScreen.getModel())) { + w3I.setLoadingScreenModel(loadingScreen.getModel()); + } + w3I.getLoadingScreen().setBackground(LoadingScreenBackground.PresetBackground.findByName(loadingScreen.getBackground())); w3I.getLoadingScreen().setTitle(loadingScreen.getTitle()); w3I.getLoadingScreen().setSubtitle(loadingScreen.getSubTitle()); w3I.getLoadingScreen().setText(loadingScreen.getText());