Create/Update assets for version 17w14a

assets/minecraft/advancements/adventure/adventuring_time.json

@@ -1,229 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "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

@@ -1,10 +1,7 @@
 {
     "display": {
-        "icon": {
-            "item": "minecraft:iron_sword"
-        },
-        "title": "Monster Hunter",
-        "description": "Kill any hostile monster"
+        "icon": "minecraft:iron_sword",
+        "title": "Kill a mob"
     },
     "parent": "adventure/root",
     "criteria": {
@@ -183,14 +180,6 @@
                     "type": "zombie_villager"
                 }
             }
-        },
-        "illusion_illager": {
-            "trigger": "minecraft:player_killed_entity",
-            "conditions": {
-                "entity": {
-                    "type": "illusion_illager"
-                }
-            }
         }
     },
     "requirements": [
@@ -215,7 +204,6 @@
         ["witch"],
         ["wither_skeleton"],
         ["zombie"],
-        ["zombie_villager"],
-        ["illusion_illager"]
+        ["zombie_villager"]
     ]
 }

assets/minecraft/advancements/adventure/kill_all_mobs.json

@@ -1,10 +1,7 @@
 {
     "display": {
-        "icon": {
-            "item": "minecraft:diamond_sword"
-        },
-        "title": "Monsters Hunted",
-        "description": "Kill one of every hostile monster",
+        "icon": "minecraft:diamond_sword",
+        "title": "Kill all the mobs",
         "frame": "challenge"
     },
     "parent": "adventure/kill_a_mob",
@@ -184,14 +181,6 @@
                     "type": "zombie_villager"
                 }
             }
-        },
-        "illusion_illager": {
-            "trigger": "minecraft:player_killed_entity",
-            "conditions": {
-                "entity": {
-                    "type": "illusion_illager"
-                }
-            }
         }
     }
 }

assets/minecraft/advancements/adventure/root.json

@@ -1,10 +1,7 @@
 {
     "display": {
-        "icon": {
-            "item": "minecraft:map"
-        },
+        "icon": "minecraft:map",
         "title": "Adventure",
-        "description": "Adventure, exploration and combat",
         "background": "minecraft:textures/gui/advancements/backgrounds/adventure.png"
     },
     "criteria": {

assets/minecraft/advancements/adventure/shoot_arrow.json

@@ -1,10 +1,7 @@
 {
     "display": {
-        "icon": {
-            "item": "minecraft:bow"
-        },
-        "title": "Take Aim",
-        "description": "Shoot something with a bow and arrow"
+        "icon": "minecraft:bow",
+        "title": "Shoot something"
     },
     "parent": "adventure/kill_a_mob",
     "criteria": {
@@ -13,10 +10,7 @@
             "conditions": {
                 "damage": {
                     "type": {
-                        "is_projectile": true,
-                        "direct_entity": {
-                            "type": "minecraft:arrow"
-                        }
+                        "is_projectile": true
                     }
                 }
             }

assets/minecraft/advancements/adventure/sleep_in_bed.json

@@ -1,10 +1,7 @@
 {
     "display": {
-        "icon": {
-            "item": "minecraft:bed"
-        },
-        "title": "Sweet dreams",
-        "description": "Change your respawn point"
+        "icon": "minecraft:bed",
+        "title": "Change your spawn point"
     },
     "parent": "adventure/root",
     "criteria": {

assets/minecraft/advancements/adventure/sniper_duel.json

@@ -1,10 +1,7 @@
 {
     "display": {
-        "icon": {
-            "item": "minecraft:arrow"
-        },
+        "icon": "minecraft:arrow",
         "title": "Sniper duel",
-        "description": "Kill a skeleton with an arrow from more than 50 meters",
         "frame": "challenge"
     },
     "parent": "adventure/shoot_arrow",
@@ -16,7 +13,6 @@
                     "is_projectile": true
                 },
                 "entity": {
-                    "type": "skeleton",
                     "distance": {
                         "min": 50
                     }

assets/minecraft/advancements/adventure/trade.json

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

assets/minecraft/advancements/end/dragon_breath.json

@@ -1,23 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:dragon_breath"
-        },
-        "title": "You Need a Mint",
-        "description": "Collect dragon's breath in a glass bottle",
-        "frame": "goal"
-    },
-    "parent": "end/kill_dragon",
-    "criteria": {
-        "dragon_breath": {
-            "trigger": "minecraft:inventory_changed",
-            "conditions": {
-                "items": [
-                    {
-                        "item": "minecraft:dragon_breath"
-                    }
-                ]
-            }
-        }
-    }
-}

assets/minecraft/advancements/end/dragon_egg.json

@@ -1,23 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:dragon_egg"
-        },
-        "title": "The Next Generation",
-        "description": "Hold the Dragon Egg",
-        "frame": "goal"
-    },
-    "parent": "end/kill_dragon",
-    "criteria": {
-        "dragon_egg": {
-            "trigger": "minecraft:inventory_changed",
-            "conditions": {
-                "items": [
-                    {
-                        "item": "minecraft:dragon_egg"
-                    }
-                ]
-            }
-        }
-    }
-}

assets/minecraft/advancements/end/find_end_city.json

@@ -1,18 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:purpur_block"
-        },
-        "title": "City at the End of the Game",
-        "description": "Go on in, what could happen?"
-    },
-    "parent": "minecraft:end/enter_end_gateway",
-    "criteria": {
-        "in_city": {
-            "trigger": "minecraft:location",
-            "conditions": {
-                "feature": "EndCity"
-            }
-        }
-    }
-}

