Create/Update assets for version 17w15a

assets/minecraft/advancements/adventure/adventuring_time.json

@@ -0,0 +1,227 @@
+{
+    "display": {
+        "icon": "minecraft:diamond_boots",
+        "title": "Adventuring Time",
+        "description": "Discover every biome",
+        "frame": "challenge"
+    },
+    "parent": "adventure/sleep_in_bed",
+    "criteria": {
+        "birch_forest_hills": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:birch_forest_hills"
+            }
+        },
+        "river": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:river"
+            }
+        },
+        "swampland": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:swampland"
+            }
+        },
+        "desert": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:desert"
+            }
+        },
+        "forest_hills": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:forest_hills"
+            }
+        },
+        "redwood_taiga_hills": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:redwood_taiga_hills"
+            }
+        },
+        "taiga_cold": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:taiga_cold"
+            }
+        },
+        "mesa": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:mesa"
+            }
+        },
+        "forest": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:forest"
+            }
+        },
+        "stone_beach": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:stone_beach"
+            }
+        },
+        "ice_flats": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:ice_flats"
+            }
+        },
+        "taiga_hills": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:taiga_hills"
+            }
+        },
+        "ice_mountains": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:ice_mountains"
+            }
+        },
+        "mesa_rock": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:mesa_rock"
+            }
+        },
+        "savanna": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:savanna"
+            }
+        },
+        "plains": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:plains"
+            }
+        },
+        "frozen_river": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:frozen_river"
+            }
+        },
+        "redwood_taiga": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:redwood_taiga"
+            }
+        },
+        "cold_beach": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:cold_beach"
+            }
+        },
+        "deep_ocean": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:deep_ocean"
+            }
+        },
+        "jungle_hills": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:jungle_hills"
+            }
+        },
+        "jungle_edge": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:jungle_edge"
+            }
+        },
+        "ocean": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:ocean"
+            }
+        },
+        "mushroom_island_shore": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:mushroom_island_shore"
+            }
+        },
+        "extreme_hills": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:extreme_hills"
+            }
+        },
+        "desert_hills": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:desert_hills"
+            }
+        },
+        "jungle": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:jungle"
+            }
+        },
+        "beaches": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:beaches"
+            }
+        },
+        "savanna_rock": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:savanna_rock"
+            }
+        },
+        "taiga_cold_hills": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:taiga_cold_hills"
+            }
+        },
+        "mesa_clear_rock": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:mesa_clear_rock"
+            }
+        },
+        "roofed_forest": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:roofed_forest"
+            }
+        },
+        "taiga": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:taiga"
+            }
+        },
+        "birch_forest": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:birch_forest"
+            }
+        },
+        "mushroom_island": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:mushroom_island"
+            }
+        },
+        "extreme_hills_with_trees": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:extreme_hills_with_trees"
+            }
+        }
+    }
+}

assets/minecraft/advancements/adventure/kill_a_mob.json

@@ -0,0 +1,210 @@
+{
+    "display": {
+        "icon": "minecraft:iron_sword",
+        "title": "Monster Hunter",
+        "description": "Kill any hostile monster"
+    },
+    "parent": "adventure/root",
+    "criteria": {
+        "cave_spider": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "cave_spider"
+                }
+            }
+        },
+        "spider": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "spider"
+                }
+            }
+        },
+        "zombie_pigman": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "zombie_pigman"
+                }
+            }
+        },
+        "enderman": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "enderman"
+                }
+            }
+        },
+        "polar_bear": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "polar_bear"
+                }
+            }
+        },
+        "blaze": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "blaze"
+                }
+            }
+        },
+        "creeper": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "creeper"
+                }
+            }
+        },
+        "evoker": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "evocation_illager"
+                }
+            }
+        },
+        "ghast": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "ghast"
+                }
+            }
+        },
+        "guardian": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "guardian"
+                }
+            }
+        },
+        "husk": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "husk"
+                }
+            }
+        },
+        "magma_cube": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "magma_cube"
+                }
+            }
+        },
+        "shulker": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "shulker"
+                }
+            }
+        },
+        "silverfish": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "silverfish"
+                }
+            }
+        },
+        "skeleton": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "skeleton"
+                }
+            }
+        },
+        "slime": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "slime"
+                }
+            }
+        },
+        "stray": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "stray"
+                }
+            }
+        },
+        "vindicator": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "vindication_illager"
+                }
+            }
+        },
+        "witch": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "witch"
+                }
+            }
+        },
+        "wither_skeleton": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "wither_skeleton"
+                }
+            }
+        },
+        "zombie": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "zombie"
+                }
+            }
+        },
+        "zombie_villager": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "zombie_villager"
+                }
+            }
+        }
+    },
+    "requirements": [
+        ["cave_spider"],
+        ["spider"],
+        ["zombie_pigman"],
+        ["enderman"],
+        ["polar_bear"],
+        ["blaze"],
+        ["creeper"],
+        ["evoker"],
+        ["ghast"],
+        ["guardian"],
+        ["husk"],
+        ["magma_cube"],
+        ["shulker"],
+        ["silverfish"],
+        ["skeleton"],
+        ["slime"],
+        ["stray"],
+        ["vindicator"],
+        ["witch"],
+        ["wither_skeleton"],
+        ["zombie"],
+        ["zombie_villager"]
+    ]
+}

