Add new flowers part2 and tweaks

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

@@ -155,11 +155,11 @@ public static void onWandererTrades(WandererTradesEvent event)
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.SEGO_LILY.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.HAREBELL.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.MECONOPSIS.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.JACK_IN_THE_PULPIT.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.BEACH_SPIDER_LILY.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.JACK_IN_THE_PULPIT.get()), 12, 1, 0.05F));
+			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.RED_SPIDER_LILY.get()), 12, 1, 0.05F));
+			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.BELLS_OF_IRELAND.get()), 12, 1, 0.05F));
+			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.BEACH_SPIDER_LILY.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/models/block/beach_spider_lily.json

@@ -1,7 +1,6 @@
 {
-  "parent": "jafohana:block/medium_flower_height_20",
+  "parent": "jafohana:block/cross_height_20",
   "textures": {
-    "particle": "jafohana:block/beach_spider_lily",
     "cross": "jafohana:block/beach_spider_lily",
     "stem": "jafohana:block/beach_spider_lily_stem"
   }

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

@@ -1,7 +1,6 @@
 {
-  "parent": "jafohana:block/medium_flower_height_20",
+  "parent": "jafohana:block/cross_height_20",
   "textures": {
-    "particle": "jafohana:block/bells_of_ireland",
     "cross": "jafohana:block/bells_of_ireland",
     "stem": "jafohana:block/bells_of_ireland_stem"
   }

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

@@ -1,6 +1,9 @@
 {
   "ambientocclusion": false,
   "render_type": "cutout",
+  "textures": {
+    "particle": "#cross"
+  },
   "elements": [
     {
       "from": [ 0.8, 0, 8 ],

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

@@ -1,6 +1,9 @@
 {
   "ambientocclusion": false,
   "render_type": "cutout",
+  "textures": {
+    "particle": "#cross"
+  },
   "elements": [
     {
       "from": [ 0.8, 0, 8 ],

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

@@ -0,0 +1,69 @@
+{
+  "ambientocclusion": false,
+  "render_type": "cutout",
+  "textures": {
+    "particle": "#cross"
+  },
+  "elements": [
+    {
+      "from": [ 0.8, 0, 8 ],
+      "to": [ 15.2, 16, 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, 0, 0.8 ],
+      "to": [ 8, 16, 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" }
+      }
+    },
+    {
+      "from": [ -1.0, 0, 8 ],
+      "to": [ 0.8, 16, 8 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "north": { "uv": [ 2, 0, 4, 16 ], "texture": "#side" },
+        "south": { "uv": [ 0, 0, 2, 16 ], "texture": "#side" }
+      }
+    },
+    {
+      "from": [ 15.2, 0, 8 ],
+      "to": [ 17.0, 16, 8 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "north": { "uv": [ 0, 0, 2, 16 ], "texture": "#side" },
+        "south": { "uv": [ 2, 0, 4, 16 ], "texture": "#side" }
+      }
+    },
+    {
+      "from": [ 8, 0, -1.0 ],
+      "to": [ 8, 16, 0.8 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "west": { "uv": [ 0, 0, 2, 16 ], "texture": "#side" },
+        "east": { "uv": [ 2, 0, 4, 16 ], "texture": "#side" }
+      }
+    },
+    {
+      "from": [ 8, 0, 15.2 ],
+      "to": [ 8, 16, 17.0 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "west": { "uv": [ 2, 0, 4, 16 ], "texture": "#side" },
+        "east": { "uv": [ 0, 0, 2, 16 ], "texture": "#side" }
+      }
+    }
+  ]
+}

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

@@ -1,8 +1,92 @@
 {
-  "parent": "jafohana:block/medium_flower_height_18",
+  "ambientocclusion": false,
+  "render_type": "cutout",
   "textures": {
     "particle": "jafohana:block/jack_in_the_pulpit",
     "cross": "jafohana:block/jack_in_the_pulpit",
+    "side": "jafohana:block/jack_in_the_pulpit_side",
     "stem": "jafohana:block/jack_in_the_pulpit_stem"
-  }
+  },
+  "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" }
+      }
+    },
+    {
+      "from": [ -1.0, 2, 8 ],
+      "to": [ 0.8, 18, 8 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "north": { "uv": [ 2, 0, 4, 16 ], "texture": "#side" },
+        "south": { "uv": [ 0, 0, 2, 16 ], "texture": "#side" }
+      }
+    },
+    {
+      "from": [ 15.2, 2, 8 ],
+      "to": [ 17.0, 18, 8 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "north": { "uv": [ 0, 0, 2, 16 ], "texture": "#side" },
+        "south": { "uv": [ 2, 0, 4, 16 ], "texture": "#side" }
+      }
+    },
+    {
+      "from": [ 8, 2, -1.0 ],
+      "to": [ 8, 18, 0.8 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "west": { "uv": [ 0, 0, 2, 16 ], "texture": "#side" },
+        "east": { "uv": [ 2, 0, 4, 16 ], "texture": "#side" }
+      }
+    },
+    {
+      "from": [ 8, 2, 15.2 ],
+      "to": [ 8, 18, 17.0 ],
+      "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "west": { "uv": [ 2, 0, 4, 16 ], "texture": "#side" },
+        "east": { "uv": [ 0, 0, 2, 16 ], "texture": "#side" }
+      }
+    }
+  ]
 }

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

@@ -1,7 +1,8 @@
 {
-  "parent": "minecraft:block/cross",
+  "parent": "jafohana:block/cross_width_18",
   "render_type": "cutout",
   "textures": {
-    "cross": "jafohana:block/princes_plume_bottom"
+    "cross": "jafohana:block/princes_plume_bottom",
+    "side": "jafohana:block/princes_plume_bottom_side"
   }
 }

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

@@ -1,7 +1,8 @@
 {
-  "parent": "minecraft:block/cross",
+  "parent": "jafohana:block/cross_width_18",
   "render_type": "cutout",
   "textures": {
-    "cross": "jafohana:block/princes_plume_top"
+    "cross": "jafohana:block/princes_plume_top",
+    "side": "jafohana:block/princes_plume_top_side"
   }
 }

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

@@ -1,7 +1,6 @@
 {
-  "parent": "jafohana:block/medium_flower_height_18",
+  "parent": "jafohana:block/cross_height_18",
   "textures": {
-    "particle": "jafohana:block/wheel_lily",
     "cross": "jafohana:block/wheel_lily",
     "stem": "jafohana:block/wheel_lily_stem"
   }

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

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

src/main/resources/data/jafohana/loot_modifiers/chests/village/village_desert_house.json

@@ -0,0 +1,10 @@
+{
+  "type": "neoforge:add_table",
+  "conditions": [
+    {
+      "condition": "neoforge:loot_table_id",
+      "loot_table_id": "minecraft:chests/village/village_desert_house"
+    }
+  ],
+  "table": "jafohana:additions/chests/village/village_desert_house"
+}

src/main/resources/data/jafohana/loot_table/additions/chests/village/village_desert_house.json

@@ -0,0 +1,51 @@
+{
+  "type": "minecraft:chest",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 3.0,
+                "min": 1.0
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
+          "name": "jafohana:apricot_mallow",
+          "weight": 2
+        },
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 3.0,
+                "min": 1.0
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
+          "name": "jafohana:princes_plume"
+        },
+        {
+          "type": "minecraft:empty",
+          "weight": 27
+        }
+      ],
+      "rolls": {
+        "type": "minecraft:uniform",
+        "max": 3.0,
+        "min": 0.0
+      }
+    }
+  ],
+  "random_sequence": "jafohana:additions/chests/village/village_desert_house"
+}

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

@@ -4,7 +4,26 @@
     "type": "neoforge:and",
     "values": [
       "#jafohana:is_overworld",
-      "#jafohana:is_plains",
+      {
+        "type": "neoforge:or",
+        "values": [
+          "#jafohana:is_plains",
+          {
+            "type": "neoforge:and",
+            "values": [
+              "#jafohana:is_spooky",
+              {
+                "type": "neoforge:or",
+                "values": [
+                  "#jafohana:is_coniferous",
+                  "#jafohana:is_forest",
+                  "#jafohana:is_swamp"
+                ]
+              }
+            ]
+          }
+        ]
+      },
       {
         "type": "neoforge:not",
         "value": {