From 6084156f6c61d50d5e4860cd578a46a67aa79058 Mon Sep 17 00:00:00 2001
From: mithral <mithral@mithraic.cloud>
Date: Fri, 21 Aug 2026 13:00:03 -0400
Subject: [PATCH] =?UTF-8?q?fix:=20resolve=20loader=20incompatibilities=20?=
 =?UTF-8?q?=E2=80=94=20structure=5Fpool=5Fapi/lithostitched=20to=20both,?=
 =?UTF-8?q?=20add=20unionlib=20for=20tiered,=20replace=20switchy-puffish-s?=
 =?UTF-8?q?kills=20with=20switchy-skills-compat=20for=20Switchy=203.7.1,?=
 =?UTF-8?q?=20downgrade=20c2me=200.4.0=E2=86=920.3.0=20for=20Java=2021,=20?=
 =?UTF-8?q?update=20compose=20to=20v0.4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client_pack/index.toml                            | 15 ++++++++++-----
 client_pack/mods/c2me-fabric.pw.toml              |  8 ++++----
 client_pack/mods/lithostitched.pw.toml            |  2 +-
 client_pack/mods/structure-pool-api.pw.toml       |  2 +-
 client_pack/mods/switchy-puffish-skills.pw.toml   | 13 -------------
 .../mods/switchy-skills-compatibility.pw.toml     | 13 +++++++++++++
 client_pack/mods/unionlib.pw.toml                 | 13 +++++++++++++
 client_pack/pack.toml                             |  2 +-
 docker-compose.yml                                |  4 ++--
 server_pack/index.toml                            | 15 ++++++++++-----
 server_pack/mods/c2me-fabric.pw.toml              |  8 ++++----
 server_pack/mods/lithostitched.pw.toml            |  2 +-
 server_pack/mods/structure-pool-api.pw.toml       |  2 +-
 server_pack/mods/switchy-puffish-skills.pw.toml   | 13 -------------
 .../mods/switchy-skills-compatibility.pw.toml     | 13 +++++++++++++
 server_pack/mods/unionlib.pw.toml                 | 13 +++++++++++++
 server_pack/pack.toml                             |  2 +-
 17 files changed, 88 insertions(+), 52 deletions(-)
 delete mode 100644 client_pack/mods/switchy-puffish-skills.pw.toml
 create mode 100644 client_pack/mods/switchy-skills-compatibility.pw.toml
 create mode 100644 client_pack/mods/unionlib.pw.toml
 delete mode 100644 server_pack/mods/switchy-puffish-skills.pw.toml
 create mode 100644 server_pack/mods/switchy-skills-compatibility.pw.toml
 create mode 100644 server_pack/mods/unionlib.pw.toml

diff --git a/client_pack/index.toml b/client_pack/index.toml
index aa01bef..ecda4b3 100644
--- a/client_pack/index.toml
+++ b/client_pack/index.toml
@@ -149,7 +149,7 @@ metafile = true
 
 [[files]]
 file = "mods/c2me-fabric.pw.toml"
-hash = "7156f5d99da2d54756765c890951245aa39cbf52bae92fddfdb66e1a606d7b24"
+hash = "c6341b1444c78777ea4baf694acf8bf0f30efaa37bb7b502101224a328221b8f"
 metafile = true
 
 [[files]]
@@ -454,7 +454,7 @@ metafile = true
 
 [[files]]
 file = "mods/lithostitched.pw.toml"
-hash = "c7af5bfc6d87f6d4041b7e116b3296c90ec136e611d07cf584bb7a20a0fd09a3"
+hash = "1214190903d0b7f92eedb4979feda67640ad6e6cde8a1731c11808895700a0a8"
 metafile = true
 
 [[files]]
@@ -814,7 +814,7 @@ metafile = true
 
 [[files]]
 file = "mods/structure-pool-api.pw.toml"
-hash = "b35dc0035b4a1554f912fa5c26609a29e17f00886ffa8812b997f97a5b777ff5"
+hash = "919153a4c85c7b33c97ac722d95b001c34903368880b144388c6d20cb77c19dc"
 metafile = true
 
 [[files]]
@@ -833,8 +833,8 @@ hash = "13848a9eb3c5fd091b52f78cfae4ace2c3cd0cb32a76d6f61c12435f47d82ed1"
 metafile = true
 
 [[files]]
