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

Added usage of OS.getAppDataDirectory()

Browse Source
This commit is contained in:
Anuken
2018-05-20 21:52:45 -04:00
parent 75f01099ee
commit 2108aab523
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/io/anuke/mindustry/Vars.java
View File

@@ -16,12 +16,12 @@ import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.io.Platform; import io.anuke.mindustry.io.Platform;
import io.anuke.mindustry.net.ClientDebug; import io.anuke.mindustry.net.ClientDebug;
import io.anuke.mindustry.net.ServerDebug; import io.anuke.mindustry.net.ServerDebug;
import io.anuke.ucore.UCore;
import io.anuke.ucore.entities.EffectEntity; import io.anuke.ucore.entities.EffectEntity;
import io.anuke.ucore.entities.Entities; import io.anuke.ucore.entities.Entities;
import io.anuke.ucore.entities.Entity; import io.anuke.ucore.entities.Entity;
import io.anuke.ucore.entities.EntityGroup; import io.anuke.ucore.entities.EntityGroup;
import io.anuke.ucore.scene.ui.layout.Unit; import io.anuke.ucore.scene.ui.layout.Unit;
import io.anuke.ucore.util.OS;
import java.util.Locale; import java.util.Locale;
@@ -56,12 +56,9 @@ public class Vars{
public static final String releasesURL = "https://api.github.com/repos/Anuken/Mindustry/releases"; public static final String releasesURL = "https://api.github.com/repos/Anuken/Mindustry/releases";
//directory for user-created map data //directory for user-created map data
public static final FileHandle customMapDirectory = gwt ? null : UCore.isAssets() ? public static final FileHandle customMapDirectory = OS.getAppDataDirectory("Mindustry").child("maps/");
Gdx.files.local("../../desktop/mindustry-maps") : Gdx.files.local("mindustry-maps/");
//save file directory //save file directory
public static final FileHandle saveDirectory = gwt ? null : UCore.isAssets() ? public static final FileHandle saveDirectory = OS.getAppDataDirectory("Mindustry").child("saves/");
Gdx.files.local("../../desktop/mindustry-saves") : Gdx.files.local("mindustry-saves/");
public static final String mapExtension = "mmap"; public static final String mapExtension = "mmap";
public static final String saveExtension = "msav"; public static final String saveExtension = "msav";
//scale of the font //scale of the font

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

@@ -9,8 +9,8 @@ import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.core.ThreadHandler.ThreadProvider; import io.anuke.mindustry.core.ThreadHandler.ThreadProvider;
import io.anuke.mindustry.io.Platform; import io.anuke.mindustry.io.Platform;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.ucore.UCore;
import io.anuke.ucore.core.Settings; import io.anuke.ucore.core.Settings;
import io.anuke.ucore.util.OS;
import io.anuke.ucore.util.Strings; import io.anuke.ucore.util.Strings;
import javax.swing.*; import javax.swing.*;
@@ -26,7 +26,7 @@ import java.util.Random;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
public class DesktopPlatform extends Platform { 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 String applicationId = "398246104468291591";
final static DateFormat format = SimpleDateFormat.getDateTimeInstance(); final static DateFormat format = SimpleDateFormat.getDateTimeInstance();
String[] args; String[] args;