assets/minecraft/advancements/adventure/kill_all_mobs.json

@@ -0,0 +1,187 @@
+{
+    "display": {
+        "icon": "minecraft:diamond_sword",
+        "title": "Monsters Hunted",
+        "description": "Kill one of every hostile monster",
+        "frame": "challenge"
+    },
+    "parent": "adventure/kill_a_mob",
+    "criteria": {
+        "cave_spider": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "cave_spider"
+                }
+            }
+        },
+        "spider": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "spider"
+                }
+            }
+        },
+        "zombie_pigman": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "zombie_pigman"
+                }
+            }
+        },
+        "enderman": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "enderman"
+                }
+            }
+        },
+        "polar_bear": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "polar_bear"
+                }
+            }
+        },
+        "blaze": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "blaze"
+                }
+            }
+        },
+        "creeper": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "creeper"
+                }
+            }
+        },
+        "evoker": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "evocation_illager"
+                }
+            }
+        },
+        "ghast": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "ghast"
+                }
+            }
+        },
+        "guardian": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "guardian"
+                }
+            }
+        },
+        "husk": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "husk"
+                }
+            }
+        },
+        "magma_cube": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "magma_cube"
+                }
+            }
+        },
+        "shulker": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "shulker"
+                }
+            }
+        },
+        "silverfish": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "silverfish"
+                }
+            }
+        },
+        "skeleton": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "skeleton"
+                }
+            }
+        },
+        "slime": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "slime"
+                }
+            }
+        },
+        "stray": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "stray"
+                }
+            }
+        },
+        "vindicator": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "vindication_illager"
+                }
+            }
+        },
+        "witch": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "witch"
+                }
+            }
+        },
+        "wither_skeleton": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "wither_skeleton"
+                }
+            }
+        },
+        "zombie": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "zombie"
+                }
+            }
+        },
+        "zombie_villager": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": {
+                    "type": "zombie_villager"
+                }
+            }
+        }
+    }
+}

assets/minecraft/advancements/adventure/root.json

@@ -0,0 +1,17 @@
+{
+    "display": {
+        "icon": "minecraft:map",
+        "title": "Adventure",
+        "description": "Adventure, exploration and combat.",
+        "background": "minecraft:textures/gui/advancements/backgrounds/adventure.png"
+    },
+    "criteria": {
+        "killed_something": {
+            "trigger": "minecraft:player_killed_entity"
+        },
+        "killed_by_something": {
+            "trigger": "minecraft:entity_killed_player"
+        }
+    },
+    "requirements": [["killed_something"], ["killed_by_something"]]
+}

assets/minecraft/advancements/adventure/shoot_arrow.json

@@ -0,0 +1,20 @@
+{
+    "display": {
+        "icon": "minecraft:bow",
+        "title": "Take Aim",
+        "description": "Shoot something with a bow and arrow"
+    },
+    "parent": "adventure/kill_a_mob",
+    "criteria": {
+        "shot_arrow": {
+            "trigger": "minecraft:player_hurt_entity",
+            "conditions": {
+                "damage": {
+                    "type": {
+                        "is_projectile": true
+                    }
+                }
+            }
+        }
+    }
+}