-file = "mods/switchy-puffish-skills.pw.toml"
-hash = "eb50bfaf25bd340a7f708ba633b450ad269bb75ebcbfe0254cd9b033dea1c50f"
+file = "mods/switchy-skills-compatibility.pw.toml"
+hash = "e361dcfab7b880aabcd88bd2fa6ed0ba2d2aadb8edf509cb3f4ec3f193d7d630"
 metafile = true
 
 [[files]]
@@ -872,6 +872,11 @@ file = "mods/trinkets.pw.toml"
 hash = "860812150cb54f0d9ee1bce7b72798b6cc5f752bb05709f0c60231d054ec281d"
 metafile = true
 
+[[files]]
+file = "mods/unionlib.pw.toml"
+hash = "13d819170b259def0a0aa10154ef85d041e50ab623da22d125c99a0cbe68a14c"
+metafile = true
+
 [[files]]
 file = "mods/universal-sawmill.pw.toml"
 hash = "8bbf31653067adfa63b505ad48585db61cbded91f4c23d0a068cb5dcb6782618"
diff --git a/client_pack/mods/c2me-fabric.pw.toml b/client_pack/mods/c2me-fabric.pw.toml
index 61a7601..4b54619 100644
--- a/client_pack/mods/c2me-fabric.pw.toml
+++ b/client_pack/mods/c2me-fabric.pw.toml
@@ -1,13 +1,13 @@
 name = "c2me-fabric"
-filename = "c2me-fabric-mc1.21.1-0.4.0-alpha.0.27.jar"
+filename = "c2me-fabric-mc1.21.1-0.3.0+alpha.0.364.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/VSNURh3q/versions/gRm1ZAvc/c2me-fabric-mc1.21.1-0.4.0-alpha.0.27.jar"
+url = "https://cdn.modrinth.com/data/VSNURh3q/versions/DSqOVCaF/c2me-fabric-mc1.21.1-0.3.0%2Balpha.0.364.jar"
 hash-format = "sha512"
-hash = "8ecfb2cc5daff31d0ccf30021c31ac31ca845ad7c9eaa1a436f106279e00b79d5d75a325ebf9f9373ef0199864f073e6315a6b9f0d5a51332c906a81c50dcb9e"
+hash = "8653a751eb2ad1ad70da38017ccad0ee2bda5448ffe405d28049f09a61936765303f63ba4fcff798f32bb1e6b4645e892c275515b69c98c1730e24caab0ba7e0"
 
 [update]
 [update.modrinth]
 mod-id = "VSNURh3q"
-version = "gRm1ZAvc"
+version = "DSqOVCaF"
diff --git a/client_pack/mods/lithostitched.pw.toml b/client_pack/mods/lithostitched.pw.toml
index 53a8294..a3edbae 100644
--- a/client_pack/mods/lithostitched.pw.toml
+++ b/client_pack/mods/lithostitched.pw.toml
@@ -1,6 +1,6 @@
 name = "Lithostitched"
 filename = "lithostitched-1.8.0+beta5-fabric-21.1.jar"
-side = "server"
+side = "both"
 
 [download]
 url = "https://cdn.modrinth.com/data/XaDC71GB/versions/vPyJwd70/lithostitched-1.8.0%2Bbeta5-fabric-21.1.jar"
diff --git a/client_pack/mods/structure-pool-api.pw.toml b/client_pack/mods/structure-pool-api.pw.toml
index 0dba247..27a5350 100644
--- a/client_pack/mods/structure-pool-api.pw.toml
+++ b/client_pack/mods/structure-pool-api.pw.toml
@@ -1,6 +1,6 @@
 name = "Structure Pool API"
 filename = "structure_pool_api-fabric-1.2.1+1.21.1.jar"
-side = "server"
+side = "both"
 
 [download]
 url = "https://cdn.modrinth.com/data/LrYZi08Q/versions/Y6aBoKEl/structure_pool_api-fabric-1.2.1%2B1.21.1.jar"
