From 282509426219ebc45e8032f5b9595f3a4985d575 Mon Sep 17 00:00:00 2001
From: Apollo <102649729+Apollounknowndev@users.noreply.github.com>
Date: Sat, 9 Mar 2024 15:24:40 -0800
Subject: [PATCH] Fix a crash

---
 .../data/cyclic/forge/biome_modifier/absalon.json        | 6 ++++++
 .../resources/data/cyclic/forge/biome_modifier/cyan.json | 6 ++++++
 .../resources/data/cyclic/forge/biome_modifier/lime.json | 6 ++++++
 .../cyclic/forge/biome_modifier/modify_badlands.json     | 6 ------
 .../data/cyclic/forge/biome_modifier/modify_beach.json   | 6 ------
 .../data/cyclic/forge/biome_modifier/modify_forest.json  | 6 ------
 .../data/cyclic/forge/biome_modifier/modify_jungle.json  | 6 ------
 .../cyclic/forge/biome_modifier/modify_mountain.json     | 6 ------
 .../data/cyclic/forge/biome_modifier/modify_river.json   | 6 ------
 .../data/cyclic/forge/biome_modifier/modify_savanna.json | 6 ------
 .../data/cyclic/forge/biome_modifier/modify_taiga.json   | 6 ------
 .../data/cyclic/forge/biome_modifier/purple.json         | 6 ++++++
 .../cyclic/tags/worldgen/biome/has_flower/absalon.json   | 7 +++++++
 .../data/cyclic/tags/worldgen/biome/has_flower/cyan.json | 9 +++++++++
 .../data/cyclic/tags/worldgen/biome/has_flower/lime.json | 7 +++++++
 .../cyclic/tags/worldgen/biome/has_flower/purple.json    | 8 ++++++++
 16 files changed, 55 insertions(+), 48 deletions(-)
 create mode 100644 src/main/resources/data/cyclic/forge/biome_modifier/absalon.json
 create mode 100644 src/main/resources/data/cyclic/forge/biome_modifier/cyan.json
 create mode 100644 src/main/resources/data/cyclic/forge/biome_modifier/lime.json
 delete mode 100644 src/main/resources/data/cyclic/forge/biome_modifier/modify_badlands.json
 delete mode 100644 src/main/resources/data/cyclic/forge/biome_modifier/modify_beach.json
 delete mode 100644 src/main/resources/data/cyclic/forge/biome_modifier/modify_forest.json
 delete mode 100644 src/main/resources/data/cyclic/forge/biome_modifier/modify_jungle.json
 delete mode 100644 src/main/resources/data/cyclic/forge/biome_modifier/modify_mountain.json
 delete mode 100644 src/main/resources/data/cyclic/forge/biome_modifier/modify_river.json
 delete mode 100644 src/main/resources/data/cyclic/forge/biome_modifier/modify_savanna.json
 delete mode 100644 src/main/resources/data/cyclic/forge/biome_modifier/modify_taiga.json
 create mode 100644 src/main/resources/data/cyclic/forge/biome_modifier/purple.json
 create mode 100644 src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/absalon.json
 create mode 100644 src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/cyan.json
 create mode 100644 src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/lime.json
 create mode 100644 src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/purple.json

