mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-13 19:39:04 +07:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken 2019-06-30 10:09:20 -04:00
parent 12bff75586
commit c77f51b7ae
4 changed files with 7 additions and 8 deletions
core/src/io/anuke/mindustry
core
Control.java
net
CrashSender.java
ui/dialogs
SettingsMenuDialog.java
tools
build.gradle

2
core/src/io/anuke/mindustry/core/Control.java
View File

@ -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();
}
}

7
core/src/io/anuke/mindustry/net/CrashSender.java
View File

@ -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);

4
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@ -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 -> {

2
tools/build.gradle
View File

@ -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
}