diff --git a/client_pack/mods/switchy-puffish-skills.pw.toml b/client_pack/mods/switchy-puffish-skills.pw.toml
deleted file mode 100644
index dd6092a..0000000
--- a/client_pack/mods/switchy-puffish-skills.pw.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-name = "Switchy Pufferfish Skills"
-filename = "switchy-puffish-skills-1.0+1.21.1.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/gGcH2H1x/versions/iAebDLY0/switchy-puffish-skills-1.0%2B1.21.1.jar"
-hash-format = "sha512"
-hash = "082974191adf7b8608754eb141051eb1de8c98e89c63ae1c017bf7c3a174e1c0cee0c6bef8efa7e702a5eb4fd3dfe2eb7b0c296a8e62b36fc8ba3a7d0e21e1bd"
-
-[update]
-[update.modrinth]
-mod-id = "gGcH2H1x"
-version = "iAebDLY0"
diff --git a/client_pack/mods/switchy-skills-compatibility.pw.toml b/client_pack/mods/switchy-skills-compatibility.pw.toml
new file mode 100644
index 0000000..b21218d
--- /dev/null
+++ b/client_pack/mods/switchy-skills-compatibility.pw.toml
@@ -0,0 +1,13 @@
+name = "switchy-skills-compatibility"
+filename = "switchy_skills_compat-1.0.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/QGgCWxoj/versions/42l4OzlC/switchy_skills_compat-1.0.jar"
+hash-format = "sha512"
+hash = "a267064cf14e5df41941fdde4984ecff24e474cb0dcd1e379854e6bc268f3e2f5571e8e58ee64e2ef8c01e688fd789add08340e8138073a6ef16f8c440b7f946"
+
+[update]
+[update.modrinth]
+mod-id = "QGgCWxoj"
+version = "42l4OzlC"
diff --git a/client_pack/mods/unionlib.pw.toml b/client_pack/mods/unionlib.pw.toml
new file mode 100644
index 0000000..61c2a8a
--- /dev/null
+++ b/client_pack/mods/unionlib.pw.toml
@@ -0,0 +1,13 @@
+name = "unionlib"
+filename = "UnionLib-1.21.1-13.0-Fabric.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/EkkPwdCY/versions/BNJaVOT0/UnionLib-1.21.1-13.0-Fabric.jar"
+hash-format = "sha512"
+hash = "4f66c257d6e186c599b6e80657a50ea01e543ba71dab933e1a530591fa68b036392a0a66a778a5efaed764e77497503448d52f883cbaa6c8c4bf2e571a7b3156"
+
+[update]
+[update.modrinth]
+mod-id = "EkkPwdCY"
+version = "BNJaVOT0"
diff --git a/client_pack/pack.toml b/client_pack/pack.toml
index 214b151..13ae487 100644
--- a/client_pack/pack.toml
+++ b/client_pack/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "2b5221aef87dd6f9e270bdab0d50be3d8b7c14a602fceac1e9032fb849f60493"
+hash = "f926a50afae3e8cce9cde0a67d50e01d08b5275ac1b992bcf78cdbba29963cac"
 
 [versions]
 fabric = "0.19.3"
diff --git a/docker-compose.yml b/docker-compose.yml
index 8045db6..d33c070 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,12 +13,12 @@ services:
       INIT_MEMORY: "8G"
       MAX_MEMORY: "10G"
       # FKRPG server pack — packwiz mrpack from Gitea releases (includes all perf mods)
-      MODRINTH_MODPACK: "https://git.mithraic.cloud/ad3laid3/FKRPG/releases/download/v0.3.0/FKRPG-SERVER-v0.3.0.mrpack"
+      MODRINTH_MODPACK: "https://git.mithraic.cloud/ad3laid3/FKRPG/releases/download/v0.4.1/FKRPG-SERVER-v0.4.1.mrpack"
       # All of these are now inside FKRPG-SERVER (krypton, c2me-fabric 0.4.0-alpha.0.27, modernfix, chunksmith 3.4.1, architectury-api, mythicmetals, simply-swords, bountiful, wilder-wild, kambrik, alloy-forgery, simply-tooltips, frozenlib, fabric-language-kotlin, owo-lib, alternate-current, etc.) — no extra fetch needed
       # BlueMap is already on your server host as a standalone Fabric mod / plugin, not via the pack — keep it on host, don't duplicate here
       # Keep excludes to strip any strays if you ever re-add a Modrinth pack that bundles them
       MODRINTH_EXCLUDE_FILES: "*Chunky*,*chunky*,*voxy*,*Voxy*,*DistantHorizons*,*Sounds-2.2.1+1.20.1+fabric.jar*"
-      MOTD: "§b✨ §lWelcome, Traveler, to FantasyRPG §r§b✨\n§3Choose your Origin. Master your Magic."
+      MOTD: "§b✨ §lWelcome, Traveler, to F##KRPG §r§b✨\n§3Choose your Origin. Master your Magic."
       # Optional: force packwiz to allow alpha c2me etc. (already pinned in pack, but harmless to keep)
       MODRINTH_ALLOWED_VERSION_TYPE: "alpha"
     volumes:
