From 65192892f0ed829b8a228eabba44a4f3ba0f7268 Mon Sep 17 00:00:00 2001
From: Meta Vens <rwvens@hotmail.com>
Date: Fri, 4 Sep 2026 04:23:05 +0200
Subject: [PATCH] Consume the core stack from CultLib instead of forking it

CultCache and CultNet were submodules on two more branches of the retiring
standalone repos. The CultCache fork held nothing CultLib lacks. The CultNet
fork held the pre-migration RuntimePresenceCorrelation as an enum where CultLib
has a struct, but the connector never referenced that type -- it came along with
the vendored library rather than being used -- so the migration costs nothing
here. Builds and its 35 tests pass against the pinned revision with no code
changes.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .gitmodules         | 6 ------
 Cargo.lock          | 3 +++
 Cargo.toml          | 4 ++--
 vendor/cultcache-rs | 1 -
 vendor/cultnet-rs   | 1 -
 5 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 vendor/cultcache-rs
 delete mode 160000 vendor/cultnet-rs

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index a831628..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "vendor/cultnet-rs"]
-	path = vendor/cultnet-rs
-	url = https://github.com/GameCult/cultnet-rs.git
-[submodule "vendor/cultcache-rs"]
-	path = vendor/cultcache-rs
-	url = https://github.com/GameCult/cultcache-rs.git
diff --git a/Cargo.lock b/Cargo.lock
index 0adc2e0..100cc6c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -203,6 +203,7 @@ dependencies = [
 [[package]]
 name = "cultcache-rs"
 version = "0.1.0"
+source = "git+https://github.com/GameCult/CultLib.git?rev=e171eca32329baa928f4a1d810401a8b4c857029#e171eca32329baa928f4a1d810401a8b4c857029"
 dependencies = [
  "anyhow",
  "chrono",
@@ -220,6 +221,7 @@ dependencies = [
 [[package]]
 name = "cultcache-rs-derive"
 version = "0.1.0"
+source = "git+https://github.com/GameCult/CultLib.git?rev=e171eca32329baa928f4a1d810401a8b4c857029#e171eca32329baa928f4a1d810401a8b4c857029"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,6 +231,7 @@ dependencies = [
 [[package]]
 name = "cultnet-rs"
 version = "0.1.0"
+source = "git+https://github.com/GameCult/CultLib.git?rev=e171eca32329baa928f4a1d810401a8b4c857029#e171eca32329baa928f4a1d810401a8b4c857029"
 dependencies = [
  "aes-gcm",
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index 05dcb96..e4087ba 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,8 +33,8 @@ aes-gcm = "0.10"
 anyhow = { version = "1", optional = true }
 base64 = "0.23"
 chrono = { version = "0.4", features = ["serde"], optional = true }
-cultcache-rs = { path = "vendor/cultcache-rs", optional = true }
-cultnet-rs = { path = "vendor/cultnet-rs", optional = true }
+cultcache-rs = { git = "https://github.com/GameCult/CultLib.git", rev = "e171eca32329baa928f4a1d810401a8b4c857029", package = "cultcache-rs", optional = true }
+cultnet-rs = { git = "https://github.com/GameCult/CultLib.git", rev = "e171eca32329baa928f4a1d810401a8b4c857029", package = "cultnet-rs", optional = true }
 fs2 = { version = "0.4", optional = true }
 libc = { version = "0.2", optional = true }
 rand_core = { version = "0.6", features = ["getrandom"] }
diff --git a/vendor/cultcache-rs b/vendor/cultcache-rs
deleted file mode 160000
index 73b2555..0000000
--- a/vendor/cultcache-rs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 73b2555bbcd5f05f091d2cf17fcb86ac30695cae
diff --git a/vendor/cultnet-rs b/vendor/cultnet-rs
deleted file mode 160000
index 9dcb88d..0000000
--- a/vendor/cultnet-rs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9dcb88df1361b157a48502f43093fe7a25ca22b7