From 8e8483d07244acd2b9431e35e214167771f898e3 Mon Sep 17 00:00:00 2001
From: Logan <logan@ljones.me>
Date: Wed, 14 Oct 2026 20:55:13 -0400
Subject: [PATCH] fix(config): correct Critters and Companions spawn keys to
 snake_case

YACL serialises config with FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES
(and serializeNulls), so the camelCase keys biomeSpec, leafInsect, seaBunny,
stagBeetle, rolyPoly and stickBug were never read. Every SpawnEntry then
deserialised with biomeSpec = null, and CAC 2.7.0's SpawnEntry.isTag() calls
biomeSpec.startsWith("#") without a null check, crashing FMLCommonSetup on
both the dedicated server and the client.

Rename the keys; all tuned weights and biome specs are unchanged. Missing
keys still fall back to mod defaults (partial file). Refresh the index and
pack hashes.
---
 config/crittersandcompanions-common.json5 | 60 +++++++++++------------
 index.toml                                |  2 +-
 pack.toml                                 |  2 +-
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/config/crittersandcompanions-common.json5 b/config/crittersandcompanions-common.json5
index 259a191..99e4099 100644
--- a/config/crittersandcompanions-common.json5
+++ b/config/crittersandcompanions-common.json5
@@ -4,48 +4,48 @@
 {
   "configVersion": 2,
   "spawning": {
-    "leafInsect": [
-      {"biomeSpec": "#c:is_jungle", "weight": 8, "min": 1, "max": 1},
-      {"biomeSpec": "#c:is_forest", "weight": 4, "min": 1, "max": 1}
+    "leaf_insect": [
+      {"biome_spec": "#c:is_jungle", "weight": 8, "min": 1, "max": 1},
+      {"biome_spec": "#c:is_forest", "weight": 4, "min": 1, "max": 1}
     ],
-    "seaBunny": [
-      {"biomeSpec": "minecraft:ocean", "weight": 10, "min": 1, "max": 2},
-      {"biomeSpec": "minecraft:deep_ocean", "weight": 10, "min": 1, "max": 2},
-      {"biomeSpec": "minecraft:warm_ocean", "weight": 20, "min": 1, "max": 3},
-      {"biomeSpec": "minecraft:lukewarm_ocean", "weight": 10, "min": 1, "max": 3},
-      {"biomeSpec": "minecraft:deep_lukewarm_ocean", "weight": 10, "min": 1, "max": 3}
+    "sea_bunny": [
+      {"biome_spec": "minecraft:ocean", "weight": 10, "min": 1, "max": 2},
+      {"biome_spec": "minecraft:deep_ocean", "weight": 10, "min": 1, "max": 2},
+      {"biome_spec": "minecraft:warm_ocean", "weight": 20, "min": 1, "max": 3},
+      {"biome_spec": "minecraft:lukewarm_ocean", "weight": 10, "min": 1, "max": 3},
+      {"biome_spec": "minecraft:deep_lukewarm_ocean", "weight": 10, "min": 1, "max": 3}
     ],
     "dragonfly": [
-      {"biomeSpec": "#c:is_river", "weight": 4, "min": 1, "max": 1},
-      {"biomeSpec": "#c:is_swamp", "weight": 5, "min": 1, "max": 1},
-      {"biomeSpec": "#c:is_lush", "weight": 6, "min": 1, "max": 1}
+      {"biome_spec": "#c:is_river", "weight": 4, "min": 1, "max": 1},
+      {"biome_spec": "#c:is_swamp", "weight": 5, "min": 1, "max": 1},
+      {"biome_spec": "#c:is_lush", "weight": 6, "min": 1, "max": 1}
     ],
     "ladybug": [
-      {"biomeSpec": "#c:is_forest", "weight": 4, "min": 1, "max": 3},
-      {"biomeSpec": "#c:is_lush", "weight": 6, "min": 1, "max": 2},
-      {"biomeSpec": "#c:is_floral", "weight": 7, "min": 1, "max": 2}
+      {"biome_spec": "#c:is_forest", "weight": 4, "min": 1, "max": 3},
+      {"biome_spec": "#c:is_lush", "weight": 6, "min": 1, "max": 2},
+      {"biome_spec": "#c:is_floral", "weight": 7, "min": 1, "max": 2}
     ],
-    "stagBeetle": [
-      {"biomeSpec": "#c:is_forest", "weight": 3, "min": 1, "max": 2},
-      {"biomeSpec": "#c:is_lush", "weight": 6, "min": 1, "max": 2}
+    "stag_beetle": [
+      {"biome_spec": "#c:is_forest", "weight": 3, "min": 1, "max": 2},
+      {"biome_spec": "#c:is_lush", "weight": 6, "min": 1, "max": 2}
     ],
-    "rolyPoly": [
-      {"biomeSpec": "#c:is_forest", "weight": 3, "min": 1, "max": 3},
-      {"biomeSpec": "#c:is_lush", "weight": 6, "min": 1, "max": 2},
-      {"biomeSpec": "#c:is_swamp", "weight": 6, "min": 1, "max": 2}
+    "roly_poly": [
+      {"biome_spec": "#c:is_forest", "weight": 3, "min": 1, "max": 3},
+      {"biome_spec": "#c:is_lush", "weight": 6, "min": 1, "max": 2},
+      {"biome_spec": "#c:is_swamp", "weight": 6, "min": 1, "max": 2}
     ],
     "snail": [
-      {"biomeSpec": "#c:is_forest", "weight": 3, "min": 1, "max": 2},
-      {"biomeSpec": "#c:is_lush", "weight": 5, "min": 1, "max": 2},
-      {"biomeSpec": "#c:is_swamp", "weight": 6, "min": 1, "max": 2}
+      {"biome_spec": "#c:is_forest", "weight": 3, "min": 1, "max": 2},
+      {"biome_spec": "#c:is_lush", "weight": 5, "min": 1, "max": 2},
+      {"biome_spec": "#c:is_swamp", "weight": 6, "min": 1, "max": 2}
     ],
-    "stickBug": [
-      {"biomeSpec": "#c:is_forest", "weight": 3, "min": 1, "max": 2},
-      {"biomeSpec": "#c:is_lush", "weight": 6, "min": 1, "max": 2}
+    "stick_bug": [
+      {"biome_spec": "#c:is_forest", "weight": 3, "min": 1, "max": 2},
+      {"biome_spec": "#c:is_lush", "weight": 6, "min": 1, "max": 2}
     ],
     "weevil": [
-      {"biomeSpec": "#c:is_forest", "weight": 3, "min": 1, "max": 3},
-      {"biomeSpec": "#c:is_lush", "weight": 6, "min": 1, "max": 2}
+      {"biome_spec": "#c:is_forest", "weight": 3, "min": 1, "max": 3},
+      {"biome_spec": "#c:is_lush", "weight": 6, "min": 1, "max": 2}
     ]
   }
 }
diff --git a/index.toml b/index.toml
index 3fb9d14..68a8871 100644
--- a/index.toml
+++ b/index.toml
@@ -10,7 +10,7 @@ hash = "bc47ee67032ceab8b2b408819ce9b268812f37da8f13b9b7efeae0deed607c4b"
 
 [[files]]
 file = "config/crittersandcompanions-common.json5"
-hash = "a00a9fe09ce5b469247f757e780b5faf74191f5cfef158d999c4d7a1e203f420"
+hash = "1ac5a9b392b3aa980abe86b37aa8a9853e91c02cd18f8a1bceea0d08fe3f10c4"
 
 [[files]]
 file = "config/defaultoptions/extra/config/DistantHorizons.toml"
diff --git a/pack.toml b/pack.toml
index 8d23c93..f3fc44e 100644
--- a/pack.toml
+++ b/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "3c17e58506c00f8c5aba5151afa765fdd68245c384293a017a5e2062ac35afbe"
+hash = "121d9177b8ca74535005b85160a3e314bc9c95f8c87671b3d6947cb8d52c37e1"
 
 [versions]
 minecraft = "1.21.1"