assets/minecraft/advancements/adventure/sleep_in_bed.json

@@ -0,0 +1,13 @@
+{
+    "display": {
+        "icon": "minecraft:bed",
+        "title": "Sweet dreams",
+        "description": "Change your respawn point"
+    },
+    "parent": "adventure/root",
+    "criteria": {
+        "slept_in_bed": {
+            "trigger": "minecraft:slept_in_bed"
+        }
+    }
+}

assets/minecraft/advancements/adventure/sniper_duel.json

@@ -0,0 +1,24 @@
+{
+    "display": {
+        "icon": "minecraft:arrow",
+        "title": "Sniper duel",
+        "description": "Kill a skeleton with an arrow from more than 50 meters",
+        "frame": "challenge"
+    },
+    "parent": "adventure/shoot_arrow",
+    "criteria": {
+        "killed_skeleton": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "killing_blow": {
+                    "is_projectile": true
+                },
+                "entity": {
+                    "distance": {
+                        "min": 50
+                    }
+                }
+            }
+        }
+    }
+}

assets/minecraft/advancements/adventure/trade.json

@@ -0,0 +1,13 @@
+{
+    "display": {
+        "icon": "minecraft:emerald",
+        "title": "What a Deal!",
+        "description": "Successfully trade with a Villager"
+    },
+    "parent": "adventure/root",
+    "criteria": {
+        "shot_arrow": {
+            "trigger": "minecraft:villager_trade"
+        }
+    }
+}

assets/minecraft/advancements/recipes/buildingBlocks/black_wool.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/buildingBlocks/blue_wool.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/buildingBlocks/bone_block.json

@@ -12,7 +12,7 @@
         "recipe": "bone_block"
       }
     },
-    "has_at_least_9_dye": {
+    "has_at_least_9_bonemeal": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -32,7 +32,7 @@
       "has_the_recipe"
     ],
     [
-      "has_at_least_9_dye"
+      "has_at_least_9_bonemeal"
     ]
   ]
 }

assets/minecraft/advancements/recipes/buildingBlocks/brown_wool.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/buildingBlocks/cyan_wool.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/buildingBlocks/gray_wool.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/buildingBlocks/green_wool.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/buildingBlocks/lapis_block.json

@@ -6,13 +6,7 @@
     ]
   },
   "criteria": {
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "lapis_block"
-      }
-    },
-    "has_at_least_9_dye": {
+    "has_at_least_9_lapis": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,14 +19,20 @@
           }
         ]
       }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "lapis_block"
+      }
     }
   },
   "requirements": [
     [
-      "has_the_recipe"
+      "has_at_least_9_lapis"
     ],
     [
-      "has_at_least_9_dye"
+      "has_the_recipe"
     ]
   ]
 }

