From c77f51b7ae290c0a553f990599aaf724b0e87716 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 30 Jun 2019 10:09:20 -0400 Subject: [PATCH] Bugfixes --- core/src/io/anuke/mindustry/core/Control.java | 2 +- core/src/io/anuke/mindustry/net/CrashSender.java | 7 ++----- .../io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java | 4 ++-- tools/build.gradle | 2 ++ 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 3b87d16091..43f197ad3e 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -321,7 +321,7 @@ public class Control implements ApplicationListener{ Time.update(); } - if(!scene.hasDialog() && !(scene.root.getChildren().peek() instanceof Dialog) && Core.input.keyTap(KeyCode.BACK)){ + if(!scene.hasDialog() && !scene.root.getChildren().isEmpty() && !(scene.root.getChildren().peek() instanceof Dialog) && Core.input.keyTap(KeyCode.BACK)){ Platform.instance.hide(); } } diff --git a/core/src/io/anuke/mindustry/net/CrashSender.java b/core/src/io/anuke/mindustry/net/CrashSender.java index 21d197866c..c0ab9812e5 100644 --- a/core/src/io/anuke/mindustry/net/CrashSender.java +++ b/core/src/io/anuke/mindustry/net/CrashSender.java @@ -3,11 +3,8 @@ package io.anuke.mindustry.net; import io.anuke.arc.Core; import io.anuke.arc.collection.ObjectMap; import io.anuke.arc.function.Consumer; -import io.anuke.arc.util.Log; -import io.anuke.arc.util.OS; -import io.anuke.arc.util.Strings; +import io.anuke.arc.util.*; import io.anuke.arc.util.io.PropertiesUtils; -import io.anuke.arc.util.io.Streams; import io.anuke.arc.util.serialization.JsonValue; import io.anuke.arc.util.serialization.JsonValue.ValueType; import io.anuke.arc.util.serialization.JsonWriter.OutputType; @@ -53,7 +50,7 @@ public class CrashSender{ try{ File file = new File(OS.getAppDataDirectoryString(Vars.appName), "crashes/crash-report-" + DateTimeFormatter.ofPattern("MM_dd_yyyy_HH_mm_ss").format(LocalDateTime.now()) + ".txt"); new File(OS.getAppDataDirectoryString(Vars.appName)).mkdir(); - new BufferedOutputStream(new FileOutputStream(file), Streams.DEFAULT_BUFFER_SIZE).write(parseException(exception).getBytes()); + Files.write(file.toPath(), parseException(exception).getBytes()); Files.createDirectories(Paths.get(OS.getAppDataDirectoryString(Vars.appName), "crashes")); writeListener.accept(file); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index 677d2fe950..d4d7eaf152 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -189,11 +189,11 @@ public class SettingsMenuDialog extends SettingsDialog{ Core.graphics.setVSync(Core.settings.getBool("vsync")); if(Core.settings.getBool("fullscreen")){ - Core.graphics.setFullscreenMode(Core.graphics.getDisplayMode()); + Core.app.post(() -> Core.graphics.setFullscreenMode(Core.graphics.getDisplayMode())); } if(Core.settings.getBool("borderlesswindow")){ - Core.graphics.setUndecorated(true); + Core.app.post(() -> Core.graphics.setUndecorated(true)); } }else{ graphics.checkPref("landscape", false, b -> { diff --git a/tools/build.gradle b/tools/build.gradle index a4eb2a3317..2a38aef093 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -294,6 +294,7 @@ task pack(){ jvmArgs "-XstartOnFirstThread" } + jvmArgs("-Djava.awt.headless=true") main = "io.anuke.mindustry.Upscaler" classpath = sourceSets.main.runtimeClasspath standardInput = System.in @@ -332,6 +333,7 @@ task genSprites(dependsOn: classes, type: JavaExec){ main = "io.anuke.mindustry.ImagePacker" classpath = sourceSets.main.runtimeClasspath + jvmArgs("-Djava.awt.headless=true") standardInput = System.in workingDir = genFolder }