assets/minecraft/advancements/end/kill_dragon.json

@@ -1,21 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:skull",
-            "data": 5
-        },
-        "title": "Free the End",
-        "description": "Good luck"
-    },
-    "parent": "end/root",
-    "criteria": {
-        "killed_dragon": {
-            "trigger": "minecraft:player_killed_entity",
-            "conditions": {
-                "entity": {
-                    "type": "ender_dragon"
-                }
-            }
-        }
-    }
-}

assets/minecraft/advancements/end/levitate.json

@@ -1,21 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:shulker_shell"
-        },
-        "title": "Great View From Up Here",
-        "description": "Levitate for at least 30 seconds",
-        "frame": "challenge"
-    },
-    "parent": "minecraft:end/find_end_city",
-    "criteria": {
-        "levitated": {
-            "trigger": "minecraft:levitation",
-            "conditions": {
-                "duration": {
-                    "min": 600
-                }
-            }
-        }
-    }
-}

assets/minecraft/advancements/end/respawn_dragon.json

@@ -1,21 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:end_crystal"
-        },
-        "title": "The End... Again...",
-        "description": "Respawn the ender dragon",
-        "frame": "goal"
-    },
-    "parent": "end/kill_dragon",
-    "criteria": {
-        "summoned_dragon": {
-            "trigger": "minecraft:summoned_entity",
-            "conditions": {
-                "entity": {
-                    "type": "ender_dragon"
-                }
-            }
-        }
-    }
-}

assets/minecraft/advancements/end/root.json

@@ -1,18 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:end_stone"
-        },
-        "title": "The End",
-        "description": "Or the beginning?",
-        "background": "minecraft:textures/gui/advancements/backgrounds/end.png"
-    },
-    "criteria": {
-        "entered_end_portal": {
-            "trigger": "minecraft:enter_block",
-            "conditions": {
-                "block": "minecraft:end_portal"
-            }
-        }
-    }
-}

assets/minecraft/advancements/nether/brew_potion.json

@@ -1,15 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:potion"
-        },
-        "title": "Local Brewery",
-        "description": "Brew a potion"
-    },
-    "parent": "minecraft:nether/obtain_blaze_rod",
-    "criteria": {
-        "potion": {
-            "trigger": "minecraft:brewed_potion"
-        }
-    }
-}

