Server cleanup

core/src/io/anuke/mindustry/Vars.java

@@ -25,6 +25,8 @@ import java.util.Locale;
 
 @SuppressWarnings("unchecked")
 public class Vars{
+    /** Whether to load locales.*/
+    public static boolean loadLocales = true;
     /** IO buffer size. */
     public static final int bufferSize = 8192;
     /** global charset */
@@ -143,6 +145,7 @@ public class Vars{
     public static void init(){
         Serialization.init();
 
+        if(loadLocales){
             //load locales
             String[] stra = Core.files.internal("locales").readString().split("\n");
             locales = new Locale[stra.length];
@@ -156,6 +159,8 @@ public class Vars{
             }
 
             Arrays.sort(locales, Structs.comparing(l -> l.getDisplayName(l), String.CASE_INSENSITIVE_ORDER));
+        }
+
         Version.init();
 
         content = new ContentLoader();

server/src/io/anuke/mindustry/server/MindustryServer.java

@@ -19,6 +19,7 @@ public class MindustryServer implements ApplicationListener{
     @Override
     public void init(){
         Core.settings.setDataDirectory(Core.files.local("config"));
+        loadLocales = false;
         Vars.init();
 
         headless = true;

server/src/io/anuke/mindustry/server/ServerLauncher.java

@@ -1,19 +1,10 @@
 package io.anuke.mindustry.server;
 
 
-import io.anuke.arc.ApplicationListener;
 import io.anuke.arc.backends.headless.HeadlessApplication;
-import io.anuke.arc.backends.headless.HeadlessApplicationConfiguration;
+import io.anuke.mindustry.net.*;
-import io.anuke.mindustry.net.CrashSender;
-import io.anuke.mindustry.net.Net;
-import io.anuke.mindustry.net.ArcNetClient;
-import io.anuke.mindustry.net.ArcNetServer;
 
-public class ServerLauncher extends HeadlessApplication{
+public class ServerLauncher{
-
-    public ServerLauncher(ApplicationListener listener, HeadlessApplicationConfiguration config){
-        super(listener, config);
-    }
 
     public static void main(String[] args){
         try{
@@ -21,18 +12,9 @@ public class ServerLauncher extends HeadlessApplication{
             Net.setClientProvider(new ArcNetClient());
             Net.setServerProvider(new ArcNetServer());
 
-            HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration();
+            new HeadlessApplication(new MindustryServer(args), null, throwable -> CrashSender.send(throwable, f -> {}));
-            new ServerLauncher(new MindustryServer(args), config);
         }catch(Throwable t){
             CrashSender.send(t, f -> {});
         }
-
-        //find and handle uncaught exceptions in libGDX thread
-        for(Thread thread : Thread.getAllStackTraces().keySet()){
-            if(thread.getName().equals("HeadlessApplication")){
-                thread.setUncaughtExceptionHandler((t, throwable) -> CrashSender.send(throwable, f -> {}));
-                break;
-            }
-        }
     }
 }