Add new flowers part6

src/main/java/com/github/mechalopa/jafohana/registry/ModBlocks.java

@@ -84,6 +84,7 @@ public class ModBlocks
 	public static final Supplier<Block> FIREWEED = REGISTRY.register("fireweed", () -> new ModTallFlowerBlock());
 	public static final Supplier<Block> ALPINE_RAGWORT = REGISTRY.register("alpine_ragwort", () -> new ModTallFlowerBlock());
 	public static final Supplier<Block> TATARIAN_ASTER = REGISTRY.register("tatarian_aster", () -> new ModTallFlowerBlock());
+	public static final Supplier<Block> BUTTERFLY_WEED = REGISTRY.register("butterfly_weed", () -> new ModTallFlowerBlock());
 	public static final Supplier<Block> CARDINAL_FLOWER = REGISTRY.register("cardinal_flower", () -> new ModTallFlowerBlock());
 	public static final Supplier<Block> YELLOWFLAG_IRIS = REGISTRY.register("yellowflag_iris", () -> new ModTallFlowerBlock());
 	public static final Supplier<Block> PRINCES_PLUME = REGISTRY.register("princes_plume", () -> new BadlandsTallFlowerBlock());

src/main/java/com/github/mechalopa/jafohana/registry/ModItems.java

@@ -72,6 +72,7 @@ public class ModItems
 	public static final Supplier<Item> FIREWEED = REGISTRY.register("fireweed", () -> new DoubleHighBlockItem(ModBlocks.FIREWEED.get(), new Item.Properties()));
 	public static final Supplier<Item> ALPINE_RAGWORT = REGISTRY.register("alpine_ragwort", () -> new DoubleHighBlockItem(ModBlocks.ALPINE_RAGWORT.get(), new Item.Properties()));
 	public static final Supplier<Item> TATARIAN_ASTER = REGISTRY.register("tatarian_aster", () -> new DoubleHighBlockItem(ModBlocks.TATARIAN_ASTER.get(), new Item.Properties()));
+	public static final Supplier<Item> BUTTERFLY_WEED = REGISTRY.register("butterfly_weed", () -> new DoubleHighBlockItem(ModBlocks.BUTTERFLY_WEED.get(), new Item.Properties()));
 	public static final Supplier<Item> CARDINAL_FLOWER = REGISTRY.register("cardinal_flower", () -> new DoubleHighBlockItem(ModBlocks.CARDINAL_FLOWER.get(), new Item.Properties()));
 	public static final Supplier<Item> YELLOWFLAG_IRIS = REGISTRY.register("yellowflag_iris", () -> new DoubleHighBlockItem(ModBlocks.YELLOWFLAG_IRIS.get(), new Item.Properties()));
 	public static final Supplier<Item> PRINCES_PLUME = REGISTRY.register("princes_plume", () -> new DoubleHighBlockItem(ModBlocks.PRINCES_PLUME.get(), new Item.Properties()));

src/main/resources/assets/jafohana/blockstates/butterfly_weed.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "half=lower": {
+      "model": "jafohana:block/butterfly_weed_bottom"
+    },
+    "half=upper": {
+      "model": "jafohana:block/butterfly_weed_top"
+    }
+  }
+}

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

@@ -55,6 +55,7 @@
   "block.jafohana.fireweed": "Fireweeds",
   "block.jafohana.alpine_ragwort": "Alpine Ragwort",
   "block.jafohana.tatarian_aster": "Tatarian Aster",
+  "block.jafohana.butterfly_weed": "Butterfly Weed",
   "block.jafohana.cardinal_flower": "Cardinal Flower",
   "block.jafohana.yellowflag_iris": "Yellowflag Iris",
   "block.jafohana.princes_plume": "Prince's Plume",

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

@@ -55,6 +55,7 @@
   "block.jafohana.fireweed": "ヤナギラン",
   "block.jafohana.alpine_ragwort": "キオン",
   "block.jafohana.tatarian_aster": "シオン",