diff --git a/server_pack/index.toml b/server_pack/index.toml
index 4d38e6c..eb5afdd 100644
--- a/server_pack/index.toml
+++ b/server_pack/index.toml
@@ -121,7 +121,7 @@ metafile = true
 
 [[files]]
 file = "mods/c2me-fabric.pw.toml"
-hash = "7156f5d99da2d54756765c890951245aa39cbf52bae92fddfdb66e1a606d7b24"
+hash = "c6341b1444c78777ea4baf694acf8bf0f30efaa37bb7b502101224a328221b8f"
 metafile = true
 
 [[files]]
@@ -351,7 +351,7 @@ metafile = true
 
 [[files]]
 file = "mods/lithostitched.pw.toml"
-hash = "c7af5bfc6d87f6d4041b7e116b3296c90ec136e611d07cf584bb7a20a0fd09a3"
+hash = "1214190903d0b7f92eedb4979feda67640ad6e6cde8a1731c11808895700a0a8"
 metafile = true
 
 [[files]]
@@ -631,7 +631,7 @@ metafile = true
 
 [[files]]
 file = "mods/structure-pool-api.pw.toml"
-hash = "b35dc0035b4a1554f912fa5c26609a29e17f00886ffa8812b997f97a5b777ff5"
+hash = "919153a4c85c7b33c97ac722d95b001c34903368880b144388c6d20cb77c19dc"
 metafile = true
 
 [[files]]
@@ -650,8 +650,8 @@ hash = "13848a9eb3c5fd091b52f78cfae4ace2c3cd0cb32a76d6f61c12435f47d82ed1"
 metafile = true
 
 [[files]]
-file = "mods/switchy-puffish-skills.pw.toml"
-hash = "eb50bfaf25bd340a7f708ba633b450ad269bb75ebcbfe0254cd9b033dea1c50f"
+file = "mods/switchy-skills-compatibility.pw.toml"
+hash = "e361dcfab7b880aabcd88bd2fa6ed0ba2d2aadb8edf509cb3f4ec3f193d7d630"
 metafile = true
 
 [[files]]
@@ -689,6 +689,11 @@ file = "mods/trinkets.pw.toml"
 hash = "860812150cb54f0d9ee1bce7b72798b6cc5f752bb05709f0c60231d054ec281d"
 metafile = true
 
+[[files]]
+file = "mods/unionlib.pw.toml"
+hash = "13d819170b259def0a0aa10154ef85d041e50ab623da22d125c99a0cbe68a14c"
+metafile = true
+
 [[files]]
 file = "mods/universal-sawmill.pw.toml"
 hash = "8bbf31653067adfa63b505ad48585db61cbded91f4c23d0a068cb5dcb6782618"
diff --git a/server_pack/mods/c2me-fabric.pw.toml b/server_pack/mods/c2me-fabric.pw.toml
index 61a7601..4b54619 100644
--- a/server_pack/mods/c2me-fabric.pw.toml
+++ b/server_pack/mods/c2me-fabric.pw.toml
@@ -1,13 +1,13 @@
 name = "c2me-fabric"
-filename = "c2me-fabric-mc1.21.1-0.4.0-alpha.0.27.jar"
+filename = "c2me-fabric-mc1.21.1-0.3.0+alpha.0.364.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/VSNURh3q/versions/gRm1ZAvc/c2me-fabric-mc1.21.1-0.4.0-alpha.0.27.jar"
+url = "https://cdn.modrinth.com/data/VSNURh3q/versions/DSqOVCaF/c2me-fabric-mc1.21.1-0.3.0%2Balpha.0.364.jar"
 hash-format = "sha512"
-hash = "8ecfb2cc5daff31d0ccf30021c31ac31ca845ad7c9eaa1a436f106279e00b79d5d75a325ebf9f9373ef0199864f073e6315a6b9f0d5a51332c906a81c50dcb9e"
+hash = "8653a751eb2ad1ad70da38017ccad0ee2bda5448ffe405d28049f09a61936765303f63ba4fcff798f32bb1e6b4645e892c275515b69c98c1730e24caab0ba7e0"
 
 [update]
 [update.modrinth]
 mod-id = "VSNURh3q"
