Biome modifier tweaks, etc

Mechalopa · Oct 19, 2024 · 53539f4 · 53539f4
1 parent 7bbd53b
commit 53539f4
Show file tree

Hide file tree

Showing 20 changed files with 359 additions and 250 deletions.
diff --git a/src/main/resources/data/c/tags/entity_type/creepers.json b/src/main/resources/data/c/tags/entity_type/creepers.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:creeper"
+  ]
+}
diff --git a/...main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_birch_forest.json b/...main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_birch_forest.json
@@ -8,6 +8,10 @@
       {
         "name": "#jafohana:is_birch_forest"
       },
+      {
+        "name": "#jafohana:is_old_growth",
+        "negate": true
+      },
       {
         "name": "#jafohana:is_hot",
         "negate": true
@@ -17,7 +21,7 @@
         "negate": true
       },
       {
-        "name": "#jafohana:is_coniferous",
+        "name": "#jafohana:is_dense_vegetation",
         "negate": true
       },
       {

diff --git a/...resources/data/jafohana/neoforge/biome_modifier/flower_features_in_coniferous_forest.json b/...resources/data/jafohana/neoforge/biome_modifier/flower_features_in_coniferous_forest.json
@@ -17,6 +17,10 @@
         "name": "#jafohana:is_spooky",
         "negate": true
       },
+      {
+        "name": "#jafohana:is_birch_forest",
+        "negate": true
+      },
       {
         "name": "#jafohana:is_dead_or_wasteland",
         "negate": true

diff --git a/...ier/harebell_and_wheel_lily_features.json → ...modifier/flower_features_in_mountain.json b/...ier/harebell_and_wheel_lily_features.json → ...modifier/flower_features_in_mountain.json
@@ -54,6 +54,6 @@
       }
     ]
   ],
-  "features": "jafohana:harebell_and_wheel_lily",
+  "features": "jafohana:flower_mountain",
   "step": "vegetal_decoration"
 }
diff --git a/...ces/data/jafohana/neoforge/biome_modifier/flower_features_in_old_growth_birch_forest.json b/...ces/data/jafohana/neoforge/biome_modifier/flower_features_in_old_growth_birch_forest.json
@@ -0,0 +1,61 @@
+{
+  "type": "jafohana:add_features",
+  "biomes": [
+    [
+      {
+        "name": "#jafohana:is_overworld"
+      },
+      {
+        "name": "#jafohana:is_birch_forest"
+      },
+      {
+        "name": "#jafohana:is_old_growth"
+      },
+      {
+        "name": "#jafohana:is_hot",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_snowy",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_spooky",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_dead_or_wasteland",
+        "negate": true
+      }
+    ],
+    [
+      {
+        "name": "#jafohana:is_overworld"
+      },
+      {
+        "name": "#jafohana:is_birch_forest"
+      },
+      {
+        "name": "#jafohana:is_dense_vegetation"
+      },
+      {
+        "name": "#jafohana:is_hot",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_snowy",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_spooky",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_dead_or_wasteland",
+        "negate": true
+      }
+    ]
+  ],
+  "features": "jafohana:flower_old_growth_birch_forest",
+  "step": "vegetal_decoration"
+}
diff --git a/...ome_modifier/flower_features_in_hill.json → ...r/flower_features_in_windswept_hills.json b/...ome_modifier/flower_features_in_hill.json → ...r/flower_features_in_windswept_hills.json
@@ -55,6 +55,6 @@
       }
     ]
   ],
-  "features": "jafohana:flower_hill",
+  "features": "jafohana:flower_windswept_hills",
   "step": "vegetal_decoration"
 }
diff --git a/...odifier/tall_flower_features_in_hill.json → ...ier/tall_flower_features_in_mountain.json b/...odifier/tall_flower_features_in_hill.json → ...ier/tall_flower_features_in_mountain.json
@@ -42,6 +42,6 @@
       }
     ]
   ],
