tirbofish/dropbear · commit

fd8da52e0edbc855f0fc92ca582659f65f27788f

feature: JVM now working after testing has been complete. HOORAY!!!. Happy new year to everyone. final commit for the year because i gotta spend time with family now :D looks like its ready to merge into main!

Thribhu K <4tkbytes@pm.me> · 2025-12-31 12:28

view full diff

diff --git a/build.gradle.kts b/build.gradle.kts
index 06a66f0..47daf77 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -42,7 +42,7 @@ val libPathProvider = provider {
 }
 
 kotlin {
-    jvm {}
+    jvm { }
 
     val nativeTarget = when {
         isMacOs && isArm64 -> macosArm64("nativeLib")
@@ -145,7 +145,7 @@ tasks.register<JavaCompile>("generateJniHeaders") {
         tasks.named("compileKotlinJvm"),
     )
 
-    source = fileTree("src/jvmMain/kotlin") {
+    source = fileTree("src/jvmMain/java") {
         include("**/*.java")
     }
 
diff --git a/eucalyptus-core/src/asset.rs b/eucalyptus-core/src/asset.rs
index 399baf5..fa00e93 100644
--- a/eucalyptus-core/src/asset.rs
+++ b/eucalyptus-core/src/asset.rs
@@ -33,7 +33,7 @@ pub mod jni {
     use crate::convert_ptr;
 
     #[unsafe(no_mangle)]
-    pub extern "system" fn Java_com_com_dropbear_asset_AssetHandleNative_isModelHandle(
+    pub fn Java_com_dropbear_asset_AssetHandleNative_isModelHandle(
         _env: JNIEnv,
         _class: JClass,
         asset_registry_ptr: jlong,
@@ -50,7 +50,7 @@ pub mod jni {
     }
 
     #[unsafe(no_mangle)]
-    pub extern "system" fn Java_com_com_dropbear_asset_AssetHandleNative_isTextureHandle(
+    pub fn Java_com_dropbear_asset_AssetHandleNative_isTextureHandle(
         _env: JNIEnv,
         _class: JClass,
         asset_registry_ptr: jlong,
diff --git a/eucalyptus-core/src/asset/texture.rs b/eucalyptus-core/src/asset/texture.rs
index 7e37fcc..0e30f30 100644
--- a/eucalyptus-core/src/asset/texture.rs
+++ b/eucalyptus-core/src/asset/texture.rs
@@ -25,7 +25,7 @@ pub mod jni {
     use crate::scripting::native::DropbearNativeError;

Large diffs are not rendered by default. Showing the first 50 of 2686 lines. Show full diff