assets/minecraft/advancements/nether/create_beacon.json

@@ -1,18 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:beacon"
-        },
-        "title": "Bring Home the Beacon",
-        "description": "Construct and place a Beacon"
-    },
-    "parent": "minecraft:nether/summon_wither",
-    "criteria": {
-        "beacon": {
-            "trigger": "minecraft:construct_beacon",
-            "conditions": {
-                "level": {"min": 1}
-            }
-        }
-    }
-}

assets/minecraft/advancements/nether/find_fortress.json

@@ -1,18 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:nether_brick"
-        },
-        "title": "A Terrible Fortress",
-        "description": "Break your way into a Nether Fortress"
-    },
-    "parent": "minecraft:nether/root",
-    "criteria": {
-        "fortress": {
-            "trigger": "minecraft:location",
-            "conditions": {
-                "feature": "Fortress"
-            }
-        }
-    }
-}

assets/minecraft/advancements/nether/get_wither_skull.json

@@ -1,23 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:skull",
-            "data": 1
-        },
-        "title": "Spooky Scary Skeleton",
-        "description": "Obtain a wither skeleton's skull"
-    },
-    "parent": "minecraft:nether/find_fortress",
-    "criteria": {
-        "wither_skull": {
-            "trigger": "minecraft:inventory_changed",
-            "conditions": {
-                "items": [
-                    {
-                        "item": "minecraft:blaze_rod"
-                    }
-                ]
-            }
-        }
-    }
-}

assets/minecraft/advancements/nether/return_to_sender.json

@@ -1,27 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:ghast_tear"
-        },
-        "title": "Return to Sender",
-        "description": "Destroy a Ghast with a fireball",
-        "frame": "challenge"
-    },
-    "parent": "minecraft:nether/root",
-    "criteria": {
-        "killed_ghast": {
-            "trigger": "minecraft:player_killed_entity",
-            "conditions": {
-                "entity": {
-                    "type": "minecraft:ghast"
-                },
-                "killing_blow": {
-                    "is_projectile": true,
-                    "direct_entity": {
-                        "type": "minecraft:fireball"
-                    }
-                }
-            }
-        }
-    }
-}

assets/minecraft/advancements/nether/root.json

