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
9 changes: 6 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ apply plugin: 'com.android.application'

android {
namespace "me.stringfromjava.funkin"
compileSdk 35
compileSdk 36
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
Expand All @@ -31,7 +31,7 @@ android {
}
defaultConfig {
applicationId 'me.stringfromjava.funkin'
minSdkVersion 26
minSdkVersion 34
targetSdkVersion 35
versionCode 1
versionName "1.0"
Expand Down Expand Up @@ -65,6 +65,10 @@ dependencies {
implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
implementation project(':core')

api "games.rednblack.miniaudio:gdx-miniaudio-platform:$miniaudioVersion:natives-armeabi-v7a"
api "games.rednblack.miniaudio:gdx-miniaudio-platform:$miniaudioVersion:natives-arm64-v8a"
api "games.rednblack.miniaudio:gdx-miniaudio-platform:$miniaudioVersion:natives-x86"
api "games.rednblack.miniaudio:gdx-miniaudio-platform:$miniaudioVersion:natives-x86_64"
natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a"
natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a"
natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86"
Expand All @@ -73,7 +77,6 @@ dependencies {
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"

}

// Called every time gradle gets executed, takes the native dependencies of
Expand Down
7 changes: 3 additions & 4 deletions assets/another_test.groovy
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.Input
import com.badlogic.gdx.graphics.Texture
import com.badlogic.gdx.graphics.g2d.Sprite
import me.stringfromjava.funkin.Funkin
import me.stringfromjava.funkin.backend.system.Paths
import me.stringfromjava.funkin.backend.Paths
import me.stringfromjava.funkin.graphics.sprite.FunkinSprite
import me.stringfromjava.funkin.polyverse.script.type.Script
import me.stringfromjava.funkin.util.Constants

Expand All @@ -27,7 +26,7 @@ class AnotherTestClass extends Script {
super.onRender(delta)

if (Gdx.input.isKeyJustPressed(Input.Keys.SPACE)) {
var sprite = new Sprite(new Texture(Paths.image("pauseAlt/bfLol")))
var sprite = new FunkinSprite().loadGraphic(Paths.sharedImageAsset("pauseAlt/bfLol"))
var randomPosX = new Random().nextInt(Constants.Display.WINDOW_WIDTH)
var randomPosY = new Random().nextInt(Constants.Display.WINDOW_HEIGHT)

Expand Down
12 changes: 6 additions & 6 deletions assets/test.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import com.badlogic.gdx.Gdx
import com.badlogic.gdx.Input
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.Texture
import com.badlogic.gdx.graphics.g2d.Sprite
import me.stringfromjava.funkin.Funkin
import me.stringfromjava.funkin.backend.display.FunkinScreen
import me.stringfromjava.funkin.backend.system.Paths
import me.stringfromjava.funkin.graphics.screen.FunkinScreen
import me.stringfromjava.funkin.backend.Paths
import me.stringfromjava.funkin.graphics.sprite.FunkinSprite
import me.stringfromjava.funkin.polyverse.script.type.SystemScript

class TestScript extends SystemScript {
Expand Down Expand Up @@ -38,18 +38,18 @@ class TestScript extends SystemScript {

class TestScreen extends FunkinScreen {

private Sprite test
private FunkinSprite test

@Override
void show() {
super.show()

test = new Sprite(new Texture(Paths.image('NOTE_hold_assets')))
test = new FunkinSprite().loadGraphic(Paths.sharedImageAsset('NOTE_hold_assets'))
add(test)

bgColor = new Color(0, 1, 0, 1)

Funkin.playMusic('songs/guns/Inst.ogg')
Funkin.playMusic('songs/darnell/Inst.ogg')
}

@Override
Expand Down
1 change: 1 addition & 0 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies {
api "com.github.tommyettinger:anim8-gdx:$anim8Version"
api "com.github.tommyettinger:libgdx-utils:$utilsVersion"
api "io.github.libktx:ktx-freetype:$ktxVersion"
api "games.rednblack.miniaudio:miniaudio:$miniaudioVersion"

// FNF:JE.
implementation "org.apache.groovy:groovy:4.0.12"
Expand Down
Loading