assets/minecraft/advancements/recipes/buildingBlocks/light_blue_wool.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/buildingBlocks/light_gray_wool.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/buildingBlocks/lime_wool.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/buildingBlocks/magenta_wool.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/buildingBlocks/orange_wool.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/buildingBlocks/pink_wool.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/buildingBlocks/purple_wool.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/buildingBlocks/red_wool.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/buildingBlocks/yellow_wool.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/black_banner.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_black_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_black_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/black_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:black_bed"
+    ]
+  },
+  "criteria": {
+    "has_black_wool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:wool",
+            "data": 15
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "black_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_black_wool"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/black_bed_from_white_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:black_bed_from_white_bed"
+    ]
+  },
+  "criteria": {
+    "has_bed": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:bed",
+            "data": 0
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "black_bed_from_white_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_bed"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/black_carpet.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_black_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_black_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/blue_banner.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_blue_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_blue_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/blue_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:blue_bed"
+    ]
+  },
+  "criteria": {
+    "has_blue_wool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:wool",
+            "data": 11
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "blue_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_blue_wool"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/blue_bed_from_white_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:blue_bed_from_white_bed"
+    ]
+  },
+  "criteria": {
+    "has_bed": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:bed",
+            "data": 0
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "blue_bed_from_white_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_bed"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/blue_carpet.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_blue_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_blue_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/brown_banner.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_brown_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_brown_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/brown_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:brown_bed"
+    ]
+  },
+  "criteria": {
+    "has_brown_wool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:wool",
+            "data": 12
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "brown_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_brown_wool"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/brown_bed_from_white_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:brown_bed_from_white_bed"
+    ]
+  },
+  "criteria": {
+    "has_bed": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:bed",
+            "data": 0
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "brown_bed_from_white_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_bed"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/brown_carpet.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_brown_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_brown_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/cyan_banner.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_cyan_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_cyan_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/cyan_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:cyan_bed"
+    ]
+  },
+  "criteria": {
+    "has_cyan_wool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:wool",
+            "data": 9
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "cyan_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_cyan_wool"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/cyan_bed_from_white_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:cyan_bed_from_white_bed"
+    ]
+  },
+  "criteria": {
+    "has_bed": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:bed",
+            "data": 0
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "cyan_bed_from_white_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_bed"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/cyan_carpet.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_cyan_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_cyan_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/gray_banner.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_gray_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_gray_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/gray_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:gray_bed"
+    ]
+  },
+  "criteria": {
+    "has_gray_wool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:wool",
+            "data": 7
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "gray_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_gray_wool"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/gray_bed_from_white_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:gray_bed_from_white_bed"
+    ]
+  },
+  "criteria": {
+    "has_bed": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:bed",
+            "data": 0
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "gray_bed_from_white_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_bed"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/gray_carpet.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_gray_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_gray_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/green_banner.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_green_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_green_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/green_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:green_bed"
+    ]
+  },
+  "criteria": {
+    "has_green_wool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:wool",
+            "data": 13
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "green_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_green_wool"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/green_bed_from_white_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:green_bed_from_white_bed"
+    ]
+  },
+  "criteria": {
+    "has_bed": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:bed",
+            "data": 0
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "green_bed_from_white_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_bed"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/green_carpet.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_green_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_green_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/light_blue_banner.json

@@ -5,7 +5,13 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "light_blue_banner"
+      }
+    },
+    "has_light_blue_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -15,20 +21,14 @@
           }
         ]
       }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "light_blue_banner"
-      }
     }
   },
   "requirements": [
     [
-      "has_wool"
+      "has_the_recipe"
     ],
     [
-      "has_the_recipe"
+      "has_light_blue_wool"
     ]
   ]
 }

assets/minecraft/advancements/recipes/decorations/light_blue_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:light_blue_bed"
+    ]
+  },
+  "criteria": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "light_blue_bed"
+      }
+    },
+    "has_light_blue_wool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:wool",
+            "data": 3
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ],
+    [
+      "has_light_blue_wool"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/light_blue_bed_from_white_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:light_blue_bed_from_white_bed"
+    ]
+  },
+  "criteria": {
+    "has_bed": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:bed",
+            "data": 0
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "light_blue_bed_from_white_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_bed"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/light_blue_carpet.json

@@ -5,7 +5,13 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "light_blue_carpet"
+      }
+    },
+    "has_light_blue_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -15,20 +21,14 @@
           }
         ]
       }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "light_blue_carpet"
-      }
     }
   },
   "requirements": [
     [
-      "has_wool"
+      "has_the_recipe"
     ],
     [
-      "has_the_recipe"
+      "has_light_blue_wool"
     ]
   ]
 }

assets/minecraft/advancements/recipes/decorations/light_gray_banner.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_light_gray_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_light_gray_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/light_gray_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:light_gray_bed"
+    ]
+  },
+  "criteria": {
+    "has_light_gray_wool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:wool",
+            "data": 8
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "light_gray_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_light_gray_wool"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/light_gray_bed_from_white_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:light_gray_bed_from_white_bed"
+    ]
+  },
+  "criteria": {
+    "has_bed": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:bed",
+            "data": 0
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "light_gray_bed_from_white_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_bed"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/light_gray_carpet.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_light_gray_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_light_gray_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/lime_banner.json

@@ -5,7 +5,13 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "lime_banner"
+      }
+    },
+    "has_lime_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -15,20 +21,14 @@
           }
         ]
       }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "lime_banner"
