From ce4099fabb9453de2f24c3699cdcd6a9fe00e00a Mon Sep 17 00:00:00 2001
From: Mechalopa <92443696+Mechalopa@users.noreply.github.com>
Date: Sat, 21 Sep 2024 13:49:40 +0900
Subject: [PATCH] Tweaks

---
 .../textures/block/jack_in_the_pulpit.png     | Bin 307 -> 307 bytes
 .../block/jack_in_the_pulpit_stem.png         | Bin 100 -> 100 bytes
 .../block/potted_jack_in_the_pulpit.png       | Bin 302 -> 302 bytes
 .../flower_features_in_bamboo_jungle.json     |  20 +-
 .../flower_features_in_dense_forest.json      |  46 +++++
 .../flower_features_in_forest.json            |   4 +
 .../flower_features_in_jungle.json            |   9 +-
 .../flower_features_in_sparse_jungle.json     |  24 ++-
 .../tags/worldgen/biome/is_bamboo_jungle.json |  42 +++++
 .../flower_dense_forest.json                  | 172 ++++++++++++++++++
 .../placed_feature/flower_bamboo_jungle.json  |   2 +-
 .../placed_feature/flower_dense_forest.json   |  19 ++
 .../placed_feature/tall_flower_forest.json    |   2 +-
 13 files changed, 330 insertions(+), 10 deletions(-)
 create mode 100644 src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_dense_forest.json
 create mode 100644 src/main/resources/data/jafohana/tags/worldgen/biome/is_bamboo_jungle.json
 create mode 100644 src/main/resources/data/jafohana/worldgen/configured_feature/flower_dense_forest.json
 create mode 100644 src/main/resources/data/jafohana/worldgen/placed_feature/flower_dense_forest.json

diff --git a/src/main/resources/assets/jafohana/textures/block/jack_in_the_pulpit.png b/src/main/resources/assets/jafohana/textures/block/jack_in_the_pulpit.png
index 9ae3ae50662ed931f807033287bc400d0067a0a4..a7ac99529a8edc12458aab3ece60760fe335337e 100644
GIT binary patch
delta 271
zcmV+q0r38_0<!{;Eq}2J!axv2gN0ygCzjd>Mk^7lgp`&FVz3ZI5EVqRGPY^#`~f>Z
zz}|mbnaCXLnKMbTT<$V&ZufRQ5%JPuarb2uH)VS3$S|sjOZRgC05G8Lsv@m<N&2U1
zVwPzD5kLTdqvuREk0AMWW%0GqqU&oX+rSsBG|5#0Q^oC*UVr^BoNB;e8CdZyg$?)~
zg}Y#zup^lUxXEr6GqBst`7j0?8UXqy>L2gRqCu?zm%yx3!-#P4N!@h;R*xGk0D!ae
zp>2e==Bor<zpgvJ3`{o1b;CR+O^gAZDI~-U>~B4_KO?M#G}ETJ=0JnXu<nErZ%=}e
VAY1lZ&Hw-a00>D%PDHLkV1ghPd~5&!

delta 271
zcmV+q0r38_0<!{;Eq^@<!axv(Qz=$9no0|aKaF6O!pc(d53vX~N<h*X?8H*=29_Sc
z6L`Oo7kJBLV>Bs-&2HZJc4lWB5pll7_TkCo(w6zXC;q7+dAiI20KkCyK}|ZViVUNA
zV)oYnB7gt@pI=KkJjcm*UKXj17Tw;V?ES7_rAeU@m@00c4S(F9@K*x{%fO0vDQ&>_
zDBT6ygdO>7fSc@AF$25JoDXBbp#h+OqW)=E6%A?)xCCaM8b+))P5E^JR)-rc0D!aj
z=oz7{NtK}M*L7dxk;x|7wajDE#2C<-LPE^I{?=2Q8DTA?nKmsn2O10(ZZ3@Y021hf
VaABpLwEzGB00>D%PDHLkV1iu1eI)<@

diff --git a/src/main/resources/assets/jafohana/textures/block/jack_in_the_pulpit_stem.png b/src/main/resources/assets/jafohana/textures/block/jack_in_the_pulpit_stem.png
index 2dc06cce817b54e0186b991c3894e71a0c46ab93..d8528521e7b5da361932b897c9a17a8788409038 100644
GIT binary patch
delta 55
zcmYdEnP6lzM@IFpd`scU!v=9DS2$>%;!$AhmomsYu!1qfh=D=<`OjI*k;j)a0D-5g
KpUXO@geCw|`V=Yv

delta 55
zcmYdEnP6lj^Gx@fd`scU!v=Al@#=x6cof+Br3|tTtY8c=VqjSD<EQ!OM{AuJfWXt$
K&t;ucLK6U4#uVfL