diff --git a/src/main/resources/data/cyclic/forge/biome_modifier/absalon.json b/src/main/resources/data/cyclic/forge/biome_modifier/absalon.json
new file mode 100644
index 000000000..a52a94f46
--- /dev/null
+++ b/src/main/resources/data/cyclic/forge/biome_modifier/absalon.json
@@ -0,0 +1,6 @@
+{
+  "type": "forge:add_features",
+  "biomes": "#cyclic:has_flower/lime",
+  "features": "cyclic:flower_lime",
+  "step": "vegetal_decoration"
+}
\ No newline at end of file
diff --git a/src/main/resources/data/cyclic/forge/biome_modifier/cyan.json b/src/main/resources/data/cyclic/forge/biome_modifier/cyan.json
new file mode 100644
index 000000000..1dd6154b0
--- /dev/null
+++ b/src/main/resources/data/cyclic/forge/biome_modifier/cyan.json
@@ -0,0 +1,6 @@
+{
+  "type": "forge:add_features",
+  "biomes": "#cyclic:has_flower/cyan",
+  "features": "cyclic:flower_cyan",
+  "step": "vegetal_decoration"
+}
\ No newline at end of file
diff --git a/src/main/resources/data/cyclic/forge/biome_modifier/lime.json b/src/main/resources/data/cyclic/forge/biome_modifier/lime.json
new file mode 100644
index 000000000..27bafece5
--- /dev/null
+++ b/src/main/resources/data/cyclic/forge/biome_modifier/lime.json
@@ -0,0 +1,6 @@
+{
+  "type": "forge:add_features",
+  "biomes": "#cyclic:has_flower/absalon",
+  "features": "cyclic:flower_absalon",
+  "step": "vegetal_decoration"
+}
\ No newline at end of file
diff --git a/src/main/resources/data/cyclic/forge/biome_modifier/modify_badlands.json b/src/main/resources/data/cyclic/forge/biome_modifier/modify_badlands.json
deleted file mode 100644
index 4b7e2b6a9..000000000
--- a/src/main/resources/data/cyclic/forge/biome_modifier/modify_badlands.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "type": "forge:add_features",
-  "biomes": "#minecraft:is_badlands",
-  "features": ["cyclic:flower_absalon","cyclic:flower_cyan"],
-  "step": "top_layer_modification"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/cyclic/forge/biome_modifier/modify_beach.json b/src/main/resources/data/cyclic/forge/biome_modifier/modify_beach.json
deleted file mode 100644
index 576c487db..000000000
--- a/src/main/resources/data/cyclic/forge/biome_modifier/modify_beach.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "type": "forge:add_features",
-  "biomes": "#minecraft:is_beach",
-  "features": ["cyclic:flower_cyan","cyclic:flower_purple"],
-  "step": "top_layer_modification"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/cyclic/forge/biome_modifier/modify_forest.json b/src/main/resources/data/cyclic/forge/biome_modifier/modify_forest.json
deleted file mode 100644
index cf3e58202..000000000
--- a/src/main/resources/data/cyclic/forge/biome_modifier/modify_forest.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "type": "forge:add_features",
-  "biomes": "#minecraft:is_forest",
-  "features": ["cyclic:flower_purple"],
-  "step": "top_layer_modification"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/cyclic/forge/biome_modifier/modify_jungle.json b/src/main/resources/data/cyclic/forge/biome_modifier/modify_jungle.json
deleted file mode 100644
index fc42118af..000000000
--- a/src/main/resources/data/cyclic/forge/biome_modifier/modify_jungle.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "type": "forge:add_features",
-  "biomes": "#minecraft:is_jungle",
-  "features": ["cyclic:flower_purple"],
-  "step": "top_layer_modification"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/cyclic/forge/biome_modifier/modify_mountain.json b/src/main/resources/data/cyclic/forge/biome_modifier/modify_mountain.json
deleted file mode 100644
index 0b3fd9340..000000000
--- a/src/main/resources/data/cyclic/forge/biome_modifier/modify_mountain.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "type": "forge:add_features",
-  "biomes": "#minecraft:is_mountain",
-  "features": ["cyclic:flower_cyan","cyclic:flower_lime"],
-  "step": "top_layer_modification"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/cyclic/forge/biome_modifier/modify_river.json b/src/main/resources/data/cyclic/forge/biome_modifier/modify_river.json
deleted file mode 100644
index b927dbb2c..000000000
--- a/src/main/resources/data/cyclic/forge/biome_modifier/modify_river.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "type": "forge:add_features",
-  "biomes": "#minecraft:is_river",
-  "features": ["cyclic:flower_cyan","cyclic:flower_lime"],
-  "step": "top_layer_modification"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/cyclic/forge/biome_modifier/modify_savanna.json b/src/main/resources/data/cyclic/forge/biome_modifier/modify_savanna.json
deleted file mode 100644
index 3c31c0877..000000000
--- a/src/main/resources/data/cyclic/forge/biome_modifier/modify_savanna.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "type": "forge:add_features",
-  "biomes": "#minecraft:is_savanna",
-  "features": ["cyclic:flower_absalon","cyclic:flower_lime","cyclic:flower_purple"],
-  "step": "top_layer_modification"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/cyclic/forge/biome_modifier/modify_taiga.json b/src/main/resources/data/cyclic/forge/biome_modifier/modify_taiga.json
deleted file mode 100644
index 52b9686ac..000000000
--- a/src/main/resources/data/cyclic/forge/biome_modifier/modify_taiga.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "type": "forge:add_features",
-  "biomes": "#minecraft:is_taiga",
-  "features": ["cyclic:flower_absalon","cyclic:flower_cyan"],
-  "step": "top_layer_modification"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/cyclic/forge/biome_modifier/purple.json b/src/main/resources/data/cyclic/forge/biome_modifier/purple.json
new file mode 100644
index 000000000..29df2df5a
--- /dev/null
+++ b/src/main/resources/data/cyclic/forge/biome_modifier/purple.json
@@ -0,0 +1,6 @@
+{
+  "type": "forge:add_features",
+  "biomes": "#cyclic:has_flower/purple",
+  "features": "cyclic:flower_purple",
+  "step": "vegetal_decoration"
+}
\ No newline at end of file
diff --git a/src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/absalon.json b/src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/absalon.json
new file mode 100644
index 000000000..2e2196e99
--- /dev/null
+++ b/src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/absalon.json
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "#minecraft:is_badlands",
+    "#minecraft:is_savanna",
+    "#minecraft:is_taiga"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/cyan.json b/src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/cyan.json
new file mode 100644
index 000000000..f4ee46337
--- /dev/null
+++ b/src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/cyan.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "#minecraft:is_badlands",
+    "#minecraft:is_beach",
+    "#minecraft:is_mountain",
+    "#minecraft:is_river",
+    "#minecraft:is_taiga"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/lime.json b/src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/lime.json
new file mode 100644
index 000000000..9e237a8f9
--- /dev/null
+++ b/src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/lime.json
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "#minecraft:is_mountain",
+    "#minecraft:is_river",
+    "#minecraft:is_savanna"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/purple.json b/src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/purple.json
new file mode 100644
index 000000000..078fff0ed
--- /dev/null
+++ b/src/main/resources/data/cyclic/tags/worldgen/biome/has_flower/purple.json
@@ -0,0 +1,8 @@
+{
+  "values": [
+    "#minecraft:is_beach",
+    "#minecraft:is_forest",
+    "#minecraft:is_jungle",
+    "#minecraft:is_savanna"
+  ]
+}
\ No newline at end of file