diff --git a/core/src/main/java/com/openeggbert/core/main/OpenEggbertApplication.java b/core/src/main/java/com/openeggbert/core/main/OpenEggbertApplication.java index ef072b7..5fc050a 100644 --- a/core/src/main/java/com/openeggbert/core/main/OpenEggbertApplication.java +++ b/core/src/main/java/com/openeggbert/core/main/OpenEggbertApplication.java @@ -20,9 +20,9 @@ package com.openeggbert.core.main; import com.openeggbert.core.gamespace.GameSpace; -import com.pixelgamelibrary.api.GameI; import com.pixelgamelibrary.api.PixelApplication; import java.util.Map; +import com.pixelgamelibrary.api.Game; /** * {@link com.badlogic.gdx.ApplicationListener} implementation shared by all @@ -34,7 +34,7 @@ public class OpenEggbertApplication extends PixelApplication { private static final String ABSOLUTE_PATH_OF_ROOT_DIRECTORY_IN = "absolutePathOfRootDirectoryIn"; @Override - public GameI createGameViaMap(Map objects) { + public Game createGameViaMap(Map objects) { String absolutePathOfRootDirectoryIn = null; GameSpace gameSpace = null; diff --git a/core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.java b/core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.java index 3633fb1..d997095 100644 --- a/core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.java +++ b/core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.java @@ -73,12 +73,12 @@ public class OpenEggbertGame extends GameAdapter { // for(FileHandle f:Gdx.files.internal(".").list()) { // System.out.println("assets contains also: " + f.name()); // } - com.pixelgamelibrary.api.storage.FileHandle embeddedModsDirectory = Pixel.asset().getAssets().file("/embedded_mods"); + com.pixelgamelibrary.api.storage.FileHandle embeddedModsDirectory = Pixel.files().assets().file("/embedded_mods"); System.out.println("embeddedModsDirectory.exists=" + embeddedModsDirectory.exists()); System.out.println("embeddedModsDirectory.list().size()=" + embeddedModsDirectory.list().size()); embeddedModsDirectory.list().forEach(e -> System.out.println(e.path())); - Pixel.asset().getAssets().list().forEach(e -> System.out.println(e)); + Pixel.files().assets().list().forEach(e -> System.out.println(e)); for (FileHandle embeddedModGroup : embeddedModsDirectory.list()) { if (embeddedModGroup.name().equals("README.md")) { diff --git a/core/src/main/java/com/openeggbert/core/screen/GameSpaceListScreen.java b/core/src/main/java/com/openeggbert/core/screen/GameSpaceListScreen.java index fce0699..b11e8fd 100644 --- a/core/src/main/java/com/openeggbert/core/screen/GameSpaceListScreen.java +++ b/core/src/main/java/com/openeggbert/core/screen/GameSpaceListScreen.java @@ -29,7 +29,6 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.utils.ScreenUtils; import com.openeggbert.core.gamespace.GameSpace; -import com.openeggbert.core.main.OpenEggbertApplication; import com.openeggbert.core.main.OpenEggbertGame; import com.openeggbert.core.mod.Mod; import com.openeggbert.core.mod.ModType; @@ -75,7 +74,7 @@ public class GameSpaceListScreen extends OpenEggbertScreen { Preferences prefs = Gdx.app.getPreferences("My Preferences"); prefs.putString("test", "abc"); prefs.flush(); - final Storage storage = Pixel.storage().getStorage(); + final Storage storage = Pixel.files().local(); storage.createDirectory("modes"); storage.createDirectory("gameSpaces"); System.out.println(storage.debug()); diff --git a/lwjgl3/src/main/java/com/openeggbert/lwjgl3/Lwjgl3Launcher.java b/lwjgl3/src/main/java/com/openeggbert/lwjgl3/Lwjgl3Launcher.java index a7f4304..1a9f676 100644 --- a/lwjgl3/src/main/java/com/openeggbert/lwjgl3/Lwjgl3Launcher.java +++ b/lwjgl3/src/main/java/com/openeggbert/lwjgl3/Lwjgl3Launcher.java @@ -28,7 +28,7 @@ import com.openeggbert.core.gamespace.GameSpace; import com.pixelgamelibrary.api.Pixel; import com.pixelgamelibrary.backend.libgdx.PixelBackendLibGDX; import java.util.Optional; -import com.pixelgamelibrary.api.GameI; +import com.pixelgamelibrary.api.Game; import com.pixelgamelibrary.backend.libgdx.game.LibGdxGame; /** Launches the desktop (LWJGL3) application. */ @@ -44,7 +44,7 @@ public class Lwjgl3Launcher { String currentDirectory = DesktopUtils.getPathOfDirectoryWhereJarIsRunning(); OpenEggbertApplication openEggbertApplication = new OpenEggbertApplication(); - GameI game; + Game game; if (gameSpace.isPresent()) { game = openEggbertApplication.createGame("gameSpace", gameSpace.get(), "currentDirectory", currentDirectory); } else {