From 1ed50026fdd9a490c72fc1526a2e92436336d1f4 Mon Sep 17 00:00:00 2001 From: Robert Vokac Date: Wed, 18 Sep 2024 18:37:20 +0200 Subject: [PATCH] Refactoring --- .../pixelgamelibrary/backend/libgdx/AppLibGDXImpl.java | 2 +- .../backend/libgdx/GraphicsLibGDXImpl.java | 8 ++++---- .../pixelgamelibrary/backend/libgdx/game/LibGdxGame.java | 6 +++--- .../backend/libgdx/screen/LibGdxScreen.java | 4 ++-- .../backend/libgdx/storage/DesktopAndroidStorageTest.java | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/AppLibGDXImpl.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/AppLibGDXImpl.java index a8b1307..db9b976 100644 --- a/src/main/java/com/pixelgamelibrary/backend/libgdx/AppLibGDXImpl.java +++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/AppLibGDXImpl.java @@ -28,7 +28,7 @@ import com.badlogic.gdx.Gdx; import com.pixelgamelibrary.api.PixelException; import com.pixelgamelibrary.api.Platform; import com.pixelgamelibrary.api.interfaces.App; -import com.pixelgamelibrary.api.Game; +import com.pixelgamelibrary.api.game.Game; import com.pixelgamelibrary.api.PixelFeature; import com.pixelgamelibrary.api.utils.ClipBoard; import com.pixelgamelibrary.api.utils.LogLevel; diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/GraphicsLibGDXImpl.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/GraphicsLibGDXImpl.java index 1178ece..50d5873 100644 --- a/src/main/java/com/pixelgamelibrary/backend/libgdx/GraphicsLibGDXImpl.java +++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/GraphicsLibGDXImpl.java @@ -21,7 +21,7 @@ package com.pixelgamelibrary.backend.libgdx; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Graphics; -import com.pixelgamelibrary.api.WindowMode; +import com.pixelgamelibrary.api.DisplayMode; import com.pixelgamelibrary.api.PixelException; import com.pixelgamelibrary.api.utils.Monitor; import java.util.Arrays; @@ -37,7 +37,7 @@ public class GraphicsLibGDXImpl implements com.pixelgamelibrary.api.interfaces.G @Override - public WindowMode setDisplayMode(boolean fullscreen, boolean window) { + public DisplayMode setDisplayMode(boolean fullscreen, boolean window) { if (fullscreen) { Graphics.Monitor currentMonitor = Gdx.graphics.getMonitor(); @@ -67,13 +67,13 @@ public class GraphicsLibGDXImpl implements com.pixelgamelibrary.api.interfaces.G Gdx.app.error("InitScreen", "Switching to fullscreen mode failed."); return null; } - return WindowMode.FULLSCREEN; + return DisplayMode.FULLSCREEN; } if (window) { setToOriginalDisplayMode(); Gdx.graphics.setWindowedMode(640, 480); - return WindowMode.WINDOW; + return DisplayMode.WINDOW; } throw new PixelException("Unsupported DisplayMode: fullscreen=" + fullscreen + " window=" + window); diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/game/LibGdxGame.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/game/LibGdxGame.java index 281636b..2877319 100644 --- a/src/main/java/com/pixelgamelibrary/backend/libgdx/game/LibGdxGame.java +++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/game/LibGdxGame.java @@ -19,11 +19,11 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.pixelgamelibrary.backend.libgdx.game; -import com.pixelgamelibrary.api.GameWrapper; +import com.pixelgamelibrary.api.game.GameWrapper; import com.pixelgamelibrary.api.OnSetScreenListener; import com.pixelgamelibrary.backend.libgdx.screen.LibGdxScreen; -import com.pixelgamelibrary.api.Game; -import com.pixelgamelibrary.api.Screen; +import com.pixelgamelibrary.api.game.Game; +import com.pixelgamelibrary.api.screen.Screen; /** * diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/screen/LibGdxScreen.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/screen/LibGdxScreen.java index f433606..34e0fed 100644 --- a/src/main/java/com/pixelgamelibrary/backend/libgdx/screen/LibGdxScreen.java +++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/screen/LibGdxScreen.java @@ -19,9 +19,9 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.pixelgamelibrary.backend.libgdx.screen; -import com.pixelgamelibrary.api.ScreenWrapper; +import com.pixelgamelibrary.api.screen.ScreenWrapper; import lombok.Getter; -import com.pixelgamelibrary.api.Screen; +import com.pixelgamelibrary.api.screen.Screen; /** * diff --git a/src/test/java/com/pixelgamelibrary/backend/libgdx/storage/DesktopAndroidStorageTest.java b/src/test/java/com/pixelgamelibrary/backend/libgdx/storage/DesktopAndroidStorageTest.java index a7bba66..12d300f 100644 --- a/src/test/java/com/pixelgamelibrary/backend/libgdx/storage/DesktopAndroidStorageTest.java +++ b/src/test/java/com/pixelgamelibrary/backend/libgdx/storage/DesktopAndroidStorageTest.java @@ -26,7 +26,7 @@ import com.pixelgamelibrary.api.interfaces.Internal; import com.pixelgamelibrary.api.interfaces.Net; import com.pixelgamelibrary.api.interfaces.Utils; import com.pixelgamelibrary.api.interfaces.App; -import com.pixelgamelibrary.api.Game; +import com.pixelgamelibrary.api.game.Game; import com.pixelgamelibrary.api.PixelFeature; import com.pixelgamelibrary.api.utils.ClipBoard; import com.pixelgamelibrary.api.utils.LogLevel;