diff --git a/src/main/resources/assets/jafohana/textures/block/potted_jack_in_the_pulpit.png b/src/main/resources/assets/jafohana/textures/block/potted_jack_in_the_pulpit.png
index 6cdf2894d660814dce4a610c9c83b1192f68e154..0fd16b442814289b22f78e6235930a30ed056b31 100644
GIT binary patch
delta 266
zcmV+l0rmc_0<Hp(Eq}WT!axuV7J{u^OsS1vv=Un(rIjd%!6G1ns33}!scr210Xsjy
z-hW$}g9)3<LsKk!o6OA3?w%tePF_S$UnaMXEFOIs$F3CNG9N$y8Kl9cA>CC?Mwg}$
z`zZhrh#-I*zn8Lm1?F7jB2{S6{d16g;0rQE{%V0%ar=Dem4A|R1sH4t8FQ&Dz<K<=
z1pw_yqsB(;Epfex0C$d?^iMj_M2!K@kZDtsIfvP?E=3n0J1jJSw!_FxfHo%8g6?12
zK5yHJ8=N^ziX;M5wn^7hFZZk;UFHR95j$6U2kX!iL>akMzzlKPDkUSnR0ffI#QUyc
Q00000NkvXXt^-0~g6~IjB>(^b

delta 266
zcmV+l0rmc_0<Hp(Eq^--!cY)QrC8aRR9Z;<G`1<M1RF(-h()kb0+LR#vlhI8r3df?
z-fv|B6E-g&lVaJo$;`aj-Dio2l^6S$E3<n~R?ne$myQ(SG9N$y8KhCrlD^-NNz{(T
z{t5sDA_ySgJ{vi`r}4SSMXJ!C$2XLtHxOisRBC}%ar<)Ylz)<Q1sH4t8FQ&Ez<E^O
z0)XbEQDY<Kmbl(TfIG)c`X?P|qQ-z1lW9|vIfq5ql%fleEfyL;+uNO;08LD)1>L{4
z9UZ!f8=N^ziX;M5Hc8jBn|s!eF7pDlh?#4>gJA6lqKsTBfbi#bDH-ttfM<jAw{RLB
Q00000NkvXXt^-0~g0#1G&Hw-a

diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_bamboo_jungle.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_bamboo_jungle.json
index 9b90fca8..24dc9427 100644
--- a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_bamboo_jungle.json
+++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_bamboo_jungle.json
@@ -1,6 +1,22 @@
 {
-  "type": "neoforge:add_features",
-  "biomes": "minecraft:bamboo_jungle",
+  "type": "jafohana:add_features",
+  "biomes": [
+    [
+      {
+        "name": "#jafohana:is_overworld"
+      },
+      {
+        "name": "#jafohana:is_bamboo_jungle"
+      },
+      {
+        "name": "#jafohana:is_dead_or_wasteland",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_jungle"
+      }
+    ]
+  ],
   "features": "jafohana:flower_bamboo_jungle",
   "step": "vegetal_decoration"
 }
\ No newline at end of file
diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_dense_forest.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_dense_forest.json
new file mode 100644
index 00000000..8beade67
--- /dev/null
+++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_dense_forest.json
@@ -0,0 +1,46 @@
+{
+  "type": "jafohana:add_features",
+  "biomes": [
+    [
+      {
+        "name": "#jafohana:is_overworld"
+      },
+      {
+        "name": "#jafohana:is_birch_forest",
+        "negate": true
+      },
+      {
+        "name": "minecraft:flower_forest",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_hot",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_snowy",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_coniferous",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_dense_vegetation"
+      },
+      {
+        "name": "#jafohana:is_spooky",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_dead_or_wasteland",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_forest"
+      }
+    ]
+  ],
+  "features": "jafohana:flower_dense_forest",
+  "step": "vegetal_decoration"
+}
\ No newline at end of file
diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_forest.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_forest.json
index 9ec436a2..179bd98e 100644
--- a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_forest.json
+++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_forest.json
@@ -25,6 +25,10 @@
         "name": "#jafohana:is_coniferous",
         "negate": true
       },
+      {
+        "name": "#jafohana:is_dense_vegetation",
+        "negate": true
+      },
       {
         "name": "#jafohana:is_spooky",
         "negate": true
diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_jungle.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_jungle.json
index 35c018c6..eda906dd 100644
--- a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_jungle.json
+++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_jungle.json
@@ -6,10 +6,11 @@
         "name": "#jafohana:is_overworld"
       },
       {
-        "name": [
-          "minecraft:sparse_jungle",
-          "minecraft:bamboo_jungle"
-        ],
+        "name": "#jafohana:is_sparse_vegetation",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_bamboo_jungle",
         "negate": true
       },
       {
diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_sparse_jungle.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_sparse_jungle.json
index 3fa18c14..7185ec28 100644
--- a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_sparse_jungle.json
+++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_sparse_jungle.json
@@ -1,6 +1,26 @@
 {
-  "type": "neoforge:add_features",
-  "biomes": "minecraft:sparse_jungle",
+  "type": "jafohana:add_features",
+  "biomes": [
+    [
+      {
+        "name": "#jafohana:is_overworld"
+      },
+      {
+        "name": "#jafohana:is_sparse_vegetation"
+      },
+      {
+        "name": "#jafohana:is_bamboo_jungle",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_dead_or_wasteland",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_jungle"
+      }
+    ]
+  ],
   "features": "jafohana:flower_sparse_jungle",
   "step": "vegetal_decoration"
 }
\ No newline at end of file
diff --git a/src/main/resources/data/jafohana/tags/worldgen/biome/is_bamboo_jungle.json b/src/main/resources/data/jafohana/tags/worldgen/biome/is_bamboo_jungle.json
new file mode 100644
index 00000000..e3560324
--- /dev/null
+++ b/src/main/resources/data/jafohana/tags/worldgen/biome/is_bamboo_jungle.json
@@ -0,0 +1,42 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:bamboo_jungle",
+    {
+      "id": "#c:is_bamboo_jungle",
+      "required": false
+    },
+    {
+      "id": "regions_unexplored:bamboo_forest",
+      "required": false
+    },
+    {
+      "id": "eastwardjourneys:cherry_blossom_bamboo_jungle",
+      "required": false
+    },
+    {
+      "id": "wythers:bamboo_jungle_canyon",
+      "required": false
+    },
+    {
+      "id": "wythers:bamboo_jungle_highlands",
+      "required": false
+    },
+    {
+      "id": "wythers:bamboo_jungle_swamp",
+      "required": false
+    },
+    {
+      "id": "wythers:bamboo_swamp",
+      "required": false
+    },
+    {
+      "id": "wythers:sparse_bamboo_jungle",
+      "required": false
+    },
+    {
+      "id": "biomeswevegone:crag_gardens",
+      "required": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/jafohana/worldgen/configured_feature/flower_dense_forest.json b/src/main/resources/data/jafohana/worldgen/configured_feature/flower_dense_forest.json
new file mode 100644
index 00000000..a614e208
--- /dev/null
+++ b/src/main/resources/data/jafohana/worldgen/configured_feature/flower_dense_forest.json
@@ -0,0 +1,172 @@
+{
+  "type": "minecraft:simple_random_selector",
+  "config": {
+    "features": [
+      {
+        "feature": {
+          "type": "minecraft:random_patch",
+          "config": {
+            "feature": {
+              "feature": {
+                "type": "minecraft:simple_block",
+                "config": {
+                  "to_place": {
+                    "type": "minecraft:simple_state_provider",
+                    "state": {
+                      "Name": "jafohana:dayflower"
+                    }
+                  }
+                }
+              },
+              "placement": [
+                {
+                  "type": "minecraft:block_predicate_filter",
+                  "predicate": {
+                    "type": "minecraft:matching_blocks",
+                    "blocks": "minecraft:air"
+                  }
+                }
+              ]
+            },
+            "tries": 96,
+            "xz_spread": 7,
+            "y_spread": 3
+          }
+        },
+        "placement": []
+      },
+      {
+        "feature": {
+          "type": "minecraft:random_patch",
+          "config": {
+            "feature": {
+              "feature": {
+                "type": "minecraft:simple_block",
+                "config": {
+                  "to_place": {
+                    "type": "minecraft:simple_state_provider",
+                    "state": {
+                      "Name": "jafohana:evening_primrose"
+                    }
+                  }
+                }
+              },
+              "placement": [
+                {
+                  "type": "minecraft:block_predicate_filter",
+                  "predicate": {
+                    "type": "minecraft:matching_blocks",
+                    "blocks": "minecraft:air"
+                  }
+                }
+              ]
+            },
+            "tries": 96,
+            "xz_spread": 7,
+            "y_spread": 3
+          }
+        },
+        "placement": []
+      },
+      {
+        "feature": {
+          "type": "minecraft:random_patch",
+          "config": {
+            "feature": {
+              "feature": {
+                "type": "minecraft:simple_block",
+                "config": {
+                  "to_place": {
+                    "type": "minecraft:simple_state_provider",
+                    "state": {
+                      "Name": "jafohana:forget_me_not"
+                    }
+                  }
+                }
+              },
+              "placement": [
+                {
+                  "type": "minecraft:block_predicate_filter",
+                  "predicate": {
+                    "type": "minecraft:matching_blocks",
+                    "blocks": "minecraft:air"
+                  }
+                }
+              ]
+            },
+            "tries": 96,
+            "xz_spread": 7,
+            "y_spread": 3
+          }
+        },
+        "placement": []
+      },
+      {
+        "feature": {
+          "type": "minecraft:random_patch",
+          "config": {
+            "feature": {
+              "feature": {
+                "type": "minecraft:simple_block",
+                "config": {
+                  "to_place": {
+                    "type": "minecraft:simple_state_provider",
+                    "state": {
+                      "Name": "jafohana:orange_spider_lily"
+                    }
+                  }
+                }
+              },
+              "placement": [
+                {
+                  "type": "minecraft:block_predicate_filter",
+                  "predicate": {
+                    "type": "minecraft:matching_blocks",
+                    "blocks": "minecraft:air"
+                  }
+                }
+              ]
+            },
+            "tries": 96,
+            "xz_spread": 7,
+            "y_spread": 3
+          }
+        },
+        "placement": []
+      },
+      {
+        "feature": {
+          "type": "minecraft:random_patch",
+          "config": {
+            "feature": {
+              "feature": {
+                "type": "minecraft:simple_block",
+                "config": {
+                  "to_place": {
+                    "type": "minecraft:simple_state_provider",
+                    "state": {
+                      "Name": "jafohana:jack_in_the_pulpit"
+                    }
+                  }
+                }
+              },
+              "placement": [
+                {
+                  "type": "minecraft:block_predicate_filter",
+                  "predicate": {
+                    "type": "minecraft:matching_blocks",
+                    "blocks": "minecraft:air"
+                  }
+                }
+              ]
+            },
+            "tries": 64,
+            "xz_spread": 7,
+            "y_spread": 3
+          }
+        },
+        "placement": []
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/flower_bamboo_jungle.json b/src/main/resources/data/jafohana/worldgen/placed_feature/flower_bamboo_jungle.json
index dc5a8348..25f40e5c 100644
--- a/src/main/resources/data/jafohana/worldgen/placed_feature/flower_bamboo_jungle.json
+++ b/src/main/resources/data/jafohana/worldgen/placed_feature/flower_bamboo_jungle.json
@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 36
+      "chance": 14
     },
     {
       "type": "minecraft:in_square"
diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/flower_dense_forest.json b/src/main/resources/data/jafohana/worldgen/placed_feature/flower_dense_forest.json
new file mode 100644
index 00000000..3b4542d7
--- /dev/null
+++ b/src/main/resources/data/jafohana/worldgen/placed_feature/flower_dense_forest.json
@@ -0,0 +1,19 @@
+{
+  "feature": "jafohana:flower_dense_forest",
+  "placement": [
+    {
+      "type": "minecraft:rarity_filter",
+      "chance": 18
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:heightmap",
+      "heightmap": "MOTION_BLOCKING"
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_forest.json b/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_forest.json
index 143761a6..a25ce2b4 100644
--- a/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_forest.json
+++ b/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_forest.json
@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 56
+      "chance": 48
     },
     {
       "type": "minecraft:in_square"