diff --git a/core/src/main/java/com/openeggbert/core/configuration/OpenEggbertDisplayMode.java b/core/src/main/java/com/openeggbert/core/configuration/OpenEggbertDisplayMode.java index c7b621b..082eb9f 100644 --- a/core/src/main/java/com/openeggbert/core/configuration/OpenEggbertDisplayMode.java +++ b/core/src/main/java/com/openeggbert/core/configuration/OpenEggbertDisplayMode.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.openeggbert.core.configuration; -import com.openeggbert.core.fbox.core.FBox; +import com.pixelgamelibrary.Pixel; import com.openeggbert.core.main.OpenEggbertException; /** @@ -63,7 +63,7 @@ public enum OpenEggbertDisplayMode { } public static OpenEggbertDisplayMode setDisplayMode(OpenEggbertDisplayMode displayMode) { - String result = FBox.get().graphics().setDisplayMode(displayMode == FULLSCREEN, displayMode == WINDOW); + String result = Pixel.get().graphics().setDisplayMode(displayMode == FULLSCREEN, displayMode == WINDOW); return result == null ? null : OpenEggbertDisplayMode.valueOf(result); } diff --git a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxInterface.java b/core/src/main/java/com/openeggbert/core/fbox/api/FBoxInterface.java deleted file mode 100644 index cdfa00c..0000000 --- a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxInterface.java +++ /dev/null @@ -1,40 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. -// Copyright (C) 2024 the original author or authors. -// -// This program is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation, either version 3 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see -// or write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -/////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.api; - -import com.openeggbert.core.fbox.entity.Platform; - -/** - * - * @author robertvokac - */ -public interface FBoxInterface { - - void exit(); - Platform getPlatform(); - FBoxGraphicsInterface graphics(); - FBoxAudioInterface audio(); - FBoxInputInterface input(); - FBoxNetInterface net(); - FBoxAssetInterface asset(); - FBoxStorageInterface storage(); - FBoxUtilsInterface utils(); - -} diff --git a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxStorageInterface.java b/core/src/main/java/com/openeggbert/core/fbox/api/FBoxStorageInterface.java deleted file mode 100644 index 26dec18..0000000 --- a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxStorageInterface.java +++ /dev/null @@ -1,28 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. -// Copyright (C) 2024 the original author or authors. -// -// This program is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation, either version 3 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see -// or write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -/////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.api; - -/** - * - * @author robertvokac - */ -public interface FBoxStorageInterface { - -} diff --git a/core/src/main/java/com/openeggbert/core/fbox/core/DefinitiveFrameworkException.java b/core/src/main/java/com/openeggbert/core/fbox/core/DefinitiveFrameworkException.java deleted file mode 100644 index f7ee6dc..0000000 --- a/core/src/main/java/com/openeggbert/core/fbox/core/DefinitiveFrameworkException.java +++ /dev/null @@ -1,33 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. -// Copyright (C) 2024 the original author or authors. -// -// This program is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation, either version 3 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see -// or write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -/////////////////////////////////////////////////////////////////////////////////////////////// - -package com.openeggbert.core.fbox.core; - -/** - * - * @author robertvokac - */ -public class DefinitiveFrameworkException extends RuntimeException{ - - public DefinitiveFrameworkException(String string) { - super(string); - } - -} diff --git a/core/src/main/java/com/openeggbert/core/fbox/core/FBoxScreen.java b/core/src/main/java/com/openeggbert/core/fbox/core/FBoxScreen.java deleted file mode 100644 index 5a33437..0000000 --- a/core/src/main/java/com/openeggbert/core/fbox/core/FBoxScreen.java +++ /dev/null @@ -1,28 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. -// Copyright (C) 2024 the original author or authors. -// -// This program is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation, either version 3 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see -// or write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -/////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.core; - -/** - * - * @author robertvokac - */ -public abstract class FBoxScreen extends com.badlogic.gdx.ScreenAdapter { - -} diff --git a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxAssetLibGDXImpl.java b/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxAssetLibGDXImpl.java deleted file mode 100644 index c08fcfd..0000000 --- a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxAssetLibGDXImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. -// Copyright (C) 2024 the original author or authors. -// -// This program is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation, either version 3 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see -// or write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -/////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.impl.libgdx; - -import com.openeggbert.core.fbox.api.FBoxAssetInterface; - -/** - * - * @author robertvokac - */ -public class FBoxAssetLibGDXImpl implements FBoxAssetInterface { - - - -} diff --git a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxAudioLibGDXImpl.java b/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxAudioLibGDXImpl.java deleted file mode 100644 index fa974b8..0000000 --- a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxAudioLibGDXImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. -// Copyright (C) 2024 the original author or authors. -// -// This program is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation, either version 3 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see -// or write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -/////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.impl.libgdx; - -import com.openeggbert.core.fbox.api.FBoxAudioInterface; - -/** - * - * @author robertvokac - */ -public class FBoxAudioLibGDXImpl implements FBoxAudioInterface { - - - -} diff --git a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxInputLibGDXImpl.java b/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxInputLibGDXImpl.java deleted file mode 100644 index 89e5cb2..0000000 --- a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxInputLibGDXImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. -// Copyright (C) 2024 the original author or authors. -// -// This program is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation, either version 3 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see -// or write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -/////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.impl.libgdx; - -import com.openeggbert.core.fbox.api.FBoxInputInterface; - -/** - * - * @author robertvokac - */ -public class FBoxInputLibGDXImpl implements FBoxInputInterface { - - - -} diff --git a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxLibGDXImpl.java b/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxLibGDXImpl.java deleted file mode 100644 index 67c1460..0000000 --- a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxLibGDXImpl.java +++ /dev/null @@ -1,131 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. -// Copyright (C) 2024 the original author or authors. -// -// This program is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation, either version 3 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see -// or write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -/////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.impl.libgdx; - -import com.badlogic.gdx.Application; -import static com.badlogic.gdx.Application.ApplicationType.Desktop; -import com.badlogic.gdx.Gdx; -import com.openeggbert.core.fbox.api.FBoxAssetInterface; -import com.openeggbert.core.fbox.api.FBoxAudioInterface; -import com.openeggbert.core.fbox.core.DefinitiveFrameworkException; -import com.openeggbert.core.fbox.entity.Platform; -import com.openeggbert.core.fbox.api.FBoxGraphicsInterface; -import com.openeggbert.core.fbox.api.FBoxInputInterface; -import com.openeggbert.core.fbox.api.FBoxInterface; -import com.openeggbert.core.fbox.api.FBoxNetInterface; -import com.openeggbert.core.fbox.api.FBoxStorageInterface; -import com.openeggbert.core.fbox.api.FBoxUtilsInterface; - -/** - * - * @author robertvokac - */ -public class FBoxLibGDXImpl implements FBoxInterface { - - private FBoxGraphicsInterface fBoxGraphicsLibGdxImpl = null; - private FBoxAudioInterface fBoxAudioLibGdxImpl = null; - private FBoxInputInterface fBoxInputLibGdxImpl = null; - private FBoxNetInterface fBoxNetLibGdxImpl = null; - private FBoxAssetInterface fBoxAssetLibGdxImpl = null; - private FBoxStorageInterface fBoxStorageLibGdxImpl = null; - private FBoxUtilsInterface fBoxUtilsLibGdxImpl = null; - - @Override - public void exit() { - throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody - } - - @Override - public Platform getPlatform() { - Application.ApplicationType applicationType = Gdx.app.getType(); - switch (applicationType) { - case Desktop: - return Platform.DESKTOP; - case Android: - return Platform.ANDROID; - case WebGL: - return Platform.WEB; - default: - throw new DefinitiveFrameworkException("Unsupported platform: " + applicationType); - } - } - - @Override - public FBoxGraphicsInterface graphics() { - if (fBoxGraphicsLibGdxImpl == null) { - fBoxGraphicsLibGdxImpl = new FBoxGraphicsLibGDXImpl(); - } - return fBoxGraphicsLibGdxImpl; - } - - @Override - public FBoxAudioInterface audio() { - - if (fBoxAudioLibGdxImpl == null) { - fBoxAudioLibGdxImpl = new FBoxAudioLibGDXImpl(); - } - return fBoxAudioLibGdxImpl; - } - - @Override - public FBoxInputInterface input() { - - if (fBoxInputLibGdxImpl == null) { - fBoxInputLibGdxImpl = new FBoxInputLibGDXImpl(); - } - return fBoxInputLibGdxImpl; - } - - @Override - public FBoxNetInterface net() { - - if (fBoxNetLibGdxImpl == null) { - fBoxNetLibGdxImpl = new FBoxNetLibGDXImpl(); - } - return fBoxNetLibGdxImpl; - } - - @Override - public FBoxAssetInterface asset() { - - if (fBoxAssetLibGdxImpl == null) { - fBoxAssetLibGdxImpl = new FBoxAssetLibGDXImpl(); - } - return fBoxAssetLibGdxImpl; - } - - @Override - public FBoxStorageInterface storage() { - - if (fBoxStorageLibGdxImpl == null) { - fBoxStorageLibGdxImpl = new FBoxStorageLibGDXImpl(); - } - return fBoxStorageLibGdxImpl; - } - - @Override - public FBoxUtilsInterface utils() { - - if (fBoxUtilsLibGdxImpl == null) { - fBoxUtilsLibGdxImpl = new FBoxUtilsLibGDXImpl(); - } - return fBoxUtilsLibGdxImpl; } - -} diff --git a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxStorageLibGDXImpl.java b/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxStorageLibGDXImpl.java deleted file mode 100644 index 72f9fcc..0000000 --- a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxStorageLibGDXImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. -// Copyright (C) 2024 the original author or authors. -// -// This program is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation, either version 3 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see -// or write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -/////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.impl.libgdx; - -import com.openeggbert.core.fbox.api.FBoxStorageInterface; - -/** - * - * @author robertvokac - */ -public class FBoxStorageLibGDXImpl implements FBoxStorageInterface { - - - -} 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 dd255dc..313b0e0 100644 --- a/core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.java +++ b/core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.java @@ -36,11 +36,13 @@ import com.openeggbert.core.mod.Mod; import com.openeggbert.core.mod.ModIdentification; import com.openeggbert.core.screen.GameSpaceListScreen; import com.openeggbert.core.screen.InitScreen; -import com.openeggbert.gdx.storage.Storage; -import com.openeggbert.gdx.storage.StorageImplementationLoader; +import com.pixelgamelibrary.storage.Storage; +import com.pixelgamelibrary.storage.StorageImplementationLoader; import com.openeggbert.core.configuration.OpenEggbertDisplayMode; -import com.openeggbert.core.fbox.core.FBoxGame; +import com.pixelgamelibrary.Game; import com.openeggbert.core.utils.OpenEggbertUtils; +import com.pixelgamelibrary.Pixel; +import com.pixelgamelibrary.backends.libgdx.PixelLibGDXBackend; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -51,7 +53,7 @@ import lombok.Data; * platforms. */ @Data -public class OpenEggbertGame extends FBoxGame { +public class OpenEggbertGame extends Game { private Texture image; private GameSpace gameSpace = null; @@ -82,6 +84,7 @@ public class OpenEggbertGame extends FBoxGame { public OpenEggbertGame(GameSpace gameSpace, String absolutePathOfRootDirectoryIn) { this.gameSpace = gameSpace; this.absolutePathOfRootDirectory = absolutePathOfRootDirectoryIn; + Pixel.setBackend(new PixelLibGDXBackend()); } diff --git a/core/src/main/java/com/openeggbert/core/mod/Mod.java b/core/src/main/java/com/openeggbert/core/mod/Mod.java index bbb84b2..45e3b63 100644 --- a/core/src/main/java/com/openeggbert/core/mod/Mod.java +++ b/core/src/main/java/com/openeggbert/core/mod/Mod.java @@ -19,8 +19,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.openeggbert.core.mod; -import com.openeggbert.core.fbox.api.XmlElement; -import com.openeggbert.core.fbox.core.FBox; +import com.pixelgamelibrary.api.XmlElement; +import com.pixelgamelibrary.Pixel; import com.openeggbert.core.release.Release; import java.util.ArrayList; import java.util.List; @@ -34,7 +34,7 @@ import lombok.Data; public class Mod { public Mod(String xml) { - XmlElement root = FBox.get().utils().parseXml(xml); + XmlElement root = Pixel.get().utils().parseXml(xml); XmlElement parentElement = root.getChildByName("parent"); if (parentElement != null) { parent = new ModIdentification(parentElement); diff --git a/core/src/main/java/com/openeggbert/core/mod/ModIdentification.java b/core/src/main/java/com/openeggbert/core/mod/ModIdentification.java index d80be93..1c78bd0 100644 --- a/core/src/main/java/com/openeggbert/core/mod/ModIdentification.java +++ b/core/src/main/java/com/openeggbert/core/mod/ModIdentification.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.openeggbert.core.mod; -import com.openeggbert.core.fbox.api.XmlElement; +import com.pixelgamelibrary.api.XmlElement; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/openeggbert/core/mod/Store.java b/core/src/main/java/com/openeggbert/core/mod/Store.java index a4a60fb..2ddf1a1 100644 --- a/core/src/main/java/com/openeggbert/core/mod/Store.java +++ b/core/src/main/java/com/openeggbert/core/mod/Store.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.openeggbert.core.mod; -import com.openeggbert.core.fbox.api.XmlElement; +import com.pixelgamelibrary.api.XmlElement; /** * diff --git a/core/src/main/java/com/openeggbert/core/screen/AbstractOpenEggbertScreen.java b/core/src/main/java/com/openeggbert/core/screen/AbstractOpenEggbertScreen.java index 21ec9b5..f4edc1e 100644 --- a/core/src/main/java/com/openeggbert/core/screen/AbstractOpenEggbertScreen.java +++ b/core/src/main/java/com/openeggbert/core/screen/AbstractOpenEggbertScreen.java @@ -25,7 +25,7 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import com.openeggbert.core.fbox.core.FBoxScreen; +import com.pixelgamelibrary.Screen; import com.openeggbert.core.gamespace.GameFileType; import com.openeggbert.core.main.OpenEggbertGame; import com.openeggbert.core.utils.OpenEggbertUtils; @@ -36,7 +36,7 @@ import java.util.Optional; * * @author robertvokac */ -public abstract class AbstractOpenEggbertScreen extends FBoxScreen { +public abstract class AbstractOpenEggbertScreen extends Screen { protected OpenEggbertGame game; protected SpriteBatch batch; diff --git a/core/src/main/java/com/openeggbert/core/utils/EmbeddedFileHandleFactory.java b/core/src/main/java/com/openeggbert/core/utils/EmbeddedFileHandleFactory.java index a4290cd..acda7d5 100644 --- a/core/src/main/java/com/openeggbert/core/utils/EmbeddedFileHandleFactory.java +++ b/core/src/main/java/com/openeggbert/core/utils/EmbeddedFileHandleFactory.java @@ -21,7 +21,7 @@ package com.openeggbert.core.utils; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; -import com.openeggbert.core.fbox.core.FBox; +import com.pixelgamelibrary.Pixel; /** * @@ -35,7 +35,7 @@ public class EmbeddedFileHandleFactory { public static FileHandle create(String name) { - if (FBox.get().getPlatform().isAndroid() || FBox.get().getPlatform().isWeb()) { + if (Pixel.get().getPlatform().isAndroid() || Pixel.get().getPlatform().isWeb()) { return Gdx.files.internal(name); } else { return Gdx.files.classpath(name); diff --git a/core/src/main/java/com/openeggbert/gdx/storage/GdxStorageMainClass.java b/core/src/main/java/com/openeggbert/gdx/storage/GdxStorageMainClass.java deleted file mode 100644 index 3bcfd60..0000000 --- a/core/src/main/java/com/openeggbert/gdx/storage/GdxStorageMainClass.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.openeggbert.gdx.storage; - -import com.badlogic.gdx.ApplicationAdapter; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.GL20; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import com.badlogic.gdx.utils.ScreenUtils; - -/** {@link com.badlogic.gdx.ApplicationListener} implementation shared by all platforms. */ -public class GdxStorageMainClass extends ApplicationAdapter { - private SpriteBatch batch; - private Texture image; - - @Override - public void create() { - batch = new SpriteBatch(); - image = new Texture("libgdx.png"); - } - - @Override - public void render() { - ScreenUtils.clear(0.15f, 0.15f, 0.2f, 1f); - batch.begin(); - batch.draw(image, 140, 210); - batch.end(); - } - - @Override - public void dispose() { - batch.dispose(); - image.dispose(); - } -} diff --git a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxNetInterface.java b/core/src/main/java/com/pixelgamelibrary/Game.java similarity index 87% rename from core/src/main/java/com/openeggbert/core/fbox/api/FBoxNetInterface.java rename to core/src/main/java/com/pixelgamelibrary/Game.java index 6547b91..01bac8c 100644 --- a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxNetInterface.java +++ b/core/src/main/java/com/pixelgamelibrary/Game.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,12 +17,13 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.api; +package com.pixelgamelibrary; /** * * @author robertvokac */ -public interface FBoxNetInterface { +public abstract class Game extends com.badlogic.gdx.Game { + } diff --git a/core/src/main/java/com/openeggbert/gdx/storage/GdxStorageMainClass.gwt.xml b/core/src/main/java/com/pixelgamelibrary/Pixel.gwt.xml similarity index 98% rename from core/src/main/java/com/openeggbert/gdx/storage/GdxStorageMainClass.gwt.xml rename to core/src/main/java/com/pixelgamelibrary/Pixel.gwt.xml index e348369..8dd5046 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/GdxStorageMainClass.gwt.xml +++ b/core/src/main/java/com/pixelgamelibrary/Pixel.gwt.xml @@ -6,4 +6,4 @@ - + \ No newline at end of file diff --git a/core/src/main/java/com/openeggbert/core/fbox/core/FBox.java b/core/src/main/java/com/pixelgamelibrary/Pixel.java similarity index 61% rename from core/src/main/java/com/openeggbert/core/fbox/core/FBox.java rename to core/src/main/java/com/pixelgamelibrary/Pixel.java index 3f3940f..03c57e2 100644 --- a/core/src/main/java/com/openeggbert/core/fbox/core/FBox.java +++ b/core/src/main/java/com/pixelgamelibrary/Pixel.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,25 +17,41 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.core; +package com.pixelgamelibrary; -import com.openeggbert.core.fbox.impl.libgdx.FBoxLibGDXImpl; -import com.openeggbert.core.fbox.api.FBoxInterface; +import com.pixelgamelibrary.api.PixelBackend; /** * * @author robertvokac */ -public class FBox { - private static FBoxInterface INSTANCE = null; - - private FBox() { +public class Pixel { + + private static PixelBackend INSTANCE = null; + + private Pixel() { //Not meant to be instantiated. } - public static FBoxInterface get() { - if(INSTANCE == null) { - INSTANCE = new FBoxLibGDXImpl(); + + public static PixelBackend get() { + return getBackend(); + } + + public static void setBackend(PixelBackend pixelBackend) { + if (isBackendSet()) { + throw new PixelException("Pixel Backend was already set"); + } + INSTANCE = pixelBackend; + } + + public static PixelBackend getBackend() { + if (!isBackendSet()) { + throw new PixelException("Pixel Backend was not set"); } return INSTANCE; } + + public static boolean isBackendSet() { + return INSTANCE != null; + } } diff --git a/core/src/main/java/com/openeggbert/core/fbox/core/FBoxGame.java b/core/src/main/java/com/pixelgamelibrary/PixelException.java similarity index 85% rename from core/src/main/java/com/openeggbert/core/fbox/core/FBoxGame.java rename to core/src/main/java/com/pixelgamelibrary/PixelException.java index 5e2116e..f3177a4 100644 --- a/core/src/main/java/com/openeggbert/core/fbox/core/FBoxGame.java +++ b/core/src/main/java/com/pixelgamelibrary/PixelException.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,13 +17,17 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.core; + +package com.pixelgamelibrary; /** * * @author robertvokac */ -public abstract class FBoxGame extends com.badlogic.gdx.Game { +public class PixelException extends RuntimeException{ + public PixelException(String string) { + super(string); + } } diff --git a/core/src/main/java/com/openeggbert/core/fbox/entity/Platform.java b/core/src/main/java/com/pixelgamelibrary/Platform.java similarity index 91% rename from core/src/main/java/com/openeggbert/core/fbox/entity/Platform.java rename to core/src/main/java/com/pixelgamelibrary/Platform.java index 55c3c88..d6ba1a8 100644 --- a/core/src/main/java/com/openeggbert/core/fbox/entity/Platform.java +++ b/core/src/main/java/com/pixelgamelibrary/Platform.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.entity; +package com.pixelgamelibrary; /** * diff --git a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxAssetInterface.java b/core/src/main/java/com/pixelgamelibrary/Screen.java similarity index 87% rename from core/src/main/java/com/openeggbert/core/fbox/api/FBoxAssetInterface.java rename to core/src/main/java/com/pixelgamelibrary/Screen.java index ffa02da..6d23fcb 100644 --- a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxAssetInterface.java +++ b/core/src/main/java/com/pixelgamelibrary/Screen.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,12 +17,12 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.api; +package com.pixelgamelibrary; /** * * @author robertvokac */ -public interface FBoxAssetInterface { +public abstract class Screen extends com.badlogic.gdx.ScreenAdapter { } diff --git a/core/src/main/java/com/openeggbert/core/fbox/utils/Constants.java b/core/src/main/java/com/pixelgamelibrary/WindowMode.java similarity index 88% rename from core/src/main/java/com/openeggbert/core/fbox/utils/Constants.java rename to core/src/main/java/com/pixelgamelibrary/WindowMode.java index 158d71b..f42ff33 100644 --- a/core/src/main/java/com/openeggbert/core/fbox/utils/Constants.java +++ b/core/src/main/java/com/pixelgamelibrary/WindowMode.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,15 +17,15 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.utils; +package com.pixelgamelibrary; /** * * @author robertvokac */ -public class Constants { +public class WindowMode { - private Constants() { + private WindowMode() { //Not meant to be instantiated. } diff --git a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxAudioInterface.java b/core/src/main/java/com/pixelgamelibrary/api/AssetI.java similarity index 87% rename from core/src/main/java/com/openeggbert/core/fbox/api/FBoxAudioInterface.java rename to core/src/main/java/com/pixelgamelibrary/api/AssetI.java index 26dcdc1..c831dd0 100644 --- a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxAudioInterface.java +++ b/core/src/main/java/com/pixelgamelibrary/api/AssetI.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,12 +17,12 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.api; +package com.pixelgamelibrary.api; /** * * @author robertvokac */ -public interface FBoxAudioInterface { +public interface AssetI { } diff --git a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxInputInterface.java b/core/src/main/java/com/pixelgamelibrary/api/AudioI.java similarity index 87% rename from core/src/main/java/com/openeggbert/core/fbox/api/FBoxInputInterface.java rename to core/src/main/java/com/pixelgamelibrary/api/AudioI.java index d35d56e..70ab3f9 100644 --- a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxInputInterface.java +++ b/core/src/main/java/com/pixelgamelibrary/api/AudioI.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,12 +17,12 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.api; +package com.pixelgamelibrary.api; /** * * @author robertvokac */ -public interface FBoxInputInterface { +public interface AudioI { } diff --git a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxGraphicsInterface.java b/core/src/main/java/com/pixelgamelibrary/api/GraphicsI.java similarity index 88% rename from core/src/main/java/com/openeggbert/core/fbox/api/FBoxGraphicsInterface.java rename to core/src/main/java/com/pixelgamelibrary/api/GraphicsI.java index adabdd7..bb3fd12 100644 --- a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxGraphicsInterface.java +++ b/core/src/main/java/com/pixelgamelibrary/api/GraphicsI.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,13 +17,13 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.api; +package com.pixelgamelibrary.api; /** * * @author robertvokac */ -public interface FBoxGraphicsInterface { +public interface GraphicsI { boolean setToOriginalDisplayMode(); String setDisplayMode(boolean fullscreen, boolean window); diff --git a/core/src/main/java/com/pixelgamelibrary/api/InputI.java b/core/src/main/java/com/pixelgamelibrary/api/InputI.java new file mode 100644 index 0000000..9ec8893 --- /dev/null +++ b/core/src/main/java/com/pixelgamelibrary/api/InputI.java @@ -0,0 +1,28 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +// Pixel: Game library. +// Copyright (C) 2024 the original author or authors. +// +// This program is free software: you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see +// or write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +/////////////////////////////////////////////////////////////////////////////////////////////// +package com.pixelgamelibrary.api; + +/** + * + * @author robertvokac + */ +public interface InputI { + +} diff --git a/core/src/main/java/com/pixelgamelibrary/api/NetI.java b/core/src/main/java/com/pixelgamelibrary/api/NetI.java new file mode 100644 index 0000000..f2debc3 --- /dev/null +++ b/core/src/main/java/com/pixelgamelibrary/api/NetI.java @@ -0,0 +1,28 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +// Pixel: Game library. +// Copyright (C) 2024 the original author or authors. +// +// This program is free software: you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see +// or write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +/////////////////////////////////////////////////////////////////////////////////////////////// +package com.pixelgamelibrary.api; + +/** + * + * @author robertvokac + */ +public interface NetI { + +} diff --git a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxNetLibGDXImpl.java b/core/src/main/java/com/pixelgamelibrary/api/PixelBackend.java similarity index 76% rename from core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxNetLibGDXImpl.java rename to core/src/main/java/com/pixelgamelibrary/api/PixelBackend.java index b34a547..a4c40a1 100644 --- a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxNetLibGDXImpl.java +++ b/core/src/main/java/com/pixelgamelibrary/api/PixelBackend.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,16 +17,24 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.impl.libgdx; +package com.pixelgamelibrary.api; -import com.openeggbert.core.fbox.api.FBoxNetInterface; +import com.pixelgamelibrary.Platform; /** * * @author robertvokac */ -public class FBoxNetLibGDXImpl implements FBoxNetInterface { +public interface PixelBackend { - + void exit(); + Platform getPlatform(); + GraphicsI graphics(); + AudioI audio(); + InputI input(); + NetI net(); + AssetI asset(); + StorageI storage(); + UtilsI utils(); } diff --git a/core/src/main/java/com/pixelgamelibrary/api/StorageI.java b/core/src/main/java/com/pixelgamelibrary/api/StorageI.java new file mode 100644 index 0000000..12b4dac --- /dev/null +++ b/core/src/main/java/com/pixelgamelibrary/api/StorageI.java @@ -0,0 +1,28 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +// Pixel: Game library. +// Copyright (C) 2024 the original author or authors. +// +// This program is free software: you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see +// or write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +/////////////////////////////////////////////////////////////////////////////////////////////// +package com.pixelgamelibrary.api; + +/** + * + * @author robertvokac + */ +public interface StorageI { + +} diff --git a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxUtilsInterface.java b/core/src/main/java/com/pixelgamelibrary/api/UtilsI.java similarity index 88% rename from core/src/main/java/com/openeggbert/core/fbox/api/FBoxUtilsInterface.java rename to core/src/main/java/com/pixelgamelibrary/api/UtilsI.java index ae0b098..0813175 100644 --- a/core/src/main/java/com/openeggbert/core/fbox/api/FBoxUtilsInterface.java +++ b/core/src/main/java/com/pixelgamelibrary/api/UtilsI.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,12 +17,12 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.api; +package com.pixelgamelibrary.api; /** * * @author robertvokac */ -public interface FBoxUtilsInterface { +public interface UtilsI { XmlElement parseXml(String xmlString); } diff --git a/core/src/main/java/com/openeggbert/core/fbox/api/XmlElement.java b/core/src/main/java/com/pixelgamelibrary/api/XmlElement.java similarity index 91% rename from core/src/main/java/com/openeggbert/core/fbox/api/XmlElement.java rename to core/src/main/java/com/pixelgamelibrary/api/XmlElement.java index e74da08..30a4760 100644 --- a/core/src/main/java/com/openeggbert/core/fbox/api/XmlElement.java +++ b/core/src/main/java/com/pixelgamelibrary/api/XmlElement.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.api; +package com.pixelgamelibrary.api; /** * diff --git a/core/src/main/java/com/pixelgamelibrary/backends/libgdx/AssetLibGDXImpl.java b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/AssetLibGDXImpl.java new file mode 100644 index 0000000..1437c0a --- /dev/null +++ b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/AssetLibGDXImpl.java @@ -0,0 +1,32 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +// Pixel: Game library. +// Copyright (C) 2024 the original author or authors. +// +// This program is free software: you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see +// or write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +/////////////////////////////////////////////////////////////////////////////////////////////// +package com.pixelgamelibrary.backends.libgdx; + +import com.pixelgamelibrary.api.AssetI; + +/** + * + * @author robertvokac + */ +public class AssetLibGDXImpl implements AssetI { + + + +} diff --git a/core/src/main/java/com/pixelgamelibrary/backends/libgdx/AudioLibGDXImpl.java b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/AudioLibGDXImpl.java new file mode 100644 index 0000000..8827f03 --- /dev/null +++ b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/AudioLibGDXImpl.java @@ -0,0 +1,32 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +// Pixel: Game library. +// Copyright (C) 2024 the original author or authors. +// +// This program is free software: you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see +// or write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +/////////////////////////////////////////////////////////////////////////////////////////////// +package com.pixelgamelibrary.backends.libgdx; + +import com.pixelgamelibrary.api.AudioI; + +/** + * + * @author robertvokac + */ +public class AudioLibGDXImpl implements AudioI { + + + +} diff --git a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/ElementLibGDXImpl.java b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/ElementLibGDXImpl.java similarity index 92% rename from core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/ElementLibGDXImpl.java rename to core/src/main/java/com/pixelgamelibrary/backends/libgdx/ElementLibGDXImpl.java index d159bd9..24353a5 100644 --- a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/ElementLibGDXImpl.java +++ b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/ElementLibGDXImpl.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,10 +17,10 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.impl.libgdx; +package com.pixelgamelibrary.backends.libgdx; import com.badlogic.gdx.utils.XmlReader; -import com.openeggbert.core.fbox.api.XmlElement; +import com.pixelgamelibrary.api.XmlElement; /** * diff --git a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxGraphicsLibGDXImpl.java b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/GraphicsLibGDXImpl.java similarity index 85% rename from core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxGraphicsLibGDXImpl.java rename to core/src/main/java/com/pixelgamelibrary/backends/libgdx/GraphicsLibGDXImpl.java index ea0d6da..c02283a 100644 --- a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxGraphicsLibGDXImpl.java +++ b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/GraphicsLibGDXImpl.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,22 +17,22 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.impl.libgdx; +package com.pixelgamelibrary.backends.libgdx; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Graphics; -import com.openeggbert.core.fbox.utils.Constants; -import com.openeggbert.core.fbox.core.DefinitiveFrameworkException; +import com.pixelgamelibrary.WindowMode; +import com.pixelgamelibrary.PixelException; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import com.openeggbert.core.fbox.api.FBoxGraphicsInterface; +import com.pixelgamelibrary.api.GraphicsI; /** * * @author robertvokac */ -public class FBoxGraphicsLibGDXImpl implements FBoxGraphicsInterface { +public class GraphicsLibGDXImpl implements GraphicsI { @Override @@ -66,15 +66,15 @@ public class FBoxGraphicsLibGDXImpl implements FBoxGraphicsInterface { Gdx.app.error("InitScreen", "Switching to fullscreen mode failed."); return null; } - return Constants.FULLSCREEN; + return WindowMode.FULLSCREEN; } if (window) { setToOriginalDisplayMode(); Gdx.graphics.setWindowedMode(640, 480); - return Constants.WINDOW; + return WindowMode.WINDOW; } - throw new DefinitiveFrameworkException("Unsupported DisplayMode: fullscreen=" + fullscreen + " window=" + window); + throw new PixelException("Unsupported DisplayMode: fullscreen=" + fullscreen + " window=" + window); } @Override diff --git a/core/src/main/java/com/pixelgamelibrary/backends/libgdx/InputLibGDXImpl.java b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/InputLibGDXImpl.java new file mode 100644 index 0000000..a64d36c --- /dev/null +++ b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/InputLibGDXImpl.java @@ -0,0 +1,32 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +// Pixel: Game library. +// Copyright (C) 2024 the original author or authors. +// +// This program is free software: you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see +// or write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +/////////////////////////////////////////////////////////////////////////////////////////////// +package com.pixelgamelibrary.backends.libgdx; + +import com.pixelgamelibrary.api.InputI; + +/** + * + * @author robertvokac + */ +public class InputLibGDXImpl implements InputI { + + + +} diff --git a/core/src/main/java/com/pixelgamelibrary/backends/libgdx/NetLibGDXImpl.java b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/NetLibGDXImpl.java new file mode 100644 index 0000000..477af67 --- /dev/null +++ b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/NetLibGDXImpl.java @@ -0,0 +1,32 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +// Pixel: Game library. +// Copyright (C) 2024 the original author or authors. +// +// This program is free software: you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see +// or write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +/////////////////////////////////////////////////////////////////////////////////////////////// +package com.pixelgamelibrary.backends.libgdx; + +import com.pixelgamelibrary.api.NetI; + +/** + * + * @author robertvokac + */ +public class NetLibGDXImpl implements NetI { + + + +} diff --git a/core/src/main/java/com/pixelgamelibrary/backends/libgdx/PixelLibGDXBackend.java b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/PixelLibGDXBackend.java new file mode 100644 index 0000000..767a428 --- /dev/null +++ b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/PixelLibGDXBackend.java @@ -0,0 +1,131 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +// Pixel: Game library. +// Copyright (C) 2024 the original author or authors. +// +// This program is free software: you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see +// or write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +/////////////////////////////////////////////////////////////////////////////////////////////// +package com.pixelgamelibrary.backends.libgdx; + +import com.badlogic.gdx.Application; +import static com.badlogic.gdx.Application.ApplicationType.Desktop; +import com.badlogic.gdx.Gdx; +import com.pixelgamelibrary.PixelException; +import com.pixelgamelibrary.Platform; +import com.pixelgamelibrary.api.AssetI; +import com.pixelgamelibrary.api.AudioI; +import com.pixelgamelibrary.api.GraphicsI; +import com.pixelgamelibrary.api.InputI; +import com.pixelgamelibrary.api.UtilsI; +import com.pixelgamelibrary.api.StorageI; +import com.pixelgamelibrary.api.NetI; +import com.pixelgamelibrary.api.PixelBackend; + +/** + * + * @author robertvokac + */ +public class PixelLibGDXBackend implements PixelBackend { + + private GraphicsI pixelGraphicsLibGdxImpl = null; + private AudioI pixelAudioLibGdxImpl = null; + private InputI pixelInputLibGdxImpl = null; + private NetI pixelNetLibGdxImpl = null; + private AssetI pixelAssetLibGdxImpl = null; + private StorageI pixelStorageLibGdxImpl = null; + private UtilsI pixelUtilsLibGdxImpl = null; + + @Override + public void exit() { + throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + } + + @Override + public Platform getPlatform() { + Application.ApplicationType applicationType = Gdx.app.getType(); + switch (applicationType) { + case Desktop: + return Platform.DESKTOP; + case Android: + return Platform.ANDROID; + case WebGL: + return Platform.WEB; + default: + throw new PixelException("Unsupported platform: " + applicationType); + } + } + + @Override + public GraphicsI graphics() { + if (pixelGraphicsLibGdxImpl == null) { + pixelGraphicsLibGdxImpl = new GraphicsLibGDXImpl(); + } + return pixelGraphicsLibGdxImpl; + } + + @Override + public AudioI audio() { + + if (pixelAudioLibGdxImpl == null) { + pixelAudioLibGdxImpl = new AudioLibGDXImpl(); + } + return pixelAudioLibGdxImpl; + } + + @Override + public InputI input() { + + if (pixelInputLibGdxImpl == null) { + pixelInputLibGdxImpl = new InputLibGDXImpl(); + } + return pixelInputLibGdxImpl; + } + + @Override + public NetI net() { + + if (pixelNetLibGdxImpl == null) { + pixelNetLibGdxImpl = new NetLibGDXImpl(); + } + return pixelNetLibGdxImpl; + } + + @Override + public AssetI asset() { + + if (pixelAssetLibGdxImpl == null) { + pixelAssetLibGdxImpl = new AssetLibGDXImpl(); + } + return pixelAssetLibGdxImpl; + } + + @Override + public StorageI storage() { + + if (pixelStorageLibGdxImpl == null) { + pixelStorageLibGdxImpl = new StorageLibGDXImpl(); + } + return pixelStorageLibGdxImpl; + } + + @Override + public UtilsI utils() { + + if (pixelUtilsLibGdxImpl == null) { + pixelUtilsLibGdxImpl = new UtilsLibGDXImpl(); + } + return pixelUtilsLibGdxImpl; } + +} diff --git a/core/src/main/java/com/pixelgamelibrary/backends/libgdx/StorageLibGDXImpl.java b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/StorageLibGDXImpl.java new file mode 100644 index 0000000..0db007e --- /dev/null +++ b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/StorageLibGDXImpl.java @@ -0,0 +1,32 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +// Pixel: Game library. +// Copyright (C) 2024 the original author or authors. +// +// This program is free software: you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see +// or write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +/////////////////////////////////////////////////////////////////////////////////////////////// +package com.pixelgamelibrary.backends.libgdx; + +import com.pixelgamelibrary.api.StorageI; + +/** + * + * @author robertvokac + */ +public class StorageLibGDXImpl implements StorageI { + + + +} diff --git a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxUtilsLibGDXImpl.java b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/UtilsLibGDXImpl.java similarity index 81% rename from core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxUtilsLibGDXImpl.java rename to core/src/main/java/com/pixelgamelibrary/backends/libgdx/UtilsLibGDXImpl.java index 1d9df69..e7f521b 100644 --- a/core/src/main/java/com/openeggbert/core/fbox/impl/libgdx/FBoxUtilsLibGDXImpl.java +++ b/core/src/main/java/com/pixelgamelibrary/backends/libgdx/UtilsLibGDXImpl.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,17 +17,17 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.fbox.impl.libgdx; +package com.pixelgamelibrary.backends.libgdx; import com.badlogic.gdx.utils.XmlReader; -import com.openeggbert.core.fbox.api.FBoxUtilsInterface; -import com.openeggbert.core.fbox.api.XmlElement; +import com.pixelgamelibrary.api.XmlElement; +import com.pixelgamelibrary.api.UtilsI; /** * * @author robertvokac */ -public class FBoxUtilsLibGDXImpl implements FBoxUtilsInterface { +public class UtilsLibGDXImpl implements UtilsI { @Override public XmlElement parseXml(String xmlString) { diff --git a/core/src/main/java/com/openeggbert/gdx/storage/GdxStorageException.java b/core/src/main/java/com/pixelgamelibrary/storage/GdxStorageException.java similarity index 93% rename from core/src/main/java/com/openeggbert/gdx/storage/GdxStorageException.java rename to core/src/main/java/com/pixelgamelibrary/storage/GdxStorageException.java index 11c0d7d..75f094f 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/GdxStorageException.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/GdxStorageException.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage; +package com.pixelgamelibrary.storage; /** * diff --git a/core/src/main/java/com/openeggbert/gdx/storage/GdxStorageUtils.java b/core/src/main/java/com/pixelgamelibrary/storage/GdxStorageUtils.java similarity index 95% rename from core/src/main/java/com/openeggbert/gdx/storage/GdxStorageUtils.java rename to core/src/main/java/com/pixelgamelibrary/storage/GdxStorageUtils.java index 50093d9..d0a7956 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/GdxStorageUtils.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/GdxStorageUtils.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage; +package com.pixelgamelibrary.storage; import com.badlogic.gdx.utils.Base64Coder; diff --git a/core/src/main/java/com/openeggbert/gdx/storage/Storage.java b/core/src/main/java/com/pixelgamelibrary/storage/Storage.java similarity index 95% rename from core/src/main/java/com/openeggbert/gdx/storage/Storage.java rename to core/src/main/java/com/pixelgamelibrary/storage/Storage.java index 30c5220..836a11d 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/Storage.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/Storage.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,9 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage; +package com.pixelgamelibrary.storage; -import com.openeggbert.core.fbox.entity.Platform; +import com.pixelgamelibrary.Platform; import java.util.List; /** diff --git a/core/src/main/java/com/openeggbert/gdx/storage/StorageImplementationLoader.java b/core/src/main/java/com/pixelgamelibrary/storage/StorageImplementationLoader.java similarity index 79% rename from core/src/main/java/com/openeggbert/gdx/storage/StorageImplementationLoader.java rename to core/src/main/java/com/pixelgamelibrary/storage/StorageImplementationLoader.java index ca4bfca..7a35616 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/StorageImplementationLoader.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/StorageImplementationLoader.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,14 +17,14 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage; +package com.pixelgamelibrary.storage; -import com.openeggbert.gdx.storage.map.WebGLStorage; -import com.openeggbert.gdx.storage.map.MemoryStorage; -import com.openeggbert.gdx.storage.filesystem.AndroidStorage; -import com.openeggbert.gdx.storage.filesystem.DesktopStorage; -import com.openeggbert.core.fbox.core.FBox; -import com.openeggbert.core.fbox.entity.Platform; +import com.pixelgamelibrary.storage.map.WebGLStorage; +import com.pixelgamelibrary.storage.map.MemoryStorage; +import com.pixelgamelibrary.storage.filesystem.AndroidStorage; +import com.pixelgamelibrary.storage.filesystem.DesktopStorage; +import com.pixelgamelibrary.Pixel; +import com.pixelgamelibrary.Platform; /** * @@ -38,7 +38,7 @@ public class StorageImplementationLoader { private static Storage storage = null; public static Storage getStorage() { - final Platform platform = FBox.get().getPlatform(); + final Platform platform = Pixel.get().getPlatform(); if (storage == null) { storage = new MemoryStorage(); } diff --git a/core/src/main/java/com/openeggbert/gdx/storage/command/BaseCommandLine.java b/core/src/main/java/com/pixelgamelibrary/storage/command/BaseCommand.java similarity index 91% rename from core/src/main/java/com/openeggbert/gdx/storage/command/BaseCommandLine.java rename to core/src/main/java/com/pixelgamelibrary/storage/command/BaseCommand.java index bbb70fe..97e3197 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/command/BaseCommandLine.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/command/BaseCommand.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.command; +package com.pixelgamelibrary.storage.command; import java.util.function.Function; @@ -25,13 +25,13 @@ import java.util.function.Function; * * @author robertvokac */ -public class BaseCommandLine implements StorageCommand { +public class BaseCommand implements StorageCommand { private StorageCommandLine storageCommandLine = null; private String name; private final Function function; - public BaseCommandLine( + public BaseCommand( StorageCommandLine storageCommandLineIn, String nameIn, Function functionIn ) { setStorageCommandLine(storageCommandLineIn); diff --git a/core/src/main/java/com/openeggbert/gdx/storage/command/CommandLineScanner.java b/core/src/main/java/com/pixelgamelibrary/storage/command/CommandLineScanner.java similarity index 92% rename from core/src/main/java/com/openeggbert/gdx/storage/command/CommandLineScanner.java rename to core/src/main/java/com/pixelgamelibrary/storage/command/CommandLineScanner.java index e682f67..2d59506 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/command/CommandLineScanner.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/command/CommandLineScanner.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.command; +package com.pixelgamelibrary.storage.command; /** * diff --git a/core/src/main/java/com/openeggbert/gdx/storage/command/StorageCommand.java b/core/src/main/java/com/pixelgamelibrary/storage/command/StorageCommand.java similarity index 93% rename from core/src/main/java/com/openeggbert/gdx/storage/command/StorageCommand.java rename to core/src/main/java/com/pixelgamelibrary/storage/command/StorageCommand.java index e11e879..79ea625 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/command/StorageCommand.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/command/StorageCommand.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.command; +package com.pixelgamelibrary.storage.command; /** * diff --git a/core/src/main/java/com/openeggbert/gdx/storage/command/StorageCommandLine.java b/core/src/main/java/com/pixelgamelibrary/storage/command/StorageCommandLine.java similarity index 97% rename from core/src/main/java/com/openeggbert/gdx/storage/command/StorageCommandLine.java rename to core/src/main/java/com/pixelgamelibrary/storage/command/StorageCommandLine.java index 8771033..6727cca 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/command/StorageCommandLine.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/command/StorageCommandLine.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,9 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.command; +package com.pixelgamelibrary.storage.command; -import com.openeggbert.gdx.storage.Storage; +import com.pixelgamelibrary.storage.Storage; import java.util.Arrays; import java.util.Date; import java.util.HashMap; @@ -126,7 +126,7 @@ public class StorageCommandLine { } private void addCommand(String nameIn, Function functionIn) { - StorageCommand storageCommand = new BaseCommandLine(this, nameIn, functionIn); + StorageCommand storageCommand = new BaseCommand(this, nameIn, functionIn); commands.put(storageCommand.getName(), storageCommand); } diff --git a/core/src/main/java/com/openeggbert/gdx/storage/command/StorageCommandLineScanner.java b/core/src/main/java/com/pixelgamelibrary/storage/command/StorageCommandLineScanner.java similarity index 91% rename from core/src/main/java/com/openeggbert/gdx/storage/command/StorageCommandLineScanner.java rename to core/src/main/java/com/pixelgamelibrary/storage/command/StorageCommandLineScanner.java index b762a48..00647f4 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/command/StorageCommandLineScanner.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/command/StorageCommandLineScanner.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,10 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.command; - -import com.openeggbert.gdx.storage.map.MemoryStorage; -import java.util.Scanner; +package com.pixelgamelibrary.storage.command; /** * diff --git a/core/src/main/java/com/openeggbert/gdx/storage/command/StorageCommandResult.java b/core/src/main/java/com/pixelgamelibrary/storage/command/StorageCommandResult.java similarity index 95% rename from core/src/main/java/com/openeggbert/gdx/storage/command/StorageCommandResult.java rename to core/src/main/java/com/pixelgamelibrary/storage/command/StorageCommandResult.java index 802ab77..d85c9b2 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/command/StorageCommandResult.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/command/StorageCommandResult.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.command; +package com.pixelgamelibrary.storage.command; /** * diff --git a/core/src/main/java/com/openeggbert/gdx/storage/filesystem/AndroidStorage.java b/core/src/main/java/com/pixelgamelibrary/storage/filesystem/AndroidStorage.java similarity index 89% rename from core/src/main/java/com/openeggbert/gdx/storage/filesystem/AndroidStorage.java rename to core/src/main/java/com/pixelgamelibrary/storage/filesystem/AndroidStorage.java index 947231d..f2fe3eb 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/filesystem/AndroidStorage.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/filesystem/AndroidStorage.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,9 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.filesystem; +package com.pixelgamelibrary.storage.filesystem; -import com.openeggbert.core.fbox.entity.Platform; +import com.pixelgamelibrary.Platform; /** * diff --git a/core/src/main/java/com/openeggbert/gdx/storage/filesystem/DesktopAndroidStorage.java b/core/src/main/java/com/pixelgamelibrary/storage/filesystem/DesktopAndroidStorage.java similarity index 96% rename from core/src/main/java/com/openeggbert/gdx/storage/filesystem/DesktopAndroidStorage.java rename to core/src/main/java/com/pixelgamelibrary/storage/filesystem/DesktopAndroidStorage.java index 1d2d928..72995f4 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/filesystem/DesktopAndroidStorage.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/filesystem/DesktopAndroidStorage.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,10 +17,10 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.filesystem; +package com.pixelgamelibrary.storage.filesystem; -import com.openeggbert.core.fbox.entity.Platform; -import com.openeggbert.gdx.storage.Storage; +import com.pixelgamelibrary.Platform; +import com.pixelgamelibrary.storage.Storage; import java.util.List; /** diff --git a/core/src/main/java/com/openeggbert/gdx/storage/filesystem/DesktopStorage.java b/core/src/main/java/com/pixelgamelibrary/storage/filesystem/DesktopStorage.java similarity index 89% rename from core/src/main/java/com/openeggbert/gdx/storage/filesystem/DesktopStorage.java rename to core/src/main/java/com/pixelgamelibrary/storage/filesystem/DesktopStorage.java index d6067e4..5f5d448 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/filesystem/DesktopStorage.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/filesystem/DesktopStorage.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,9 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.filesystem; +package com.pixelgamelibrary.storage.filesystem; -import com.openeggbert.core.fbox.entity.Platform; +import com.pixelgamelibrary.Platform; /** * diff --git a/core/src/main/java/com/openeggbert/gdx/storage/map/MapFileType.java b/core/src/main/java/com/pixelgamelibrary/storage/map/MapFileType.java similarity index 91% rename from core/src/main/java/com/openeggbert/gdx/storage/map/MapFileType.java rename to core/src/main/java/com/pixelgamelibrary/storage/map/MapFileType.java index 72b422b..debd12b 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/map/MapFileType.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/map/MapFileType.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,9 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.map; +package com.pixelgamelibrary.storage.map; -import com.openeggbert.gdx.storage.GdxStorageException; +import com.pixelgamelibrary.storage.GdxStorageException; /** diff --git a/core/src/main/java/com/openeggbert/gdx/storage/map/MapStorage.java b/core/src/main/java/com/pixelgamelibrary/storage/map/MapStorage.java similarity index 97% rename from core/src/main/java/com/openeggbert/gdx/storage/map/MapStorage.java rename to core/src/main/java/com/pixelgamelibrary/storage/map/MapStorage.java index be0c399..979b169 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/map/MapStorage.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/map/MapStorage.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,14 +17,14 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.map; +package com.pixelgamelibrary.storage.map; import com.badlogic.gdx.Application; import com.badlogic.gdx.Gdx; -import com.openeggbert.core.fbox.entity.Platform; -import com.openeggbert.gdx.storage.GdxStorageException; -import com.openeggbert.gdx.storage.GdxStorageUtils; -import com.openeggbert.gdx.storage.Storage; +import com.pixelgamelibrary.Platform; +import com.pixelgamelibrary.storage.GdxStorageException; +import com.pixelgamelibrary.storage.GdxStorageUtils; +import com.pixelgamelibrary.storage.Storage; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/com/openeggbert/gdx/storage/map/MapStorageCompression.java b/core/src/main/java/com/pixelgamelibrary/storage/map/MapStorageCompression.java similarity index 92% rename from core/src/main/java/com/openeggbert/gdx/storage/map/MapStorageCompression.java rename to core/src/main/java/com/pixelgamelibrary/storage/map/MapStorageCompression.java index 106959c..af92680 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/map/MapStorageCompression.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/map/MapStorageCompression.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.map; +package com.pixelgamelibrary.storage.map; /** * diff --git a/core/src/main/java/com/openeggbert/gdx/storage/map/MemoryStorage.java b/core/src/main/java/com/pixelgamelibrary/storage/map/MemoryStorage.java similarity index 89% rename from core/src/main/java/com/openeggbert/gdx/storage/map/MemoryStorage.java rename to core/src/main/java/com/pixelgamelibrary/storage/map/MemoryStorage.java index 112d1c8..5ec8486 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/map/MemoryStorage.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/map/MemoryStorage.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,9 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.map; +package com.pixelgamelibrary.storage.map; -import com.openeggbert.core.fbox.entity.Platform; +import com.pixelgamelibrary.Platform; /** * diff --git a/core/src/main/java/com/openeggbert/gdx/storage/map/SimpleJavaMap.java b/core/src/main/java/com/pixelgamelibrary/storage/map/SimpleJavaMap.java similarity index 96% rename from core/src/main/java/com/openeggbert/gdx/storage/map/SimpleJavaMap.java rename to core/src/main/java/com/pixelgamelibrary/storage/map/SimpleJavaMap.java index b060265..5f88f67 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/map/SimpleJavaMap.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/map/SimpleJavaMap.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.map; +package com.pixelgamelibrary.storage.map; import java.util.Collections; import java.util.HashMap; diff --git a/core/src/main/java/com/openeggbert/gdx/storage/map/SimpleLocalStorageMap.java b/core/src/main/java/com/pixelgamelibrary/storage/map/SimpleLocalStorageMap.java similarity index 96% rename from core/src/main/java/com/openeggbert/gdx/storage/map/SimpleLocalStorageMap.java rename to core/src/main/java/com/pixelgamelibrary/storage/map/SimpleLocalStorageMap.java index ae6eb86..499fbac 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/map/SimpleLocalStorageMap.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/map/SimpleLocalStorageMap.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.map; +package com.pixelgamelibrary.storage.map; import com.badlogic.gdx.Preferences; import java.util.Collections; diff --git a/core/src/main/java/com/openeggbert/gdx/storage/map/SimpleMap.java b/core/src/main/java/com/pixelgamelibrary/storage/map/SimpleMap.java similarity index 94% rename from core/src/main/java/com/openeggbert/gdx/storage/map/SimpleMap.java rename to core/src/main/java/com/pixelgamelibrary/storage/map/SimpleMap.java index 3aab24c..ec01fa1 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/map/SimpleMap.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/map/SimpleMap.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.map; +package com.pixelgamelibrary.storage.map; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/openeggbert/gdx/storage/map/WebGLStorage.java b/core/src/main/java/com/pixelgamelibrary/storage/map/WebGLStorage.java similarity index 91% rename from core/src/main/java/com/openeggbert/gdx/storage/map/WebGLStorage.java rename to core/src/main/java/com/pixelgamelibrary/storage/map/WebGLStorage.java index f847fd9..67fe162 100644 --- a/core/src/main/java/com/openeggbert/gdx/storage/map/WebGLStorage.java +++ b/core/src/main/java/com/pixelgamelibrary/storage/map/WebGLStorage.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -// Gdx Storage: Multiplatform persistent storage. +// Pixel: Game library. // Copyright (C) 2024 the original author or authors. // // This program is free software: you can redistribute it and/or @@ -17,11 +17,11 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.gdx.storage.map; +package com.pixelgamelibrary.storage.map; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Preferences; -import com.openeggbert.core.fbox.entity.Platform; +import com.pixelgamelibrary.Platform; /** * diff --git a/html/src/main/java/com/openeggbert/GdxDefinition.gwt.xml b/html/src/main/java/com/openeggbert/GdxDefinition.gwt.xml index 760fa94..50d68c4 100644 --- a/html/src/main/java/com/openeggbert/GdxDefinition.gwt.xml +++ b/html/src/main/java/com/openeggbert/GdxDefinition.gwt.xml @@ -23,6 +23,7 @@ + diff --git a/lwjgl3/src/main/java/com/openeggbert/lwjgl3/debugging/DesktopCommandLineScanner.java b/lwjgl3/src/main/java/com/openeggbert/lwjgl3/debugging/DesktopCommandLineScanner.java index 55f0f88..dcdee66 100644 --- a/lwjgl3/src/main/java/com/openeggbert/lwjgl3/debugging/DesktopCommandLineScanner.java +++ b/lwjgl3/src/main/java/com/openeggbert/lwjgl3/debugging/DesktopCommandLineScanner.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.openeggbert.lwjgl3.debugging; -import com.openeggbert.gdx.storage.command.CommandLineScanner; +import com.pixelgamelibrary.storage.command.CommandLineScanner; import java.util.Scanner; /** diff --git a/lwjgl3/src/main/java/com/openeggbert/lwjgl3/debugging/DesktopStorageCommandLineScanner.java b/lwjgl3/src/main/java/com/openeggbert/lwjgl3/debugging/DesktopStorageCommandLineScanner.java index 5b01eaa..150ddcc 100644 --- a/lwjgl3/src/main/java/com/openeggbert/lwjgl3/debugging/DesktopStorageCommandLineScanner.java +++ b/lwjgl3/src/main/java/com/openeggbert/lwjgl3/debugging/DesktopStorageCommandLineScanner.java @@ -19,9 +19,9 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.openeggbert.lwjgl3.debugging; -import com.openeggbert.gdx.storage.command.StorageCommandLine; -import com.openeggbert.gdx.storage.command.StorageCommandLineScanner; -import com.openeggbert.gdx.storage.map.MemoryStorage; +import com.pixelgamelibrary.storage.command.StorageCommandLine; +import com.pixelgamelibrary.storage.command.StorageCommandLineScanner; +import com.pixelgamelibrary.storage.map.MemoryStorage; /** *