Follows 1.21 update

src/main/java/com/github/mechalopa/jafohana/ModEvents.java

@@ -152,9 +152,9 @@ public static void onWandererTrades(WandererTradesEvent event)
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.BLUE_DAISY.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.WINTER_HEATH.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.CRIMSON_CLOVER.get()), 12, 1, 0.05F));
-			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.WHEEL_LILY.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.MAGENTA_SPOTTED_BELLFLOWER.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.WHITE_SPOTTED_BELLFLOWER.get()), 12, 1, 0.05F));
+			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.WHEEL_LILY.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.RED_SPIDER_LILY.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.BELLS_OF_IRELAND.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.JADE_VINE.get(), 2), 5, 1, 0.05F));

src/main/resources/assets/jafohana/lang/ja_jp.json

@@ -8,7 +8,7 @@
   "block.jafohana.white_african_daisy": "白色のアフリカンデイジー",
   "block.jafohana.black_tulip": "黒色のチューリップ",
   "block.jafohana.green_tulip": "緑色のチューリップ",
-  "block.jafohana.blood_red_iris": "菖蒲",
+  "block.jafohana.blood_red_iris": "アヤメ",
   "block.jafohana.bluebell": "ブルーベル",
   "block.jafohana.red_snapdragon": "赤色の金魚草",
   "block.jafohana.yellow_snapdragon": "黄色の金魚草",
@@ -54,7 +54,7 @@
   "block.jafohana.potted_white_african_daisy": "植えられた白色のアフリカンデイジー",
   "block.jafohana.potted_black_tulip": "植えられた黒色のチューリップ",
   "block.jafohana.potted_green_tulip": "植えられた緑色のチューリップ",
-  "block.jafohana.potted_blood_red_iris": "植えられた菖蒲",
+  "block.jafohana.potted_blood_red_iris": "植えられたアヤメ",
   "block.jafohana.potted_bluebell": "植えられたブルーベル",
   "block.jafohana.potted_red_snapdragon": "植えられた赤色の金魚草",
   "block.jafohana.potted_yellow_snapdragon": "植えられた黄色の金魚草",

src/main/resources/assets/jafohana/models/block/bells_of_ireland.json

@@ -1,51 +1,8 @@
 {
-  "ambientocclusion": false,
-  "render_type": "cutout",
+  "parent": "jafohana:block/medium_flower_height_20",
   "textures": {
     "particle": "jafohana:block/bells_of_ireland",
     "cross": "jafohana:block/bells_of_ireland",
     "stem": "jafohana:block/bells_of_ireland_stem"
-  },
-  "elements": [
-    {
-      "from": [ 0.8, 0, 8 ],
-      "to": [ 15.2, 4, 8 ],
-      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
-      "shade": false,
-      "faces": {
-        "north": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" },
-        "south": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }
-      }
-    },
-    {
-      "from": [ 8, 0, 0.8 ],
-      "to": [ 8, 4, 15.2 ],
-      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
-      "shade": false,
-      "faces": {
-        "west": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" },
-        "east": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }
-      }
-    },
-    {
-      "from": [ 0.8, 4, 8 ],
-      "to": [ 15.2, 20, 8 ],
-      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
-      "shade": false,
-      "faces": {
-        "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" },
-        "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }
-      }
-    },
-    {
-      "from": [ 8, 4, 0.8 ],
-      "to": [ 8, 20, 15.2 ],
-      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
-      "shade": false,
-      "faces": {
-        "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" },
-        "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }
-      }
-    }
-  ]
+  }
 }

src/main/resources/assets/jafohana/models/block/medium_flower_height_18.json

@@ -0,0 +1,46 @@
+{
+  "ambientocclusion": false,
+  "render_type": "cutout",
+  "elements": [
+    {
+      "from": [ 0.8, 0, 8 ],
+      "to": [ 15.2, 2, 8 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "north": { "uv": [ 0, 0, 16, 2 ], "texture": "#stem" },
+        "south": { "uv": [ 0, 0, 16, 2 ], "texture": "#stem" }
+      }
+    },
+    {
+      "from": [ 8, 0, 0.8 ],
+      "to": [ 8, 2, 15.2 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "west": { "uv": [ 0, 0, 16, 2 ], "texture": "#stem" },
+        "east": { "uv": [ 0, 0, 16, 2 ], "texture": "#stem" }
+      }
+    },
+    {
+      "from": [ 0.8, 2, 8 ],
+      "to": [ 15.2, 18, 8 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" },
+        "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }
+      }
+    },
+    {
+      "from": [ 8, 2, 0.8 ],
+      "to": [ 8, 18, 15.2 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" },
+        "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }
+      }
+    }
+  ]
+}

src/main/resources/assets/jafohana/models/block/medium_flower_height_20.json

