SaveUtils - libgdx

RemixedDungeon/src/main/java/com/watabou/pixeldungeon/Dungeon.java

@@ -28,6 +28,7 @@
 import com.nyrds.platform.game.Game;
 import com.nyrds.platform.storage.FileSystem;
 import com.nyrds.platform.storage.Preferences;
+import com.nyrds.platform.storage.SaveUtils;
 import com.nyrds.platform.util.Os;
 import com.nyrds.platform.util.StringsManager;
 import com.nyrds.platform.util.TrackedRuntimeException;
@@ -66,7 +67,6 @@
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;

RemixedDungeon/src/main/java/com/watabou/pixeldungeon/GamesInProgress.java

@@ -1,6 +1,7 @@
 
 package com.watabou.pixeldungeon;
 
+import com.nyrds.platform.storage.SaveUtils;
 import com.watabou.pixeldungeon.actors.hero.Hero;
 import com.watabou.pixeldungeon.actors.hero.HeroClass;
 

RemixedDungeon/src/main/java/com/watabou/pixeldungeon/scenes/InterlevelScene.java

@@ -8,12 +8,12 @@
 import com.nyrds.pixeldungeon.utils.Position;
 import com.nyrds.platform.EventCollector;
 import com.nyrds.platform.audio.MusicManager;
+import com.nyrds.platform.storage.SaveUtils;
 import com.nyrds.platform.util.StringsManager;
 import com.nyrds.util.GuiProperties;
 import com.watabou.noosa.Camera;
 import com.watabou.noosa.Text;
 import com.watabou.pixeldungeon.Dungeon;
-import com.watabou.pixeldungeon.SaveUtils;
 import com.watabou.pixeldungeon.actors.Actor;
 import com.watabou.pixeldungeon.actors.hero.Hero;
 import com.watabou.pixeldungeon.actors.mobs.Mob;

RemixedDungeon/src/main/java/com/watabou/pixeldungeon/windows/WndModDescription.java

@@ -6,12 +6,12 @@
 import com.nyrds.platform.game.Game;
 import com.nyrds.platform.game.RemixedDungeon;
 import com.nyrds.platform.input.Touchscreen.Touch;
+import com.nyrds.platform.storage.SaveUtils;
 import com.nyrds.platform.util.StringsManager;
 import com.nyrds.util.GuiProperties;
 import com.nyrds.util.ModdingMode;
 import com.watabou.noosa.Text;
 import com.watabou.noosa.TouchArea;
-import com.watabou.pixeldungeon.SaveUtils;
 import com.watabou.pixeldungeon.scenes.PixelScene;
 import com.watabou.pixeldungeon.ui.RedButton;
 import com.watabou.pixeldungeon.ui.Window;

RemixedDungeon/src/main/java/com/watabou/pixeldungeon/windows/WndModSelect.java

@@ -11,6 +11,7 @@
 import com.nyrds.pixeldungeon.windows.WndHelper;
 import com.nyrds.platform.game.RemixedDungeon;
 import com.nyrds.platform.storage.FileSystem;
+import com.nyrds.platform.storage.SaveUtils;
 import com.nyrds.platform.util.Os;
 import com.nyrds.platform.util.StringsManager;
 import com.nyrds.util.DownloadStateListener;
@@ -22,7 +23,6 @@
 import com.nyrds.util.UnzipTask;
 import com.watabou.noosa.Text;
 import com.watabou.noosa.ui.Component;
-import com.watabou.pixeldungeon.SaveUtils;
 import com.watabou.pixeldungeon.scenes.PixelScene;
 import com.watabou.pixeldungeon.ui.Icons;
 import com.watabou.pixeldungeon.ui.RedButton;

RemixedDungeon/src/main/java/com/watabou/pixeldungeon/windows/WndSaveSlotSelect.java

@@ -1,13 +1,10 @@
 package com.watabou.pixeldungeon.windows;
 
 
-
 import com.nyrds.pixeldungeon.game.GameLoop;
 import com.nyrds.pixeldungeon.game.GamePreferences;
 import com.nyrds.pixeldungeon.ml.R;
 import com.nyrds.pixeldungeon.mobs.common.MobFactory;
-import com.nyrds.platform.support.Ads;
-import com.nyrds.platform.support.Iap;
 import com.nyrds.pixeldungeon.windows.HBox;
 import com.nyrds.pixeldungeon.windows.ImageTab;
 import com.nyrds.pixeldungeon.windows.WndDifficultyOptions;
@@ -16,6 +13,9 @@
 import com.nyrds.platform.game.Game;
 import com.nyrds.platform.game.RemixedDungeon;
 import com.nyrds.platform.storage.FileSystem;