+  "block.jafohana.butterfly_weed": "ヤナギトウワタ",
   "block.jafohana.cardinal_flower": "ベニバナサワギキョウ",
   "block.jafohana.yellowflag_iris": "キショウブ",
   "block.jafohana.princes_plume": "スタンレヤ",

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

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cross",
+  "render_type": "cutout",
+  "textures": {
+    "cross": "jafohana:block/butterfly_weed_bottom"
+  }
+}

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

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cross",
+  "render_type": "cutout",
+  "textures": {
+    "cross": "jafohana:block/butterfly_weed_top"
+  }
+}

src/main/resources/assets/jafohana/models/item/butterfly_weed.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "jafohana:block/butterfly_weed_top"
+  }
+}

src/main/resources/data/jafohana/loot_table/blocks/butterfly_weed.json

@@ -0,0 +1,30 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "conditions": [
+            {
+              "block": "jafohana:butterfly_weed",
+              "condition": "minecraft:block_state_property",
+              "properties": {
+                "half": "lower"
+              }
+            }
+          ],
+          "name": "jafohana:butterfly_weed"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "jafohana:blocks/butterfly_weed"
+}

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

@@ -0,0 +1,42 @@
+{
+  "type": "neoforge:add_features",
+  "biomes": {
+    "type": "neoforge:and",
+    "values": [
+      "#jafohana:is_overworld",
+      {
+        "type": "neoforge:or",
+        "values": [
+          "#jafohana:is_forest",
+          "#jafohana:is_coniferous"
+        ]
+      },
+      {
+        "type": "neoforge:or",
+        "values": [
+          "#jafohana:is_sparse_vegetation",
+          "#jafohana:is_aquatic",
+          "#c:is_floral"
+        ]
+      },
+      {
+        "type": "neoforge:not",
+        "value": {
+          "type": "neoforge:or",
+          "values": [
+            "minecraft:flower_forest",
+            "#jafohana:is_hot",
+            "#jafohana:is_snowy",
+            "#jafohana:is_old_growth",
+            "#jafohana:is_jungle",
+            "#jafohana:is_hill_or_mountain",
+            "#jafohana:is_dead_or_wasteland",
+            "#jafohana:biomesoplenty/tundra"
+          ]
+        }
+      }
+    ]
+  },
+  "features": "jafohana:butterfly_weed",
+  "step": "vegetal_decoration"
+}

src/main/resources/data/jafohana/recipe/actuallyadditions/crushing/orange_dye_from_tall_flower.json

@@ -17,6 +17,9 @@
       },
       {
         "item": "jafohana:bird_of_paradise"
+      },
+      {
+        "item": "jafohana:butterfly_weed"
       }
     ]
   },

src/main/resources/data/jafohana/recipe/ars_nouveau/crush/orange_dye_from_tall_flower.json

@@ -17,6 +17,9 @@
       },
       {
         "item": "jafohana:bird_of_paradise"
+      },
+      {
+        "item": "jafohana:butterfly_weed"
       }
     ]
   },

src/main/resources/data/jafohana/recipe/enderio/sag_milling/orange_dye_from_tall_flower.json

@@ -27,6 +27,9 @@
       },
       {
         "item": "jafohana:bird_of_paradise"
+      },
+      {
+        "item": "jafohana:butterfly_weed"
       }
     ]
   },

src/main/resources/data/jafohana/recipe/extradelight/mortar/orange_dye_from_tall_flower.json

@@ -19,6 +19,9 @@
       },
       {
         "item": "jafohana:bird_of_paradise"
+      },
+      {
+        "item": "jafohana:butterfly_weed"
       }
     ]
   },

src/main/resources/data/jafohana/recipe/immersiveengineering/cloche/butterfly_weed.json

@@ -0,0 +1,25 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "immersiveengineering"
+    }
+  ],
+  "type": "immersiveengineering:cloche",
+  "input": {
+    "item": "jafohana:butterfly_weed"
+  },
+  "render": {
+    "type": "immersiveengineering:doubleflower",
+    "block": "jafohana:butterfly_weed"
+  },
+  "results": [
+    {
+      "item": "jafohana:butterfly_weed"
+    }
+  ],
+  "soil": {
+    "item": "minecraft:dirt"
+  },
+  "time": 480
+}

