Move things around a bit

Author: stringfromjava

assets/test.lua

@@ -1,7 +1,7 @@
 local Gdx = luajava.bindClass("com.badlogic.gdx.Gdx")
 local Input = luajava.bindClass("com.badlogic.gdx.Input")
 local Funkin = luajava.bindClass("me.stringfromjava.funkin.Funkin")
-local Paths = luajava.bindClass("me.stringfromjava.funkin.util.Paths")
+local Paths = luajava.bindClass("me.stringfromjava.funkin.backend.system.Paths")
 local Sprite = luajava.bindClass("com.badlogic.gdx.graphics.g2d.Sprite")
 local Texture = luajava.bindClass("com.badlogic.gdx.graphics.Texture")
 

core/build.gradle

@@ -9,7 +9,7 @@ dependencies {
   api "io.github.libktx:ktx-freetype:$ktxVersion"
   api "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
   api "org.mini2Dx:universal-tween-engine:$universalTweenVersion"
-  implementation 'org.luaj:luaj-jse:3.0.1'
+  implementation "org.luaj:luaj-jse:3.0.1"
 
   if(enableGraalNative == 'true') {
     implementation "io.github.berstanio:gdx-svmhelper-annotations:$graalHelperVersion"

core/src/main/java/me/stringfromjava/funkin/Funkin.java

@@ -7,8 +7,8 @@
 import me.stringfromjava.funkin.backend.display.FunkinScreen;
 import me.stringfromjava.funkin.lua.FunkinLua;
 import me.stringfromjava.funkin.tween.FunkinTween;
-import me.stringfromjava.funkin.util.FunkinSignal;
-import me.stringfromjava.funkin.util.Paths;
+import me.stringfromjava.funkin.backend.system.FunkinSignal;
+import me.stringfromjava.funkin.backend.system.Paths;
 
 import java.util.HashMap;
 import java.util.Map;

core/src/main/java/me/stringfromjava/funkin/FunkinGame.java

@@ -11,7 +11,7 @@
  * An enhanced version of libGDX's {@link Game} object.
  * <p>
  * If you want to change what happens to the pre and window
- * configurations, you might want to see {@link me.stringfromjava.funkin.lwjgl3.Lwjgl3Launcher} in the
+ * configurations, you might want to see {@code Lwjgl3Launcher} in the
  * {@code lwjgl3} folder.
  */
 public class FunkinGame extends Game {

core/src/main/java/me/stringfromjava/funkin/audio/FunkinSound.java

@@ -4,7 +4,7 @@
 import com.badlogic.gdx.audio.Sound;
 import com.badlogic.gdx.files.FileHandle;
 import me.stringfromjava.funkin.Funkin;
-import me.stringfromjava.funkin.util.Paths;
+import me.stringfromjava.funkin.backend.system.Paths;
 
 /**
  * An enhanced version of libGDX's {@link Sound}.

…ngfromjava/funkin/util/FunkinSignal.java …/funkin/backend/system/FunkinSignal.javacore/src/main/java/me/stringfromjava/funkin/util/FunkinSignal.java renamed to core/src/main/java/me/stringfromjava/funkin/backend/system/FunkinSignal.java core/src/main/java/me/stringfromjava/funkin/util/FunkinSignal.java renamed to core/src/main/java/me/stringfromjava/funkin/backend/system/FunkinSignal.java

@@ -1,4 +1,4 @@
-package me.stringfromjava.funkin.util;
+package me.stringfromjava.funkin.backend.system;
 
 import java.util.ArrayList;
 

…me/stringfromjava/funkin/util/Paths.java …romjava/funkin/backend/system/Paths.javacore/src/main/java/me/stringfromjava/funkin/util/Paths.java renamed to core/src/main/java/me/stringfromjava/funkin/backend/system/Paths.java core/src/main/java/me/stringfromjava/funkin/util/Paths.java renamed to core/src/main/java/me/stringfromjava/funkin/backend/system/Paths.java

@@ -1,4 +1,4 @@
-package me.stringfromjava.funkin.util;
+package me.stringfromjava.funkin.backend.system;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;

core/src/main/java/me/stringfromjava/funkin/game/InitScreen.java

@@ -9,12 +9,7 @@ public class InitScreen extends FunkinScreen {
     @Override
     public void show() {
         super.show();
-        System.out.println("setup complete");
-        Funkin.setScreen(new TitleScreen());
-    }
 
-    @Override
-    public void render(float delta) {
-        super.render(delta);
+        Funkin.setScreen(new TitleScreen());
     }
 }

lwjgl3/build.gradle

@@ -38,8 +38,7 @@ dependencies {
 
   if(enableGraalNative == 'true') {
     implementation "io.github.berstanio:gdx-svmhelper-backend-lwjgl3:$graalHelperVersion"
-
-    }
+  }
 }
 
 def os = System.properties['os.name'].toLowerCase()

lwjgl3/src/main/java/me/stringfromjava/funkin/lwjgl3/Lwjgl3Launcher.java

@@ -21,25 +21,25 @@ public static void main(String[] args) {
     private static Lwjgl3Application createApplication() {
         FunkinGame game = new FunkinGame();
         Funkin.initialize(game); // This is VERY important to do before creating the application!
-        return new Lwjgl3Application(game, getDefaultConfiguration());
+        return new Lwjgl3Application(game, createWindowConfiguration());
     }
 
-    private static Lwjgl3ApplicationConfiguration getDefaultConfiguration() {
+    private static Lwjgl3ApplicationConfiguration createWindowConfiguration() {
         Lwjgl3ApplicationConfiguration configuration = new Lwjgl3ApplicationConfiguration();
         configuration.setTitle("Friday Night Funkin': Java Edition");
-        //// Vsync limits the frames per second to what your hardware can display, and helps eliminate
-        //// screen tearing. This setting doesn't always work on Linux, so the line after is a safeguard.
+        // Vsync limits the frames per second to what your hardware can display, and helps eliminate
+        // screen tearing. This setting doesn't always work on Linux, so the line after is a safeguard.
         configuration.useVsync(true);
-        //// Limits FPS to the refresh rate of the currently active monitor, plus 1 to try to match fractional
-        //// refresh rates. The Vsync setting above should limit the actual FPS to match the monitor.
+        // Limits FPS to the refresh rate of the currently active monitor, plus 1 to try to match fractional
+        // refresh rates. The Vsync setting above should limit the actual FPS to match the monitor.
         configuration.setForegroundFPS(Lwjgl3ApplicationConfiguration.getDisplayMode().refreshRate + 1);
-        //// If you remove the above line and set Vsync to false, you can get unlimited FPS, which can be
-        //// useful for testing performance, but can also be very stressful to some hardware.
-        //// You may also need to configure GPU drivers to fully disable Vsync; this can cause screen tearing.
+        // If you remove the above line and set Vsync to false, you can get unlimited FPS, which can be
+        // useful for testing performance, but can also be very stressful to some hardware.
+        // You may also need to configure GPU drivers to fully disable Vsync; this can cause screen tearing.
 
         configuration.setWindowedMode(Constants.Display.WINDOW_WIDTH, Constants.Display.WINDOW_HEIGHT);
-        //// You can change these files; they are in lwjgl3/src/main/resources/ .
-        //// They can also be loaded from the root of assets/ .
+        // You can change these files; they are in lwjgl3/src/main/resources/ .
+        // They can also be loaded from the root of assets/ .
         configuration.setWindowIcon("icon128.png", "icon64.png", "icon32.png", "icon16.png");
         return configuration;
     }