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

MapEditor tweaks, fixed file browser on Android w/ permissions

Browse Source
This commit is contained in:
Anuken
2018-05-31 20:27:13 -04:00
parent 92acf009b0
commit e60b3880ce
8 changed files with 140 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
View File

@@ -8,7 +8,6 @@ import io.anuke.kryonet.KryoServer;
import io.anuke.mindustry.Mindustry;
import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.net.Net;
import io.anuke.ucore.UCore;
import io.anuke.ucore.util.OS;
public class DesktopLauncher {
@@ -22,7 +21,7 @@ public class DesktopLauncher {
config.setWindowIcon("sprites/icon.png");
if(OS.isMac) {
config.setPreferencesConfig(UCore.getProperty("user.home") + "/Library/Application Support/Mindustry", FileType.Absolute);
config.setPreferencesConfig(OS.getAppDataDirectoryString("Mindustry"), FileType.Absolute);
}
Platform.instance = new DesktopPlatform(arg);

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

@@ -12,6 +12,7 @@ import io.anuke.mindustry.core.ThreadHandler.ThreadProvider;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.ui.dialogs.FileChooser;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.function.Consumer;
import io.anuke.ucore.util.OS;
import io.anuke.ucore.util.Strings;
@@ -35,8 +36,6 @@ public class DesktopPlatform extends Platform {
public DesktopPlatform(String[] args){
this.args = args;
if(useDiscord) {
DiscordEventHandlers handlers = new DiscordEventHandlers();
DiscordRPC.INSTANCE.Discord_Initialize(applicationId, handlers, true, "");
@@ -60,7 +59,7 @@ public class DesktopPlatform extends Platform {
@Override
public void showError(String text){
//JOptionPane.showMessageDialog(null, text);
}
@Override