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

Rewrite of all static initialization code

Browse Source
This commit is contained in:
Anuken
2018-05-29 15:24:47 -04:00
parent 4655bd5502
commit b434c37f01
60 changed files with 2605 additions and 2545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
desktop/src/io/anuke/mindustry/desktop/CrashHandler.java
View File

@@ -3,8 +3,6 @@ package io.anuke.mindustry.desktop;
import io.anuke.mindustry.net.Net;
import io.anuke.ucore.util.Strings;
import javax.swing.*;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.text.SimpleDateFormat;
@@ -42,9 +40,9 @@ public class CrashHandler {
}
try{
JOptionPane.showMessageDialog(null, "An error has occured: \n" + result + "\n\n" +
(!failed ? "A crash report has been written to " + new File(filename).getAbsolutePath() + ".\nPlease send this file to the developer!"
: "Failed to generate crash report.\nPlease send an image of this crash log to the developer!"));
//JOptionPane.showMessageDialog(null, "An error has occured: \n" + result + "\n\n" +
// (!failed ? "A crash report has been written to " + new File(filename).getAbsolutePath() + ".\nPlease send this file to the developer!"
// : "Failed to generate crash report.\nPlease send an image of this crash log to the developer!"));
}catch (Throwable i){
i.printStackTrace();
//what now?

8
desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
View File

@@ -6,14 +6,12 @@ import club.minnced.discord.rpc.DiscordRichPresence;
import com.badlogic.gdx.utils.Base64Coder;
import io.anuke.kryonet.DefaultThreadImpl;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.core.ThreadHandler.ThreadProvider;
import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.core.ThreadHandler.ThreadProvider;
import io.anuke.mindustry.net.Net;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.util.OS;
import io.anuke.ucore.util.Strings;
import javax.swing.*;
import java.net.NetworkInterface;
import java.text.DateFormat;
import java.text.NumberFormat;
@@ -26,7 +24,7 @@ import java.util.Random;
import static io.anuke.mindustry.Vars.*;
public class DesktopPlatform extends Platform {
final static boolean useDiscord = OS.getPropertyNotNull("sun.arch.data.model").equals("64");
final static boolean useDiscord = false;//OS.getPropertyNotNull("sun.arch.data.model").equals("64");
final static String applicationId = "398246104468291591";
final static DateFormat format = SimpleDateFormat.getDateTimeInstance();
String[] args;
@@ -52,7 +50,7 @@ public class DesktopPlatform extends Platform {
@Override
public void showError(String text){
JOptionPane.showMessageDialog(null, text);
//JOptionPane.showMessageDialog(null, text);
}
@Override