From f71357e10afb0287b87c4a4d29407afc4f739005 Mon Sep 17 00:00:00 2001
From: AlcatrazEscapee <alex@molleroneill.com>
Date: Thu, 5 Sep 2024 12:35:56 -0400
Subject: [PATCH] Make more hostile mobs powder snow immune and walkable

---
 .../freeze_immune_entity_types.json           | 11 +++----
 .../powder_snow_walkable_mobs.json            |  8 ++---
 .../primalwinter/data/BuiltinEntityTags.java  | 31 +++++++++----------
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/Common/src/generated/resources/data/minecraft/tags/entity_type/freeze_immune_entity_types.json b/Common/src/generated/resources/data/minecraft/tags/entity_type/freeze_immune_entity_types.json
index dac40b5..8879bb0 100644
--- a/Common/src/generated/resources/data/minecraft/tags/entity_type/freeze_immune_entity_types.json
+++ b/Common/src/generated/resources/data/minecraft/tags/entity_type/freeze_immune_entity_types.json
@@ -1,11 +1,8 @@
 {
   "values": [
-    "minecraft:wolf",
-    "minecraft:wandering_trader",
-    "minecraft:trader_llama",
-    "minecraft:pillager",
-    "minecraft:illusioner",
-    "minecraft:vindicator",
-    "minecraft:witch"
+    "#minecraft:undead",
+    "#minecraft:raiders",
+    "minecraft:spider",
+    "minecraft:creeper"
   ]
 }
\ No newline at end of file
diff --git a/Common/src/generated/resources/data/minecraft/tags/entity_type/powder_snow_walkable_mobs.json b/Common/src/generated/resources/data/minecraft/tags/entity_type/powder_snow_walkable_mobs.json
index dac40b5..96d261e 100644
--- a/Common/src/generated/resources/data/minecraft/tags/entity_type/powder_snow_walkable_mobs.json
+++ b/Common/src/generated/resources/data/minecraft/tags/entity_type/powder_snow_walkable_mobs.json
@@ -1,11 +1,11 @@
 {
   "values": [
+    "#minecraft:undead",
+    "#minecraft:raiders",
     "minecraft:wolf",
     "minecraft:wandering_trader",
     "minecraft:trader_llama",
-    "minecraft:pillager",
-    "minecraft:illusioner",
-    "minecraft:vindicator",
-    "minecraft:witch"
+    "minecraft:spider",
+    "minecraft:creeper"
   ]
 }
\ No newline at end of file
diff --git a/NeoForge/src/test/java/com/alcatrazescapee/primalwinter/data/BuiltinEntityTags.java b/NeoForge/src/test/java/com/alcatrazescapee/primalwinter/data/BuiltinEntityTags.java
index 316139d..382334f 100644
--- a/NeoForge/src/test/java/com/alcatrazescapee/primalwinter/data/BuiltinEntityTags.java
+++ b/NeoForge/src/test/java/com/alcatrazescapee/primalwinter/data/BuiltinEntityTags.java
@@ -17,21 +17,20 @@ public BuiltinEntityTags(GatherDataEvent event)
     @Override
     protected void addTags(HolderLookup.Provider provider)
     {
-        tag(EntityTypeTags.FREEZE_IMMUNE_ENTITY_TYPES).add(
-            EntityType.WOLF,
-            EntityType.WANDERING_TRADER,
-            EntityType.TRADER_LLAMA,
-            EntityType.PILLAGER,
-            EntityType.ILLUSIONER,
-            EntityType.VINDICATOR,
-            EntityType.WITCH);
-        tag(EntityTypeTags.POWDER_SNOW_WALKABLE_MOBS).add(
-            EntityType.WOLF,
-            EntityType.WANDERING_TRADER,
-            EntityType.TRADER_LLAMA,
-            EntityType.PILLAGER,
-            EntityType.ILLUSIONER,
-            EntityType.VINDICATOR,
-            EntityType.WITCH);
+        tag(EntityTypeTags.FREEZE_IMMUNE_ENTITY_TYPES)
+            .addTag(EntityTypeTags.UNDEAD)
+            .addTag(EntityTypeTags.RAIDERS)
+            .add(
+                EntityType.SPIDER,
+                EntityType.CREEPER);
+        tag(EntityTypeTags.POWDER_SNOW_WALKABLE_MOBS)
+            .addTag(EntityTypeTags.UNDEAD)
+            .addTag(EntityTypeTags.RAIDERS)
+            .add(
+                EntityType.WOLF,
+                EntityType.WANDERING_TRADER,
+                EntityType.TRADER_LLAMA,
+                EntityType.SPIDER,
+                EntityType.CREEPER);
     }
 }