-      }
     }
   },
   "requirements": [
     [
-      "has_wool"
+      "has_the_recipe"
     ],
     [
-      "has_the_recipe"
+      "has_lime_wool"
     ]
   ]
 }

assets/minecraft/advancements/recipes/decorations/lime_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:lime_bed"
+    ]
+  },
+  "criteria": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "lime_bed"
+      }
+    },
+    "has_lime_wool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:wool",
+            "data": 5
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ],
+    [
+      "has_lime_wool"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/lime_bed_from_white_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:lime_bed_from_white_bed"
+    ]
+  },
+  "criteria": {
+    "has_bed": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:bed",
+            "data": 0
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "lime_bed_from_white_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_bed"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/lime_carpet.json

@@ -5,7 +5,13 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "lime_carpet"
+      }
+    },
+    "has_lime_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -15,20 +21,14 @@
           }
         ]
       }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "lime_carpet"
-      }
     }
   },
   "requirements": [
     [
-      "has_wool"
+      "has_the_recipe"
     ],
     [
-      "has_the_recipe"
+      "has_lime_wool"
     ]
   ]
 }

assets/minecraft/advancements/recipes/decorations/magenta_banner.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_magenta_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_magenta_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/magenta_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:magenta_bed"
+    ]
+  },
+  "criteria": {
+    "has_magenta_wool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:wool",
+            "data": 2
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "magenta_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_magenta_wool"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/magenta_bed_from_white_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:magenta_bed_from_white_bed"
+    ]
+  },
+  "criteria": {
+    "has_bed": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:bed",
+            "data": 0
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "magenta_bed_from_white_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_bed"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/magenta_carpet.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_magenta_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_magenta_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/orange_banner.json

@@ -5,7 +5,13 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "orange_banner"
+      }
+    },
+    "has_orange_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -15,20 +21,14 @@
           }
         ]
       }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "orange_banner"
-      }
     }
   },
   "requirements": [
     [
-      "has_wool"
+      "has_the_recipe"
     ],
     [
-      "has_the_recipe"
+      "has_orange_wool"
     ]
   ]
 }

assets/minecraft/advancements/recipes/decorations/orange_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:orange_bed"
+    ]
+  },
+  "criteria": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "orange_bed"
+      }
+    },
+    "has_orange_wool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:wool",
+            "data": 1
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ],
+    [
+      "has_orange_wool"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/orange_bed_from_white_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:orange_bed_from_white_bed"
+    ]
+  },
+  "criteria": {
+    "has_bed": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:bed",
+            "data": 0
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "orange_bed_from_white_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_bed"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/orange_carpet.json

@@ -5,7 +5,13 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "orange_carpet"
+      }
+    },
+    "has_orange_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -15,20 +21,14 @@
           }
         ]
       }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "orange_carpet"
-      }
     }
   },
   "requirements": [
     [
-      "has_wool"
+      "has_the_recipe"
     ],
     [
-      "has_the_recipe"
+      "has_orange_wool"
     ]
   ]
 }

assets/minecraft/advancements/recipes/decorations/pink_banner.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_pink_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_pink_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/pink_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:pink_bed"
+    ]
+  },
+  "criteria": {
+    "has_pink_wool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:wool",
+            "data": 6
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "pink_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_pink_wool"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/pink_bed_from_white_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:pink_bed_from_white_bed"
+    ]
+  },
+  "criteria": {
+    "has_bed": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:bed",
+            "data": 0
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "pink_bed_from_white_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_bed"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/pink_carpet.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_pink_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_pink_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/purple_banner.json

@@ -5,7 +5,13 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "purple_banner"
+      }
+    },
+    "has_purple_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -15,20 +21,14 @@
           }
         ]
       }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "purple_banner"
-      }
     }
   },
   "requirements": [
     [
-      "has_wool"
+      "has_the_recipe"
     ],
     [
-      "has_the_recipe"
+      "has_purple_wool"
     ]
   ]
 }

assets/minecraft/advancements/recipes/decorations/purple_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:purple_bed"
+    ]
+  },
+  "criteria": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "purple_bed"
+      }
+    },
+    "has_purple_wool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:wool",
+            "data": 10
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ],
+    [
+      "has_purple_wool"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/purple_bed_from_white_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:purple_bed_from_white_bed"
+    ]
+  },
+  "criteria": {
+    "has_bed": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:bed",
+            "data": 0
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "purple_bed_from_white_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_bed"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/purple_carpet.json

@@ -5,7 +5,13 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "purple_carpet"
+      }
+    },
+    "has_purple_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -15,20 +21,14 @@
           }
         ]
       }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "purple_carpet"
