methods now are generated

Author: char-ptr

.gitignore

@@ -8,4 +8,6 @@ mc-mappings/output.txt
 crates/gen_src.rs
 crates/map-gen/test.ron
 crates/mc-mappings/mappings
-/mappings
+/mappings
+crates/mc-mappings/gen_src.rs
+crates/map-gen/lookup.ron

Cargo.lock

@@ -24,9 +24,9 @@ DYLD_INSERT_LIBRARIES=/Users/****/dev/mci/target/debug/libmci.dylib ./polymc
   - [x] set static fields
   - [x] call methods
   - [x] call static methods
-- [ ] general QOL
+- [x] general QOL
   - [x] jclass not operable with jobject (prevents you from shooting yourself)
-  - [ ] easier setting & getting via traits/macros (?)
+  - [x] easier setting & getting via traits/macros (?)
 - [ ] types
   - [x] jclass
   - [x] jobject
@@ -51,10 +51,10 @@ DYLD_INSERT_LIBRARIES=/Users/****/dev/mci/target/debug/libmci.dylib ./polymc
     - [x] call static methods
     - [x] set fields
     - [x] set static fields
-    - [ ] compilable 
+    - [x] compilable 
     - [ ] auto static detection (i)
  #### information
- 1. im currently working on a tool to get static fields and method names from a jar file.
+ i. i'll eventually work on a tool to get static fields and method names from a jar file.
  ### MCI (root)
  im not even working on it until mappings work lol
 

README.md

@@ -2,9 +2,10 @@ use std::{path::PathBuf, env, fs};
 
 fn main() {
 
-    println!("cargo:rerun-if-env-changed=JAVA_HOME");
     let mut jdk_location = PathBuf::from(std::env::var("JAVA_HOME").expect("JAVA_HOME not set"));
 
+    println!("cargo:rerun-if-changed={}",std::env::var("JAVA_HOME").unwrap());
+    
     if jdk_location.display().to_string().contains("homebrew") && !jdk_location.display().to_string().contains("Contents"){
         jdk_location = jdk_location.join("libexec/openjdk.jdk/Contents/Home");
         println!("cargo:rustc-link-search={}",jdk_location.join("lib/server").display());

crates/jdk-sys/build.rs

@@ -1,6 +1,7 @@
 use std::{ops::{Index, Deref, DerefMut}, default, marker::PhantomData};
 
 use crate::{unchecked_jnic, object::JObject, jvalue::JValue};
+use crate::object::JClassInstance;
 use super::env::Jenv;
 pub struct JArray<'a,T> {
     pub ptr : JObject<'a>,
@@ -34,4 +35,10 @@ impl<'a> JArray<'a,i32> {
             Vec::from_raw_parts(unchecked_jnic!(self.ptr.env.ptr,GetIntArrayElements, self.ptr.ptr, std::ptr::null_mut()), self.length, self.length)
         }
     }
+}
+
+impl<T> JClassInstance for JArray<'_,T> {
+    fn get_jobject(&self) -> JObject {
+        self.ptr.clone()
+    }
 }

crates/jni/src/jarray.rs

@@ -96,6 +96,11 @@ impl<'a> From<JObject<'a>> for JValue<'a> {
         Self::JObject(obj)
     }
 }
+impl<'a> From<&JObject<'a>> for JValue<'a> {
+    fn from(obj: &JObject<'a>) -> Self {
+        Self::JObject(obj.clone())
+    }
+}
 
 impl From<bool> for JValue<'_> {
     fn from(x: bool) -> Self {

crates/jni/src/jvalue.rs

@@ -15,4 +15,5 @@ pub mod prelude {
     pub use crate::jarray::JArray;
     pub use crate::jstring::JString;
     pub use crate::class::JClass;
+    pub use crate::object::JClassInstance;
 }

crates/jni/src/lib.rs

@@ -296,4 +296,12 @@ impl<'a,T> From<JArray<'a,T>> for JObject<'a> {
     fn from(x: JArray<'a,T>) -> Self {
         Self::from(&x.ptr)
     }
+}
+pub trait JClassInstance {
+    fn get_jobject(&self) -> JObject;
+}
+impl<'a> JClassInstance for JObject<'a> {
+    fn get_jobject(&self) -> JObject<'a> {
+        self.clone()
+    }
 }

crates/jni/src/object.rs

@@ -11,4 +11,5 @@ parking_lot = "0.12.1"
 walkdir = "2"
 proc-macro2 = "1.0.43"
 quote = "1.0.21"
-codegen = "0.2.0"
+codegen = "0.2.0"
+rand = "0.8.5"