From 9c2a91e1ab11b2cfa0d3a16944d20bf12e10fb51 Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Tue, 11 Feb 2025 20:51:19 +0000 Subject: [PATCH] move datapack existence advancements to dedicated namespace --- .../advancement/anti_enderman_grief.json | 0 .../advancement/cauldron_concrete.json | 0 .../advancement/craftable_saddles.json | 0 .../advancement/double_shulker_shells.json | 0 .../advancement/leather_bundle.json | 0 .../advancement/leather_bundle_recipe.json | 0 .../recipe/leather_bundle.json | 0 .../advancement/nether_coordinate_scale.json | 0 .../advancement/no_vault_limit.json | 0 .../advancement/player_death_counter.json | 0 .../advancement/universal_dyeing.json | 22 +++++++++++++++++++ .../advancement/universal_dyeing.json | 22 +++++++++++++++++++ .../data/wool_dyeing/recipe/white_wool.json | 2 +- 13 files changed, 45 insertions(+), 1 deletion(-) rename src/anti_enderman_grief/data/{minecraft => anti_enderman_grief}/advancement/anti_enderman_grief.json (100%) rename src/cauldron_concrete/data/{minecraft => cauldron_concrete}/advancement/cauldron_concrete.json (100%) rename src/craftable_saddles/data/{minecraft => craftable_saddles}/advancement/craftable_saddles.json (100%) rename src/double_shulker_shells/data/{minecraft => double_shulker_shells}/advancement/double_shulker_shells.json (100%) rename src/leather_bundles/data/{minecraft => leather_bundles}/advancement/leather_bundle.json (100%) rename src/leather_bundles/data/{minecraft => leather_bundles}/advancement/leather_bundle_recipe.json (100%) rename src/leather_bundles/data/{minecraft => leather_bundles}/recipe/leather_bundle.json (100%) rename src/nether_coordinate_scale_1to1/data/{minecraft => nether_coordinate_scale_1to1}/advancement/nether_coordinate_scale.json (100%) rename src/no_vault_limit/data/{minecraft => no_vault_limit}/advancement/no_vault_limit.json (100%) rename src/player_death_counter/data/{minecraft => player_death_counter}/advancement/player_death_counter.json (100%) create mode 100644 src/universal_dyeing/data/universal_dyeing/advancement/universal_dyeing.json create mode 100644 src/wool_dyeing/data/wool_dyeing/advancement/universal_dyeing.json diff --git a/src/anti_enderman_grief/data/minecraft/advancement/anti_enderman_grief.json b/src/anti_enderman_grief/data/anti_enderman_grief/advancement/anti_enderman_grief.json similarity index 100% rename from src/anti_enderman_grief/data/minecraft/advancement/anti_enderman_grief.json rename to src/anti_enderman_grief/data/anti_enderman_grief/advancement/anti_enderman_grief.json diff --git a/src/cauldron_concrete/data/minecraft/advancement/cauldron_concrete.json b/src/cauldron_concrete/data/cauldron_concrete/advancement/cauldron_concrete.json similarity index 100% rename from src/cauldron_concrete/data/minecraft/advancement/cauldron_concrete.json rename to src/cauldron_concrete/data/cauldron_concrete/advancement/cauldron_concrete.json diff --git a/src/craftable_saddles/data/minecraft/advancement/craftable_saddles.json b/src/craftable_saddles/data/craftable_saddles/advancement/craftable_saddles.json similarity index 100% rename from src/craftable_saddles/data/minecraft/advancement/craftable_saddles.json rename to src/craftable_saddles/data/craftable_saddles/advancement/craftable_saddles.json diff --git a/src/double_shulker_shells/data/minecraft/advancement/double_shulker_shells.json b/src/double_shulker_shells/data/double_shulker_shells/advancement/double_shulker_shells.json similarity index 100% rename from src/double_shulker_shells/data/minecraft/advancement/double_shulker_shells.json rename to src/double_shulker_shells/data/double_shulker_shells/advancement/double_shulker_shells.json diff --git a/src/leather_bundles/data/minecraft/advancement/leather_bundle.json b/src/leather_bundles/data/leather_bundles/advancement/leather_bundle.json similarity index 100% rename from src/leather_bundles/data/minecraft/advancement/leather_bundle.json rename to src/leather_bundles/data/leather_bundles/advancement/leather_bundle.json diff --git a/src/leather_bundles/data/minecraft/advancement/leather_bundle_recipe.json b/src/leather_bundles/data/leather_bundles/advancement/leather_bundle_recipe.json similarity index 100% rename from src/leather_bundles/data/minecraft/advancement/leather_bundle_recipe.json rename to src/leather_bundles/data/leather_bundles/advancement/leather_bundle_recipe.json diff --git a/src/leather_bundles/data/minecraft/recipe/leather_bundle.json b/src/leather_bundles/data/leather_bundles/recipe/leather_bundle.json similarity index 100% rename from src/leather_bundles/data/minecraft/recipe/leather_bundle.json rename to src/leather_bundles/data/leather_bundles/recipe/leather_bundle.json diff --git a/src/nether_coordinate_scale_1to1/data/minecraft/advancement/nether_coordinate_scale.json b/src/nether_coordinate_scale_1to1/data/nether_coordinate_scale_1to1/advancement/nether_coordinate_scale.json similarity index 100% rename from src/nether_coordinate_scale_1to1/data/minecraft/advancement/nether_coordinate_scale.json rename to src/nether_coordinate_scale_1to1/data/nether_coordinate_scale_1to1/advancement/nether_coordinate_scale.json diff --git a/src/no_vault_limit/data/minecraft/advancement/no_vault_limit.json b/src/no_vault_limit/data/no_vault_limit/advancement/no_vault_limit.json similarity index 100% rename from src/no_vault_limit/data/minecraft/advancement/no_vault_limit.json rename to src/no_vault_limit/data/no_vault_limit/advancement/no_vault_limit.json diff --git a/src/player_death_counter/data/minecraft/advancement/player_death_counter.json b/src/player_death_counter/data/player_death_counter/advancement/player_death_counter.json similarity index 100% rename from src/player_death_counter/data/minecraft/advancement/player_death_counter.json rename to src/player_death_counter/data/player_death_counter/advancement/player_death_counter.json diff --git a/src/universal_dyeing/data/universal_dyeing/advancement/universal_dyeing.json b/src/universal_dyeing/data/universal_dyeing/advancement/universal_dyeing.json new file mode 100644 index 0000000..eac9988 --- /dev/null +++ b/src/universal_dyeing/data/universal_dyeing/advancement/universal_dyeing.json @@ -0,0 +1,22 @@ +{ + "display": { + "icon": { + "id": "minecraft:orange_concrete_powder" + }, + "title": "Universal Dyeing", + "description": "Dye 8 different items in bulk.", + "show_toast": false, + "announce_to_chat": false + }, + "parent": "minecraft:root", + "criteria": { + "tick": { + "trigger": "minecraft:tick" + } + }, + "requirements": [ + [ + "tick" + ] + ] +} diff --git a/src/wool_dyeing/data/wool_dyeing/advancement/universal_dyeing.json b/src/wool_dyeing/data/wool_dyeing/advancement/universal_dyeing.json new file mode 100644 index 0000000..d847c60 --- /dev/null +++ b/src/wool_dyeing/data/wool_dyeing/advancement/universal_dyeing.json @@ -0,0 +1,22 @@ +{ + "display": { + "icon": { + "id": "minecraft:lime_wool" + }, + "title": "Better Wool Dyeing", + "description": "Dye 8 different wool in bulk.", + "show_toast": false, + "announce_to_chat": false + }, + "parent": "minecraft:root", + "criteria": { + "tick": { + "trigger": "minecraft:tick" + } + }, + "requirements": [ + [ + "tick" + ] + ] +} diff --git a/src/wool_dyeing/data/wool_dyeing/recipe/white_wool.json b/src/wool_dyeing/data/wool_dyeing/recipe/white_wool.json index 90f6f29..1bc6144 100644 --- a/src/wool_dyeing/data/wool_dyeing/recipe/white_wool.json +++ b/src/wool_dyeing/data/wool_dyeing/recipe/white_wool.json @@ -23,7 +23,7 @@ "minecraft:red_wool", "minecraft:black_wool" ], - "O": "#universal_dyeing:dyes/white_dye" + "O": "minecraft:white_dye" }, "result": { "id": "minecraft:white_wool",