Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
39 changes: 31 additions & 8 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
tools:ignore="UnusedAttribute"
android:theme="@style/GdxTheme">
<activity
android:name="me.stringfromjava.funkin.android.AndroidLauncher"
android:name="me.stringdotjar.funkin.android.AndroidLauncher"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|screenLayout"
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ apply plugin: 'com.android.application'


android {
namespace "me.stringfromjava.funkin"
namespace "me.stringdotjar.funkin"
compileSdk 36
sourceSets {
main {
Expand All @@ -30,7 +30,7 @@ android {
}
}
defaultConfig {
applicationId 'me.stringfromjava.funkin'
applicationId 'me.stringdotjar.funkin'
minSdkVersion 34
targetSdkVersion 35
versionCode 1
Expand Down Expand Up @@ -129,7 +129,7 @@ tasks.register('run', Exec) {
}

def adb = path + "/platform-tools/adb"
commandLine "$adb", 'shell', 'am', 'start', '-n', 'me.stringfromjava.funkin/me.stringfromjava.funkin.android.AndroidLauncher'
commandLine "$adb", 'shell', 'am', 'start', '-n', 'me.stringdotjar.funkin/me.stringdotjar.funkin.android.AndroidLauncher'
}

eclipse.project.name = appName + "-android"
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package me.stringfromjava.funkin.android;
package me.stringdotjar.funkin.android;

import android.os.Bundle;
import com.badlogic.gdx.backends.android.AndroidApplication;
import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
import me.stringfromjava.flixelgdx.FlixelGame;
import me.stringfromjava.funkin.FunkinGame;
import me.stringfromjava.funkin.init.InitScreen;
import me.stringfromjava.funkin.util.FunkinConstants;
import me.stringdotjar.funkin.FunkinGame;
import me.stringdotjar.funkin.init.InitScreen;
import me.stringdotjar.funkin.util.FunkinConstants;

/** Launches the Android application. */
public class AndroidLauncher extends AndroidApplication {
Expand Down
10 changes: 5 additions & 5 deletions assets/another_test.groovy
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.Input
import me.stringfromjava.flixelgdx.Flixel
import me.stringfromjava.flixelgdx.backend.FlixelPaths
import me.stringfromjava.flixelgdx.graphics.sprite.FlixelSprite
import me.stringfromjava.funkin.util.FunkinConstants
import me.stringfromjava.polyverse.script.type.Script
import me.stringdotjar.flixelgdx.Flixel
import me.stringdotjar.flixelgdx.backend.FlixelPaths
import me.stringdotjar.flixelgdx.graphics.sprite.FlixelSprite
import me.stringdotjar.funkin.util.FunkinConstants
import me.stringdotjar.polyverse.script.type.Script

class AnotherTestClass extends Script {

Expand Down
10 changes: 5 additions & 5 deletions assets/test.groovy
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.Input
import com.badlogic.gdx.graphics.Color
import me.stringfromjava.flixelgdx.Flixel
import me.stringfromjava.flixelgdx.graphics.screen.FlixelScreen
import me.stringfromjava.flixelgdx.backend.FlixelPaths
import me.stringfromjava.flixelgdx.graphics.sprite.FlixelSprite
import me.stringfromjava.polyverse.script.type.SystemScript
import me.stringdotjar.flixelgdx.Flixel
import me.stringdotjar.flixelgdx.graphics.screen.FlixelScreen
import me.stringdotjar.flixelgdx.backend.FlixelPaths
import me.stringdotjar.flixelgdx.graphics.sprite.FlixelSprite
import me.stringdotjar.polyverse.script.type.SystemScript

class TestScript extends SystemScript {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.stringfromjava.flixelgdx;
package me.stringdotjar.flixelgdx;

import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.assets.AssetManager;
Expand All @@ -8,13 +8,13 @@
import games.rednblack.miniaudio.MASound;
import games.rednblack.miniaudio.MiniAudio;
import games.rednblack.miniaudio.loader.MASoundLoader;
import me.stringfromjava.flixelgdx.graphics.screen.FlixelScreen;
import me.stringfromjava.flixelgdx.util.FlixelConstants;
import me.stringfromjava.flixelgdx.signal.FlixelSignal;
import me.stringfromjava.flixelgdx.signal.FlixelSignalData.MusicPlayedSignalData;
import me.stringfromjava.flixelgdx.signal.FlixelSignalData.RenderSignalData;
import me.stringfromjava.flixelgdx.signal.FlixelSignalData.ScreenSwitchSignalData;
import me.stringfromjava.flixelgdx.signal.FlixelSignalData.SoundPlayedSignalData;
import me.stringdotjar.flixelgdx.graphics.screen.FlixelScreen;
import me.stringdotjar.flixelgdx.util.FlixelConstants;
import me.stringdotjar.flixelgdx.signal.FlixelSignal;
import me.stringdotjar.flixelgdx.signal.FlixelSignalData.MusicPlayedSignalData;
import me.stringdotjar.flixelgdx.signal.FlixelSignalData.RenderSignalData;
import me.stringdotjar.flixelgdx.signal.FlixelSignalData.ScreenSwitchSignalData;
import me.stringdotjar.flixelgdx.signal.FlixelSignalData.SoundPlayedSignalData;
import org.jetbrains.annotations.NotNull;

import java.time.LocalDateTime;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.stringfromjava.flixelgdx;
package me.stringdotjar.flixelgdx;

import com.badlogic.gdx.Application;
import com.badlogic.gdx.ApplicationListener;
Expand All @@ -13,17 +13,17 @@
import com.badlogic.gdx.scenes.scene2d.Stage;
import com.badlogic.gdx.utils.ScreenUtils;
import com.badlogic.gdx.utils.viewport.FitViewport;
import me.stringfromjava.flixelgdx.graphics.screen.FlixelScreen;
import me.stringfromjava.flixelgdx.graphics.sprite.FlixelObject;
import me.stringfromjava.flixelgdx.graphics.sprite.FlixelSprite;
import me.stringfromjava.flixelgdx.tween.FlixelTween;
import me.stringfromjava.flixelgdx.util.FlixelConstants;
import me.stringfromjava.flixelgdx.util.FlixelRuntimeUtil;
import me.stringfromjava.funkin.util.FunkinConstants;
import me.stringfromjava.polyverse.Polyverse;
import me.stringfromjava.polyverse.script.type.Script;

import static me.stringfromjava.flixelgdx.signal.FlixelSignalData.RenderSignalData;
import me.stringdotjar.flixelgdx.graphics.screen.FlixelScreen;
import me.stringdotjar.flixelgdx.graphics.sprite.FlixelObject;
import me.stringdotjar.flixelgdx.graphics.sprite.FlixelSprite;
import me.stringdotjar.flixelgdx.tween.FlixelTween;
import me.stringdotjar.flixelgdx.util.FlixelConstants;
import me.stringdotjar.flixelgdx.util.FlixelRuntimeUtil;
import me.stringdotjar.funkin.util.FunkinConstants;
import me.stringdotjar.polyverse.Polyverse;
import me.stringdotjar.polyverse.script.type.Script;

import static me.stringdotjar.flixelgdx.signal.FlixelSignalData.RenderSignalData;

/**
* Flixel's enhanced game object used for containing the main loop and core elements of Flixel.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.stringfromjava.flixelgdx.backend;
package me.stringdotjar.flixelgdx.backend;

import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package me.stringfromjava.flixelgdx.graphics.screen;
package me.stringdotjar.flixelgdx.graphics.screen;

import com.badlogic.gdx.Screen;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.SnapshotArray;
import me.stringfromjava.flixelgdx.graphics.sprite.FlixelObject;
import me.stringdotjar.flixelgdx.graphics.sprite.FlixelObject;

/**
* Base class for creating a better screen display with more functionality than the default {@link
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.stringfromjava.flixelgdx.graphics.sprite;
package me.stringdotjar.flixelgdx.graphics.sprite;

import me.stringfromjava.flixelgdx.graphics.screen.FlixelScreen;
import me.stringdotjar.flixelgdx.graphics.screen.FlixelScreen;

/**
* An interface which allows any class that implements it to be added to a {@link
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.stringfromjava.flixelgdx.graphics.sprite;
package me.stringdotjar.flixelgdx.graphics.sprite;

import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Texture;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.stringfromjava.flixelgdx.graphics.text;
package me.stringdotjar.flixelgdx.graphics.text;

/** A display object for creating a piece of text to show on the screen. */
public class FlixelText {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.stringfromjava.flixelgdx.signal;
package me.stringdotjar.flixelgdx.signal;

import java.util.concurrent.CopyOnWriteArrayList;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package me.stringfromjava.flixelgdx.signal;
package me.stringdotjar.flixelgdx.signal;

import games.rednblack.miniaudio.MASound;
import me.stringfromjava.flixelgdx.graphics.screen.FlixelScreen;
import me.stringfromjava.flixelgdx.Flixel;
import me.stringdotjar.flixelgdx.graphics.screen.FlixelScreen;
import me.stringdotjar.flixelgdx.Flixel;

/**
* Convenience class for holding all signal data records used in the default signals stored in
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.stringfromjava.flixelgdx.tween;
package me.stringdotjar.flixelgdx.tween;

/** Class where all easer functions are stored, mostly used for tweening. */
public final class FlixelEase {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package me.stringfromjava.flixelgdx.tween;
package me.stringdotjar.flixelgdx.tween;

import com.badlogic.gdx.utils.Pool;
import me.stringfromjava.flixelgdx.Flixel;
import me.stringfromjava.flixelgdx.tween.settings.FlixelTweenSettings;
import me.stringfromjava.flixelgdx.util.FlixelConstants;
import me.stringfromjava.flixelgdx.util.FlixelReflectUtil;
import me.stringdotjar.flixelgdx.Flixel;
import me.stringdotjar.flixelgdx.tween.settings.FlixelTweenSettings;
import me.stringdotjar.flixelgdx.util.FlixelConstants;
import me.stringdotjar.flixelgdx.util.FlixelReflectUtil;
import org.jetbrains.annotations.NotNull;

import java.lang.reflect.Field;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.stringfromjava.flixelgdx.tween;
package me.stringdotjar.flixelgdx.tween;

import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Pool;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package me.stringfromjava.flixelgdx.tween.settings;
package me.stringdotjar.flixelgdx.tween.settings;

import me.stringfromjava.flixelgdx.tween.FlixelTween;
import me.stringfromjava.flixelgdx.tween.FlixelEase;
import me.stringdotjar.flixelgdx.tween.FlixelTween;
import me.stringdotjar.flixelgdx.tween.FlixelEase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.stringfromjava.flixelgdx.tween.settings;
package me.stringdotjar.flixelgdx.tween.settings;

/** Enum containing all different tween types that can determine */
public enum FlixelTweenType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.stringfromjava.flixelgdx.util;
package me.stringdotjar.flixelgdx.util;

/**
* Core class for holding static classes with values which do not change. It is NOT RECOMMENDED to
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.stringfromjava.flixelgdx.util;
package me.stringdotjar.flixelgdx.util;

import me.stringfromjava.flixelgdx.Flixel;
import me.stringdotjar.flixelgdx.Flixel;

import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
Expand Down Expand Up @@ -65,7 +65,7 @@ public static Field[] getAllFieldsAsArray(Class<?> 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.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
14 changes: 14 additions & 0 deletions core/src/main/java/me/stringdotjar/funkin/init/InitScreen.java
Original file line number Diff line number Diff line change
@@ -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());
}
}
Loading