diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index a5c556e..eafd405 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -3,7 +3,7 @@ github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] patreon: # Replace with a single Patreon username open_collective: # Replace with a single Open Collective username -ko_fi: stringfromjava +ko_fi: stringdotjar tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry liberapay: # Replace with a single Liberapay username diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 51db3bd..005304b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,25 +13,48 @@ jobs: os: [windows-latest, macos-latest, ubuntu-latest] runs-on: ${{ matrix.os }} - + steps: - uses: actions/checkout@v4 - - # LibGDX typically uses Java 11 or newer + + # LibGDX typically uses Java 11 or newer. - name: Set up JDK 17 uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' - # Cache Gradle dependencies to speed up subsequent runs + # Cache Gradle dependencies to speed up subsequent runs. cache: 'gradle' - # Grant execute permission for gradlew (necessary for macOS and Linux) + # Grant execute permission for gradlew (necessary for macOS and Linux). - name: Grant execute permission for gradlew run: chmod +x gradlew - # Use an 'if' condition to only run this on non-Windows OS + # Use an 'if' condition to only run this on non-Windows OS. if: startsWith(runner.os, 'macOS') || startsWith(runner.os, 'Linux') - - # This task compiles all modules (core, desktop, etc.) + + # This task compiles all modules (core, desktop, etc.). - name: Build with Gradle run: ./gradlew build + + build-android: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + # LibGDX typically uses Java 11 or newer. + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + # Cache Gradle dependencies to speed up subsequent runs. + cache: 'gradle' + + # Grant execute permission for gradlew. + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + # Build Android module. + - name: Build Android with Gradle + run: ./gradlew android:build diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index f1a19ce..2bddab6 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -12,7 +12,7 @@ tools:ignore="UnusedAttribute" android:theme="@style/GdxTheme"> type) { * Checks if a class of a certain package is final. * * @param classPath The package definition of the class to check if final. An example could be - * {@code "me.stringfromjava.flixelgdx.Flixel"}. + * {@code "me.stringdotjar.flixelgdx.Flixel"}. * @return If the class provided is final. If there was an exception caught, then {@code false} is * automatically returned. */ diff --git a/core/src/main/java/me/stringfromjava/flixelgdx/util/FlixelRuntimeUtil.java b/core/src/main/java/me/stringdotjar/flixelgdx/util/FlixelRuntimeUtil.java similarity index 97% rename from core/src/main/java/me/stringfromjava/flixelgdx/util/FlixelRuntimeUtil.java rename to core/src/main/java/me/stringdotjar/flixelgdx/util/FlixelRuntimeUtil.java index 2ce8b95..4d8a48c 100644 --- a/core/src/main/java/me/stringfromjava/flixelgdx/util/FlixelRuntimeUtil.java +++ b/core/src/main/java/me/stringdotjar/flixelgdx/util/FlixelRuntimeUtil.java @@ -1,4 +1,4 @@ -package me.stringfromjava.flixelgdx.util; +package me.stringdotjar.flixelgdx.util; /** * Utility class for handling operation related to the runtime environment, including OS detection, diff --git a/core/src/main/java/me/stringfromjava/funkin/FunkinGame.java b/core/src/main/java/me/stringdotjar/funkin/FunkinGame.java similarity index 68% rename from core/src/main/java/me/stringfromjava/funkin/FunkinGame.java rename to core/src/main/java/me/stringdotjar/funkin/FunkinGame.java index 1d93000..0040de4 100644 --- a/core/src/main/java/me/stringfromjava/funkin/FunkinGame.java +++ b/core/src/main/java/me/stringdotjar/funkin/FunkinGame.java @@ -1,12 +1,12 @@ -package me.stringfromjava.funkin; - -import me.stringfromjava.flixelgdx.Flixel; -import me.stringfromjava.flixelgdx.FlixelGame; -import me.stringfromjava.flixelgdx.backend.FlixelPaths; -import me.stringfromjava.flixelgdx.graphics.screen.FlixelScreen; -import me.stringfromjava.polyverse.Polyverse; -import me.stringfromjava.polyverse.script.type.Script; -import me.stringfromjava.polyverse.script.type.SystemScript; +package me.stringdotjar.funkin; + +import me.stringdotjar.flixelgdx.Flixel; +import me.stringdotjar.flixelgdx.FlixelGame; +import me.stringdotjar.flixelgdx.backend.FlixelPaths; +import me.stringdotjar.flixelgdx.graphics.screen.FlixelScreen; +import me.stringdotjar.polyverse.Polyverse; +import me.stringdotjar.polyverse.script.type.Script; +import me.stringdotjar.polyverse.script.type.SystemScript; /** * The main Funkin' game class that initializes and runs the game. diff --git a/core/src/main/java/me/stringdotjar/funkin/init/InitScreen.java b/core/src/main/java/me/stringdotjar/funkin/init/InitScreen.java new file mode 100644 index 0000000..f73bf8c --- /dev/null +++ b/core/src/main/java/me/stringdotjar/funkin/init/InitScreen.java @@ -0,0 +1,14 @@ +package me.stringdotjar.funkin.init; + +import me.stringdotjar.flixelgdx.graphics.screen.FlixelScreen; +import me.stringdotjar.flixelgdx.Flixel; +import me.stringdotjar.funkin.menus.TitleScreen; + +public class InitScreen extends FlixelScreen { + + @Override + public void show() { + super.show(); + Flixel.setScreen(new TitleScreen()); + } +} diff --git a/core/src/main/java/me/stringfromjava/funkin/menus/TitleScreen.java b/core/src/main/java/me/stringdotjar/funkin/menus/TitleScreen.java similarity index 80% rename from core/src/main/java/me/stringfromjava/funkin/menus/TitleScreen.java rename to core/src/main/java/me/stringdotjar/funkin/menus/TitleScreen.java index bd6715d..5597818 100644 --- a/core/src/main/java/me/stringfromjava/funkin/menus/TitleScreen.java +++ b/core/src/main/java/me/stringdotjar/funkin/menus/TitleScreen.java @@ -1,15 +1,15 @@ -package me.stringfromjava.funkin.menus; +package me.stringdotjar.funkin.menus; import com.badlogic.gdx.Input; import games.rednblack.miniaudio.MASound; -import me.stringfromjava.flixelgdx.Flixel; -import me.stringfromjava.flixelgdx.backend.FlixelPaths; -import me.stringfromjava.flixelgdx.graphics.screen.FlixelScreen; -import me.stringfromjava.flixelgdx.graphics.sprite.FlixelSprite; -import me.stringfromjava.flixelgdx.tween.FlixelEase; -import me.stringfromjava.flixelgdx.tween.FlixelTween; -import me.stringfromjava.flixelgdx.tween.settings.FlixelTweenSettings; -import me.stringfromjava.flixelgdx.tween.settings.FlixelTweenType; +import me.stringdotjar.flixelgdx.Flixel; +import me.stringdotjar.flixelgdx.backend.FlixelPaths; +import me.stringdotjar.flixelgdx.graphics.screen.FlixelScreen; +import me.stringdotjar.flixelgdx.graphics.sprite.FlixelSprite; +import me.stringdotjar.flixelgdx.tween.FlixelEase; +import me.stringdotjar.flixelgdx.tween.FlixelTween; +import me.stringdotjar.flixelgdx.tween.settings.FlixelTweenSettings; +import me.stringdotjar.flixelgdx.tween.settings.FlixelTweenType; public class TitleScreen extends FlixelScreen { diff --git a/core/src/main/java/me/stringfromjava/funkin/util/FunkinConstants.java b/core/src/main/java/me/stringdotjar/funkin/util/FunkinConstants.java similarity index 94% rename from core/src/main/java/me/stringfromjava/funkin/util/FunkinConstants.java rename to core/src/main/java/me/stringdotjar/funkin/util/FunkinConstants.java index ced76f0..8fd5196 100644 --- a/core/src/main/java/me/stringfromjava/funkin/util/FunkinConstants.java +++ b/core/src/main/java/me/stringdotjar/funkin/util/FunkinConstants.java @@ -1,4 +1,4 @@ -package me.stringfromjava.funkin.util; +package me.stringdotjar.funkin.util; /** * Constants used throughout Funkin'. diff --git a/core/src/main/java/me/stringfromjava/polyverse/Polyverse.java b/core/src/main/java/me/stringdotjar/polyverse/Polyverse.java similarity index 97% rename from core/src/main/java/me/stringfromjava/polyverse/Polyverse.java rename to core/src/main/java/me/stringdotjar/polyverse/Polyverse.java index 6daace4..a8383af 100644 --- a/core/src/main/java/me/stringfromjava/polyverse/Polyverse.java +++ b/core/src/main/java/me/stringdotjar/polyverse/Polyverse.java @@ -1,9 +1,9 @@ -package me.stringfromjava.polyverse; +package me.stringdotjar.polyverse; import com.badlogic.gdx.files.FileHandle; import groovy.lang.GroovyClassLoader; -import me.stringfromjava.flixelgdx.Flixel; -import me.stringfromjava.polyverse.script.type.Script; +import me.stringdotjar.flixelgdx.Flixel; +import me.stringdotjar.polyverse.script.type.Script; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/me/stringfromjava/polyverse/script/type/Script.java b/core/src/main/java/me/stringdotjar/polyverse/script/type/Script.java similarity index 92% rename from core/src/main/java/me/stringfromjava/polyverse/script/type/Script.java rename to core/src/main/java/me/stringdotjar/polyverse/script/type/Script.java index 64d3ae7..6b41e28 100644 --- a/core/src/main/java/me/stringfromjava/polyverse/script/type/Script.java +++ b/core/src/main/java/me/stringdotjar/polyverse/script/type/Script.java @@ -1,4 +1,4 @@ -package me.stringfromjava.polyverse.script.type; +package me.stringdotjar.polyverse.script.type; /** Base class for all Polyverse scripts to extend to. */ public abstract class Script { diff --git a/core/src/main/java/me/stringfromjava/polyverse/script/type/SystemScript.java b/core/src/main/java/me/stringdotjar/polyverse/script/type/SystemScript.java similarity index 69% rename from core/src/main/java/me/stringfromjava/polyverse/script/type/SystemScript.java rename to core/src/main/java/me/stringdotjar/polyverse/script/type/SystemScript.java index b37a5e0..acc8b98 100644 --- a/core/src/main/java/me/stringfromjava/polyverse/script/type/SystemScript.java +++ b/core/src/main/java/me/stringdotjar/polyverse/script/type/SystemScript.java @@ -1,4 +1,4 @@ -package me.stringfromjava.polyverse.script.type; +package me.stringdotjar.polyverse.script.type; public abstract class SystemScript extends Script { diff --git a/core/src/main/java/me/stringfromjava/funkin/init/InitScreen.java b/core/src/main/java/me/stringfromjava/funkin/init/InitScreen.java deleted file mode 100644 index 1f89de2..0000000 --- a/core/src/main/java/me/stringfromjava/funkin/init/InitScreen.java +++ /dev/null @@ -1,14 +0,0 @@ -package me.stringfromjava.funkin.init; - -import me.stringfromjava.flixelgdx.graphics.screen.FlixelScreen; -import me.stringfromjava.flixelgdx.Flixel; -import me.stringfromjava.funkin.menus.TitleScreen; - -public class InitScreen extends FlixelScreen { - - @Override - public void show() { - super.show(); - Flixel.setScreen(new TitleScreen()); - } -} diff --git a/lwjgl3/build.gradle b/lwjgl3/build.gradle index 9e4435f..3e513cd 100644 --- a/lwjgl3/build.gradle +++ b/lwjgl3/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'io.github.fourlastor.construo' import io.github.fourlastor.construo.Target sourceSets.main.resources.srcDirs += [ rootProject.file('assets').path ] -mainClassName = 'me.stringfromjava.funkin.lwjgl3.Lwjgl3Launcher' +mainClassName = 'me.stringdotjar.funkin.lwjgl3.Lwjgl3Launcher' application.setMainClass(mainClassName) eclipse.project.name = appName + '-lwjgl3' java.sourceCompatibility = 17 @@ -131,7 +131,7 @@ construo { architecture.set(Target.Architecture.AARCH64) jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.15_6.tar.gz") // macOS needs an identifier - identifier.set("me.stringfromjava.funkin." + appName) + identifier.set("me.stringdotjar.funkin." + appName) // Optional: icon for macOS, as an ICNS file macIcon.set(project.file("icons/logo.icns")) } @@ -139,7 +139,7 @@ construo { architecture.set(Target.Architecture.X86_64) jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_x64_mac_hotspot_17.0.15_6.tar.gz") // macOS needs an identifier - identifier.set("me.stringfromjava.funkin." + appName) + identifier.set("me.stringdotjar.funkin." + appName) // Optional: icon for macOS, as an ICNS file macIcon.set(project.file("icons/logo.icns")) } diff --git a/lwjgl3/src/main/java/me/stringfromjava/funkin/lwjgl3/Lwjgl3Launcher.java b/lwjgl3/src/main/java/me/stringdotjar/funkin/lwjgl3/Lwjgl3Launcher.java similarity index 92% rename from lwjgl3/src/main/java/me/stringfromjava/funkin/lwjgl3/Lwjgl3Launcher.java rename to lwjgl3/src/main/java/me/stringdotjar/funkin/lwjgl3/Lwjgl3Launcher.java index cef9ed3..6a84013 100644 --- a/lwjgl3/src/main/java/me/stringfromjava/funkin/lwjgl3/Lwjgl3Launcher.java +++ b/lwjgl3/src/main/java/me/stringdotjar/funkin/lwjgl3/Lwjgl3Launcher.java @@ -1,12 +1,12 @@ -package me.stringfromjava.funkin.lwjgl3; +package me.stringdotjar.funkin.lwjgl3; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3WindowAdapter; -import me.stringfromjava.flixelgdx.Flixel; -import me.stringfromjava.funkin.FunkinGame; -import me.stringfromjava.funkin.init.InitScreen; -import me.stringfromjava.funkin.util.FunkinConstants; +import me.stringdotjar.flixelgdx.Flixel; +import me.stringdotjar.funkin.FunkinGame; +import me.stringdotjar.funkin.init.InitScreen; +import me.stringdotjar.funkin.util.FunkinConstants; /** Launches the desktop (LWJGL3) application. */ public class Lwjgl3Launcher { diff --git a/lwjgl3/src/main/java/me/stringfromjava/funkin/lwjgl3/StartupHelper.java b/lwjgl3/src/main/java/me/stringdotjar/funkin/lwjgl3/StartupHelper.java similarity index 99% rename from lwjgl3/src/main/java/me/stringfromjava/funkin/lwjgl3/StartupHelper.java rename to lwjgl3/src/main/java/me/stringdotjar/funkin/lwjgl3/StartupHelper.java index 0a33663..b6ae7f1 100644 --- a/lwjgl3/src/main/java/me/stringfromjava/funkin/lwjgl3/StartupHelper.java +++ b/lwjgl3/src/main/java/me/stringdotjar/funkin/lwjgl3/StartupHelper.java @@ -13,7 +13,7 @@ * limitations under the License. */ // Note, the above license and copyright applies to this file only. -package me.stringfromjava.funkin.lwjgl3; +package me.stringdotjar.funkin.lwjgl3; import com.badlogic.gdx.Version; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3NativesLoader;