Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

non-functional loading screen

Browse Source
This commit is contained in:
Anuken
2019-08-26 22:53:11 -04:00
parent 1fc9c82aaf
commit 76cd7ba8d1
211 changed files with 722 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/net/Administration.java
View File

@@ -4,7 +4,7 @@ import io.anuke.annotations.Annotations.Serialize;
import io.anuke.arc.Core;
import io.anuke.arc.collection.*;
import static io.anuke.mindustry.Vars.headless;
import static io.anuke.mindustry.Min.headless;
public class Administration{

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

@@ -50,8 +50,8 @@ 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");
Files.createDirectories(Paths.get(OS.getAppDataDirectoryString(Vars.appName), "crashes"));
File file = new File(OS.getAppDataDirectoryString(Min.appName), "crashes/crash-report-" + DateTimeFormatter.ofPattern("MM_dd_yyyy_HH_mm_ss").format(LocalDateTime.now()) + ".txt");
Files.createDirectories(Paths.get(OS.getAppDataDirectoryString(Min.appName), "crashes"));
Files.write(file.toPath(), parseException(exception).getBytes());
writeListener.accept(file);
@@ -95,8 +95,8 @@ public class CrashSender{
ex(() -> value.addChild("build", new JsonValue(Version.build)));
ex(() -> value.addChild("net", new JsonValue(fn)));
ex(() -> value.addChild("server", new JsonValue(fs)));
ex(() -> value.addChild("players", new JsonValue(Vars.playerGroup.size())));
ex(() -> value.addChild("state", new JsonValue(Vars.state.getState().name())));
ex(() -> value.addChild("players", new JsonValue(Min.playerGroup.size())));
ex(() -> value.addChild("state", new JsonValue(Min.state.getState().name())));
ex(() -> value.addChild("os", new JsonValue(System.getProperty("os.name") + "x" + (OS.is64Bit ? "64" : "32"))));
ex(() -> value.addChild("trace", new JsonValue(parseException(exception))));
@@ -104,7 +104,7 @@ public class CrashSender{
Log.info("Sending crash report.");
//post to crash report URL
httpPost(Vars.crashReportURL, value.toJson(OutputType.json), r -> {
httpPost(Min.crashReportURL, value.toJson(OutputType.json), r -> {
Log.info("Crash sent successfully.");
sent[0] = true;
System.exit(1);

2
core/src/io/anuke/mindustry/net/Net.java
View File

@@ -14,7 +14,7 @@ import net.jpountz.lz4.*;
import java.io.*;
import java.nio.*;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Min.*;
@SuppressWarnings("unchecked")
public class Net{

2
core/src/io/anuke/mindustry/net/NetworkIO.java
View File

@@ -13,7 +13,7 @@ import java.io.*;
import java.nio.ByteBuffer;
import java.util.Arrays;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Min.*;
public class NetworkIO{