From 6a5bf08d55e12a4b96bd5980dcafe213038d8636 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 16 Nov 2018 22:28:27 -0500
Subject: [PATCH] Implemented local server configs

---
 build.gradle                                             | 2 +-
 core/src/io/anuke/mindustry/Vars.java                    | 4 ++--
 server/src/io/anuke/mindustry/server/ServerLauncher.java | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index f77d2ff19a..085cf17f4f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
-        uCoreVersion = '2385d794f2cd3db2fb25d320f2223fa2148c25a0'
+        uCoreVersion = '1d5b8b5359344bd1d956d6085be69b7a836906fc'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index a11a7dbdcb..ed21672801 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -17,12 +17,12 @@ import io.anuke.mindustry.game.Version;
 import io.anuke.mindustry.gen.Serialization;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.world.blocks.defense.ForceProjector.ShieldEntity;
+import io.anuke.ucore.core.Settings;
 import io.anuke.ucore.entities.Entities;
 import io.anuke.ucore.entities.EntityGroup;
 import io.anuke.ucore.entities.impl.EffectEntity;
 import io.anuke.ucore.entities.trait.DrawTrait;
 import io.anuke.ucore.scene.ui.layout.Unit;
-import io.anuke.ucore.util.OS;
 import io.anuke.ucore.util.Translator;
 
 import java.util.Arrays;
@@ -170,7 +170,7 @@ public class Vars{
         ios = Gdx.app.getType() == ApplicationType.iOS;
         android = Gdx.app.getType() == ApplicationType.Android;
 
-        dataDirectory = OS.getAppDataDirectory(appName);
+        dataDirectory = Settings.getDataDirectory(appName);
         customMapDirectory = dataDirectory.child("maps/");
         saveDirectory = dataDirectory.child("saves/");
         baseCameraScale = Math.round(Unit.dp.scl(4));
diff --git a/server/src/io/anuke/mindustry/server/ServerLauncher.java b/server/src/io/anuke/mindustry/server/ServerLauncher.java
index b9c82c56d6..fb7fd882dc 100644
--- a/server/src/io/anuke/mindustry/server/ServerLauncher.java
+++ b/server/src/io/anuke/mindustry/server/ServerLauncher.java
@@ -7,8 +7,8 @@ import com.badlogic.gdx.backends.headless.HeadlessApplicationConfiguration;
 import io.anuke.kryonet.KryoClient;
 import io.anuke.kryonet.KryoServer;
 import io.anuke.mindustry.net.Net;
+import io.anuke.ucore.core.Settings;
 import io.anuke.ucore.util.EmptyLogger;
-import io.anuke.ucore.util.OS;
 
 public class ServerLauncher extends HeadlessApplication{
 
@@ -26,7 +26,7 @@ public class ServerLauncher extends HeadlessApplication{
             Net.setServerProvider(new KryoServer());
 
             HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration();
-            config.preferencesDirectory = OS.getAppDataDirectoryString("Mindustry");
+            Settings.setPrefHandler((appName) -> Gdx.files.local("config"));
 
             new ServerLauncher(new MindustryServer(args), config);
         }catch(Throwable t){