Merge branch 'master' into 1.21.2

CHANGELOG.md

@@ -58,6 +58,7 @@ hi
 - Particles created by entities touching Seeding Dandelions are now dependent on how the entity was moving.
 - Glories of the Snow have been removed.
   - They are now replaced with four Hibiscus Blocks:
+    - Red Hibiscus
     - Yellow Hibiscus.
     - White Hibiscus.
     - Pink Hibiscus.
@@ -66,6 +67,8 @@ hi
   - Glory of the Snow Petals will be datafixed into Pollen.
 - Added a config option to toggle pools of water generating in River biomes.
   - This is now disabled by default, unlike before.
+- Scorched now set entities on fire upon attacking.
+- Removed the `wilderwild:sculk_spreader` entity, and updated the `spreadsculk` command to place all Sculk at once.
 
 # Music
 - Added three new tracks by Willow/pictochats_.

src/main/generated/assets/wilderwild/blockstates/potted_red_hibiscus.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "wilderwild:block/potted_red_hibiscus"
+    }
+  }
+}

src/main/generated/assets/wilderwild/blockstates/red_hibiscus.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "wilderwild:block/red_hibiscus"
+    }
+  }
+}

src/main/generated/assets/wilderwild/models/block/potted_red_hibiscus.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/flower_pot_cross",
+  "textures": {
+    "plant": "wilderwild:block/red_hibiscus"
+  }
+}

src/main/generated/assets/wilderwild/models/block/red_hibiscus.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "wilderwild:block/red_hibiscus"
+  }
+}

src/main/generated/assets/wilderwild/models/item/red_hibiscus.json

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

src/main/generated/data/minecraft/tags/block/small_flowers.json

@@ -4,6 +4,7 @@
     "wilderwild:marigold",
     "wilderwild:seeding_dandelion",
     "wilderwild:pasqueflower",
+    "wilderwild:red_hibiscus",
     "wilderwild:yellow_hibiscus",
     "wilderwild:white_hibiscus",
     "wilderwild:pink_hibiscus",

src/main/generated/data/minecraft/tags/item/small_flowers.json

@@ -4,6 +4,7 @@
     "wilderwild:marigold",
     "wilderwild:seeding_dandelion",
     "wilderwild:pasqueflower",
+    "wilderwild:red_hibiscus",
     "wilderwild:yellow_hibiscus",
     "wilderwild:white_hibiscus",
     "wilderwild:pink_hibiscus",

src/main/generated/data/sereneseasons/tags/block/spring_crops.json

@@ -1,5 +1,6 @@
 {
   "values": [
+    "wilderwild:red_hibiscus",
     "wilderwild:yellow_hibiscus",
     "wilderwild:white_hibiscus",
     "wilderwild:pink_hibiscus",

src/main/generated/data/sereneseasons/tags/block/summer_crops.json

@@ -1,5 +1,6 @@
 {
   "values": [
+    "wilderwild:red_hibiscus",
     "wilderwild:yellow_hibiscus",
     "wilderwild:white_hibiscus",
     "wilderwild:pink_hibiscus",

src/main/generated/data/sereneseasons/tags/item/spring_crops.json

@@ -1,5 +1,6 @@
 {
   "values": [
+    "wilderwild:red_hibiscus",
     "wilderwild:yellow_hibiscus",
     "wilderwild:white_hibiscus",
     "wilderwild:pink_hibiscus",

src/main/generated/data/sereneseasons/tags/item/summer_crops.json

@@ -1,5 +1,6 @@
 {
   "values": [
+    "wilderwild:red_hibiscus",
     "wilderwild:yellow_hibiscus",
     "wilderwild:white_hibiscus",
     "wilderwild:pink_hibiscus",

src/main/generated/data/wilderwild/advancement/recipes/misc/red_dye_from_red_hibiscus.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_red_hibiscus": {
+      "conditions": {
+        "items": [
+          {
+            "items": "wilderwild:red_hibiscus"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "wilderwild:red_dye_from_red_hibiscus"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_red_hibiscus"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "wilderwild:red_dye_from_red_hibiscus"
+    ]
+  }
+}

src/main/generated/data/wilderwild/loot_table/blocks/potted_pink_hibiscus.json

@@ -0,0 +1,35 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:flower_pot"
+        }
+      ],
+      "rolls": 1.0
+    },
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "wilderwild:pink_hibiscus"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/wilderwild/loot_table/blocks/potted_purple_hibiscus.json

@@ -0,0 +1,35 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:flower_pot"
+        }
+      ],
+      "rolls": 1.0
+    },
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "wilderwild:purple_hibiscus"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/wilderwild/loot_table/blocks/potted_red_hibiscus.json

@@ -0,0 +1,35 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:flower_pot"
+        }
+      ],
+      "rolls": 1.0
+    },
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "wilderwild:red_hibiscus"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/wilderwild/loot_table/blocks/potted_white_hibiscus.json

@@ -0,0 +1,35 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:flower_pot"
+        }
+      ],
+      "rolls": 1.0
+    },
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "wilderwild:white_hibiscus"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/wilderwild/loot_table/blocks/potted_yellow_hibiscus.json

@@ -0,0 +1,35 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:flower_pot"
+        }
+      ],
+      "rolls": 1.0
+    },
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "wilderwild:yellow_hibiscus"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/wilderwild/loot_table/blocks/red_hibiscus.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "wilderwild:red_hibiscus"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/wilderwild/recipe/red_dye_from_red_hibiscus.json

@@ -0,0 +1,12 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "group": "red_dye",
+  "ingredients": [
+    "wilderwild:red_hibiscus"
+  ],
+  "result": {
+    "count": 1,
+    "id": "minecraft:red_dye"
+  }
+}

src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_milkweed.json

@@ -1,6 +1,5 @@
 {
   "values": [
-    "minecraft:birch_forest",
     "minecraft:flower_forest",
     "minecraft:forest",
     "minecraft:swamp",

src/main/generated/data/wilderwild/worldgen/configured_feature/hibiscus.json

@@ -13,9 +13,15 @@
               ],
               "firstOctave": 0
             },
-            "scale": 0.048833333,
+            "scale": 0.08883333,
             "seed": 5050,
             "states": [
+              {
+                "Name": "wilderwild:red_hibiscus"
+              },
+              {
+                "Name": "wilderwild:red_hibiscus"
+              },
               {
                 "Name": "wilderwild:yellow_hibiscus"
               },
@@ -25,6 +31,9 @@
               {
                 "Name": "wilderwild:pink_hibiscus"
               },
+              {
+                "Name": "wilderwild:purple_hibiscus"
+              },
               {
                 "Name": "wilderwild:purple_hibiscus"
               }