From 2108aab52326eb50dae7f8b14fcd8187a5512148 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 20 May 2018 21:52:45 -0400
Subject: [PATCH] Added usage of OS.getAppDataDirectory()

---
 core/src/io/anuke/mindustry/Vars.java                    | 9 +++------
 .../src/io/anuke/mindustry/desktop/DesktopPlatform.java  | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index 4e678eeff4..fb38b3a5ce 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -16,12 +16,12 @@ import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.io.Platform;
 import io.anuke.mindustry.net.ClientDebug;
 import io.anuke.mindustry.net.ServerDebug;
-import io.anuke.ucore.UCore;
 import io.anuke.ucore.entities.EffectEntity;
 import io.anuke.ucore.entities.Entities;
 import io.anuke.ucore.entities.Entity;
 import io.anuke.ucore.entities.EntityGroup;
 import io.anuke.ucore.scene.ui.layout.Unit;
+import io.anuke.ucore.util.OS;
 
 import java.util.Locale;
 
@@ -56,12 +56,9 @@ public class Vars{
 
 	public static final String releasesURL = "https://api.github.com/repos/Anuken/Mindustry/releases";
 	//directory for user-created map data
-	public static final FileHandle customMapDirectory = gwt ? null : UCore.isAssets() ?
-			Gdx.files.local("../../desktop/mindustry-maps") : Gdx.files.local("mindustry-maps/");
+	public static final FileHandle customMapDirectory = OS.getAppDataDirectory("Mindustry").child("maps/");
 	//save file directory
-	public static final FileHandle saveDirectory = gwt ? null : UCore.isAssets() ?
-			Gdx.files.local("../../desktop/mindustry-saves") : Gdx.files.local("mindustry-saves/");
-
+	public static final FileHandle saveDirectory = OS.getAppDataDirectory("Mindustry").child("saves/");
 	public static final String mapExtension = "mmap";
 	public static final String saveExtension = "msav";
 	//scale of the font
diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
index 2ecac3fdc8..716fde41d7 100644
--- a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
+++ b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
@@ -9,8 +9,8 @@ import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.core.ThreadHandler.ThreadProvider;
 import io.anuke.mindustry.io.Platform;
 import io.anuke.mindustry.net.Net;
-import io.anuke.ucore.UCore;
 import io.anuke.ucore.core.Settings;
+import io.anuke.ucore.util.OS;
 import io.anuke.ucore.util.Strings;
 
 import javax.swing.*;
@@ -26,7 +26,7 @@ import java.util.Random;
 import static io.anuke.mindustry.Vars.*;
 
 public class DesktopPlatform extends Platform {
-    final static boolean useDiscord = UCore.getPropertyNotNull("sun.arch.data.model").equals("64");
+    final static boolean useDiscord = OS.getPropertyNotNull("sun.arch.data.model").equals("64");
     final static String applicationId = "398246104468291591";
     final static DateFormat format = SimpleDateFormat.getDateTimeInstance();
     String[] args;