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

Fixed bad app-data directory being provided

Browse Source
This commit is contained in:
Anuken
2018-05-31 21:24:04 -04:00
parent e60b3880ce
commit 418467e467
6 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/src/io/anuke/mindustry/AndroidLauncher.java
View File

@@ -83,11 +83,6 @@ public class AndroidLauncher extends AndroidApplication{
showDonations(); showDonations();
} }
@Override
public void requestWritePerms() {
}
@Override @Override
public ThreadProvider getThreadProvider() { public ThreadProvider getThreadProvider() {
return new DefaultThreadImpl(); return new DefaultThreadImpl();

2
core/src/io/anuke/mindustry/core/Platform.java
View File

@@ -37,8 +37,6 @@ public abstract class Platform {
public void openDonations(){} public void openDonations(){}
/**Whether discord RPC is supported.*/ /**Whether discord RPC is supported.*/
public boolean hasDiscord(){return true;} public boolean hasDiscord(){return true;}
/**Request Android permissions for writing files.*/
public void requestWritePerms(){}
/**Return the localized name for the locale. This is basically a workaround for GWT not supporting getName().*/ /**Return the localized name for the locale. This is basically a workaround for GWT not supporting getName().*/
public String getLocaleName(Locale locale){ public String getLocaleName(Locale locale){
return locale.toString(); return locale.toString();

3
core/src/io/anuke/mindustry/io/SaveIO.java
View File

@@ -4,6 +4,7 @@ import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Base64Coder; import com.badlogic.gdx.utils.Base64Coder;
import com.badlogic.gdx.utils.IntMap; import com.badlogic.gdx.utils.IntMap;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.io.versions.Save16; import io.anuke.mindustry.io.versions.Save16;
import io.anuke.ucore.core.Settings; import io.anuke.ucore.core.Settings;
@@ -103,7 +104,7 @@ public class SaveIO{
} }
public static FileHandle fileFor(int slot){ public static FileHandle fileFor(int slot){
return saveDirectory.child(slot + ".mins"); return saveDirectory.child(slot + "." + Vars.saveExtension);
} }
public static void write(FileHandle file){ public static void write(FileHandle file){

7
core/src/io/anuke/mindustry/io/Saves.java
View File

@@ -3,6 +3,7 @@ package io.anuke.mindustry.io;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.async.AsyncExecutor; import com.badlogic.gdx.utils.async.AsyncExecutor;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.Difficulty; import io.anuke.mindustry.game.Difficulty;
import io.anuke.mindustry.game.GameMode; import io.anuke.mindustry.game.GameMode;
@@ -11,9 +12,7 @@ import io.anuke.ucore.core.Timers;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.gwt; import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Vars.saveSlots;
import static io.anuke.mindustry.Vars.state;
public class Saves { public class Saves {
private int nextSlot; private int nextSlot;
@@ -170,7 +169,7 @@ public class Saves {
public void exportFile(FileHandle file) throws IOException{ public void exportFile(FileHandle file) throws IOException{
try{ try{
if(!file.extension().equals("mins")){ if(!file.extension().equals("mins")){
file = file.parent().child(file.nameWithoutExtension() + ".mins"); file = file.parent().child(file.nameWithoutExtension() + "." + Vars.saveExtension);
} }
SaveIO.fileFor(index).copyTo(file); SaveIO.fileFor(index).copyTo(file);
}catch (Exception e){ }catch (Exception e){

1
core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
View File

@@ -264,7 +264,6 @@ public class FileChooser extends FloatingDialog {
@Override @Override
public Dialog show(){ public Dialog show(){
Platform.instance.requestWritePerms();
Timers.runTask(2f, () -> { Timers.runTask(2f, () -> {
content().clear(); content().clear();
setupWidgets(); setupWidgets();

3
core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java
View File

@@ -3,6 +3,7 @@ package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.io.SaveIO; import io.anuke.mindustry.io.SaveIO;
@@ -97,7 +98,7 @@ public class LoadDialog extends FloatingDialog{
}, false, "mins"); }, false, "mins");
}else{ }else{
try { try {
FileHandle file = Gdx.files.local("save-" + slot.getName() + ".mins"); FileHandle file = Gdx.files.local("save-" + slot.getName() + "." + Vars.saveExtension);
slot.exportFile(file); slot.exportFile(file);
Platform.instance.shareFile(file); Platform.instance.shareFile(file);
}catch (Exception e){ }catch (Exception e){