@@ -1,18 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:nether_wart"
-        },
-        "title": "Nether",
-        "description": "Bring summer clothes",
-        "background": "minecraft:textures/gui/advancements/backgrounds/nether.png"
-    },
-    "criteria": {
-        "entered_nether_portal": {
-            "trigger": "minecraft:enter_block",
-            "conditions": {
-                "block": "minecraft:portal"
-            }
-        }
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,34 +0,0 @@
-{
-  "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

@@ -1,34 +0,0 @@
-{
-  "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_black_wool": {
+    "has_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_black_wool"
+      "has_wool"
     ],
     [
       "has_the_recipe"

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

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

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

@@ -1,34 +0,0 @@
-{
-  "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

@@ -1,34 +0,0 @@
-{
-  "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_blue_wool": {
+    "has_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_blue_wool"
+      "has_wool"
     ],
     [
       "has_the_recipe"

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

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

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

@@ -1,34 +0,0 @@
-{
-  "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

@@ -1,34 +0,0 @@
-{
-  "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_brown_wool": {
+    "has_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_brown_wool"
+      "has_wool"
     ],
     [
       "has_the_recipe"

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

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

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

@@ -1,34 +0,0 @@
-{
-  "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

@@ -1,34 +0,0 @@
-{
-  "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_cyan_wool": {
+    "has_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_cyan_wool"
+      "has_wool"
     ],
     [
       "has_the_recipe"

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

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

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

@@ -1,34 +0,0 @@
-{
-  "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

@@ -1,34 +0,0 @@
-{
-  "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_gray_wool": {
+    "has_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_gray_wool"
+      "has_wool"
     ],
     [
       "has_the_recipe"

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

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

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

@@ -1,34 +0,0 @@
-{
-  "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

@@ -1,34 +0,0 @@
-{
-  "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_green_wool": {
+    "has_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_green_wool"
+      "has_wool"
     ],
     [
       "has_the_recipe"

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

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

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

@@ -1,34 +0,0 @@
-{
-  "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

@@ -1,34 +0,0 @@
-{
-  "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,13 +5,7 @@
     ]
   },
   "criteria": {
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "light_blue_carpet"
-      }
-    },
-    "has_light_blue_wool": {
+    "has_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -21,14 +15,20 @@
           }
         ]
       }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "light_blue_carpet"
+      }
     }
   },
   "requirements": [
     [
-      "has_the_recipe"
+      "has_wool"
     ],
     [
-      "has_light_blue_wool"
+      "has_the_recipe"
     ]
   ]
 }

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

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

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

@@ -1,34 +0,0 @@
-{
-  "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

@@ -1,34 +0,0 @@
-{
-  "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_light_gray_wool": {
+    "has_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_light_gray_wool"
+      "has_wool"
     ],
     [
       "has_the_recipe"

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

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

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

@@ -1,34 +0,0 @@
-{
-  "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

@@ -1,34 +0,0 @@
-{
-  "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,13 +5,7 @@
     ]
   },
   "criteria": {
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "lime_carpet"
-      }
-    },
-    "has_lime_wool": {
+    "has_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -21,14 +15,20 @@
           }
         ]
       }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "lime_carpet"
+      }
     }
   },
   "requirements": [
     [
-      "has_the_recipe"
+      "has_wool"
     ],
     [
-      "has_lime_wool"
+      "has_the_recipe"
     ]
   ]
 }

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

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

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

@@ -1,34 +0,0 @@
-{
-  "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

@@ -1,34 +0,0 @@
-{
-  "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_magenta_wool": {
+    "has_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_magenta_wool"
+      "has_wool"
     ],
     [
       "has_the_recipe"

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

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

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

@@ -1,34 +0,0 @@
-{
-  "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

@@ -1,34 +0,0 @@
-{
-  "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,13 +5,7 @@
     ]
   },
   "criteria": {
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "orange_carpet"
-      }
-    },
-    "has_orange_wool": {
+    "has_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -21,14 +15,20 @@
           }
         ]
       }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "orange_carpet"
+      }
     }
   },
   "requirements": [
     [
-      "has_the_recipe"
+      "has_wool"
     ],
     [
-      "has_orange_wool"
+      "has_the_recipe"
     ]
   ]
 }

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

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

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

@@ -1,34 +0,0 @@
-{
-  "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

@@ -1,34 +0,0 @@
-{
-  "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_pink_wool": {
+    "has_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_pink_wool"
+      "has_wool"
     ],
     [
       "has_the_recipe"

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

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

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

@@ -1,34 +0,0 @@
-{
-  "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

@@ -1,34 +0,0 @@
-{
-  "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,13 +5,7 @@
     ]
   },
   "criteria": {
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "purple_carpet"
-      }
-    },
-    "has_purple_wool": {
+    "has_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -21,14 +15,20 @@
           }
         ]
       }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "purple_carpet"
+      }
     }
   },
   "requirements": [
     [
-      "has_the_recipe"
+      "has_wool"
     ],
     [
-      "has_purple_wool"
+      "has_the_recipe"
     ]
   ]
 }

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

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

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

@@ -1,34 +0,0 @@
-{
-  "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

@@ -1,34 +0,0 @@
-{
-  "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_red_wool": {
+    "has_wool": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_red_wool"
+      "has_wool"
     ],
     [
       "has_the_recipe"

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

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

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

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

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

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

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

@@ -1,34 +0,0 @@
-{
-  "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"
-    ]
-  ]
-}