-      }
     }
   },
   "requirements": [
     [
-      "has_wool"
+      "has_the_recipe"
     ],
     [
-      "has_the_recipe"
+      "has_purple_wool"
     ]
   ]
 }

assets/minecraft/advancements/recipes/decorations/red_banner.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_red_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_red_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/red_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:red_bed"
+    ]
+  },
+  "criteria": {
+    "has_red_wool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:wool",
+            "data": 14
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "red_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_red_wool"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/red_bed_from_white_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:red_bed_from_white_bed"
+    ]
+  },
+  "criteria": {
+    "has_bed": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:bed",
+            "data": 0
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "red_bed_from_white_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_bed"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/red_carpet.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_red_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_red_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/white_banner.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/white_bed.json

@@ -1,11 +1,11 @@
 {
   "rewards": {
     "recipes": [
-      "minecraft:white_wool"
+      "minecraft:white_bed"
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -19,13 +19,13 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "white_wool"
+        "recipe": "white_bed"
       }
     }
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/white_carpet.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_white_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_white_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/yellow_banner.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_yellow_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_yellow_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/decorations/yellow_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:yellow_bed"
+    ]
+  },
+  "criteria": {
+    "has_yellow_wool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:wool",
+            "data": 4
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "yellow_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_yellow_wool"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/yellow_bed_from_white_bed.json

@@ -0,0 +1,34 @@
+{
+  "rewards": {
+    "recipes": [
+      "minecraft:yellow_bed_from_white_bed"
+    ]
+  },
+  "criteria": {
+    "has_bed": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:bed",
+            "data": 0
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "yellow_bed_from_white_bed"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_bed"
+    ],
+    [
+      "has_the_recipe"
+    ]
+  ]
+}

assets/minecraft/advancements/recipes/decorations/yellow_carpet.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_yellow_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_wool"
+      "has_yellow_wool"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/food/cookie.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_dye": {
+    "has_cocoa": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_dye"
+      "has_cocoa"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/misc/book.json

@@ -1,16 +1,16 @@
 {
   "rewards": {
     "recipes": [
-      "minecraft:bed"
+      "minecraft:book"
     ]
   },
   "criteria": {
-    "has_wool": {
+    "has_paper": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "minecraft:wool"
+            "item": "minecraft:paper"
           }
         ]
       }
@@ -18,13 +18,13 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "bed"
+        "recipe": "book"
       }
     }
   },
   "requirements": [
     [
-      "has_wool"
+      "has_paper"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/misc/cyan_dye.json

@@ -5,7 +5,18 @@
     ]
   },
   "criteria": {
-    "has_dye": {
+    "has_green_dye": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:dye",
+            "data": 2
+          }
+        ]
+      }
+    },
+    "has_lapis": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +36,10 @@
   },
   "requirements": [
     [
-      "has_dye"
+      "has_green_dye"
+    ],
+    [
+      "has_lapis"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/misc/gray_dye.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_dye": {
+    "has_bonemeal": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -21,14 +21,28 @@
       "conditions": {
         "recipe": "gray_dye"
       }
+    },
+    "has_black_dye": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:dye",
+            "data": 0
+          }
+        ]
+      }
     }
   },
   "requirements": [
     [
-      "has_dye"
+      "has_bonemeal"
     ],
     [
       "has_the_recipe"
+    ],
+    [
+      "has_black_dye"
     ]
   ]
 }

assets/minecraft/advancements/recipes/misc/light_blue_dye_from_lapis_bonemeal.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_dye": {
+    "has_lapis": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -16,6 +16,17 @@
         ]
       }
     },
