IL2CPP V31

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
   "rust-analyzer.cargo.features": [
-    "unity2019",
+    "il2cpp_v31",
     "serde"
   ],
   "rust-analyzer.imports.granularity.group": "module"

Cargo.toml

@@ -21,9 +21,9 @@ tracing = { version = "0.1", features = [
     "std",
 ], default-features = false, optional = true }
 tracing-subscriber = { version = "0.3", default-features = false, optional = true }
-tracing-error = { version = "0.1", default-features = false, optional = true }
-paranoid-android = { version = "0.1.2", optional = true }
-thiserror = "1"
+tracing-error = { version = "0.2", default-features = false, optional = true }
+paranoid-android = { version = "0.2", optional = true }
+thiserror = "2"
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
 tracing-subscriber = { version = "0.3", features = [
@@ -34,7 +34,9 @@ tracing-subscriber = { version = "0.3", features = [
 
 [features]
 default = ["util", "cache"]
-unity2019 = ["libil2cpp/unity2019"]
+il2cpp_v31 = ["libil2cpp/il2cpp_v31"]
+il2cpp_v29 = ["libil2cpp/il2cpp_v29"]
+il2cpp_v24 = ["libil2cpp/il2cpp_v24"]
 unity2018 = ["libil2cpp/unity2018"]
 util = ["tracing", "tracing-error", "tracing-subscriber", "paranoid-android"]
 cache = ["libil2cpp/cache"]

inline_hook/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 cfg-if = "1"
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
-detour = "0.8"
+retour = "0.3"
 
 [build-dependencies]
 cc = "1"

inline_hook/src/detour.rs

@@ -1,6 +1,6 @@
 use std::sync::OnceLock;
 
-use detour::RawDetour;
+use retour::RawDetour;
 
 /// A function hook that works across most platforms
 #[derive(Debug)]
@@ -42,3 +42,9 @@ impl Hook {
         self.detour.get().map(|d| d.trampoline() as *const ())
     }
 }
+
+impl Default for Hook {
+    fn default() -> Self {
+        Self::new()
+    }
+}

inline_hook/src/lib.rs

@@ -1,4 +1,3 @@
-#![cfg_attr(not(target_os = "android"), feature(once_cell))]
 #![doc(html_root_url = "https://stackdoubleflow.github.io/quest-hook-rs/inline_hook")]
 #![warn(
     clippy::all,

libil2cpp/.gitignore

@@ -0,0 +1,3 @@
+extern/
+*.cmake
+bindings.rs

libil2cpp/Cargo.toml

@@ -11,8 +11,8 @@ edition = "2021"
 
 [dependencies]
 quest_hook_proc_macros = { path = "../proc_macros" }
-libloading = "0.7"
-thiserror = "1"
+libloading = "0.8"
+thiserror = "2"
 paste = "1"
 serde = { version = "1", optional = true }
 
@@ -24,7 +24,9 @@ optional = true
 
 [features]
 default = []
-unity2019 = []
+il2cpp_v31 = []
+il2cpp_v29 = []
+il2cpp_v24 = []
 unity2018 = []
 cache = []
 trace = ["tracing"]

libil2cpp/generate_bindings.ps1

@@ -0,0 +1,4 @@
+#!/bin/pwsh
+
+
+bindgen wrapper.h -o bindings.rs --wrap-unsafe-ops --sort-semantically

libil2cpp/qpm.json

@@ -0,0 +1,27 @@
+{
+  "version": "0.4.0",
+  "sharedDir": "shared",
+  "dependenciesDir": "extern",
+  "info": {
+    "name": "libil2cpp-rs",
+    "id": "libil2cpp-rs",
+    "version": "0.1.0",
+    "url": null,
+    "additionalData": {
+      "cmake": false
+    }
+  },
+  "workspace": {
+    "scripts": {},
+    "qmodIncludeDirs": [],
+    "qmodIncludeFiles": [],
+    "qmodOutput": null
+  },
+  "dependencies": [
+    {
+      "id": "libil2cpp",
+      "versionRange": "^0.4.0",
+      "additionalData": {}
+    }
+  ]
+}

libil2cpp/qpm.shared.json

@@ -0,0 +1,47 @@
+{
+  "config": {
+    "version": "0.4.0",
+    "sharedDir": "shared",
+    "dependenciesDir": "extern",
+    "info": {
+      "name": "libil2cpp-rs",
+      "id": "libil2cpp-rs",
+      "version": "0.1.0",
+      "url": null,
+      "additionalData": {
+        "cmake": false
+      }
+    },
+    "workspace": {
+      "scripts": {},
+      "qmodIncludeDirs": [],
+      "qmodIncludeFiles": [],
+      "qmodOutput": null
+    },
+    "dependencies": [
+      {
+        "id": "libil2cpp",
+        "versionRange": "^0.4.0",
+        "additionalData": {}
+      }
+    ]
+  },
+  "restoredDependencies": [
+    {
+      "dependency": {
+        "id": "libil2cpp",
+        "versionRange": "=0.4.0",
+        "additionalData": {
+          "headersOnly": true,
+          "compileOptions": {
+            "systemIncludes": [
+              "il2cpp/external/baselib/Include",
+              "il2cpp/external/baselib/Platforms/Android/Include"
+            ]
+          }
+        }
+      },
+      "version": "0.4.0"
+    }
+  ]
+}

libil2cpp/src/class.rs

@@ -8,7 +8,9 @@ use crate::{
     Return, Returned, ThisParameter, Type, WrapRaw,
 };
 
-#[cfg(feature = "unity2019")]
+#[cfg(feature = "il2cpp_v31")]
+type FieldInfoSlice<'a> = &'a [FieldInfo];
+#[cfg(feature = "il2cpp_v24")]
 type FieldInfoSlice<'a> = &'a [FieldInfo];
 #[cfg(feature = "unity2018")]
 type FieldInfoSlice<'a> = &'a [&'static FieldInfo];

libil2cpp/src/lib.rs

@@ -74,7 +74,7 @@
 
 //! Wrappers and raw bindings for Unity's libil2cpp
 
-#[cfg(not(any(feature = "unity2019", feature = "unity2018")))]
+#[cfg(not(any(feature = "il2cpp_v31", feature = "il2cpp_v29", feature = "il2cpp_v24", feature = "unity2018")))]
 compile_error!("No Unity version selected");
 
 #[cfg(feature = "trace")]
@@ -96,6 +96,12 @@ mod exception;
 mod field_info;
 mod method_info;
 mod object;
+
+#[cfg_attr(
+    any(feature = "unity2018", feature = "il2cpp_v24"),
+    path = "parameter_info.rs"
+)]
+#[cfg_attr(any(feature = "il2cpp_v31"), path = "parameter_info_stub.rs")]
 mod parameter_info;
 pub mod raw;
 mod string;
@@ -119,3 +125,5 @@ pub use typecheck::callee::{Parameter, Parameters, Return, ThisParameter};
 pub use typecheck::caller::{Argument, Arguments, Returned, ThisArgument};
 pub use typecheck::generic::Generics;
 pub use typecheck::ty::Type;
+
+pub type Result<'a, T> = std::result::Result<T, &'a mut Il2CppException>;

libil2cpp/src/method_info.rs

@@ -10,7 +10,9 @@ use crate::{
     Returned, ThisArgument, WrapRaw,
 };
 
-#[cfg(feature = "unity2019")]
+#[cfg(feature = "il2cpp_v31")]
+type ParameterInfoSlice<'a> = &'a [ParameterInfo];
+#[cfg(feature = "il2cpp_v24")]
 type ParameterInfoSlice<'a> = &'a [ParameterInfo];
 #[cfg(feature = "unity2018")]
 type ParameterInfoSlice<'a> = &'a [&'static ParameterInfo];

libil2cpp/src/parameter_info_stub.rs

@@ -0,0 +1,35 @@
+use std::fmt;
+
+use crate::{raw, Il2CppType, WrapRaw};
+
+/// Information about a C# parameter
+#[repr(transparent)]
+pub struct ParameterInfo(&'static Il2CppType);
+
+unsafe impl Send for ParameterInfo {}
+unsafe impl Sync for ParameterInfo {}
+
+impl ParameterInfo {
+    /// Type of the parameter
+    pub fn ty(&self) -> &Il2CppType {
+        self.0
+    }
+}
+
+impl fmt::Debug for ParameterInfo {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("ParameterInfo")
+            .field("ty", &self.ty())
+            .finish()
+    }
+}
+
+impl fmt::Display for ParameterInfo {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.ty())
+    }
+}
+
+unsafe impl WrapRaw for ParameterInfo {
+    type Raw = raw::Il2CppType;
+}

libil2cpp/src/raw/functions.rs

@@ -3,8 +3,8 @@
 use libloading::{Library, Symbol};
 use quest_hook_proc_macros::il2cpp_functions;
 use std::ffi::c_void;
-use std::sync::{LazyLock, OnceLock};
 use std::os::raw::c_char;
+use std::sync::{LazyLock, OnceLock};
 
 use super::{
     FieldInfo, Il2CppArray, Il2CppAssembly, Il2CppClass, Il2CppDomain, Il2CppException,

libil2cpp/src/raw/mod.rs

@@ -5,7 +5,9 @@
 
 mod functions;
 
-#[cfg_attr(feature = "unity2019", path = "types_2019.rs")]
+#[cfg_attr(feature = "il2cpp_v31", path = "types_v31.rs")]
+#[cfg_attr(feature = "il2cpp_v29", path = "types_v29.rs")]
+#[cfg_attr(feature = "il2cpp_v24", path = "types_v24.rs")]
 #[cfg_attr(feature = "unity2018", path = "types_2018.rs")]
 mod types;