-version = "gRm1ZAvc"
+version = "DSqOVCaF"
diff --git a/server_pack/mods/lithostitched.pw.toml b/server_pack/mods/lithostitched.pw.toml
index 53a8294..a3edbae 100644
--- a/server_pack/mods/lithostitched.pw.toml
+++ b/server_pack/mods/lithostitched.pw.toml
@@ -1,6 +1,6 @@
 name = "Lithostitched"
 filename = "lithostitched-1.8.0+beta5-fabric-21.1.jar"
-side = "server"
+side = "both"
 
 [download]
 url = "https://cdn.modrinth.com/data/XaDC71GB/versions/vPyJwd70/lithostitched-1.8.0%2Bbeta5-fabric-21.1.jar"
diff --git a/server_pack/mods/structure-pool-api.pw.toml b/server_pack/mods/structure-pool-api.pw.toml
index 0dba247..27a5350 100644
--- a/server_pack/mods/structure-pool-api.pw.toml
+++ b/server_pack/mods/structure-pool-api.pw.toml
@@ -1,6 +1,6 @@
 name = "Structure Pool API"
 filename = "structure_pool_api-fabric-1.2.1+1.21.1.jar"
-side = "server"
+side = "both"
 
 [download]
 url = "https://cdn.modrinth.com/data/LrYZi08Q/versions/Y6aBoKEl/structure_pool_api-fabric-1.2.1%2B1.21.1.jar"
diff --git a/server_pack/mods/switchy-puffish-skills.pw.toml b/server_pack/mods/switchy-puffish-skills.pw.toml
deleted file mode 100644
index dd6092a..0000000
--- a/server_pack/mods/switchy-puffish-skills.pw.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-name = "Switchy Pufferfish Skills"
-filename = "switchy-puffish-skills-1.0+1.21.1.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/gGcH2H1x/versions/iAebDLY0/switchy-puffish-skills-1.0%2B1.21.1.jar"
-hash-format = "sha512"
-hash = "082974191adf7b8608754eb141051eb1de8c98e89c63ae1c017bf7c3a174e1c0cee0c6bef8efa7e702a5eb4fd3dfe2eb7b0c296a8e62b36fc8ba3a7d0e21e1bd"
-
-[update]
-[update.modrinth]
-mod-id = "gGcH2H1x"
-version = "iAebDLY0"
diff --git a/server_pack/mods/switchy-skills-compatibility.pw.toml b/server_pack/mods/switchy-skills-compatibility.pw.toml
new file mode 100644
index 0000000..b21218d
--- /dev/null
+++ b/server_pack/mods/switchy-skills-compatibility.pw.toml
@@ -0,0 +1,13 @@
+name = "switchy-skills-compatibility"
+filename = "switchy_skills_compat-1.0.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/QGgCWxoj/versions/42l4OzlC/switchy_skills_compat-1.0.jar"
+hash-format = "sha512"
+hash = "a267064cf14e5df41941fdde4984ecff24e474cb0dcd1e379854e6bc268f3e2f5571e8e58ee64e2ef8c01e688fd789add08340e8138073a6ef16f8c440b7f946"
+
+[update]
+[update.modrinth]
+mod-id = "QGgCWxoj"
+version = "42l4OzlC"
diff --git a/server_pack/mods/unionlib.pw.toml b/server_pack/mods/unionlib.pw.toml
new file mode 100644
index 0000000..61c2a8a
--- /dev/null
+++ b/server_pack/mods/unionlib.pw.toml
@@ -0,0 +1,13 @@
+name = "unionlib"
+filename = "UnionLib-1.21.1-13.0-Fabric.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/EkkPwdCY/versions/BNJaVOT0/UnionLib-1.21.1-13.0-Fabric.jar"
+hash-format = "sha512"
+hash = "4f66c257d6e186c599b6e80657a50ea01e543ba71dab933e1a530591fa68b036392a0a66a778a5efaed764e77497503448d52f883cbaa6c8c4bf2e571a7b3156"
+
+[update]
+[update.modrinth]
+mod-id = "EkkPwdCY"
+version = "BNJaVOT0"
diff --git a/server_pack/pack.toml b/server_pack/pack.toml
index 991e463..baf8297 100644
--- a/server_pack/pack.toml
+++ b/server_pack/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "0071d7f59f179613200865b2ea6bddd228867188d5fd7cca538f214e6346160b"
+hash = "8209f94023fc321735bea2549b7e3c1618b951bc21e6d78479f14c58f1a2951d"
 
 [versions]
 fabric = "0.19.3"