Add swamp tall flower pt1

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

@@ -69,6 +69,8 @@ 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> SWAMP_MILKWEED = REGISTRY.register("swamp_milkweed", () -> new ModTallFlowerBlock());
+	public static final Supplier<Block> YELLOWFLAG_IRIS = REGISTRY.register("yellowflag_iris", () -> new ModTallFlowerBlock());
 	public static final Supplier<Block> FASCIATED_DANDELION = REGISTRY.register("fasciated_dandelion", () -> new FasciatedDandelionBlock());
 	public static final Supplier<Block> FASCIATED_OXEYE_DAISY = REGISTRY.register("fasciated_oxeye_daisy", () -> new FasciatedOxeyeDaisyBlock());
 	public static final Supplier<Block> JADE_VINE = REGISTRY.register("jade_vine", () -> new JadeVineBlock());

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

@@ -60,6 +60,8 @@ 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> SWAMP_MILKWEED = REGISTRY.register("swamp_milkweed", () -> new DoubleHighBlockItem(ModBlocks.SWAMP_MILKWEED.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> FASCIATED_DANDELION = REGISTRY.register("fasciated_dandelion", () -> new DoubleHighBlockItem(ModBlocks.FASCIATED_DANDELION.get(), new Item.Properties()));
 	public static final Supplier<Item> FASCIATED_OXEYE_DAISY = REGISTRY.register("fasciated_oxeye_daisy", () -> new DoubleHighBlockItem(ModBlocks.FASCIATED_OXEYE_DAISY.get(), new Item.Properties()));
 	public static final Supplier<Item> JADE_VINE = REGISTRY.register("jade_vine", () -> new BlockItem(ModBlocks.JADE_VINE.get(), new Item.Properties()));

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

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

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

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

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

@@ -43,6 +43,8 @@
   "block.jafohana.fireweed": "Fireweeds",
   "block.jafohana.alpine_ragwort": "Alpine Ragwort",
   "block.jafohana.tatarian_aster": "Tatarian Aster",
+  "block.jafohana.swamp_milkweed": "Swamp Milkweed",
+  "block.jafohana.yellowflag_iris": "Yellowflag Iris",
   "block.jafohana.fasciated_dandelion": "Fasciated Dandelion",
   "block.jafohana.fasciated_oxeye_daisy": "Fasciated Oxeye Daisy",
   "block.jafohana.jade_vine": "Jade Vine",

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

@@ -43,6 +43,8 @@
   "block.jafohana.fireweed": "ヤナギラン",
   "block.jafohana.alpine_ragwort": "キオン",
   "block.jafohana.tatarian_aster": "シオン",
+  "block.jafohana.swamp_milkweed": "スワンプミルクウィード",
+  "block.jafohana.yellowflag_iris": "キショウブ",
   "block.jafohana.fasciated_dandelion": "帯化したタンポポ",
   "block.jafohana.fasciated_oxeye_daisy": "帯化したフランスギク",
   "block.jafohana.jade_vine": "ヒスイカズラ",

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

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

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

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

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

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

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

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

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

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

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

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

src/main/resources/data/jafohana/loot_table/blocks/swamp_milkweed.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:swamp_milkweed",
+              "condition": "minecraft:block_state_property",
+              "properties": {
+                "half": "lower"
+              }
+            }
+          ],
+          "name": "jafohana:swamp_milkweed"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "jafohana:blocks/swamp_milkweed"
+}

src/main/resources/data/jafohana/loot_table/blocks/yellowflag_iris.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:yellowflag_iris",
+              "condition": "minecraft:block_state_property",
+              "properties": {
+                "half": "lower"
+              }
+            }
+          ],
+          "name": "jafohana:yellowflag_iris"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "jafohana:blocks/yellowflag_iris"
+}

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

@@ -10,6 +10,10 @@
       {
         "name": "#jafohana:is_overworld"
       },
+      {
+        "name": "minecraft:sunflower_plains",
+        "negate": true
+      },
       {
         "name": "#jafohana:is_dry",
         "negate": true
@@ -58,6 +62,6 @@
       }
     ]
   ],
-  "features": "jafohana:beach_spider_lily",
+  "features": "jafohana:beach_spider_lily_waterside",
   "step": "vegetal_decoration"
 }

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

@@ -10,7 +10,7 @@
         "negate": true
       },
       {
-        "name": "#jafohana:is_snowy",
+        "name": "#jafohana:is_cold",
         "negate": true
       },
       {
@@ -26,7 +26,11 @@
         "name": "#jafohana:is_overworld"
       },
       {
-        "name": "#jafohana:is_snowy",
+        "name": "#jafohana:is_cold",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_dead_or_wasteland",
         "negate": true
       },
       {
@@ -38,7 +42,7 @@
         "name": "#jafohana:is_overworld"
       },
       {
-        "name": "#jafohana:is_snowy",
+        "name": "#jafohana:is_cold",
         "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/tall_flower_features_in_river.json

@@ -0,0 +1,27 @@
+{
+  "type": "jafohana:add_features",
+  "biomes": [
+    [
+      {
+        "name": "#jafohana:is_overworld"
+      },
+      {
+        "name": "#jafohana:is_hot",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_cold",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_dead_or_wasteland",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_river"
+      }
+    ]
+  ],
+  "features": "jafohana:tall_flower_river",
+  "step": "vegetal_decoration"
+}

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

@@ -0,0 +1,43 @@
+{
+  "type": "jafohana:add_features",
+  "biomes": [
+    [
+      {
+        "name": "#jafohana:is_overworld"
+      },
+      {
+        "name": "#jafohana:is_savanna",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_plains",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_forest",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_coniferous",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_jungle",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_dead_or_wasteland",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_swamp"
+      },
+      {
+        "name": "minecraft:mangrove_swamp",
+        "negate": true
+      }
+    ]
+  ],
+  "features": "jafohana:tall_flower_swamp",
+  "step": "vegetal_decoration"
+}

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

@@ -0,0 +1,39 @@
+{
+  "type": "jafohana:add_features",
+  "biomes": [
+    [
+      {
+        "name": "#jafohana:is_overworld"
+      },
+      {
+        "name": "minecraft:sunflower_plains",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_hot",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_cold",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_hill_or_mountain",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_dead_or_wasteland",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_swamp",
+        "negate": true
+      },
+      {
+        "name": "#jafohana:is_plains"
+      }
+    ]
+  ],
+  "features": "jafohana:tall_flower_plain_waterside",
+  "step": "vegetal_decoration"
+}

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

@@ -7,8 +7,16 @@
   ],
   "type": "mekanism:enriching",
   "input": {
-    "count": 1,
-    "item": "jafohana:brazilian_plume"
+    "type": "neoforge:compound",
+    "children": [
+      {
+        "item": "jafohana:brazilian_plume"
+      },
+      {
+        "item": "jafohana:swamp_milkweed"
+      }
+    ],
+    "count": 1
   },
   "output": {
     "count": 4,

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

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

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

@@ -7,8 +7,16 @@
   ],
   "type": "mekanism:pigment_extracting",
   "input": {
-    "count": 1,
-    "item": "jafohana:brazilian_plume"
+    "type": "neoforge:compound",
+    "children": [
+      {
+        "item": "jafohana:brazilian_plume"
+      },
+      {
+        "item": "jafohana:swamp_milkweed"
+      }
+    ],
+    "count": 1
   },
   "output": {
     "amount": 1536,