Skip to content

Commit fbf802a

Browse files
Remove Lua
1 parent 79e101d commit fbf802a

File tree

15 files changed

+21
-348
lines changed

15 files changed

+21
-348
lines changed

assets/exclude/data/credits.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,5 @@
302302

303303
]
304304
}
305-
306305
]
307306
}

assets/new_screen.lua

Lines changed: 0 additions & 27 deletions
This file was deleted.

assets/preload/scripts/luax_api.lua

Lines changed: 0 additions & 86 deletions
This file was deleted.

assets/test.lua

Lines changed: 0 additions & 56 deletions
This file was deleted.

core/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
eclipse.project.name = appName + '-core'
33

44
dependencies {
5+
// libGDX.
56
api "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
67
api "com.badlogicgames.gdx:gdx:$gdxVersion"
78
api "com.github.tommyettinger:anim8-gdx:$anim8Version"
89
api "com.github.tommyettinger:libgdx-utils:$utilsVersion"
910
api "io.github.libktx:ktx-freetype:$ktxVersion"
10-
api "org.mini2Dx:universal-tween-engine:$universalTweenVersion"
1111

12-
implementation "org.luaj:luaj-jse:3.0.1"
13-
implementation 'org.jetbrains:annotations:15.0'
12+
// FNF:JE.
13+
implementation "org.apache.groovy:groovy:4.0.12"
14+
implementation "org.jetbrains:annotations:15.0"
1415

1516
if(enableGraalNative == 'true') {
1617
implementation "io.github.berstanio:gdx-svmhelper-annotations:$graalHelperVersion"

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import com.badlogic.gdx.audio.Sound;
66
import me.stringfromjava.funkin.audio.FunkinSound;
77
import me.stringfromjava.funkin.backend.display.FunkinScreen;
8-
import me.stringfromjava.funkin.luax.Luax;
9-
import me.stringfromjava.funkin.tween.FunkinTween;
108
import me.stringfromjava.funkin.backend.system.FunkinSignal;
119
import me.stringfromjava.funkin.backend.system.Paths;
1210
import java.util.HashMap;
@@ -65,7 +63,6 @@ public static void initialize(FunkinGame gameInstance) {
6563
throw new IllegalStateException("FNF:JE has already been initialized!");
6664
}
6765
game = gameInstance;
68-
Luax.initialize();
6966
initialized = true;
7067
}
7168

@@ -179,9 +176,7 @@ public static class Signals {
179176
public static final FunkinSignal<SoundPlayedSignalData> postSoundPlayed = new FunkinSignal<>();
180177

181178
public record RenderSignalData(float delta) {}
182-
183179
public record ScreenSwitchSignalData(FunkinScreen screen) {}
184-
185180
public record SoundPlayedSignalData(FunkinSound sound) {}
186181

187182
private Signals() {}

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
import com.badlogic.gdx.Gdx;
55
import com.badlogic.gdx.audio.Sound;
66
import me.stringfromjava.funkin.game.InitScreen;
7-
import me.stringfromjava.funkin.luax.Luax;
8-
import me.stringfromjava.funkin.tween.FunkinTween;
7+
8+
import java.util.Set;
9+
10+
import static me.stringfromjava.funkin.Funkin.Signals.RenderSignalData;
911

1012
/**
1113
* An enhanced version of libGDX's {@link Game} object.
@@ -45,11 +47,13 @@ public void pause() {
4547
@Override
4648
public void dispose() {
4749
Funkin.Signals.preGameClose.dispatch();
50+
4851
// Dispose of all sounds and the music (if there is any playing).
4952
if (Funkin.music != null) {
5053
Funkin.music.stop();
5154
Funkin.music.dispose();
5255
}
56+
5357
Set<Long> soundPoolKeys = Funkin.soundPool.keySet();
5458
for (long key : soundPoolKeys) {
5559
Sound sound = Funkin.soundPool.get(key);
@@ -59,6 +63,7 @@ public void dispose() {
5963
sound.stop();
6064
sound.dispose();
6165
}
66+
6267
Funkin.Signals.postGameClose.dispatch();
6368
}
6469
}
Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,18 @@
11
package me.stringfromjava.funkin.backend;
22

3-
import java.lang.reflect.Method;
43
import java.lang.reflect.Modifier;
54

65
public class Reflect {
76

8-
public static Object invokeBaseMethod(Object instance, String methodName, Object[] args) throws Exception {
9-
Class<?> baseClass = instance.getClass().getSuperclass();
10-
11-
for (Method m : baseClass.getMethods()) {
12-
if (m.getName().equals(methodName)) {
13-
m.setAccessible(true);
14-
return m.invoke(instance, args);
15-
}
16-
}
17-
throw new NoSuchMethodException("Method " + methodName + " not found on base class " + baseClass.getName());
18-
}
19-
20-
public static boolean isClassFinal(String classPath) {
21-
try {
22-
Class<?> clazz = Class.forName(classPath);
23-
// Uses the java.lang.reflect.Modifier utility
24-
return Modifier.isFinal(clazz.getModifiers());
25-
} catch (ClassNotFoundException e) {
26-
// Treat non-existent class as non-final for safe binding,
27-
// though the user will hit an error later.
28-
return false;
29-
}
7+
public static boolean isClassFinal(String classPath) {
8+
try {
9+
Class<?> clazz = Class.forName(classPath);
10+
// Uses the java.lang.reflect.Modifier utility
11+
return Modifier.isFinal(clazz.getModifiers());
12+
} catch (ClassNotFoundException e) {
13+
// Treat non-existent class as non-final for safe binding,
14+
// though the user will hit an error later.
15+
return false;
3016
}
17+
}
3118
}

core/src/main/java/me/stringfromjava/funkin/game/menus/TitleScreen.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import me.stringfromjava.funkin.Funkin;
77
import me.stringfromjava.funkin.audio.FunkinSound;
88
import me.stringfromjava.funkin.backend.display.FunkinScreen;
9-
import me.stringfromjava.funkin.luax.Luax;
109

1110
public class TitleScreen extends FunkinScreen {
1211

@@ -24,10 +23,6 @@ public void show() {
2423
public void render(float delta) {
2524
super.render(delta);
2625

27-
if (Gdx.input.isKeyJustPressed(Input.Keys.SPACE)) {
28-
FunkinLua.executeScript("test.lua");
29-
}
30-
3126
if (Gdx.input.isKeyJustPressed(Input.Keys.R)) {
3227
System.out.println(tickleFight.isPaused());
3328
if (tickleFight.isPaused()) {

core/src/main/java/me/stringfromjava/funkin/luax/Luax.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)