+    "has_bonemeal": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:dye",
+            "data": 15
+          }
+        ]
+      }
+    },
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
@@ -25,7 +36,10 @@
   },
   "requirements": [
     [
-      "has_dye"
+      "has_lapis"
+    ],
+    [
+      "has_bonemeal"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/misc/light_gray_dye_from_gray_bonemeal.json

@@ -5,7 +5,18 @@
     ]
   },
   "criteria": {
-    "has_dye": {
+    "has_gray_dye": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:dye",
+            "data": 8
+          }
+        ]
+      }
+    },
+    "has_bonemeal": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +36,10 @@
   },
   "requirements": [
     [
-      "has_dye"
+      "has_gray_dye"
+    ],
+    [
+      "has_bonemeal"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/misc/light_gray_dye_from_ink_bonemeal.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_dye": {
+    "has_bonemeal": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -21,14 +21,28 @@
       "conditions": {
         "recipe": "light_gray_dye_from_ink_bonemeal"
       }
+    },
+    "has_black_dye": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:dye",
+            "data": 0
+          }
+        ]
+      }
     }
   },
   "requirements": [
     [
-      "has_dye"
+      "has_bonemeal"
     ],
     [
       "has_the_recipe"
+    ],
+    [
+      "has_black_dye"
     ]
   ]
 }

assets/minecraft/advancements/recipes/misc/lime_dye.json

@@ -5,7 +5,18 @@
     ]
   },
   "criteria": {
-    "has_dye": {
+    "has_green_dye": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:dye",
+            "data": 2
+          }
+        ]
+      }
+    },
+    "has_bonemeal": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +36,10 @@
   },
   "requirements": [
     [
-      "has_dye"
+      "has_green_dye"
+    ],
+    [
+      "has_bonemeal"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/misc/magenta_dye_from_lapis_ink_bonemeal.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_dye": {
+    "has_lapis": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -16,19 +16,47 @@
         ]
       }
     },
+    "has_bonemeal": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:dye",
+            "data": 15
+          }
+        ]
+      }
+    },
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
         "recipe": "magenta_dye_from_lapis_ink_bonemeal"
       }
+    },
+    "has_black_dye": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:dye",
+            "data": 0
+          }
+        ]
+      }
     }
   },
   "requirements": [
     [
-      "has_dye"
+      "has_lapis"
+    ],
+    [
+      "has_bonemeal"
     ],
     [
       "has_the_recipe"
+    ],
+    [
+      "has_black_dye"
     ]
   ]
 }

assets/minecraft/advancements/recipes/misc/magenta_dye_from_lapis_red_pink.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_dye": {
+    "has_pink_dye": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -16,6 +16,28 @@
         ]
       }
     },
+    "has_lapis": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:dye",
+            "data": 4
+          }
+        ]
+      }
+    },
+    "has_red_dye": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:dye",
+            "data": 1
+          }
+        ]
+      }
+    },
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
@@ -25,7 +47,13 @@
   },
   "requirements": [
     [
-      "has_dye"
+      "has_pink_dye"
+    ],
+    [
+      "has_lapis"
+    ],
+    [
+      "has_red_dye"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/misc/magenta_dye_from_purple_and_pink.json

@@ -5,7 +5,7 @@
     ]
   },
   "criteria": {
-    "has_dye": {
+    "has_pink_dye": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -16,6 +16,17 @@
         ]
       }
     },
+    "has_purple_dye": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:dye",
+            "data": 5
+          }
+        ]
+      }
+    },
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
@@ -25,7 +36,10 @@
   },
   "requirements": [
     [
-      "has_dye"
+      "has_pink_dye"
+    ],
+    [
+      "has_purple_dye"
     ],
     [
       "has_the_recipe"

assets/minecraft/advancements/recipes/misc/orange_dye_from_red_yellow.json

@@ -5,13 +5,13 @@
     ]
   },
   "criteria": {
-    "has_dye": {
+    "has_red_dye": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
             "item": "minecraft:dye",
-            "data": 11
+            "data": 1
           }
         ]
       }
@@ -21,14 +21,28 @@
       "conditions": {
         "recipe": "orange_dye_from_red_yellow"
       }
+    },
+    "has_yellow_dye": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:dye",
+            "data": 11
+          }
+        ]
+      }
     }
   },
   "requirements": [
     [
-      "has_dye"
+      "has_red_dye"
     ],
     [
       "has_the_recipe"
+    ],
+    [
+      "has_yellow_dye"
     ]
   ]
 }