Skip to content

Commit ad52ad9

Browse files
Update and fix build tasks
1 parent affac5e commit ad52ad9

File tree

7 files changed

+23
-30
lines changed

7 files changed

+23
-30
lines changed

.github/FUNDING.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# These are supported funding model platforms
2+
3+
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: # Replace with a single Patreon username
5+
open_collective: # Replace with a single Open Collective username
6+
ko_fi: stringfromjava
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
12+
polar: # Replace with a single Polar username
13+
buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
14+
thanks_dev: # Replace with a single thanks.dev username
15+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ www-test/
8888

8989

9090
## NetBeans:
91-
9291
/nbproject/private/
9392
/android/nbproject/private/
9493
/core/nbproject/private/
@@ -144,6 +143,9 @@ www-test/
144143
nbactions.xml
145144
nb-configuration.xml
146145

146+
# VS Code
147+
/.vscode
148+
147149
## OS-Specific:
148150
.DS_Store
149151
Thumbs.db

android/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ apply plugin: 'com.android.application'
99
apply plugin: 'kotlin-android'
1010

1111
android {
12-
namespace "me.stringfromjava.funkinjava"
12+
namespace "me.stringfromjava.funkin"
1313
compileSdk 35
1414
sourceSets {
1515
main {
@@ -31,15 +31,15 @@ android {
3131
}
3232
}
3333
defaultConfig {
34-
applicationId 'me.stringfromjava.funkinjava'
34+
applicationId 'me.stringfromjava.funkin'
3535
minSdkVersion 21
3636
targetSdkVersion 35
3737
versionCode 1
3838
versionName "1.0"
3939
}
4040
compileOptions {
41-
sourceCompatibility "21"
42-
targetCompatibility "21"
41+
sourceCompatibility "17"
42+
targetCompatibility "17"
4343
coreLibraryDesugaringEnabled true
4444
}
4545
buildTypes {
@@ -126,7 +126,7 @@ tasks.register('run', Exec) {
126126
}
127127

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

132132
eclipse.project.name = appName + "-android"

android/src/main/java/me/stringfromjava/funkinjava/android/AndroidLauncher.java renamed to android/src/main/java/me/stringfromjava/funkin/android/AndroidLauncher.java

File renamed without changes.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import me.stringfromjava.funkin.audio.FunkinSound;
77
import me.stringfromjava.funkin.backend.display.FunkinScreen;
88
import me.stringfromjava.funkin.lua.FunkinLua;
9-
import me.stringfromjava.funkin.tween.FunkinTween;
109
import me.stringfromjava.funkin.backend.system.FunkinSignal;
1110
import me.stringfromjava.funkin.backend.system.Paths;
1211

@@ -71,7 +70,6 @@ public static void initialize(FunkinGame gameInstance) {
7170
}
7271
game = gameInstance;
7372

74-
FunkinTween.registerAccessors();
7573
FunkinLua.initialize();
7674

7775
initialized = true;

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ public void create() {
2525
public void render() {
2626
super.render();
2727
Funkin.Signals.preRender.dispatch();
28-
29-
float delta = Gdx.graphics.getDeltaTime();
30-
FunkinTween.globalManager.update(delta);
31-
3228
Funkin.Signals.postRender.dispatch();
3329
}
3430

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,10 @@
11
package me.stringfromjava.funkin.tween;
22

3-
import aurelienribon.tweenengine.Tween;
4-
import aurelienribon.tweenengine.TweenManager;
5-
import com.badlogic.gdx.Gdx;
6-
import com.badlogic.gdx.graphics.g2d.Sprite;
7-
import me.stringfromjava.funkin.tween.accessors.SpriteAccessor;
8-
93
/**
104
* Core manager class for creating new tweens.
115
*/
126
public final class FunkinTween {
137

14-
/**
15-
* The global tween manager for the entire game.
16-
*/
17-
public static TweenManager globalManager = new TweenManager();
18-
19-
/**
20-
* Registers all tween accessors used in the game.
21-
*/
22-
public static void registerAccessors() {
23-
Tween.registerAccessor(Sprite.class, new SpriteAccessor());
24-
}
25-
268
private FunkinTween() {
279
}
2810
}

0 commit comments

Comments
 (0)