Updating, cleaning, Cordl fixes

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "inline_hook/beatsaber-hook"]
 	path = inline_hook/beatsaber-hook
-	url = https://github.com/sc2ad/beatsaber-hook
+	url = https://github.com/QuestPackageManager/beatsaber-hook.git

.vscode/settings.json

@@ -1,7 +1,10 @@
 {
   "rust-analyzer.cargo.features": [
-    "unity2019",
-    "serde"
+    "il2cpp_v31",
+    "serde",
+    "util",
+    "cache",
+    "trace"
   ],
   "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/build.rs

@@ -2,11 +2,11 @@ fn main() {
     let target = std::env::var("TARGET").unwrap();
     if target == "aarch64-linux-android" {
         cc::Build::new()
-            .file("beatsaber-hook/src/inline-hook/And64InlineHook.cpp")
+            .file("beatsaber-hook/shared/inline-hook/And64InlineHook.cpp")
             .compile("inline_hook");
     } else if target == "armv7-linux-androideabi" {
         cc::Build::new()
-            .file("beatsaber-hook/src/inline-hook/inlineHook.c")
+            .file("beatsaber-hook/shared/inline-hook/inlineHook.c")
             .include("beatsaber-hook/shared/inline-hook")
             .compile("inline_hook");
     }

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,12 @@ optional = true
 
 [features]
 default = []
-unity2019 = []
+il2cpp_v31 = []
+il2cpp_v29 = []
+il2cpp_v24 = []
 unity2018 = []
 cache = []
 trace = ["tracing"]
+
+[build-dependencies]
+bindgen = "0.71.1"