-  "features": "jafohana:tall_flower_hill",
+  "features": "jafohana:tall_flower_mountain",
   "step": "vegetal_decoration"
 }
diff --git a/...rge/biome_modifier/marigold_features.json → ...flower_features_in_windswept_savanna.json b/...rge/biome_modifier/marigold_features.json → ...flower_features_in_windswept_savanna.json
@@ -17,6 +17,6 @@
       }
     ]
   ],
-  "features": "jafohana:marigold",
+  "features": "jafohana:tall_flower_windswept_savanna",
   "step": "vegetal_decoration"
 }
diff --git a/src/main/resources/data/jafohana/tags/entity_type/can_convert_to_creepansy.json b/src/main/resources/data/jafohana/tags/entity_type/can_convert_to_creepansy.json
@@ -1,247 +1,7 @@
 {
   "replace": false,
   "values": [
-    "minecraft:creeper",
-    {
-      "id": "#forge:creepers",
-      "required": false
-    },
-    {
-      "id": "#c:creepers",
-      "required": false
-    },
-    {
-      "id": "cactusmod:cactus_creeper",
-      "required": false
-    },
-    {
-      "id": "graveyard:skeleton_creeper",
-      "required": false
-    },
-    {
-      "id": "camocreepers:camo_creeper",
-      "required": false
-    },
-    {
-      "id": "apocalypse:breecher",
-      "required": false
-    },
-    {
-      "id": "dungeons_mobs:icy_creeper",
-      "required": false
-    },
-    {
-      "id": "creeperoverhaul:birch_creeper",
-      "required": false
-    },
-    {
-      "id": "creeperoverhaul:ocean_creeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:creeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:darkcreeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:deathcreeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:dirtcreeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:doomcreeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:drowningcreeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:endercreeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:firecreeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:gravelcreeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:jumpingcreeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:lightningcreeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:minicreeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:sandcreeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:scopecreeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:skeletoncreeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:snowcreeper",
-      "required": false
-    },
-    {
-      "id": "specialmobs:splittingcreeper",
-      "required": false
-    },
-    {
-      "id": "more_babies:creeper",
-      "required": false
-    },
-    {
-      "id": "tofucraft:tofucreeper",
-      "required": false
-    },
-    {
-      "id": "enderzoology:concussion_creeper",
-      "required": false
-    },
-    {
-      "id": "good_nights_sleep:baby_creeper",
-      "required": false
-    },
-    {
-      "id": "alexscaves:nucleeper",
-      "required": false
-    },
-    {
-      "id": "creepycreepers:ghostly_creeper",
-      "required": false
-    },
-    {
-      "id": "creepycreepers:snowy_creeper",
-      "required": false
-    },
-    {
-      "id": "creepycreepers:halloween_creeper",
-      "required": false
-    },
-    {
-      "id": "creepycreepers:tuff_creeper",
-      "required": false
-    },
-    {
-      "id": "creepycreepers:corrupted_creeper",
-      "required": false
-    },
-    {
-      "id": "majruszsdifficulty:creeperling",
-      "required": false
-    },
-    {
-      "id": "immersiveweapons:storm_creeper",
-      "required": false
-    },
-    {
-      "id": "lcrdrfs:laser_creeper",
-      "required": false
-    },
-    {
-      "id": "caverns_and_chasms:deeper",
-      "required": false
-    },
-    {
-      "id": "caverns_and_chasms:peeper",
-      "required": false
-    },
-    {
-      "id": "arsmagicalegacy:mana_creeper",
-      "required": false
-    },
-    {
-      "id": "#takumicraft:takumi",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:celebration_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:cookie_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:dark_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:earth_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:electric_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:fake_illusion_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:fire_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:ice_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:illusion_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:ghost_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:light_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:magma_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:psychic_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:reverse_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:spider_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:water_creeper",
-      "required": false
-    },
-    {
-      "id": "elementalcreepers:friendly_creeper",
-      "required": false
-    },
+    "#jafohana:creepers",
     {
       "id": "grimoireofgaia:creep",
       "required": false