src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/butterfly_weed.json

@@ -0,0 +1,35 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "integrateddynamics"
+    }
+  ],
+  "type": "integrateddynamics:mechanical_squeezer",
+  "duration": 5,
+  "input_item": {
+    "item": "jafohana:butterfly_weed"
+  },
+  "output_items": [
+    {
+      "item": {
+        "count": 8,
+        "id": "minecraft:orange_dye"
+      }
+    },
+    {
+      "chance": 0.5,
+      "item": {
+        "count": 2,
+        "id": "minecraft:orange_dye"
+      }
+    },
+    {
+      "chance": 0.5,
+      "item": {
+        "count": 2,
+        "id": "minecraft:orange_dye"
+      }
+    }
+  ]
+}

src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/butterfly_weed.json

@@ -0,0 +1,20 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "integrateddynamics"
+    }
+  ],
+  "type": "integrateddynamics:squeezer",
+  "input_item": {
+    "item": "jafohana:butterfly_weed"
+  },
+  "output_items": [
+    {
+      "item": {
+        "count": 8,
+        "id": "minecraft:orange_dye"
+      }
+    }
+  ]
+}

src/main/resources/data/jafohana/recipe/mekanism/enriching/dye/large_orange.json

@@ -17,6 +17,9 @@
       },
       {
         "item": "jafohana:bird_of_paradise"
+      },
+      {
+        "item": "jafohana:butterfly_weed"
       }
     ],
     "count": 1

src/main/resources/data/jafohana/recipe/mekanism/pigment_extracting/flower/large_orange.json

@@ -17,6 +17,9 @@
       },
       {
         "item": "jafohana:bird_of_paradise"
+      },
+      {
+        "item": "jafohana:butterfly_weed"
       }
     ],
     "count": 1

src/main/resources/data/jafohana/recipe/orange_dye_from_butterfly_weed.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "group": "orange_dye",
+  "ingredients": [
+    {
+      "item": "jafohana:butterfly_weed"
+    }
+  ],
+  "result": {
+    "count": 2,
+    "id": "minecraft:orange_dye"
+  }
+}

src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/orange_dye_from_tall_flower.json

@@ -17,6 +17,9 @@
       },
       {
         "item": "jafohana:bird_of_paradise"
+      },
+      {
+        "item": "jafohana:butterfly_weed"
       }
     ]
   },

src/main/resources/data/jafohana/tags/block/tall_flowers.json

@@ -13,6 +13,7 @@
     "jafohana:fireweed",
     "jafohana:alpine_ragwort",
     "jafohana:tatarian_aster",
+    "jafohana:butterfly_weed",
     "jafohana:cardinal_flower",
     "jafohana:yellowflag_iris",
     "jafohana:princes_plume",

src/main/resources/data/jafohana/tags/item/tall_flowers.json

@@ -13,6 +13,7 @@
     "jafohana:fireweed",
     "jafohana:alpine_ragwort",
     "jafohana:tatarian_aster",
+    "jafohana:butterfly_weed",
     "jafohana:cardinal_flower",
     "jafohana:yellowflag_iris",
     "jafohana:princes_plume",

src/main/resources/data/jafohana/worldgen/configured_feature/butterfly_weed.json

@@ -0,0 +1,33 @@
+{
+  "type": "minecraft:random_patch",
+  "config": {
+    "feature": {
+      "feature": {
+        "type": "minecraft:simple_block",
+        "config": {
+          "to_place": {
+            "type": "minecraft:simple_state_provider",
+            "state": {
+              "Name": "jafohana:butterfly_weed",
+              "Properties": {
+                "half": "lower"
+              }
+            }
+          }
+        }
+      },
+      "placement": [
+        {
+          "type": "minecraft:block_predicate_filter",
+          "predicate": {
+            "type": "minecraft:matching_blocks",
+            "blocks": "minecraft:air"
+          }
+        }
+      ]
+    },
+    "tries": 96,
+    "xz_spread": 7,
+    "y_spread": 3
+  }
+}