@@ -0,0 +1,46 @@
+{
+  "ambientocclusion": false,
+  "render_type": "cutout",
+  "elements": [
+    {
+      "from": [ 0.8, 0, 8 ],
+      "to": [ 15.2, 4, 8 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "north": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" },
+        "south": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }
+      }
+    },
+    {
+      "from": [ 8, 0, 0.8 ],
+      "to": [ 8, 4, 15.2 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "west": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" },
+        "east": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }
+      }
+    },
+    {
+      "from": [ 0.8, 4, 8 ],
+      "to": [ 15.2, 20, 8 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" },
+        "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }
+      }
+    },
+    {
+      "from": [ 8, 4, 0.8 ],
+      "to": [ 8, 20, 15.2 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" },
+        "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }
+      }
+    }
+  ]
+}

src/main/resources/assets/jafohana/models/block/wheel_lily.json

@@ -1,7 +1,8 @@
 {
-  "parent": "minecraft:block/cross",
-  "render_type": "cutout",
+  "parent": "jafohana:block/medium_flower_height_18",
   "textures": {
-    "cross": "jafohana:block/wheel_lily"
+    "particle": "jafohana:block/wheel_lily",
+    "cross": "jafohana:block/wheel_lily",
+    "stem": "jafohana:block/wheel_lily_stem"
   }
 }

src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_bamboo_jungle.json

@@ -1,6 +1,18 @@
 {
-  "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_jungle"
+      }
+    ]
+  ],
   "features": "jafohana:flower_bamboo_jungle",
   "step": "vegetal_decoration"
 }

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
       },
       {

src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_sparse_jungle.json

@@ -1,6 +1,22 @@
 {
-  "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_jungle"
+      }
+    ]
+  ],
   "features": "jafohana:flower_sparse_jungle",
   "step": "vegetal_decoration"
 }

src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_spooky_forest.json

@@ -14,6 +14,10 @@
       },
       {
         "name": "#jafohana:is_spooky"
+      },
+      {
+        "name": "#jafohana:biomesoplenty/ominous_woods",
+        "negate": true
       }
     ],
     [
@@ -29,6 +33,10 @@
       },
       {
         "name": "#jafohana:is_spooky"
+      },
+      {
+        "name": "#jafohana:biomesoplenty/ominous_woods",
+        "negate": true
       }
     ]
   ],

src/main/resources/data/jafohana/neoforge/biome_modifier/red_spider_lily_features.json

@@ -22,6 +22,6 @@
       }
     ]
   ],
-  "features": "jafohana:red_spider_lily",
+  "features": "jafohana:red_spider_lily_waterside",
   "step": "vegetal_decoration"
 }

src/main/resources/data/jafohana/neoforge/biome_modifier/red_spider_lily_features_in_river.json

@@ -10,7 +10,7 @@
         "negate": true
       },
       {
-        "name": "#jafohana:is_snowy",
+        "name": "#jafohana:is_cold",
         "negate": true
       },
       {

src/main/resources/data/jafohana/recipes/refurbished_furniture/slicing/black_dye.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "refurbished_furniture"
+    }
+  ],
+  "type": "refurbished_furniture:cutting_board_slicing",
+  "ingredient": {
+    "item": "jafohana:black_tulip"
+  },
+  "result": {
+    "count": 2,
+    "id": "minecraft:black_dye"
+  }
+}

src/main/resources/data/jafohana/recipes/refurbished_furniture/slicing/black_dye_from_tall_flower.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "refurbished_furniture"
+    }
+  ],
+  "type": "refurbished_furniture:cutting_board_slicing",
+  "ingredient": {
+    "item": "jafohana:black_bat_flower"
+  },
+  "result": {
+    "count": 3,
+    "id": "minecraft:black_dye"
+  }
+}

src/main/resources/data/jafohana/recipes/refurbished_furniture/slicing/blue_dye.json

@@ -0,0 +1,24 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "refurbished_furniture"
+    }
+  ],
+  "type": "refurbished_furniture:cutting_board_slicing",
+  "ingredient": {
+    "type": "neoforge:compound",
+    "children": [
+      {
+        "item": "jafohana:dayflower"
+      },
+      {
+        "item": "jafohana:bluebell"
+      }
+    ]
+  },
+  "result": {
+    "count": 2,
+    "id": "minecraft:blue_dye"
+  }
+}

src/main/resources/data/jafohana/recipes/refurbished_furniture/slicing/cyan_dye.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "refurbished_furniture"
+    }
+  ],
+  "type": "refurbished_furniture:cutting_board_slicing",
+  "ingredient": {
+    "item": "jafohana:jade_vine"
+  },
+  "result": {
+    "count": 2,
+    "id": "minecraft:cyan_dye"
+  }
+}

src/main/resources/data/jafohana/recipes/refurbished_furniture/slicing/green_dye.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "refurbished_furniture"
+    }
+  ],
+  "type": "refurbished_furniture:cutting_board_slicing",
+  "ingredient": {
+    "item": "jafohana:creepansy"
+  },
+  "result": {
+    "count": 2,
+    "id": "minecraft:green_dye"
+  }
+}