+import com.nyrds.platform.storage.SaveUtils;
+import com.nyrds.platform.support.Ads;
+import com.nyrds.platform.support.Iap;
 import com.nyrds.platform.util.StringsManager;
 import com.nyrds.util.GuiProperties;
 import com.nyrds.util.ModdingMode;
@@ -27,7 +27,6 @@
 import com.watabou.noosa.Text;
 import com.watabou.pixeldungeon.Dungeon;
 import com.watabou.pixeldungeon.GamesInProgress;
-import com.watabou.pixeldungeon.SaveUtils;
 import com.watabou.pixeldungeon.actors.hero.Hero;
 import com.watabou.pixeldungeon.actors.hero.HeroClass;
 import com.watabou.pixeldungeon.scenes.GameScene;

RemixedDungeonDesktop/src/libgdx/java/com/nyrds/platform/audio/MusicManager.java

@@ -5,7 +5,6 @@
 import com.badlogic.gdx.audio.Music;
 import com.nyrds.platform.EventCollector;
 import com.nyrds.platform.storage.FileSystem;
-import com.nyrds.platform.util.PUtil;
 import com.nyrds.util.ModdingMode;
 
 import org.jetbrains.annotations.NotNull;
@@ -51,7 +50,7 @@ public void play(@NotNull String assetName, boolean looping) {
 			player = Gdx.audio.newMusic(FileSystem.getInternalStorageFileHandle(assetFilename));
 			player.setLooping(looping);
 			player.play();
-			PUtil.slog("music", "playing " + assetFilename);
+			//PUtil.slog("music", "playing " + assetFilename);
 		} catch (Exception e) {
 			if (player != null) {
 				player.dispose();

RemixedDungeonDesktop/src/libgdx/java/com/nyrds/platform/audio/Sample.java

@@ -2,14 +2,12 @@
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.audio.Sound;
-import com.badlogic.gdx.files.FileHandle;
 import com.nyrds.pixeldungeon.game.GameLoop;
 import com.nyrds.platform.EventCollector;
-import com.nyrds.platform.util.PUtil;
 import com.nyrds.util.ModdingMode;
+
 import org.jetbrains.annotations.NotNull;
 
-import java.io.File;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -81,7 +79,7 @@ public void play(String id, float leftVolume, float rightVolume, float rate) {
 		}
 		GameLoop.instance().soundExecutor.execute(() -> {
 			Sound sound = sounds.get(id);
-			PUtil.slog("sound", "playing " + id);
+			//PUtil.slog("sound", "playing " + id);
 			if (sound != null) {
 				sound.play(leftVolume, rate, 0);
 			} else {

RemixedDungeonDesktop/src/libgdx/java/com/nyrds/platform/game/Game.java

@@ -211,7 +211,7 @@ public boolean scrolled(float amountX, float amountY) {
 
 
     public static boolean deleteFile(String path) {
-        FileHandle file = Gdx.files.external(path);
+        FileHandle file = Gdx.files.local(path);
         if (file.exists()) {
             file.delete();
             return true;
@@ -227,13 +227,9 @@ static public void requestInternetPermission(InterstitialPoint returnTo) {
         returnTo.returnToWork(true);
     }
 
-    public String[] fileList() {
-        return Gdx.files.external("").file().list();
-    }
-
     public InputStream openFileInput(String bonesFile) {
         try {
-            return Gdx.files.external(bonesFile).read();
+            return Gdx.files.local(bonesFile).read();
         } catch (Exception e) {
             return null;
         }

RemixedDungeonDesktop/src/libgdx/java/com/nyrds/platform/game/RemixedDungeon.java

@@ -75,7 +75,7 @@ public static void switchNoFade(Class<? extends PixelScene> c) {
 	}
 
 	public static boolean isDev() {
-		return true;
+		return false;
 	}
 
 

RemixedDungeonDesktop/src/libgdx/java/com/nyrds/platform/storage/FileSystem.java

@@ -84,16 +84,17 @@ static public File[] listExternalStorage() {
 	static public OutputStream getOutputStream(String filename) throws FileNotFoundException {
 		filename = SAVES_PATH + filename;
 
-		FileHandle fileHandle = Gdx.files.internal(filename);
+		FileHandle fileHandle = Gdx.files.local(filename);
 		if(!fileHandle.parent().exists()) {
 			fileHandle.parent().mkdirs();
 		}
 
-		return new FileOutputStream(FileSystem.getInternalStorageFile(filename));
+		return new FileOutputStream(Gdx.files.local(filename).file());
 	}
 
 	static public InputStream getInputStream(String filename) throws FileNotFoundException {
-		return new FileInputStream(FileSystem.getInternalStorageFile(SAVES_PATH + filename));
+		filename = SAVES_PATH + filename;
+		return new FileInputStream(Gdx.files.local(filename).file());
 	}
 
 	static public File getExternalStorageFile(String fileName) {