Pixel was moved to another package

This commit is contained in:
Robert Vokac 2024-12-22 21:20:03 +01:00
parent 0ff2f458dd
commit 4aa882089a
Signed by: robertvokac
GPG Key ID: FB9CE8E20AADA55F
30 changed files with 77 additions and 77 deletions

View File

@ -57,8 +57,8 @@ dependencies {
implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
implementation "com.github.MrStahlfelge.gdx-websockets:common:$websocketVersion"
implementation project(':core')
implementation "com.pixelgamelibrary:pixel:$pixelVersion"
implementation "com.pixelgamelibrary:pixel-backend-libgdx:$pixelVersion"
implementation "com.openeggbert.pixel:pixel-framework:$pixelVersion"
implementation "com.openeggbert.pixel:pixel-backend-libgdx:$pixelVersion"
natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-arm64-v8a"
natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-armeabi-v7a"

View File

@ -5,9 +5,9 @@ import android.os.Bundle;
import com.badlogic.gdx.backends.android.AndroidApplication;
import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
import com.openeggbert.core.main.OpenEggbertApplication;
import com.pixelgamelibrary.api.Pixel;
import com.pixelgamelibrary.backend.libgdx.interfaces.PixelBackendLibGDX;
import com.pixelgamelibrary.backend.libgdx.game.LibGdxGame;
import com.openeggbert.pixel.framework.Pixel;
import com.openeggbert.pixel.backend.libgdx.interfaces.PixelBackendLibGDX;
import com.openeggbert.pixel.backend.libgdx.game.LibGdxGame;
/** Launches the Android application. */
public class AndroidLauncher extends AndroidApplication {

View File

@ -22,7 +22,7 @@ dependencies {
compileOnly "org.projectlombok:lombok:$lombokVersion"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.3"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.3"
api "com.pixelgamelibrary:pixel:$pixelVersion"
api "com.openeggbert.pixel:pixel-framework:$pixelVersion"
implementation "com.openeggbert.jdotnet:jdotnet:$jdotnetVersion"
implementation "com.openeggbert.jxna:jxna:$jxnaVersion"

View File

@ -20,7 +20,7 @@
package com.openeggbert.core.configuration;
import com.openeggbert.core.main.OpenEggbertException;
import com.pixelgamelibrary.api.Pixel;
import com.openeggbert.pixel.framework.Pixel;
import java.util.HashMap;
import java.util.Map;
import lombok.ToString;

View File

@ -19,9 +19,9 @@
///////////////////////////////////////////////////////////////////////////////////////////////
package com.openeggbert.core.configuration;
import com.pixelgamelibrary.api.Pixel;
import com.openeggbert.pixel.framework.Pixel;
import com.openeggbert.core.main.OpenEggbertException;
import com.pixelgamelibrary.api.ViewMode;
import com.openeggbert.pixel.framework.ViewMode;
/**
*

View File

@ -20,12 +20,12 @@
package com.openeggbert.core.main;
import com.openeggbert.core.gamespace.GameSpace;
import com.pixelgamelibrary.api.PixelApplication;
import com.openeggbert.pixel.framework.PixelApplication;
import java.util.Map;
import com.pixelgamelibrary.api.game.Game;
import com.openeggbert.pixel.framework.game.Game;
/**
* {@link com.pixelgamelibrary.api.PixelApplication} implementation shared by all
* {@link com.openeggbert.pixel.framework.PixelApplication} implementation shared by all
* platforms.
*/
public class OpenEggbertApplication extends PixelApplication {

View File

@ -8,17 +8,17 @@ import com.openeggbert.core.mod.ModIdentification;
import com.openeggbert.core.screen.GameSpaceListScreen;
import com.openeggbert.core.screen.InitScreen;
import com.openeggbert.core.utils.OpenEggbertUtils;
import com.pixelgamelibrary.api.game.GameAdapter;
import com.pixelgamelibrary.api.Pixel;
import com.pixelgamelibrary.api.graphics.BitmapFont;
import com.pixelgamelibrary.api.graphics.SpriteBatch;
import com.pixelgamelibrary.api.graphics.Texture;
import com.openeggbert.pixel.framework.game.GameAdapter;
import com.openeggbert.pixel.framework.Pixel;
import com.openeggbert.pixel.framework.graphics.BitmapFont;
import com.openeggbert.pixel.framework.graphics.SpriteBatch;
import com.openeggbert.pixel.framework.graphics.Texture;
import java.util.List;
import java.util.Optional;
import lombok.Data;
import com.pixelgamelibrary.api.files.File;
import com.pixelgamelibrary.api.graphics.ShapeRenderer;
import com.pixelgamelibrary.api.utils.collections.Map;
import com.openeggbert.pixel.framework.files.File;
import com.openeggbert.pixel.framework.graphics.ShapeRenderer;
import com.openeggbert.pixel.framework.utils.collections.Map;
import lombok.Getter;
/**
@ -66,7 +66,7 @@ public class OpenEggbertGame extends GameAdapter {
// for(FileHandle f:Gdx.files.internal(".").list()) {
// System.out.println("assets contains also: " + f.name());
// }
com.pixelgamelibrary.api.files.File embeddedModsDirectory = Pixel.files().assets("/embedded_mods");
com.openeggbert.pixel.framework.files.File embeddedModsDirectory = Pixel.files().assets("/embedded_mods");
System.out.println("embeddedModsDirectory.exists=" + embeddedModsDirectory.exists());
System.out.println("embeddedModsDirectory.list().size()=" + embeddedModsDirectory.list().size());
embeddedModsDirectory.list().forEach(e -> System.out.println(e.path()));

View File

@ -19,8 +19,8 @@
///////////////////////////////////////////////////////////////////////////////////////////////
package com.openeggbert.core.mod;
import com.pixelgamelibrary.api.interfaces.XmlElement;
import com.pixelgamelibrary.api.Pixel;
import com.openeggbert.pixel.framework.interfaces.XmlElement;
import com.openeggbert.pixel.framework.Pixel;
import com.openeggbert.core.release.Release;
import java.util.ArrayList;
import java.util.List;

View File

@ -19,7 +19,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////
package com.openeggbert.core.mod;
import com.pixelgamelibrary.api.interfaces.XmlElement;
import com.openeggbert.pixel.framework.interfaces.XmlElement;
import lombok.AllArgsConstructor;
import lombok.Data;

View File

@ -19,7 +19,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////
package com.openeggbert.core.mod;
import com.pixelgamelibrary.api.interfaces.XmlElement;
import com.openeggbert.pixel.framework.interfaces.XmlElement;
/**
*

View File

@ -21,11 +21,11 @@ package com.openeggbert.core.screen;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputAdapter;
import com.pixelgamelibrary.api.graphics.Color;
import com.openeggbert.pixel.framework.graphics.Color;
import com.badlogic.gdx.utils.ScreenUtils;
import com.openeggbert.core.main.OpenEggbertGame;
import com.pixelgamelibrary.api.graphics.BitmapFont;
import com.openeggbert.pixel.framework.graphics.BitmapFont;
/**
*

View File

@ -21,11 +21,11 @@ package com.openeggbert.core.screen;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputAdapter;
import com.pixelgamelibrary.api.graphics.Color;
import com.openeggbert.pixel.framework.graphics.Color;
import com.badlogic.gdx.utils.ScreenUtils;
import com.openeggbert.core.main.OpenEggbertGame;
import com.pixelgamelibrary.api.graphics.BitmapFont;
import com.openeggbert.pixel.framework.graphics.BitmapFont;
import java.util.Optional;
/**

View File

@ -21,11 +21,11 @@ package com.openeggbert.core.screen;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputAdapter;
import com.pixelgamelibrary.api.graphics.Color;
import com.openeggbert.pixel.framework.graphics.Color;
import com.badlogic.gdx.utils.ScreenUtils;
import com.openeggbert.core.main.OpenEggbertGame;
import com.pixelgamelibrary.api.graphics.BitmapFont;
import com.openeggbert.pixel.framework.graphics.BitmapFont;
import java.util.Optional;
/**

View File

@ -24,23 +24,23 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.InputAdapter;
import com.badlogic.gdx.Preferences;
import com.pixelgamelibrary.api.graphics.Color;
import com.openeggbert.pixel.framework.graphics.Color;
import com.pixelgamelibrary.api.graphics.ShapeRenderer;
import com.openeggbert.pixel.framework.graphics.ShapeRenderer;
import com.openeggbert.core.gamespace.GameSpace;
import com.openeggbert.core.main.OpenEggbertGame;
import com.openeggbert.core.mod.Mod;
import com.openeggbert.core.mod.ModType;
import com.pixelgamelibrary.api.Pixel;
import com.pixelgamelibrary.api.graphics.BitmapFont;
import com.openeggbert.pixel.framework.Pixel;
import com.openeggbert.pixel.framework.graphics.BitmapFont;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import lombok.ToString;
import com.pixelgamelibrary.api.files.FileSystem;
import com.pixelgamelibrary.api.graphics.Texture;
import com.openeggbert.pixel.framework.files.FileSystem;
import com.openeggbert.pixel.framework.graphics.Texture;
/**
*

View File

@ -21,11 +21,11 @@ package com.openeggbert.core.screen;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputAdapter;
import com.pixelgamelibrary.api.graphics.Color;
import com.openeggbert.pixel.framework.graphics.Color;
import com.badlogic.gdx.utils.ScreenUtils;
import com.openeggbert.core.main.OpenEggbertGame;
import com.pixelgamelibrary.api.graphics.BitmapFont;
import com.openeggbert.pixel.framework.graphics.BitmapFont;
import java.util.Optional;
/**

View File

@ -22,15 +22,15 @@ package com.openeggbert.core.screen;
import com.openeggbert.core.gamespace.GameFileType;
import com.openeggbert.core.main.OpenEggbertGame;
import com.openeggbert.core.utils.OpenEggbertUtils;
import com.pixelgamelibrary.api.Pixel;
import com.pixelgamelibrary.api.Platform;
import com.pixelgamelibrary.api.app.LogLevel;
import com.pixelgamelibrary.api.graphics.SpriteBatch;
import com.pixelgamelibrary.api.graphics.Texture;
import com.pixelgamelibrary.api.screen.ScreenAdapter;
import com.openeggbert.pixel.framework.Pixel;
import com.openeggbert.pixel.framework.Platform;
import com.openeggbert.pixel.framework.app.LogLevel;
import com.openeggbert.pixel.framework.graphics.SpriteBatch;
import com.openeggbert.pixel.framework.graphics.Texture;
import com.openeggbert.pixel.framework.screen.ScreenAdapter;
import java.util.List;
import java.util.Optional;
import com.pixelgamelibrary.api.files.File;
import com.openeggbert.pixel.framework.files.File;
/**
*

View File

@ -21,11 +21,11 @@ package com.openeggbert.core.screen;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputAdapter;
import com.pixelgamelibrary.api.graphics.Color;
import com.openeggbert.pixel.framework.graphics.Color;
import com.badlogic.gdx.utils.ScreenUtils;
import com.openeggbert.core.main.OpenEggbertGame;
import com.pixelgamelibrary.api.graphics.BitmapFont;
import com.openeggbert.pixel.framework.graphics.BitmapFont;
import java.util.Optional;
/**

View File

@ -25,8 +25,8 @@ import com.badlogic.gdx.InputAdapter;
import com.badlogic.gdx.utils.ScreenUtils;
import com.openeggbert.core.main.OpenEggbertGame;
import com.pixelgamelibrary.api.Pixel;
import com.pixelgamelibrary.api.graphics.BitmapFont;
import com.openeggbert.pixel.framework.Pixel;
import com.openeggbert.pixel.framework.graphics.BitmapFont;
import java.util.function.Function;
/**

View File

@ -49,9 +49,9 @@ dependencies {
implementation "de.golfgl.gdxcontrollerutils:gdx-controllerutils-mapping:$controllerMappingVersion:sources"
implementation project(':core')
implementation "com.pixelgamelibrary:pixel:$pixelVersion:sources"
api "com.pixelgamelibrary:pixel-backend-libgdx:$pixelVersion"
implementation "com.pixelgamelibrary:pixel-backend-libgdx:$pixelVersion:sources"
implementation "com.openeggbert.pixel:pixel-framework:$pixelVersion:sources"
api "com.openeggbert.pixel:pixel-backend-libgdx:$pixelVersion"
implementation "com.openeggbert.pixel:pixel-backend-libgdx:$pixelVersion:sources"
implementation "com.openeggbert.jdotnet:jdotnet:$jdotnetVersion:sources"
api "com.openeggbert.jdotnet:jdotnet:$jdotnetVersion"

View File

@ -23,8 +23,8 @@
<inherits name="com.github.czyzby.websocket.GdxWebSocketGwt" />
<inherits name="com.github.czyzby.websocket.GdxWebSocketSerialization" />
<inherits name="com.openeggbert.core.main.OpenEggbertApplication" />
<inherits name="com.pixelgamelibrary.pixelapi" />
<inherits name="com.pixelgamelibrary.backend.pixelbackendlibgdx" />
<inherits name="com.openeggbert.pixel.pixelframework" />
<inherits name="com.openeggbert.pixel.backend.pixelbackendlibgdx" />
<inherits name="com.openeggbert.jdotnet" />
<inherits name="com.openeggbert.jxna" />
<inherits name="formic" />

View File

@ -5,9 +5,9 @@ import com.badlogic.gdx.backends.gwt.GwtApplication;
import com.badlogic.gdx.backends.gwt.GwtApplicationConfiguration;
import com.openeggbert.core.configuration.VirtualScreenResolution;
import com.openeggbert.core.main.OpenEggbertApplication;
import com.pixelgamelibrary.api.Pixel;
import com.pixelgamelibrary.backend.libgdx.interfaces.PixelBackendLibGDX;
import com.pixelgamelibrary.backend.libgdx.game.LibGdxGame;
import com.openeggbert.pixel.framework.Pixel;
import com.openeggbert.pixel.backend.libgdx.interfaces.PixelBackendLibGDX;
import com.openeggbert.pixel.backend.libgdx.game.LibGdxGame;
/** Launches the GWT application. */
public class GwtLauncher extends GwtApplication {

View File

@ -37,8 +37,8 @@ dependencies {
implementation "games.rednblack.miniaudio:miniaudio:$miniaudioVersion:natives-desktop"
implementation project(':core')
implementation "com.pixelgamelibrary:pixel:$pixelVersion"
implementation "com.pixelgamelibrary:pixel-backend-libgdx:$pixelVersion"
implementation "com.openeggbert.pixel:pixel-framework:$pixelVersion"
implementation "com.openeggbert.pixel:pixel-backend-libgdx:$pixelVersion"
if(enableGraalNative == 'true') {
implementation "io.github.berstanio:gdx-svmhelper-backend-lwjgl3:$graalHelperVersion"

View File

@ -25,11 +25,11 @@ import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
import com.openeggbert.core.configuration.VirtualScreenResolution;
import com.openeggbert.core.main.OpenEggbertApplication;
import com.openeggbert.core.gamespace.GameSpace;
import com.pixelgamelibrary.api.Pixel;
import com.pixelgamelibrary.backend.libgdx.interfaces.PixelBackendLibGDX;
import com.openeggbert.pixel.framework.Pixel;
import com.openeggbert.pixel.backend.libgdx.interfaces.PixelBackendLibGDX;
import java.util.Optional;
import com.pixelgamelibrary.api.game.Game;
import com.pixelgamelibrary.backend.libgdx.game.LibGdxGame;
import com.openeggbert.pixel.framework.game.Game;
import com.openeggbert.pixel.backend.libgdx.game.LibGdxGame;
/** Launches the desktop (LWJGL3) application. */
public class Lwjgl3Launcher {

View File

@ -19,9 +19,9 @@
///////////////////////////////////////////////////////////////////////////////////////////////
package com.openeggbert.lwjgl3.debugging;
import com.pixelgamelibrary.api.Pixel;
import com.pixelgamelibrary.backend.libgdx.interfaces.PixelBackendLibGDX;
import com.pixelgamelibrary.api.utils.AssetsTxt;
import com.openeggbert.pixel.framework.Pixel;
import com.openeggbert.pixel.backend.libgdx.interfaces.PixelBackendLibGDX;
import com.openeggbert.pixel.framework.utils.AssetsTxt;
import java.util.List;
import java.util.Scanner;

View File

@ -19,7 +19,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////
package com.openeggbert.lwjgl3.debugging;
import com.pixelgamelibrary.api.files.shell.ShellScanner;
import com.openeggbert.pixel.framework.files.shell.ShellScanner;
import java.util.Scanner;
/**

View File

@ -19,9 +19,9 @@
///////////////////////////////////////////////////////////////////////////////////////////////
package com.openeggbert.lwjgl3.debugging;
import com.pixelgamelibrary.api.files.shell.ShellCommandLine;
import com.pixelgamelibrary.api.files.shell.ShellCommandLineScanner;
import com.pixelgamelibrary.api.files.map.MemoryFileSystem;
import com.openeggbert.pixel.framework.files.shell.ShellCommandLine;
import com.openeggbert.pixel.framework.files.shell.ShellCommandLineScanner;
import com.openeggbert.pixel.framework.files.map.MemoryFileSystem;
/**
*

View File

@ -27,9 +27,9 @@ dependencies {
implementation "org.teavm:teavm-jso:$teaVMVersion"
implementation "org.teavm:teavm-tooling:$teaVMVersion"
implementation project(':core')
implementation "com.pixelgamelibrary:pixel:$pixelVersion:sources"
api "com.pixelgamelibrary:pixel-backend-libgdx:$pixelVersion"
implementation "com.pixelgamelibrary:pixel-backend-libgdx:$pixelVersion:sources"
implementation "com.openeggbert.pixel:pixel-framework:$pixelVersion:sources"
api "com.openeggbert.pixel:pixel-backend-libgdx:$pixelVersion"
implementation "com.openeggbert.pixel:pixel-backend-libgdx:$pixelVersion:sources"
}

View File

@ -3,9 +3,9 @@ package com.openeggbert.teavm;
import com.github.xpenatan.gdx.backends.teavm.TeaApplicationConfiguration;
import com.github.xpenatan.gdx.backends.teavm.TeaApplication;
import com.openeggbert.core.main.OpenEggbertApplication;
import com.pixelgamelibrary.api.Pixel;
import com.pixelgamelibrary.backend.libgdx.interfaces.PixelBackendLibGDX;
import com.pixelgamelibrary.backend.libgdx.game.LibGdxGame;
import com.openeggbert.pixel.framework.Pixel;
import com.openeggbert.pixel.backend.libgdx.interfaces.PixelBackendLibGDX;
import com.openeggbert.pixel.backend.libgdx.game.LibGdxGame;
/**
* Launches the TeaVM/HTML application.