From 8c4f05b249729294ede5a03094d9beb56b9fbbe4 Mon Sep 17 00:00:00 2001 From: daenvil Date: Fri, 8 Nov 2024 16:25:17 +0100 Subject: [PATCH] 1.2.2 update --- .../function/find_acacia_bark.mcfunction | 7 ++ acacia_gum/README.txt | 4 +- .../global/advancement/dnv.acacia_gum.json | 2 +- .../function/find_acacia_bark.mcfunction | 2 +- acacia_gum/pack.mcmeta | 18 ++-- ethical_textiles/README.txt | 4 +- .../recipe/armor_scale.json | 12 +-- .../recipe/brush_string.json | 12 +-- .../recipe/faux_feather.json | 12 +-- .../recipe/faux_leather_3to1.json | 8 +- .../recipe/faux_leather_6to1.json | 8 +- .../recipe/grass_bed.json | 8 +- .../dnv.ethical_textiles/recipe/hay_bed.json | 8 +- .../recipe/item_frame_paper.json | 8 +- .../recipe/jungle_bed.json | 8 +- .../recipe/plant_string_sugar_cane.json | 4 +- .../recipe/plant_string_vines.json | 4 +- .../recipe/synthetic_cobweb.json | 8 +- .../advancement/dnv.ethical_textiles.json | 2 +- .../function/load_ethical_textiles.mcfunction | 5 +- .../on_crafted_faux_leather_3to1.mcfunction | 3 +- ...aux_leather_3to1_delayed_player.mcfunction | 7 +- ...aux_leather_3to1_replace_output.mcfunction | 2 + ...crafted_faux_leather_3to1_vegan.mcfunction | 1 + .../on_crafted_faux_leather_6to1.mcfunction | 3 +- ...aux_leather_6to1_delayed_player.mcfunction | 7 +- ...aux_leather_6to1_replace_output.mcfunction | 2 + ...crafted_faux_leather_6to1_vegan.mcfunction | 1 + .../on_crafted_synthetic_cobweb.mcfunction | 3 +- ...synthetic_cobweb_delayed_player.mcfunction | 7 +- ...synthetic_cobweb_replace_output.mcfunction | 2 + ..._crafted_synthetic_cobweb_vegan.mcfunction | 1 + ethical_textiles/pack.mcmeta | 8 +- .../recipe/magnet_fishing_rod.json | 25 ++++++ magnet_fishing/README.txt | 4 +- .../recipe/magnet_fishing_rod.json | 12 +-- .../advancement/dnv.magnet_fishing.json | 2 +- magnet_fishing/pack.mcmeta | 18 ++-- plant-based_foods/README.txt | 4 +- .../function/give/notfish_fillet.mcfunction | 2 +- .../function/give/notsalmon_fillet.mcfunction | 2 +- .../dnv.vegan_food/recipe/notfish_fillet.json | 19 ++-- .../recipe/notsalmon_fillet.json | 15 ++-- .../recipe/plant_milk_bucket.json | 12 +-- .../dnv.vegan_food/recipe/seitan_steak.json | 16 +--- .../recipe/seitan_steak_hay.json | 8 +- .../dnv.vegan_food/recipe/seitan_stew.json | 20 ++--- .../dnv.vegan_food/recipe/vegan_cake.json | 16 +--- .../recipe/vegan_honey_bottle_apple.json | 8 +- .../recipe/vegan_honey_bottle_flowers.json | 12 +-- .../recipe/vegan_pumpkin_pie.json | 12 +-- .../dnv.vegan_food/recipe/veggie_burger.json | 12 +-- .../global/advancement/dnv.vegan_food.json | 2 +- .../function/load_vegan_food.mcfunction | 6 +- .../on_crafted_notfish_fillet.mcfunction | 4 +- ...d_notfish_fillet_delayed_player.mcfunction | 9 +- ...d_notfish_fillet_replace_output.mcfunction | 2 + ...on_crafted_notfish_fillet_vegan.mcfunction | 1 + .../on_crafted_notsalmon_fillet.mcfunction | 4 +- ...notsalmon_fillet_delayed_player.mcfunction | 9 +- ...notsalmon_fillet_replace_output.mcfunction | 2 + ..._crafted_notsalmon_fillet_vegan.mcfunction | 1 + .../slots/on_crafted_seitan_stew.mcfunction | 3 +- ...fted_seitan_stew_delayed_player.mcfunction | 7 +- ...fted_seitan_stew_replace_output.mcfunction | 2 + .../on_crafted_seitan_stew_vegan.mcfunction | 1 + .../slots/on_crafted_vegan_cake.mcfunction | 3 +- ...afted_vegan_cake_delayed_player.mcfunction | 9 +- ...afted_vegan_cake_replace_output.mcfunction | 2 + .../on_crafted_vegan_cake_vegan.mcfunction | 1 + plant-based_foods/pack.mcmeta | 8 +- .../recipe/plant_wax_dead_bush.json | 22 +++++ .../recipe/plant_wax_jungle_leaves.json | 22 +++++ plant_wax/README.txt | 4 +- .../recipe/plant_wax_dead_bush.json | 4 +- .../recipe/plant_wax_jungle_leaves.json | 4 +- .../global/advancement/dnv.plant_wax.json | 2 +- plant_wax/pack.mcmeta | 18 ++-- vegancraft-DP/README.txt | 4 +- .../recipe/armor_scale.json | 12 +-- .../recipe/brush_string.json | 12 +-- .../recipe/faux_feather.json | 12 +-- .../recipe/faux_leather_3to1.json | 8 +- .../recipe/faux_leather_6to1.json | 8 +- .../recipe/grass_bed.json | 8 +- .../dnv.ethical_textiles/recipe/hay_bed.json | 8 +- .../recipe/item_frame_paper.json | 8 +- .../recipe/jungle_bed.json | 8 +- .../recipe/plant_string_sugar_cane.json | 4 +- .../recipe/plant_string_vines.json | 4 +- .../recipe/synthetic_cobweb.json | 8 +- .../recipe/magnet_fishing_rod.json | 12 +-- .../recipe/plant_wax_dead_bush.json | 4 +- .../recipe/plant_wax_jungle_leaves.json | 4 +- .../function/give/notfish_fillet.mcfunction | 2 +- .../function/give/notsalmon_fillet.mcfunction | 2 +- .../dnv.vegan_food/recipe/notfish_fillet.json | 19 ++-- .../recipe/notsalmon_fillet.json | 15 ++-- .../recipe/plant_milk_bucket.json | 12 +-- .../dnv.vegan_food/recipe/seitan_steak.json | 16 +--- .../recipe/seitan_steak_hay.json | 8 +- .../dnv.vegan_food/recipe/seitan_stew.json | 20 ++--- .../dnv.vegan_food/recipe/vegan_cake.json | 16 +--- .../recipe/vegan_honey_bottle_apple.json | 8 +- .../recipe/vegan_honey_bottle_flowers.json | 12 +-- .../recipe/vegan_pumpkin_pie.json | 12 +-- .../dnv.vegan_food/recipe/veggie_burger.json | 12 +-- .../recipes/ominous_trial_key.json | 74 ++++++++++++++++ .../advancement/recipes/totem_of_undying.json | 86 +++++++------------ .../advancement/recipes/trial_key.json | 85 ++++++++++++++++++ .../data/dnv.vegancraft/recipe/black_dye.json | 4 +- .../recipe/black_dye_stonecutting.json | 4 +- .../dnv.vegancraft/recipe/blazing_powder.json | 20 ++--- .../dnv.vegancraft/recipe/blazing_rod.json | 12 +-- .../dnv.vegancraft/recipe/bone_bonemeal.json | 12 +-- .../dnv.vegancraft/recipe/bouncy_boot.json | 8 +- .../dnv.vegancraft/recipe/breezy_rod.json | 8 +- .../dnv.vegancraft/recipe/copper_horn.json | 8 +- .../recipe/copper_horn_admire.json | 12 +-- .../recipe/copper_horn_call.json | 12 +-- .../recipe/copper_horn_dream.json | 12 +-- .../recipe/copper_horn_feel.json | 12 +-- .../recipe/copper_horn_ponder.json | 12 +-- .../recipe/copper_horn_seek.json | 12 +-- .../recipe/copper_horn_sing.json | 12 +-- .../recipe/copper_horn_yearn.json | 12 +-- .../dnv.vegancraft/recipe/creeper_head.json | 12 +-- .../data/dnv.vegancraft/recipe/end_mist.json | 12 +-- .../data/dnv.vegancraft/recipe/ender_eye.json | 12 +-- .../dnv.vegancraft/recipe/ender_pearl.json | 8 +- .../recipe/feathery_membrane.json | 16 +--- .../dnv.vegancraft/recipe/glow_ink_sac.json | 4 +- .../recipe/glow_item_frame.json | 8 +- .../data/dnv.vegancraft/recipe/gunpowder.json | 12 +-- .../recipe/hardened_seagrass.json | 8 +- .../data/dnv.vegancraft/recipe/ink_sac.json | 4 +- .../dnv.vegancraft/recipe/nether_star.json | 12 +-- .../recipe/ochre_froglight.json | 12 +-- .../recipe/ominous_trial_key.json | 17 ++++ .../recipe/pearlescent_froglight.json | 12 +-- .../dnv.vegancraft/recipe/piglin_head.json | 16 +--- .../recipe/poisonous_sprout.json | 4 +- .../recipe/prismarine_crystals.json | 4 +- .../recipe/prismarine_shard.json | 4 +- .../dnv.vegancraft/recipe/puffer_bubble.json | 8 +- .../dnv.vegancraft/recipe/shulker_box.json | 12 +-- .../dnv.vegancraft/recipe/skeleton_skull.json | 12 +-- .../recipe/totem_of_undying.json | 12 +-- .../data/dnv.vegancraft/recipe/trial_key.json | 17 ++++ .../data/dnv.vegancraft/recipe/trident.json | 12 +-- .../recipe/verdant_froglight.json | 12 +-- .../recipe/white_dye_stonecutting.json | 4 +- .../dnv.vegancraft/recipe/wither_rose.json | 12 +-- .../recipe/wither_skeleton_skull.json | 16 +--- .../recipe/writable_book_pencil.json | 12 +-- .../dnv.vegancraft/recipe/zombie_head.json | 12 +-- .../global/advancement/dnv.acacia_gum.json | 2 +- .../advancement/dnv.ethical_textiles.json | 2 +- .../advancement/dnv.magnet_fishing.json | 2 +- .../global/advancement/dnv.plant_wax.json | 2 +- .../global/advancement/dnv.vegan_food.json | 2 +- .../global/advancement/dnv.vegancraft.json | 2 +- .../function/find_acacia_bark.mcfunction | 2 +- .../function/load_ethical_textiles.mcfunction | 5 +- .../function/load_vegan_food.mcfunction | 6 +- .../function/on_load.mcfunction | 9 ++ .../slots/on_crafted_copper_horn.mcfunction | 3 +- .../on_crafted_copper_horn_admire.mcfunction | 3 +- ...pper_horn_admire_delayed_player.mcfunction | 7 +- ...pper_horn_admire_replace_output.mcfunction | 2 + ...rafted_copper_horn_admire_vegan.mcfunction | 1 + .../on_crafted_copper_horn_call.mcfunction | 3 +- ...copper_horn_call_delayed_player.mcfunction | 7 +- ...copper_horn_call_replace_output.mcfunction | 2 + ..._crafted_copper_horn_call_vegan.mcfunction | 1 + ...fted_copper_horn_delayed_player.mcfunction | 7 +- .../on_crafted_copper_horn_dream.mcfunction | 3 +- ...opper_horn_dream_delayed_player.mcfunction | 7 +- ...opper_horn_dream_replace_output.mcfunction | 2 + ...crafted_copper_horn_dream_vegan.mcfunction | 1 + .../on_crafted_copper_horn_feel.mcfunction | 3 +- ...copper_horn_feel_delayed_player.mcfunction | 7 +- ...copper_horn_feel_replace_output.mcfunction | 2 + ..._crafted_copper_horn_feel_vegan.mcfunction | 1 + .../on_crafted_copper_horn_ponder.mcfunction | 3 +- ...pper_horn_ponder_delayed_player.mcfunction | 7 +- ...pper_horn_ponder_replace_output.mcfunction | 2 + ...rafted_copper_horn_ponder_vegan.mcfunction | 1 + ...fted_copper_horn_replace_output.mcfunction | 2 + .../on_crafted_copper_horn_seek.mcfunction | 3 +- ...copper_horn_seek_delayed_player.mcfunction | 7 +- ...copper_horn_seek_replace_output.mcfunction | 2 + ..._crafted_copper_horn_seek_vegan.mcfunction | 1 + .../on_crafted_copper_horn_sing.mcfunction | 3 +- ...copper_horn_sing_delayed_player.mcfunction | 7 +- ...copper_horn_sing_replace_output.mcfunction | 2 + ..._crafted_copper_horn_sing_vegan.mcfunction | 1 + .../on_crafted_copper_horn_vegan.mcfunction | 1 + .../on_crafted_copper_horn_yearn.mcfunction | 3 +- ...opper_horn_yearn_delayed_player.mcfunction | 7 +- ...opper_horn_yearn_replace_output.mcfunction | 2 + ...crafted_copper_horn_yearn_vegan.mcfunction | 1 + .../on_crafted_faux_leather_3to1.mcfunction | 3 +- ...aux_leather_3to1_delayed_player.mcfunction | 7 +- ...aux_leather_3to1_replace_output.mcfunction | 2 + ...crafted_faux_leather_3to1_vegan.mcfunction | 1 + .../on_crafted_faux_leather_6to1.mcfunction | 3 +- ...aux_leather_6to1_delayed_player.mcfunction | 7 +- ...aux_leather_6to1_replace_output.mcfunction | 2 + ...crafted_faux_leather_6to1_vegan.mcfunction | 1 + .../on_crafted_notfish_fillet.mcfunction | 4 +- ...d_notfish_fillet_delayed_player.mcfunction | 9 +- ...d_notfish_fillet_replace_output.mcfunction | 2 + ...on_crafted_notfish_fillet_vegan.mcfunction | 1 + .../on_crafted_notsalmon_fillet.mcfunction | 4 +- ...notsalmon_fillet_delayed_player.mcfunction | 9 +- ...notsalmon_fillet_replace_output.mcfunction | 2 + ..._crafted_notsalmon_fillet_vegan.mcfunction | 1 + .../slots/on_crafted_seitan_stew.mcfunction | 3 +- ...fted_seitan_stew_delayed_player.mcfunction | 7 +- ...fted_seitan_stew_replace_output.mcfunction | 2 + .../on_crafted_seitan_stew_vegan.mcfunction | 1 + .../on_crafted_synthetic_cobweb.mcfunction | 3 +- ...synthetic_cobweb_delayed_player.mcfunction | 7 +- ...synthetic_cobweb_replace_output.mcfunction | 2 + ..._crafted_synthetic_cobweb_vegan.mcfunction | 1 + .../slots/on_crafted_vegan_cake.mcfunction | 3 +- ...afted_vegan_cake_delayed_player.mcfunction | 9 +- ...afted_vegan_cake_replace_output.mcfunction | 2 + .../on_crafted_vegan_cake_vegan.mcfunction | 1 + vegancraft-DP/pack.mcmeta | 8 +- vegancraft-RP/README.txt | 16 ++-- .../minecraft/models/item/breeze_rod.json | 2 +- vegancraft-RP/pack.mcmeta | 6 +- 234 files changed, 913 insertions(+), 944 deletions(-) create mode 100644 acacia_gum/1_21_1/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction create mode 100644 ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction create mode 100644 ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction create mode 100644 ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_replace_output.mcfunction create mode 100644 magnet_fishing/1_21_1/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json create mode 100644 plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction create mode 100644 plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction create mode 100644 plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction create mode 100644 plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_replace_output.mcfunction create mode 100644 plant_wax/1_21_1/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json create mode 100644 plant_wax/1_21_1/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json create mode 100644 vegancraft-DP/data/dnv.vegancraft/advancement/recipes/ominous_trial_key.json create mode 100644 vegancraft-DP/data/dnv.vegancraft/advancement/recipes/trial_key.json create mode 100644 vegancraft-DP/data/dnv.vegancraft/recipe/ominous_trial_key.json create mode 100644 vegancraft-DP/data/dnv.vegancraft/recipe/trial_key.json create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_replace_output.mcfunction create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_replace_output.mcfunction create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_replace_output.mcfunction create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_replace_output.mcfunction create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_replace_output.mcfunction create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_replace_output.mcfunction create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_replace_output.mcfunction create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_replace_output.mcfunction create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_replace_output.mcfunction create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_replace_output.mcfunction create mode 100644 vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_replace_output.mcfunction diff --git a/acacia_gum/1_21_1/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction b/acacia_gum/1_21_1/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction new file mode 100644 index 0000000..f54232a --- /dev/null +++ b/acacia_gum/1_21_1/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction @@ -0,0 +1,7 @@ +execute store result score @s dnv.acacia_gum.raycast_range run attribute @s player.block_interaction_range get -10 +scoreboard players operation @s dnv.acacia_gum.raycast_range_doubled = @s dnv.acacia_gum.raycast_range +scoreboard players operation @s dnv.acacia_gum.raycast_range_doubled *= #dnv dnv.2 +scoreboard players set @s dnv.acacia_gum.found_acacia 0 +execute anchored eyes positioned ^ ^ ^ anchored feet run function zz.dnv.vegancraft:find_acacia_bark_line +execute if score @s dnv.acacia_gum.found_acacia < @s dnv.acacia_gum.raycast_range anchored eyes positioned ^ ^ ^1 anchored feet run function zz.dnv.vegancraft:find_acacia_bark_wide +execute if score @s dnv.acacia_gum.found_acacia < @s dnv.acacia_gum.raycast_range_doubled run function zz.dnv.vegancraft:summon_acacia_gum_ball \ No newline at end of file diff --git a/acacia_gum/README.txt b/acacia_gum/README.txt index a56636e..d8dc9ab 100644 --- a/acacia_gum/README.txt +++ b/acacia_gum/README.txt @@ -1,4 +1,4 @@ -# Acacia Gum (v1.2.1, for Minecraft 1.21+) +# Acacia Gum (v1.2.2, for Minecraft 1.21+) This datapack adds the item "Acacia Gumball" (a retextured Slimeball), which is obtained by stripping acacia logs. @@ -7,7 +7,7 @@ This datapack adds the item "Acacia Gumball" (a retextured Slimeball), which is - On PlanetMinecraft: https://www.planetminecraft.com/data-pack/acacia-gum-slime-from-stripping-acacias/ - On my website: https://daenvil.github.io/MCDatapacks/acacia_gum.html -- This version was published on the 19th of June 2024. Check the webpages above for possible updates. +- This version was published on the 8th of November 2024. Check the webpages above for possible updates. ## Installation diff --git a/acacia_gum/data/global/advancement/dnv.acacia_gum.json b/acacia_gum/data/global/advancement/dnv.acacia_gum.json index 700d9b4..b335adc 100644 --- a/acacia_gum/data/global/advancement/dnv.acacia_gum.json +++ b/acacia_gum/data/global/advancement/dnv.acacia_gum.json @@ -6,7 +6,7 @@ "italic": false }, "description": { - "text": "Daenvil's Acacia Gum 1.2.1 (for MC1.21+)", + "text": "Daenvil's Acacia Gum 1.2.2 (for MC1.21+)", "italic": false }, "icon": { diff --git a/acacia_gum/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction b/acacia_gum/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction index f54232a..15c3326 100644 --- a/acacia_gum/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction +++ b/acacia_gum/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction @@ -1,4 +1,4 @@ -execute store result score @s dnv.acacia_gum.raycast_range run attribute @s player.block_interaction_range get -10 +execute store result score @s dnv.acacia_gum.raycast_range run attribute @s block_interaction_range get -10 scoreboard players operation @s dnv.acacia_gum.raycast_range_doubled = @s dnv.acacia_gum.raycast_range scoreboard players operation @s dnv.acacia_gum.raycast_range_doubled *= #dnv dnv.2 scoreboard players set @s dnv.acacia_gum.found_acacia 0 diff --git a/acacia_gum/pack.mcmeta b/acacia_gum/pack.mcmeta index 7eab6db..7e3e68c 100644 --- a/acacia_gum/pack.mcmeta +++ b/acacia_gum/pack.mcmeta @@ -15,7 +15,7 @@ "underlined": true }, { - "text": "\nv1.2.1, for MC1.21+", + "text": "\nv1.2.2, for MC1.21+", "color": "gray", "italic": false } @@ -23,10 +23,18 @@ "color": "green", "italic": false }, - "pack_format": 46, + "pack_format": 57, "supported_formats": { - "min_inclusive": 46, - "max_inclusive": 48 + "min_inclusive": 47, + "max_inclusive": 58 } - } + }, + "overlays": { + "entries": [ + { + "directory": "1_21_1", + "formats": { "min_inclusive": 47, "max_inclusive": 48 } + } + ] + } } \ No newline at end of file diff --git a/ethical_textiles/README.txt b/ethical_textiles/README.txt index 5e7b309..ba05d00 100644 --- a/ethical_textiles/README.txt +++ b/ethical_textiles/README.txt @@ -1,4 +1,4 @@ -# Ethical Textiles (v2.0.2, for Minecraft 1.21+) +# Ethical Textiles (v2.0.3, for Minecraft 1.21.2+) A datapack that adds plant-based alternatives to leather, string, wool, and feathers. @@ -7,7 +7,7 @@ A datapack that adds plant-based alternatives to leather, string, wool, and feat - On PlanetMinecraft: https://www.planetminecraft.com/data-pack/ethical-textiles-plant-string-and-leather/ - On my website: https://daenvil.github.io/MCDatapacks/ethical_textiles.html -- This version was published on the 27th of August 2024. Check the webpages above for possible updates. +- This version was published on the 8th of November 2024. Check the webpages above for possible updates. ## Installation diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/armor_scale.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/armor_scale.json index 151854a..4796a9f 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/armor_scale.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/armor_scale.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "S": { - "item": "string" - }, - "#": { - "item": "slime_ball" - }, - "D": { - "item": "diamond" - } + "S": "string", + "#": "slime_ball", + "D": "diamond" }, "pattern": [ "S#", diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/brush_string.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/brush_string.json index b44b88e..22ce8c2 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/brush_string.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/brush_string.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "equipment", "key": { - "S": { - "item": "string" - }, - "C": { - "item": "copper_ingot" - }, - "#": { - "item": "stick" - } + "S": "string", + "C": "copper_ingot", + "#": "stick" }, "pattern": [ "S S", diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_feather.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_feather.json index 8d2ec77..c3bf5c5 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_feather.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_feather.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "S": { - "item": "string" - }, - "L": { - "tag": "leaves" - }, - "#": { - "item": "stick" - } + "S": "string", + "L": "#leaves", + "#": "stick" }, "pattern": [ "SL", diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json index f23b7c1..c8d1f05 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "L": { - "tag": "dnv.ethical_textiles:leather_producing_plants_3to1" - }, - "S": { - "item": "slime_ball" - } + "L": "#dnv.ethical_textiles:leather_producing_plants_3to1", + "S": "slime_ball" }, "pattern": [ "LLL", diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json index df9340a..9ef9dc7 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "L": { - "tag": "dnv.ethical_textiles:leather_producing_plants_6to1" - }, - "S": { - "item": "slime_ball" - } + "L": "#dnv.ethical_textiles:leather_producing_plants_6to1", + "S": "slime_ball" }, "pattern": [ "LLL", diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/grass_bed.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/grass_bed.json index 229574d..2e35793 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/grass_bed.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/grass_bed.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "G": { - "tag": "zz.dnv.core:grass" - }, - "P": { - "tag": "planks" - } + "G": "#zz.dnv.core:grass", + "P": "#planks" }, "pattern": [ "GGG", diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/hay_bed.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/hay_bed.json index fe03d34..f5d7b2c 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/hay_bed.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/hay_bed.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "H": { - "item": "hay_block" - }, - "P": { - "tag": "planks" - } + "H": "hay_block", + "P": "#planks" }, "pattern": [ "HHH", diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/item_frame_paper.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/item_frame_paper.json index 495e4e6..c698227 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/item_frame_paper.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/item_frame_paper.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "S": { - "item": "stick" - }, - "P": { - "item": "paper" - } + "S": "stick", + "P": "paper" }, "pattern": [ "SSS", diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/jungle_bed.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/jungle_bed.json index e32d351..2b66b63 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/jungle_bed.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/jungle_bed.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "J": { - "item": "jungle_leaves" - }, - "P": { - "tag": "planks" - } + "J": "jungle_leaves", + "P": "#planks" }, "pattern": [ "JJJ", diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json index cbc965b..780ed7b 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json @@ -2,9 +2,7 @@ "type": "crafting_shaped", "category": "misc", "key": { - "S": { - "item": "sugar_cane" - } + "S": "sugar_cane" }, "pattern": [ "S ", diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_vines.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_vines.json index e8a23a6..434fa92 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_vines.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_vines.json @@ -2,9 +2,7 @@ "type": "crafting_shaped", "category": "misc", "key": { - "S": { - "tag": "dnv.ethical_textiles:string_producing_vines" - } + "S": "#dnv.ethical_textiles:string_producing_vines" }, "pattern": [ "S ", diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/synthetic_cobweb.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/synthetic_cobweb.json index 30e0a42..0fd4872 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/synthetic_cobweb.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/synthetic_cobweb.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "S": { - "item": "string" - }, - "#": { - "item": "slime_ball" - } + "S": "string", + "#": "slime_ball" }, "pattern": [ "SSS", diff --git a/ethical_textiles/data/global/advancement/dnv.ethical_textiles.json b/ethical_textiles/data/global/advancement/dnv.ethical_textiles.json index 0ba2a20..af50d46 100644 --- a/ethical_textiles/data/global/advancement/dnv.ethical_textiles.json +++ b/ethical_textiles/data/global/advancement/dnv.ethical_textiles.json @@ -6,7 +6,7 @@ "italic": false }, "description": { - "text": "Daenvil's Ethical Textiles 2.0.2 (for MC1.21+)", + "text": "Daenvil's Ethical Textiles 2.0.3 (for MC1.21.2+)", "italic": false }, "icon": { diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/load_ethical_textiles.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/load_ethical_textiles.mcfunction index 42d3a38..47f7ff0 100644 --- a/ethical_textiles/data/zz.dnv.vegancraft/function/load_ethical_textiles.mcfunction +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/load_ethical_textiles.mcfunction @@ -1 +1,4 @@ -scoreboard objectives add dnv.success dummy \ No newline at end of file +scoreboard objectives add dnv.count.crafted_faux_leather_3to1 dummy +scoreboard objectives add dnv.success dummy +scoreboard objectives add dnv.count.crafted_faux_leather_6to1 dummy +scoreboard objectives add dnv.count.crafted_synthetic_cobweb dummy \ No newline at end of file diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1.mcfunction index 4af0917..e686c04 100644 --- a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1.mcfunction +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_faux_leather_3to1 tag @s add dnv.subject.crafted_faux_leather_3to1 -schedule function zz.dnv.vegancraft:slots/on_crafted_faux_leather_3to1_delayed 1t replace +scoreboard players add @s dnv.count.crafted_faux_leather_3to1 3 +schedule function zz.dnv.vegancraft:slots/on_crafted_faux_leather_3to1_delayed 1t append \ No newline at end of file diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction index f8d0205..c0e8518 100644 --- a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_faux_leather_3to1 execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_faux_leather_3to1 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor leather run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261006,"item_name":"{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_faux_leather_3to1 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] 3 -execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] 3 \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count faux_leather_3to1.count int 1 run scoreboard players get @s dnv.count.crafted_faux_leather_3to1 +function zz.dnv.vegancraft:slots/on_crafted_faux_leather_3to1_replace_output with storage dnv.vegancraft:craft_count faux_leather_3to1 +scoreboard players set @s dnv.count.crafted_faux_leather_3to1 0 \ No newline at end of file diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction new file mode 100644 index 0000000..4d84dd5 --- /dev/null +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_vegan.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_vegan.mcfunction index e8a17c9..3c1c8da 100644 --- a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_vegan.mcfunction +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_faux_leather_3to1_vegan + tag @s add dnv.crafted_vegan diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1.mcfunction index 5515cee..a59b11e 100644 --- a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1.mcfunction +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_faux_leather_6to1 tag @s add dnv.subject.crafted_faux_leather_6to1 -schedule function zz.dnv.vegancraft:slots/on_crafted_faux_leather_6to1_delayed 1t replace +scoreboard players add @s dnv.count.crafted_faux_leather_6to1 3 +schedule function zz.dnv.vegancraft:slots/on_crafted_faux_leather_6to1_delayed 1t append \ No newline at end of file diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction index d445927..3a5cf76 100644 --- a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_faux_leather_6to1 execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_faux_leather_6to1 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor leather run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261006,"item_name":"{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_faux_leather_6to1 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] 3 -execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] 3 \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count faux_leather_6to1.count int 1 run scoreboard players get @s dnv.count.crafted_faux_leather_6to1 +function zz.dnv.vegancraft:slots/on_crafted_faux_leather_6to1_replace_output with storage dnv.vegancraft:craft_count faux_leather_6to1 +scoreboard players set @s dnv.count.crafted_faux_leather_6to1 0 \ No newline at end of file diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction new file mode 100644 index 0000000..4d84dd5 --- /dev/null +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_vegan.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_vegan.mcfunction index dcfc7b0..12f402f 100644 --- a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_vegan.mcfunction +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_faux_leather_6to1_vegan + tag @s add dnv.crafted_vegan diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb.mcfunction index 53e033b..43801f4 100644 --- a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb.mcfunction +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_synthetic_cobweb tag @s add dnv.subject.crafted_synthetic_cobweb -schedule function zz.dnv.vegancraft:slots/on_crafted_synthetic_cobweb_delayed 1t replace +scoreboard players add @s dnv.count.crafted_synthetic_cobweb 2 +schedule function zz.dnv.vegancraft:slots/on_crafted_synthetic_cobweb_delayed 1t append \ No newline at end of file diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_delayed_player.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_delayed_player.mcfunction index 6eff710..880e1d8 100644 --- a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_delayed_player.mcfunction +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_synthetic_cobweb execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_synthetic_cobweb 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor cobweb run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"item_name":"{\"translate\":\"dnv.ethical_textiles.item.synthetic_cobweb\",\"fallback\":\"Synthetic Cobweb\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_synthetic_cobweb 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s cobweb[custom_data~{dnv.vegan:true}] 2 -execute unless score @s dnv.success matches 0 run give @s cobweb[item_name="{\"translate\":\"dnv.ethical_textiles.item.synthetic_cobweb\",\"fallback\":\"Synthetic Cobweb\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":false}] 2 \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count synthetic_cobweb.count int 1 run scoreboard players get @s dnv.count.crafted_synthetic_cobweb +function zz.dnv.vegancraft:slots/on_crafted_synthetic_cobweb_replace_output with storage dnv.vegancraft:craft_count synthetic_cobweb +scoreboard players set @s dnv.count.crafted_synthetic_cobweb 0 \ No newline at end of file diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_replace_output.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_replace_output.mcfunction new file mode 100644 index 0000000..822a3c0 --- /dev/null +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s cobweb[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s cobweb[item_name="{\"translate\":\"dnv.ethical_textiles.item.synthetic_cobweb\",\"fallback\":\"Synthetic Cobweb\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_vegan.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_vegan.mcfunction index 1ef14ed..2980ab7 100644 --- a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_vegan.mcfunction +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_synthetic_cobweb_vegan + tag @s add dnv.crafted_vegan diff --git a/ethical_textiles/pack.mcmeta b/ethical_textiles/pack.mcmeta index c6dc3af..2d96a45 100644 --- a/ethical_textiles/pack.mcmeta +++ b/ethical_textiles/pack.mcmeta @@ -15,7 +15,7 @@ "underlined": true }, { - "text": "\nv2.0.2, for MC1.21+", + "text": "\nv2.0.3, for MC1.21.2+", "color": "gray", "italic": false } @@ -23,10 +23,10 @@ "color": "green", "italic": false }, - "pack_format": 46, + "pack_format": 57, "supported_formats": { - "min_inclusive": 46, - "max_inclusive": 49 + "min_inclusive": 57, + "max_inclusive": 58 } } } \ No newline at end of file diff --git a/magnet_fishing/1_21_1/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json b/magnet_fishing/1_21_1/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json new file mode 100644 index 0000000..c5aa73c --- /dev/null +++ b/magnet_fishing/1_21_1/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json @@ -0,0 +1,25 @@ +{ + "type": "crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "fishing_rod" + }, + { + "item": "redstone" + }, + { + "item": "iron_ingot" + } + ], + "result": { + "id": "fishing_rod", + "components": { + "item_name": "{\"translate\":\"dnv.magnet_fishing.item.magnet_fishing_rod\",\"fallback\":\"Magnet Fishing Rod\",\"italic\":false}", + "lore": [ + "{\"text\":\"Daenvil's Magnet Fishing\",\"color\":\"aqua\",\"italic\":true}" + ], + "custom_model_data": 9261009 + } + } +} \ No newline at end of file diff --git a/magnet_fishing/README.txt b/magnet_fishing/README.txt index 0130f2c..8101974 100644 --- a/magnet_fishing/README.txt +++ b/magnet_fishing/README.txt @@ -1,4 +1,4 @@ -# Magnet Fishing (v2.0.1, for Minecraft 1.21+) +# Magnet Fishing (v2.0.2, for Minecraft 1.21+) A datapack that adds a magnet fishing rod, with which you can fish iron and iron items. Craft the magnet rod with a regular fishing rod, an iron ingot, and redstone dust. @@ -7,7 +7,7 @@ A datapack that adds a magnet fishing rod, with which you can fish iron and iron - On PlanetMinecraft: https://www.planetminecraft.com/data-pack/magnet-fishing/ - On my website: https://daenvil.github.io/MCDatapacks/magnet_fishing.html -- This version was published on the 19th of June 2024. Check the webpages above for possible updates. +- This version was published on the 8th of November 2024. Check the webpages above for possible updates. ## Installation diff --git a/magnet_fishing/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json b/magnet_fishing/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json index c5aa73c..0affdf4 100644 --- a/magnet_fishing/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json +++ b/magnet_fishing/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json @@ -2,15 +2,9 @@ "type": "crafting_shapeless", "category": "equipment", "ingredients": [ - { - "item": "fishing_rod" - }, - { - "item": "redstone" - }, - { - "item": "iron_ingot" - } + "fishing_rod", + "redstone", + "iron_ingot" ], "result": { "id": "fishing_rod", diff --git a/magnet_fishing/data/global/advancement/dnv.magnet_fishing.json b/magnet_fishing/data/global/advancement/dnv.magnet_fishing.json index d71efce..0df2501 100644 --- a/magnet_fishing/data/global/advancement/dnv.magnet_fishing.json +++ b/magnet_fishing/data/global/advancement/dnv.magnet_fishing.json @@ -6,7 +6,7 @@ "italic": false }, "description": { - "text": "Daenvil's Magnet Fishing 2.0.1 (for MC1.21+)", + "text": "Daenvil's Magnet Fishing 2.0.2 (for MC1.21+)", "italic": false }, "icon": { diff --git a/magnet_fishing/pack.mcmeta b/magnet_fishing/pack.mcmeta index 11387e5..d5c3524 100644 --- a/magnet_fishing/pack.mcmeta +++ b/magnet_fishing/pack.mcmeta @@ -15,7 +15,7 @@ "underlined": true }, { - "text": "\nv2.0.1, for MC1.21+", + "text": "\nv2.0.2, for MC1.21+", "color": "gray", "italic": false } @@ -23,10 +23,18 @@ "color": "green", "italic": false }, - "pack_format": 46, + "pack_format": 57, "supported_formats": { - "min_inclusive": 46, - "max_inclusive": 48 + "min_inclusive": 47, + "max_inclusive": 58 } - } + }, + "overlays": { + "entries": [ + { + "directory": "1_21_1", + "formats": { "min_inclusive": 47, "max_inclusive": 48 } + } + ] + } } \ No newline at end of file diff --git a/plant-based_foods/README.txt b/plant-based_foods/README.txt index d364e94..3c31d1c 100644 --- a/plant-based_foods/README.txt +++ b/plant-based_foods/README.txt @@ -1,4 +1,4 @@ -# Plant-based Foods (v2.0.1, for Minecraft 1.21+) +# Plant-based Foods (v2.0.2, for Minecraft 1.21.2+) A datapack that adds vegan alternatives to dairy, eggs, honey, and meat. @@ -7,7 +7,7 @@ A datapack that adds vegan alternatives to dairy, eggs, honey, and meat. - On PlanetMinecraft: https://www.planetminecraft.com/data-pack/plant-based-foods/ - On my website: https://daenvil.github.io/MCDatapacks/plant-based_foods.html -- This version was published on the 19th of June 2024. Check the webpages above for possible updates. +- This version was published on the 8th of November 2024. Check the webpages above for possible updates. ## Installation diff --git a/plant-based_foods/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction b/plant-based_foods/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction index 4206f81..2ee5195 100644 --- a/plant-based_foods/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction +++ b/plant-based_foods/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction @@ -1 +1 @@ -give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261004,food={"nutrition":5,"saturation":6},custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261004,food={"nutrition":5,"saturation":6},consumable={},custom_data={"dnv.vegan":true}] \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction b/plant-based_foods/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction index e107282..0c32c39 100644 --- a/plant-based_foods/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction +++ b/plant-based_foods/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction @@ -1 +1 @@ -give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261026,food={"nutrition":6,"saturation":9.6},custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261026,food={"nutrition":6,"saturation":9.6},consumable={},custom_data={"dnv.vegan":true}] \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/notfish_fillet.json b/plant-based_foods/data/dnv.vegan_food/recipe/notfish_fillet.json index 20662a7..ccde42d 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/notfish_fillet.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/notfish_fillet.json @@ -2,18 +2,10 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "kelp" - }, - { - "item": "kelp" - }, - { - "item": "kelp" - }, - { - "item": "cooked_beef" - } + "kelp", + "kelp", + "kelp", + "cooked_beef" ], "result": { "id": "cod", @@ -27,6 +19,9 @@ "food": { "nutrition": 5, "saturation": 6 + }, + "consumable": { + }, "custom_data": { "dnv.vegan": true diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/notsalmon_fillet.json b/plant-based_foods/data/dnv.vegan_food/recipe/notsalmon_fillet.json index 027dd57..932f2d5 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/notsalmon_fillet.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/notsalmon_fillet.json @@ -2,15 +2,9 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "carrot" - }, - { - "item": "kelp" - }, - { - "item": "honey_bottle" - } + "carrot", + "kelp", + "honey_bottle" ], "result": { "id": "salmon", @@ -23,6 +17,9 @@ "food": { "nutrition": 6, "saturation": 9.6 + }, + "consumable": { + }, "custom_data": { "dnv.vegan": true diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/plant_milk_bucket.json b/plant-based_foods/data/dnv.vegan_food/recipe/plant_milk_bucket.json index 90db599..6c579f0 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/plant_milk_bucket.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/plant_milk_bucket.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "M": { - "tag": "dnv.vegan_food:milk_producing_plants" - }, - "W": { - "item": "water_bucket" - }, - "B": { - "item": "bucket" - } + "M": "#dnv.vegan_food:milk_producing_plants", + "W": "water_bucket", + "B": "bucket" }, "pattern": [ "MMM", diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak.json b/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak.json index 73d735a..cc90674 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak.json @@ -2,18 +2,10 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "wheat" - }, - { - "item": "wheat" - }, - { - "item": "wheat" - }, - { - "tag": "dnv.vegan_food:seitan_marinades" - } + "wheat", + "wheat", + "wheat", + "#dnv.vegan_food:seitan_marinades" ], "result": { "id": "cooked_beef", diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak_hay.json b/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak_hay.json index bc4294f..88254ca 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak_hay.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak_hay.json @@ -2,12 +2,8 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "hay_block" - }, - { - "tag": "dnv.vegan_food:seitan_marinades" - } + "hay_block", + "#dnv.vegan_food:seitan_marinades" ], "result": { "id": "cooked_beef", diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/seitan_stew.json b/plant-based_foods/data/dnv.vegan_food/recipe/seitan_stew.json index d983d50..5066f40 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/seitan_stew.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/seitan_stew.json @@ -2,21 +2,11 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "baked_potato" - }, - { - "item": "cooked_beef" - }, - { - "item": "bowl" - }, - { - "item": "carrot" - }, - { - "tag": "zz.dnv.core:mushrooms" - } + "baked_potato", + "cooked_beef", + "bowl", + "carrot", + "#zz.dnv.core:mushrooms" ], "result": { "id": "rabbit_stew", diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/vegan_cake.json b/plant-based_foods/data/dnv.vegan_food/recipe/vegan_cake.json index 6048e04..c4ffe97 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/vegan_cake.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/vegan_cake.json @@ -2,18 +2,10 @@ "type": "crafting_shaped", "category": "misc", "key": { - "M": { - "item": "milk_bucket" - }, - "S": { - "item": "sugar" - }, - "E": { - "tag": "dnv.vegan_food:egg_baking_replacements" - }, - "W": { - "item": "wheat" - } + "M": "milk_bucket", + "S": "sugar", + "E": "#dnv.vegan_food:egg_baking_replacements", + "W": "wheat" }, "pattern": [ "MMM", diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json b/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json index 38cbb4e..6489da2 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "A": { - "item": "apple" - }, - "G": { - "item": "glass_bottle" - } + "A": "apple", + "G": "glass_bottle" }, "pattern": [ " A ", diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json b/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json index ff45add..c4b79a5 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "F": { - "tag": "flowers" - }, - "W": { - "item": "water_bucket" - }, - "G": { - "item": "glass_bottle" - } + "F": "#flowers", + "W": "water_bucket", + "G": "glass_bottle" }, "pattern": [ "FFF", diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/vegan_pumpkin_pie.json b/plant-based_foods/data/dnv.vegan_food/recipe/vegan_pumpkin_pie.json index fb66b56..5b5bfed 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/vegan_pumpkin_pie.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/vegan_pumpkin_pie.json @@ -2,15 +2,9 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "pumpkin" - }, - { - "item": "sugar" - }, - { - "tag": "dnv.vegan_food:egg_baking_replacements" - } + "pumpkin", + "sugar", + "#dnv.vegan_food:egg_baking_replacements" ], "result": { "id": "pumpkin_pie", diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/veggie_burger.json b/plant-based_foods/data/dnv.vegan_food/recipe/veggie_burger.json index ce72885..346065f 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/veggie_burger.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/veggie_burger.json @@ -2,15 +2,9 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "bread" - }, - { - "item": "beetroot" - }, - { - "item": "brown_mushroom" - } + "bread", + "beetroot", + "brown_mushroom" ], "result": { "id": "cooked_porkchop", diff --git a/plant-based_foods/data/global/advancement/dnv.vegan_food.json b/plant-based_foods/data/global/advancement/dnv.vegan_food.json index 3e944a8..c647de2 100644 --- a/plant-based_foods/data/global/advancement/dnv.vegan_food.json +++ b/plant-based_foods/data/global/advancement/dnv.vegan_food.json @@ -6,7 +6,7 @@ "italic": false }, "description": { - "text": "Daenvil's Plant-based Foods 2.0.1 (for MC1.21+)", + "text": "Daenvil's Plant-based Foods 2.0.2 (for MC1.21.2+)", "italic": false }, "icon": { diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/load_vegan_food.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/load_vegan_food.mcfunction index 42d3a38..f4e80e9 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/load_vegan_food.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/load_vegan_food.mcfunction @@ -1 +1,5 @@ -scoreboard objectives add dnv.success dummy \ No newline at end of file +scoreboard objectives add dnv.count.crafted_vegan_cake dummy +scoreboard objectives add dnv.success dummy +scoreboard objectives add dnv.count.crafted_seitan_stew dummy +scoreboard objectives add dnv.count.crafted_notfish_fillet dummy +scoreboard objectives add dnv.count.crafted_notsalmon_fillet dummy \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet.mcfunction index 9d9b7b4..2ce7a75 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet.mcfunction @@ -1,6 +1,6 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_notfish_fillet tag @s add dnv.subject.crafted_notfish_fillet -schedule function zz.dnv.vegancraft:slots/on_crafted_notfish_fillet_delayed 1t replace - +scoreboard players add @s dnv.count.crafted_notfish_fillet 3 +schedule function zz.dnv.vegancraft:slots/on_crafted_notfish_fillet_delayed 1t append function zz.dnv.vegancraft:award_xp {xp:195} \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction index ed904e0..8bdb093 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_notfish_fillet execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_notfish_fillet 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor cod run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":true},"custom_model_data":9261004,"food":{"nutrition":5,"saturation":6},"item_name":"{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"consumable":{},"custom_data":{"dnv.vegan":false},"custom_model_data":9261004,"food":{"nutrition":5,"saturation":6},"item_name":"{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_notfish_fillet 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s cod[custom_data~{dnv.vegan:true}] 3 -execute unless score @s dnv.success matches 0 run give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261004,food={"nutrition":5,"saturation":6},custom_data={"dnv.vegan":true}] 3 \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count notfish_fillet.count int 1 run scoreboard players get @s dnv.count.crafted_notfish_fillet +function zz.dnv.vegancraft:slots/on_crafted_notfish_fillet_replace_output with storage dnv.vegancraft:craft_count notfish_fillet +scoreboard players set @s dnv.count.crafted_notfish_fillet 0 \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction new file mode 100644 index 0000000..f37e688 --- /dev/null +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s cod[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261004,food={"nutrition":5,"saturation":6},consumable={},custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_vegan.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_vegan.mcfunction index 0728241..afee95d 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_vegan.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_notfish_fillet_vegan + tag @s add dnv.crafted_vegan diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet.mcfunction index 7dba69c..d8462b0 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet.mcfunction @@ -1,6 +1,6 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_notsalmon_fillet tag @s add dnv.subject.crafted_notsalmon_fillet -schedule function zz.dnv.vegancraft:slots/on_crafted_notsalmon_fillet_delayed 1t replace - +scoreboard players add @s dnv.count.crafted_notsalmon_fillet 1 +schedule function zz.dnv.vegancraft:slots/on_crafted_notsalmon_fillet_delayed 1t append function zz.dnv.vegancraft:award_xp {xp:130} \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction index a08727d..1b34443 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_notsalmon_fillet execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_notsalmon_fillet 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor salmon run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":true},"custom_model_data":9261026,"food":{"nutrition":6,"saturation":9.6},"item_name":"{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"consumable":{},"custom_data":{"dnv.vegan":false},"custom_model_data":9261026,"food":{"nutrition":6,"saturation":9.6},"item_name":"{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_notsalmon_fillet 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s salmon[custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261026,food={"nutrition":6,"saturation":9.6},custom_data={"dnv.vegan":true}] \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count notsalmon_fillet.count int 1 run scoreboard players get @s dnv.count.crafted_notsalmon_fillet +function zz.dnv.vegancraft:slots/on_crafted_notsalmon_fillet_replace_output with storage dnv.vegancraft:craft_count notsalmon_fillet +scoreboard players set @s dnv.count.crafted_notsalmon_fillet 0 \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction new file mode 100644 index 0000000..a0018e7 --- /dev/null +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s salmon[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261026,food={"nutrition":6,"saturation":9.6},consumable={},custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_vegan.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_vegan.mcfunction index 587cc93..7e1a600 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_vegan.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_notsalmon_fillet_vegan + tag @s add dnv.crafted_vegan diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew.mcfunction index 382d488..c423c77 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_seitan_stew tag @s add dnv.subject.crafted_seitan_stew -schedule function zz.dnv.vegancraft:slots/on_crafted_seitan_stew_delayed 1t replace +scoreboard players add @s dnv.count.crafted_seitan_stew 1 +schedule function zz.dnv.vegancraft:slots/on_crafted_seitan_stew_delayed 1t append \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction index 54b1ea6..1bfa2b3 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_seitan_stew execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_seitan_stew 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor rabbit_stew run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item replace entity @s player.cursor with suspicious_stew[custom_data={ "dnv.vegan": false }] 1 +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_seitan_stew 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s rabbit_stew[custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s suspicious_stew[custom_data={"dnv.vegan":false}] \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count seitan_stew.count int 1 run scoreboard players get @s dnv.count.crafted_seitan_stew +function zz.dnv.vegancraft:slots/on_crafted_seitan_stew_replace_output with storage dnv.vegancraft:craft_count seitan_stew +scoreboard players set @s dnv.count.crafted_seitan_stew 0 \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction new file mode 100644 index 0000000..6b1167a --- /dev/null +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s rabbit_stew[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s suspicious_stew[custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_vegan.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_vegan.mcfunction index 030271a..0eb7472 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_vegan.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_seitan_stew_vegan + tag @s add dnv.crafted_vegan diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake.mcfunction index b4ac138..d371b68 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_vegan_cake tag @s add dnv.subject.crafted_vegan_cake -schedule function zz.dnv.vegancraft:slots/on_crafted_vegan_cake_delayed 1t replace +scoreboard players add @s dnv.count.crafted_vegan_cake 1 +schedule function zz.dnv.vegancraft:slots/on_crafted_vegan_cake_delayed 1t append \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_delayed_player.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_delayed_player.mcfunction index 9af55de..65ff557 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_delayed_player.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_vegan_cake execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_vegan_cake 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor cake run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item replace entity @s player.cursor with cake 1 +execute unless score @s dnv.success matches 0 run item replace entity @s player.cursor with cake[custom_data={ "dnv.vegan": false }] 1 +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_vegan_cake 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s cake[custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s cake \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count vegan_cake.count int 1 run scoreboard players get @s dnv.count.crafted_vegan_cake +function zz.dnv.vegancraft:slots/on_crafted_vegan_cake_replace_output with storage dnv.vegancraft:craft_count vegan_cake +scoreboard players set @s dnv.count.crafted_vegan_cake 0 \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_replace_output.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_replace_output.mcfunction new file mode 100644 index 0000000..a82b68b --- /dev/null +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s cake[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s cake[custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_vegan.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_vegan.mcfunction index 7b6f889..ba3ad4f 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_vegan.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_vegan_cake_vegan + tag @s add dnv.crafted_vegan diff --git a/plant-based_foods/pack.mcmeta b/plant-based_foods/pack.mcmeta index 87b9c97..6cecd4f 100644 --- a/plant-based_foods/pack.mcmeta +++ b/plant-based_foods/pack.mcmeta @@ -15,7 +15,7 @@ "underlined": true }, { - "text": "\nv2.0.1, for MC1.21+", + "text": "\nv2.0.2, for MC1.21.2+", "color": "gray", "italic": false } @@ -23,10 +23,10 @@ "color": "green", "italic": false }, - "pack_format": 46, + "pack_format": 57, "supported_formats": { - "min_inclusive": 46, - "max_inclusive": 48 + "min_inclusive": 57, + "max_inclusive": 58 } } } \ No newline at end of file diff --git a/plant_wax/1_21_1/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json b/plant_wax/1_21_1/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json new file mode 100644 index 0000000..1e8eb2c --- /dev/null +++ b/plant_wax/1_21_1/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json @@ -0,0 +1,22 @@ +{ + "type": "smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "dead_bush" + }, + "result": { + "id": "honeycomb", + "components": { + "item_name": "{\"translate\":\"dnv.plant_wax.item.plant_wax\",\"fallback\":\"Plant Wax\",\"italic\":false}", + "lore": [ + "{\"text\":\"Daenvil's Plant Wax\",\"color\":\"#FAFAB0\",\"italic\":true}" + ], + "custom_model_data": 9261008, + "custom_data": { + "dnv.vegan": true + } + } + } +} \ No newline at end of file diff --git a/plant_wax/1_21_1/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json b/plant_wax/1_21_1/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json new file mode 100644 index 0000000..b731563 --- /dev/null +++ b/plant_wax/1_21_1/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json @@ -0,0 +1,22 @@ +{ + "type": "smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "jungle_leaves" + }, + "result": { + "id": "honeycomb", + "components": { + "item_name": "{\"translate\":\"dnv.plant_wax.item.plant_wax\",\"fallback\":\"Plant Wax\",\"italic\":false}", + "lore": [ + "{\"text\":\"Daenvil's Plant Wax\",\"color\":\"#FAFAB0\",\"italic\":true}" + ], + "custom_model_data": 9261008, + "custom_data": { + "dnv.vegan": true + } + } + } +} \ No newline at end of file diff --git a/plant_wax/README.txt b/plant_wax/README.txt index 50483fe..cb4e9a9 100644 --- a/plant_wax/README.txt +++ b/plant_wax/README.txt @@ -1,4 +1,4 @@ -# Plant Wax (v2.0.1, for Minecraft 1.21+) +# Plant Wax (v2.0.2, for Minecraft 1.21+) A datapack that adds Plant Wax (a retextured Honeycomb). Obtained by smelting dead bushes or jungle leaves. @@ -7,7 +7,7 @@ A datapack that adds Plant Wax (a retextured Honeycomb). Obtained by smelting de - On PlanetMinecraft: https://www.planetminecraft.com/data-pack/plant-wax/ - On my website: https://daenvil.github.io/MCDatapacks/plant_wax.html -- This version was published on the 19th of June 2024. Check the webpages above for possible updates. +- This version was published on the 8th of November 2024. Check the webpages above for possible updates. ## Installation diff --git a/plant_wax/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json b/plant_wax/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json index 1e8eb2c..8c55f1d 100644 --- a/plant_wax/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json +++ b/plant_wax/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json @@ -3,9 +3,7 @@ "category": "misc", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "dead_bush" - }, + "ingredient": "dead_bush", "result": { "id": "honeycomb", "components": { diff --git a/plant_wax/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json b/plant_wax/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json index b731563..ad6a4a6 100644 --- a/plant_wax/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json +++ b/plant_wax/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json @@ -3,9 +3,7 @@ "category": "misc", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "jungle_leaves" - }, + "ingredient": "jungle_leaves", "result": { "id": "honeycomb", "components": { diff --git a/plant_wax/data/global/advancement/dnv.plant_wax.json b/plant_wax/data/global/advancement/dnv.plant_wax.json index 9727744..7d13c99 100644 --- a/plant_wax/data/global/advancement/dnv.plant_wax.json +++ b/plant_wax/data/global/advancement/dnv.plant_wax.json @@ -6,7 +6,7 @@ "italic": false }, "description": { - "text": "Daenvil's Plant Wax 2.0.1 (for MC1.21+)", + "text": "Daenvil's Plant Wax 2.0.2 (for MC1.21+)", "italic": false }, "icon": { diff --git a/plant_wax/pack.mcmeta b/plant_wax/pack.mcmeta index 3b3bb0e..aa18fa8 100644 --- a/plant_wax/pack.mcmeta +++ b/plant_wax/pack.mcmeta @@ -15,7 +15,7 @@ "underlined": true }, { - "text": "\nv2.0.1, for MC1.21+", + "text": "\nv2.0.2, for MC1.21+", "color": "gray", "italic": false } @@ -23,10 +23,18 @@ "color": "green", "italic": false }, - "pack_format": 46, + "pack_format": 57, "supported_formats": { - "min_inclusive": 46, - "max_inclusive": 48 + "min_inclusive": 47, + "max_inclusive": 58 } - } + }, + "overlays": { + "entries": [ + { + "directory": "1_21_1", + "formats": { "min_inclusive": 47, "max_inclusive": 48 } + } + ] + } } \ No newline at end of file diff --git a/vegancraft-DP/README.txt b/vegancraft-DP/README.txt index 9744f1d..bdd7ae2 100644 --- a/vegancraft-DP/README.txt +++ b/vegancraft-DP/README.txt @@ -1,4 +1,4 @@ -# Daenvil's Vegancraft v1.2.1 (Full Datapack) for Minecraft 1.21+ +# Daenvil's Vegancraft v1.2.2 (Full Datapack) for Minecraft 1.21.2+ This datapack is a merged version of the following datapacks: @@ -15,7 +15,7 @@ And also contains additional content not present on those datapacks. - On my website: https://daenvil.github.io/MCDatapacks/vegancraft.html - On GitHub: https://www.github.com/daenvil/vegancraft -- This version was published on the 27th of August 2024. Check the webpages above for possible updates. +- This version was published on the 8th of November 2024. Check the webpages above for possible updates. ## Installation diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/armor_scale.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/armor_scale.json index 151854a..4796a9f 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/armor_scale.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/armor_scale.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "S": { - "item": "string" - }, - "#": { - "item": "slime_ball" - }, - "D": { - "item": "diamond" - } + "S": "string", + "#": "slime_ball", + "D": "diamond" }, "pattern": [ "S#", diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/brush_string.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/brush_string.json index b44b88e..22ce8c2 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/brush_string.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/brush_string.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "equipment", "key": { - "S": { - "item": "string" - }, - "C": { - "item": "copper_ingot" - }, - "#": { - "item": "stick" - } + "S": "string", + "C": "copper_ingot", + "#": "stick" }, "pattern": [ "S S", diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_feather.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_feather.json index 8d2ec77..c3bf5c5 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_feather.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_feather.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "S": { - "item": "string" - }, - "L": { - "tag": "leaves" - }, - "#": { - "item": "stick" - } + "S": "string", + "L": "#leaves", + "#": "stick" }, "pattern": [ "SL", diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json index f23b7c1..c8d1f05 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "L": { - "tag": "dnv.ethical_textiles:leather_producing_plants_3to1" - }, - "S": { - "item": "slime_ball" - } + "L": "#dnv.ethical_textiles:leather_producing_plants_3to1", + "S": "slime_ball" }, "pattern": [ "LLL", diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json index df9340a..9ef9dc7 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "L": { - "tag": "dnv.ethical_textiles:leather_producing_plants_6to1" - }, - "S": { - "item": "slime_ball" - } + "L": "#dnv.ethical_textiles:leather_producing_plants_6to1", + "S": "slime_ball" }, "pattern": [ "LLL", diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/grass_bed.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/grass_bed.json index 229574d..2e35793 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/grass_bed.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/grass_bed.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "G": { - "tag": "zz.dnv.core:grass" - }, - "P": { - "tag": "planks" - } + "G": "#zz.dnv.core:grass", + "P": "#planks" }, "pattern": [ "GGG", diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/hay_bed.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/hay_bed.json index fe03d34..f5d7b2c 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/hay_bed.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/hay_bed.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "H": { - "item": "hay_block" - }, - "P": { - "tag": "planks" - } + "H": "hay_block", + "P": "#planks" }, "pattern": [ "HHH", diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/item_frame_paper.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/item_frame_paper.json index 495e4e6..c698227 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/item_frame_paper.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/item_frame_paper.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "S": { - "item": "stick" - }, - "P": { - "item": "paper" - } + "S": "stick", + "P": "paper" }, "pattern": [ "SSS", diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/jungle_bed.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/jungle_bed.json index e32d351..2b66b63 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/jungle_bed.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/jungle_bed.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "J": { - "item": "jungle_leaves" - }, - "P": { - "tag": "planks" - } + "J": "jungle_leaves", + "P": "#planks" }, "pattern": [ "JJJ", diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json index cbc965b..780ed7b 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json @@ -2,9 +2,7 @@ "type": "crafting_shaped", "category": "misc", "key": { - "S": { - "item": "sugar_cane" - } + "S": "sugar_cane" }, "pattern": [ "S ", diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_vines.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_vines.json index e8a23a6..434fa92 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_vines.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_vines.json @@ -2,9 +2,7 @@ "type": "crafting_shaped", "category": "misc", "key": { - "S": { - "tag": "dnv.ethical_textiles:string_producing_vines" - } + "S": "#dnv.ethical_textiles:string_producing_vines" }, "pattern": [ "S ", diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/synthetic_cobweb.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/synthetic_cobweb.json index 30e0a42..0fd4872 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/synthetic_cobweb.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/synthetic_cobweb.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "S": { - "item": "string" - }, - "#": { - "item": "slime_ball" - } + "S": "string", + "#": "slime_ball" }, "pattern": [ "SSS", diff --git a/vegancraft-DP/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json b/vegancraft-DP/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json index c5aa73c..0affdf4 100644 --- a/vegancraft-DP/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json +++ b/vegancraft-DP/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json @@ -2,15 +2,9 @@ "type": "crafting_shapeless", "category": "equipment", "ingredients": [ - { - "item": "fishing_rod" - }, - { - "item": "redstone" - }, - { - "item": "iron_ingot" - } + "fishing_rod", + "redstone", + "iron_ingot" ], "result": { "id": "fishing_rod", diff --git a/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json b/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json index 1e8eb2c..8c55f1d 100644 --- a/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json +++ b/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json @@ -3,9 +3,7 @@ "category": "misc", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "dead_bush" - }, + "ingredient": "dead_bush", "result": { "id": "honeycomb", "components": { diff --git a/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json b/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json index b731563..ad6a4a6 100644 --- a/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json +++ b/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json @@ -3,9 +3,7 @@ "category": "misc", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "jungle_leaves" - }, + "ingredient": "jungle_leaves", "result": { "id": "honeycomb", "components": { diff --git a/vegancraft-DP/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction b/vegancraft-DP/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction index 4206f81..2ee5195 100644 --- a/vegancraft-DP/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction +++ b/vegancraft-DP/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction @@ -1 +1 @@ -give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261004,food={"nutrition":5,"saturation":6},custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261004,food={"nutrition":5,"saturation":6},consumable={},custom_data={"dnv.vegan":true}] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction b/vegancraft-DP/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction index e107282..0c32c39 100644 --- a/vegancraft-DP/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction +++ b/vegancraft-DP/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction @@ -1 +1 @@ -give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261026,food={"nutrition":6,"saturation":9.6},custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261026,food={"nutrition":6,"saturation":9.6},consumable={},custom_data={"dnv.vegan":true}] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/notfish_fillet.json b/vegancraft-DP/data/dnv.vegan_food/recipe/notfish_fillet.json index 20662a7..ccde42d 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/notfish_fillet.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/notfish_fillet.json @@ -2,18 +2,10 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "kelp" - }, - { - "item": "kelp" - }, - { - "item": "kelp" - }, - { - "item": "cooked_beef" - } + "kelp", + "kelp", + "kelp", + "cooked_beef" ], "result": { "id": "cod", @@ -27,6 +19,9 @@ "food": { "nutrition": 5, "saturation": 6 + }, + "consumable": { + }, "custom_data": { "dnv.vegan": true diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/notsalmon_fillet.json b/vegancraft-DP/data/dnv.vegan_food/recipe/notsalmon_fillet.json index 027dd57..932f2d5 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/notsalmon_fillet.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/notsalmon_fillet.json @@ -2,15 +2,9 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "carrot" - }, - { - "item": "kelp" - }, - { - "item": "honey_bottle" - } + "carrot", + "kelp", + "honey_bottle" ], "result": { "id": "salmon", @@ -23,6 +17,9 @@ "food": { "nutrition": 6, "saturation": 9.6 + }, + "consumable": { + }, "custom_data": { "dnv.vegan": true diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/plant_milk_bucket.json b/vegancraft-DP/data/dnv.vegan_food/recipe/plant_milk_bucket.json index 90db599..6c579f0 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/plant_milk_bucket.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/plant_milk_bucket.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "M": { - "tag": "dnv.vegan_food:milk_producing_plants" - }, - "W": { - "item": "water_bucket" - }, - "B": { - "item": "bucket" - } + "M": "#dnv.vegan_food:milk_producing_plants", + "W": "water_bucket", + "B": "bucket" }, "pattern": [ "MMM", diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak.json b/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak.json index 73d735a..cc90674 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak.json @@ -2,18 +2,10 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "wheat" - }, - { - "item": "wheat" - }, - { - "item": "wheat" - }, - { - "tag": "dnv.vegan_food:seitan_marinades" - } + "wheat", + "wheat", + "wheat", + "#dnv.vegan_food:seitan_marinades" ], "result": { "id": "cooked_beef", diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak_hay.json b/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak_hay.json index bc4294f..88254ca 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak_hay.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak_hay.json @@ -2,12 +2,8 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "hay_block" - }, - { - "tag": "dnv.vegan_food:seitan_marinades" - } + "hay_block", + "#dnv.vegan_food:seitan_marinades" ], "result": { "id": "cooked_beef", diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_stew.json b/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_stew.json index d983d50..5066f40 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_stew.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_stew.json @@ -2,21 +2,11 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "baked_potato" - }, - { - "item": "cooked_beef" - }, - { - "item": "bowl" - }, - { - "item": "carrot" - }, - { - "tag": "zz.dnv.core:mushrooms" - } + "baked_potato", + "cooked_beef", + "bowl", + "carrot", + "#zz.dnv.core:mushrooms" ], "result": { "id": "rabbit_stew", diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_cake.json b/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_cake.json index 6048e04..c4ffe97 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_cake.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_cake.json @@ -2,18 +2,10 @@ "type": "crafting_shaped", "category": "misc", "key": { - "M": { - "item": "milk_bucket" - }, - "S": { - "item": "sugar" - }, - "E": { - "tag": "dnv.vegan_food:egg_baking_replacements" - }, - "W": { - "item": "wheat" - } + "M": "milk_bucket", + "S": "sugar", + "E": "#dnv.vegan_food:egg_baking_replacements", + "W": "wheat" }, "pattern": [ "MMM", diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json b/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json index 38cbb4e..6489da2 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "A": { - "item": "apple" - }, - "G": { - "item": "glass_bottle" - } + "A": "apple", + "G": "glass_bottle" }, "pattern": [ " A ", diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json b/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json index ff45add..c4b79a5 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "F": { - "tag": "flowers" - }, - "W": { - "item": "water_bucket" - }, - "G": { - "item": "glass_bottle" - } + "F": "#flowers", + "W": "water_bucket", + "G": "glass_bottle" }, "pattern": [ "FFF", diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_pumpkin_pie.json b/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_pumpkin_pie.json index fb66b56..5b5bfed 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_pumpkin_pie.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_pumpkin_pie.json @@ -2,15 +2,9 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "pumpkin" - }, - { - "item": "sugar" - }, - { - "tag": "dnv.vegan_food:egg_baking_replacements" - } + "pumpkin", + "sugar", + "#dnv.vegan_food:egg_baking_replacements" ], "result": { "id": "pumpkin_pie", diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/veggie_burger.json b/vegancraft-DP/data/dnv.vegan_food/recipe/veggie_burger.json index ce72885..346065f 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/veggie_burger.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/veggie_burger.json @@ -2,15 +2,9 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "bread" - }, - { - "item": "beetroot" - }, - { - "item": "brown_mushroom" - } + "bread", + "beetroot", + "brown_mushroom" ], "result": { "id": "cooked_porkchop", diff --git a/vegancraft-DP/data/dnv.vegancraft/advancement/recipes/ominous_trial_key.json b/vegancraft-DP/data/dnv.vegancraft/advancement/recipes/ominous_trial_key.json new file mode 100644 index 0000000..4ca385f --- /dev/null +++ b/vegancraft-DP/data/dnv.vegancraft/advancement/recipes/ominous_trial_key.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_blaze_rod": { + "trigger": "inventory_changed", + "conditions": { + "items": [ + { + "items": "blaze_rod" + } + ] + } + }, + "has_ominous_trial_key": { + "trigger": "inventory_changed", + "conditions": { + "items": [ + { + "items": "ominous_trial_key" + } + ] + } + }, + "has_the_recipe": { + "trigger": "recipe_unlocked", + "conditions": { + "recipe": "dnv.vegancraft:ominous_trial_key" + } + }, + "breeze_hurt_player": { + "trigger": "entity_hurt_player", + "conditions": { + "damage": { + "source_entity": { + "type": "breeze" + } + } + } + }, + "wind_charge_hurt_player": { + "trigger": "entity_hurt_player", + "conditions": { + "damage": { + "source_entity": { + "type": "wind_charge" + } + } + } + }, + "player_hurt_breeze": { + "trigger": "player_hurt_entity", + "conditions": { + "entity": { + "type": "breeze" + } + } + } + }, + "requirements": [ + [ + "has_blaze_rod", + "has_ominous_trial_key", + "has_the_recipe", + "breeze_hurt_player", + "wind_charge_hurt_player", + "player_hurt_breeze" + ] + ], + "rewards": { + "recipes": [ + "dnv.vegancraft:ominous_trial_key" + ] + } +} \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/advancement/recipes/totem_of_undying.json b/vegancraft-DP/data/dnv.vegancraft/advancement/recipes/totem_of_undying.json index 51f4140..0286589 100644 --- a/vegancraft-DP/data/dnv.vegancraft/advancement/recipes/totem_of_undying.json +++ b/vegancraft-DP/data/dnv.vegancraft/advancement/recipes/totem_of_undying.json @@ -1,26 +1,6 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_emerald": { - "trigger": "inventory_changed", - "conditions": { - "items": [ - { - "items": "emerald" - } - ] - } - }, - "has_gold_block": { - "trigger": "inventory_changed", - "conditions": { - "items": [ - { - "items": "gold_block" - } - ] - } - }, "has_echo_shard": { "trigger": "inventory_changed", "conditions": { @@ -31,83 +11,79 @@ ] } }, - "has_chorus_fruit": { + "has_totem_of_undying": { "trigger": "inventory_changed", "conditions": { "items": [ { - "items": "chorus_fruit" + "items": "totem_of_undying" } ] } }, - "has_shulker_box": { - "trigger": "inventory_changed", + "has_the_recipe": { + "trigger": "recipe_unlocked", "conditions": { - "items": [ - { - "items": "shulker_box" - } - ] + "recipe": "dnv.vegancraft:totem_of_undying" } }, - "has_shulker_shell": { - "trigger": "inventory_changed", + "evoker_hurt_player": { + "trigger": "entity_hurt_player", "conditions": { - "items": [ - { - "items": "shulker_shell" + "damage": { + "source_entity": { + "type": "evoker" } - ] - } - }, - "has_the_recipe": { - "trigger": "recipe_unlocked", - "conditions": { - "recipe": "dnv.vegancraft:totem_of_undying" + } } }, - "shulker_hurt_player": { + "evoker_fangs_hurt_player": { "trigger": "entity_hurt_player", "conditions": { "damage": { "source_entity": { - "type": "shulker" + "type": "evoker_fangs" } } } }, - "shulker_bullet_hurt_player": { + "player_hurt_evoker": { + "trigger": "player_hurt_entity", + "conditions": { + "entity": { + "type": "evoker" + } + } + }, + "vex_hurt_player": { "trigger": "entity_hurt_player", "conditions": { "damage": { "source_entity": { - "type": "shulker_bullet" + "type": "vex" } } } }, - "player_hurt_shulker": { + "player_hurt_vex": { "trigger": "player_hurt_entity", "conditions": { "entity": { - "type": "shulker" + "type": "vex" } } } }, "requirements": [ [ - "has_emerald", - "has_gold_block", "has_echo_shard", - "has_chorus_fruit", - "has_shulker_box", - "has_shulker_shell", + "has_totem_of_undying", "has_the_recipe", - "shulker_hurt_player", - "shulker_bullet_hurt_player", - "player_hurt_shulker" + "evoker_hurt_player", + "evoker_fangs_hurt_player", + "player_hurt_evoker", + "vex_hurt_player", + "player_hurt_vex" ] ], "rewards": { diff --git a/vegancraft-DP/data/dnv.vegancraft/advancement/recipes/trial_key.json b/vegancraft-DP/data/dnv.vegancraft/advancement/recipes/trial_key.json new file mode 100644 index 0000000..e64af48 --- /dev/null +++ b/vegancraft-DP/data/dnv.vegancraft/advancement/recipes/trial_key.json @@ -0,0 +1,85 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lightning_rod": { + "trigger": "inventory_changed", + "conditions": { + "items": [ + { + "items": "lightning_rod" + } + ] + } + }, + "has_trial_key": { + "trigger": "inventory_changed", + "conditions": { + "items": [ + { + "items": "trial_key" + } + ] + } + }, + "has_ominous_trial_key": { + "trigger": "inventory_changed", + "conditions": { + "items": [ + { + "items": "ominous_trial_key" + } + ] + } + }, + "has_the_recipe": { + "trigger": "recipe_unlocked", + "conditions": { + "recipe": "dnv.vegancraft:trial_key" + } + }, + "breeze_hurt_player": { + "trigger": "entity_hurt_player", + "conditions": { + "damage": { + "source_entity": { + "type": "breeze" + } + } + } + }, + "wind_charge_hurt_player": { + "trigger": "entity_hurt_player", + "conditions": { + "damage": { + "source_entity": { + "type": "wind_charge" + } + } + } + }, + "player_hurt_breeze": { + "trigger": "player_hurt_entity", + "conditions": { + "entity": { + "type": "breeze" + } + } + } + }, + "requirements": [ + [ + "has_lightning_rod", + "has_trial_key", + "has_ominous_trial_key", + "has_the_recipe", + "breeze_hurt_player", + "wind_charge_hurt_player", + "player_hurt_breeze" + ] + ], + "rewards": { + "recipes": [ + "dnv.vegancraft:trial_key" + ] + } +} \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/black_dye.json b/vegancraft-DP/data/dnv.vegancraft/recipe/black_dye.json index 49b628b..afac746 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/black_dye.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/black_dye.json @@ -2,9 +2,7 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "tag": "coals" - } + "#coals" ], "result": { "id": "black_dye" diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/black_dye_stonecutting.json b/vegancraft-DP/data/dnv.vegancraft/recipe/black_dye_stonecutting.json index ab490d6..70b820d 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/black_dye_stonecutting.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/black_dye_stonecutting.json @@ -1,8 +1,6 @@ { "type": "stonecutting", - "ingredient": { - "tag": "zz.dnv.core:dark_oak_bark" - }, + "ingredient": "#zz.dnv.core:dark_oak_bark", "result": { "id": "black_dye", "count": 4 diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_powder.json b/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_powder.json index fd9bd62..4691aff 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_powder.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_powder.json @@ -2,21 +2,11 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "magma_block" - }, - { - "item": "glowstone_dust" - }, - { - "item": "glowstone_dust" - }, - { - "item": "glowstone_dust" - }, - { - "item": "glowstone_dust" - } + "magma_block", + "glowstone_dust", + "glowstone_dust", + "glowstone_dust", + "glowstone_dust" ], "result": { "id": "blaze_powder", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_rod.json b/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_rod.json index f9c81fb..30f7c2d 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_rod.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_rod.json @@ -2,15 +2,9 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "lightning_rod" - }, - { - "item": "blaze_powder" - }, - { - "item": "blaze_powder" - } + "lightning_rod", + "blaze_powder", + "blaze_powder" ], "result": { "id": "blaze_rod", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/bone_bonemeal.json b/vegancraft-DP/data/dnv.vegancraft/recipe/bone_bonemeal.json index 3aa3919..a4dc5a4 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/bone_bonemeal.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/bone_bonemeal.json @@ -2,15 +2,9 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "bone_meal" - }, - { - "item": "bone_meal" - }, - { - "item": "bone_meal" - } + "bone_meal", + "bone_meal", + "bone_meal" ], "result": { "id": "bone" diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/bouncy_boot.json b/vegancraft-DP/data/dnv.vegancraft/recipe/bouncy_boot.json index 85ff858..1d809eb 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/bouncy_boot.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/bouncy_boot.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "misc", "key": { - "S": { - "item": "slime_ball" - }, - "L": { - "item": "leather_boots" - } + "S": "slime_ball", + "L": "leather_boots" }, "pattern": [ "SSS", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/breezy_rod.json b/vegancraft-DP/data/dnv.vegancraft/recipe/breezy_rod.json index 5b6df8d..cb8b61c 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/breezy_rod.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/breezy_rod.json @@ -2,12 +2,8 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "blaze_rod" - }, - { - "item": "dragon_breath" - } + "blaze_rod", + "dragon_breath" ], "result": { "id": "breeze_rod", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn.json index b85013c..fc16d19 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn.json @@ -2,12 +2,8 @@ "type": "crafting_shaped", "category": "equipment", "key": { - "C": { - "item": "copper_ingot" - }, - "H": { - "item": "honeycomb" - } + "C": "copper_ingot", + "H": "honeycomb" }, "pattern": [ "C C", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_admire.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_admire.json index ebd9390..8eef048 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_admire.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_admire.json @@ -1,14 +1,8 @@ { "type": "smithing_transform", - "base": { - "item": "goat_horn" - }, - "addition": { - "item": "copper_ingot" - }, - "template": { - "tag": "dnv.vegancraft:copper_horn_templates_admire" - }, + "base": "goat_horn", + "addition": "copper_ingot", + "template": "#dnv.vegancraft:copper_horn_templates_admire", "result": { "id": "goat_horn", "components": { diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_call.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_call.json index e82550b..02ad532 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_call.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_call.json @@ -1,14 +1,8 @@ { "type": "smithing_transform", - "base": { - "item": "goat_horn" - }, - "addition": { - "item": "copper_ingot" - }, - "template": { - "tag": "dnv.vegancraft:copper_horn_templates_call" - }, + "base": "goat_horn", + "addition": "copper_ingot", + "template": "#dnv.vegancraft:copper_horn_templates_call", "result": { "id": "goat_horn", "components": { diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_dream.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_dream.json index 286d55d..0537ec4 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_dream.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_dream.json @@ -1,14 +1,8 @@ { "type": "smithing_transform", - "base": { - "item": "goat_horn" - }, - "addition": { - "item": "copper_ingot" - }, - "template": { - "tag": "dnv.vegancraft:copper_horn_templates_dream" - }, + "base": "goat_horn", + "addition": "copper_ingot", + "template": "#dnv.vegancraft:copper_horn_templates_dream", "result": { "id": "goat_horn", "components": { diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_feel.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_feel.json index ffcb15c..f2e7afa 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_feel.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_feel.json @@ -1,14 +1,8 @@ { "type": "smithing_transform", - "base": { - "item": "goat_horn" - }, - "addition": { - "item": "copper_ingot" - }, - "template": { - "tag": "dnv.vegancraft:copper_horn_templates_feel" - }, + "base": "goat_horn", + "addition": "copper_ingot", + "template": "#dnv.vegancraft:copper_horn_templates_feel", "result": { "id": "goat_horn", "components": { diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_ponder.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_ponder.json index 420c933..80d5aa1 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_ponder.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_ponder.json @@ -1,14 +1,8 @@ { "type": "smithing_transform", - "base": { - "item": "goat_horn" - }, - "addition": { - "item": "copper_ingot" - }, - "template": { - "tag": "dnv.vegancraft:copper_horn_templates_ponder" - }, + "base": "goat_horn", + "addition": "copper_ingot", + "template": "#dnv.vegancraft:copper_horn_templates_ponder", "result": { "id": "goat_horn", "components": { diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_seek.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_seek.json index 40f801b..e1cb64b 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_seek.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_seek.json @@ -1,14 +1,8 @@ { "type": "smithing_transform", - "base": { - "item": "goat_horn" - }, - "addition": { - "item": "copper_ingot" - }, - "template": { - "tag": "dnv.vegancraft:copper_horn_templates_seek" - }, + "base": "goat_horn", + "addition": "copper_ingot", + "template": "#dnv.vegancraft:copper_horn_templates_seek", "result": { "id": "goat_horn", "components": { diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_sing.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_sing.json index 09de071..880f656 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_sing.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_sing.json @@ -1,14 +1,8 @@ { "type": "smithing_transform", - "base": { - "item": "goat_horn" - }, - "addition": { - "item": "copper_ingot" - }, - "template": { - "tag": "dnv.vegancraft:copper_horn_templates_sing" - }, + "base": "goat_horn", + "addition": "copper_ingot", + "template": "#dnv.vegancraft:copper_horn_templates_sing", "result": { "id": "goat_horn", "components": { diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_yearn.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_yearn.json index 5dd87e2..1e983b0 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_yearn.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_yearn.json @@ -1,14 +1,8 @@ { "type": "smithing_transform", - "base": { - "item": "goat_horn" - }, - "addition": { - "item": "copper_ingot" - }, - "template": { - "tag": "dnv.vegancraft:copper_horn_templates_yearn" - }, + "base": "goat_horn", + "addition": "copper_ingot", + "template": "#dnv.vegancraft:copper_horn_templates_yearn", "result": { "id": "goat_horn", "components": { diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/creeper_head.json b/vegancraft-DP/data/dnv.vegancraft/recipe/creeper_head.json index 6e29016..6770203 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/creeper_head.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/creeper_head.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "G": { - "item": "green_dye" - }, - "#": { - "item": "gunpowder" - }, - "C": { - "item": "carved_pumpkin" - } + "G": "green_dye", + "#": "gunpowder", + "C": "carved_pumpkin" }, "pattern": [ "G#G", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/end_mist.json b/vegancraft-DP/data/dnv.vegancraft/recipe/end_mist.json index 5fe174d..0a108f6 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/end_mist.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/end_mist.json @@ -2,15 +2,9 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "glass_bottle" - }, - { - "item": "blaze_powder" - }, - { - "item": "chorus_fruit" - } + "glass_bottle", + "blaze_powder", + "chorus_fruit" ], "result": { "id": "dragon_breath", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/ender_eye.json b/vegancraft-DP/data/dnv.vegancraft/recipe/ender_eye.json index adf822a..a92d2f3 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/ender_eye.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/ender_eye.json @@ -2,15 +2,9 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "compass" - }, - { - "item": "blaze_powder" - }, - { - "item": "crying_obsidian" - } + "compass", + "blaze_powder", + "crying_obsidian" ], "result": { "id": "ender_eye", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/ender_pearl.json b/vegancraft-DP/data/dnv.vegancraft/recipe/ender_pearl.json index 24ece59..ac7f62c 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/ender_pearl.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/ender_pearl.json @@ -2,12 +2,8 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "chorus_fruit" - }, - { - "item": "emerald" - } + "chorus_fruit", + "emerald" ], "result": { "id": "ender_pearl" diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/feathery_membrane.json b/vegancraft-DP/data/dnv.vegancraft/recipe/feathery_membrane.json index cb6dbc6..2de6132 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/feathery_membrane.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/feathery_membrane.json @@ -2,18 +2,10 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "honeycomb" - }, - { - "item": "feather" - }, - { - "item": "feather" - }, - { - "item": "honeycomb" - } + "honeycomb", + "feather", + "feather", + "honeycomb" ], "result": { "id": "phantom_membrane", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/glow_ink_sac.json b/vegancraft-DP/data/dnv.vegancraft/recipe/glow_ink_sac.json index 1f8f9df..88a85b9 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/glow_ink_sac.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/glow_ink_sac.json @@ -2,9 +2,7 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "tag": "dnv.vegancraft:glow_items" - } + "#dnv.vegancraft:glow_items" ], "result": { "id": "glow_ink_sac" diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/glow_item_frame.json b/vegancraft-DP/data/dnv.vegancraft/recipe/glow_item_frame.json index 7d9fb45..88f0a87 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/glow_item_frame.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/glow_item_frame.json @@ -2,12 +2,8 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "tag": "dnv.vegancraft:glow_items" - }, - { - "item": "item_frame" - } + "#dnv.vegancraft:glow_items", + "item_frame" ], "result": { "id": "glow_item_frame" diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/gunpowder.json b/vegancraft-DP/data/dnv.vegancraft/recipe/gunpowder.json index deb9c69..5a02078 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/gunpowder.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/gunpowder.json @@ -2,15 +2,9 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "tag": "coals" - }, - { - "item": "redstone" - }, - { - "item": "glowstone_dust" - } + "#coals", + "redstone", + "glowstone_dust" ], "result": { "id": "gunpowder", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/hardened_seagrass.json b/vegancraft-DP/data/dnv.vegancraft/recipe/hardened_seagrass.json index 9de4a36..69d3eeb 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/hardened_seagrass.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/hardened_seagrass.json @@ -2,12 +2,8 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "seagrass" - }, - { - "item": "honeycomb" - } + "seagrass", + "honeycomb" ], "result": { "id": "turtle_scute", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/ink_sac.json b/vegancraft-DP/data/dnv.vegancraft/recipe/ink_sac.json index 6d31f86..86b0dcc 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/ink_sac.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/ink_sac.json @@ -2,9 +2,7 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "black_dye" - } + "black_dye" ], "result": { "id": "ink_sac" diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/nether_star.json b/vegancraft-DP/data/dnv.vegancraft/recipe/nether_star.json index cc1ed76..d11438c 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/nether_star.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/nether_star.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "N": { - "item": "netherite_ingot" - }, - "D": { - "item": "diamond" - }, - "B": { - "item": "blaze_powder" - } + "N": "netherite_ingot", + "D": "diamond", + "B": "blaze_powder" }, "pattern": [ "NDN", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/ochre_froglight.json b/vegancraft-DP/data/dnv.vegancraft/recipe/ochre_froglight.json index 4da5e24..02ba6ff 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/ochre_froglight.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/ochre_froglight.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "Y": { - "item": "yellow_dye" - }, - "P": { - "item": "prismarine_crystals" - }, - "S": { - "item": "shroomlight" - } + "Y": "yellow_dye", + "P": "prismarine_crystals", + "S": "shroomlight" }, "pattern": [ "YPY", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/ominous_trial_key.json b/vegancraft-DP/data/dnv.vegancraft/recipe/ominous_trial_key.json new file mode 100644 index 0000000..3350c3e --- /dev/null +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/ominous_trial_key.json @@ -0,0 +1,17 @@ +{ + "type": "crafting_shaped", + "category": "misc", + "key": { + "P": "polished_tuff", + "B": "blaze_rod", + "C": "crying_obsidian" + }, + "pattern": [ + " P ", + " B ", + " C " + ], + "result": { + "id": "ominous_trial_key" + } +} \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/pearlescent_froglight.json b/vegancraft-DP/data/dnv.vegancraft/recipe/pearlescent_froglight.json index fc19847..fccfe26 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/pearlescent_froglight.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/pearlescent_froglight.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "M": { - "item": "magenta_dye" - }, - "P": { - "item": "prismarine_crystals" - }, - "S": { - "item": "shroomlight" - } + "M": "magenta_dye", + "P": "prismarine_crystals", + "S": "shroomlight" }, "pattern": [ "MPM", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/piglin_head.json b/vegancraft-DP/data/dnv.vegancraft/recipe/piglin_head.json index 6f4ccfe..7504089 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/piglin_head.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/piglin_head.json @@ -2,18 +2,10 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "carved_pumpkin" - }, - { - "item": "pink_dye" - }, - { - "item": "nether_gold_ore" - }, - { - "tag": "dnv.vegancraft:piglin_head_patterns" - } + "carved_pumpkin", + "pink_dye", + "nether_gold_ore", + "#dnv.vegancraft:piglin_head_patterns" ], "result": { "id": "piglin_head" diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/poisonous_sprout.json b/vegancraft-DP/data/dnv.vegancraft/recipe/poisonous_sprout.json index 934fa9f..ad056ab 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/poisonous_sprout.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/poisonous_sprout.json @@ -2,9 +2,7 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "poisonous_potato" - } + "poisonous_potato" ], "result": { "id": "spider_eye", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/prismarine_crystals.json b/vegancraft-DP/data/dnv.vegancraft/recipe/prismarine_crystals.json index ef84047..2f08801 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/prismarine_crystals.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/prismarine_crystals.json @@ -3,9 +3,7 @@ "category": "misc", "cookingtime": 200, "experience": 0, - "ingredient": { - "item": "prismarine_shard" - }, + "ingredient": "prismarine_shard", "result": { "id": "prismarine_crystals" } diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/prismarine_shard.json b/vegancraft-DP/data/dnv.vegancraft/recipe/prismarine_shard.json index 2b33652..7321879 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/prismarine_shard.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/prismarine_shard.json @@ -3,9 +3,7 @@ "category": "misc", "cookingtime": 200, "experience": 0, - "ingredient": { - "item": "amethyst_shard" - }, + "ingredient": "amethyst_shard", "result": { "id": "prismarine_shard" } diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/puffer_bubble.json b/vegancraft-DP/data/dnv.vegancraft/recipe/puffer_bubble.json index 43a7c96..a8578b1 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/puffer_bubble.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/puffer_bubble.json @@ -2,12 +2,8 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "heart_of_the_sea" - }, - { - "item": "soul_sand" - } + "heart_of_the_sea", + "soul_sand" ], "result": { "id": "pufferfish", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/shulker_box.json b/vegancraft-DP/data/dnv.vegancraft/recipe/shulker_box.json index 9db26e1..61f4c82 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/shulker_box.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/shulker_box.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "P": { - "item": "popped_chorus_fruit" - }, - "E": { - "item": "ender_pearl" - }, - "C": { - "item": "chest" - } + "P": "popped_chorus_fruit", + "E": "ender_pearl", + "C": "chest" }, "pattern": [ "PEP", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/skeleton_skull.json b/vegancraft-DP/data/dnv.vegancraft/recipe/skeleton_skull.json index 982de26..94b484a 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/skeleton_skull.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/skeleton_skull.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "W": { - "item": "white_dye" - }, - "B": { - "item": "bone_block" - }, - "C": { - "item": "carved_pumpkin" - } + "W": "white_dye", + "B": "bone_block", + "C": "carved_pumpkin" }, "pattern": [ "WBW", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/totem_of_undying.json b/vegancraft-DP/data/dnv.vegancraft/recipe/totem_of_undying.json index d315dff..530dc1e 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/totem_of_undying.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/totem_of_undying.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "E": { - "item": "emerald" - }, - "G": { - "item": "gold_block" - }, - "#": { - "item": "echo_shard" - } + "E": "emerald", + "G": "gold_block", + "#": "echo_shard" }, "pattern": [ " ", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/trial_key.json b/vegancraft-DP/data/dnv.vegancraft/recipe/trial_key.json new file mode 100644 index 0000000..12e699a --- /dev/null +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/trial_key.json @@ -0,0 +1,17 @@ +{ + "type": "crafting_shaped", + "category": "misc", + "key": { + "P": "polished_tuff", + "L": "lightning_rod", + "O": "obsidian" + }, + "pattern": [ + " P ", + " L ", + " O " + ], + "result": { + "id": "trial_key" + } +} \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/trident.json b/vegancraft-DP/data/dnv.vegancraft/recipe/trident.json index 5b7f070..c8f9b73 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/trident.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/trident.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "equipment", "key": { - "D": { - "item": "diamond_sword" - }, - "P": { - "item": "prismarine_crystals" - }, - "B": { - "item": "blaze_rod" - } + "D": "diamond_sword", + "P": "prismarine_crystals", + "B": "blaze_rod" }, "pattern": [ " DD", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/verdant_froglight.json b/vegancraft-DP/data/dnv.vegancraft/recipe/verdant_froglight.json index 11eeb34..5145214 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/verdant_froglight.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/verdant_froglight.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "G": { - "item": "green_dye" - }, - "P": { - "item": "prismarine_crystals" - }, - "S": { - "item": "shroomlight" - } + "G": "green_dye", + "P": "prismarine_crystals", + "S": "shroomlight" }, "pattern": [ "GPG", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/white_dye_stonecutting.json b/vegancraft-DP/data/dnv.vegancraft/recipe/white_dye_stonecutting.json index df80652..e6b3371 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/white_dye_stonecutting.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/white_dye_stonecutting.json @@ -1,8 +1,6 @@ { "type": "stonecutting", - "ingredient": { - "tag": "zz.dnv.core:birch_bark" - }, + "ingredient": "#zz.dnv.core:birch_bark", "result": { "id": "white_dye", "count": 4 diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/wither_rose.json b/vegancraft-DP/data/dnv.vegancraft/recipe/wither_rose.json index c11e457..52ded17 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/wither_rose.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/wither_rose.json @@ -2,15 +2,9 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "rose_bush" - }, - { - "item": "netherite_ingot" - }, - { - "tag": "soul_fire_base_blocks" - } + "rose_bush", + "netherite_ingot", + "#soul_fire_base_blocks" ], "result": { "id": "wither_rose", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/wither_skeleton_skull.json b/vegancraft-DP/data/dnv.vegancraft/recipe/wither_skeleton_skull.json index 5a4f9cc..09a6c53 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/wither_skeleton_skull.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/wither_skeleton_skull.json @@ -2,18 +2,10 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "skeleton_skull" - }, - { - "item": "black_dye" - }, - { - "item": "netherite_ingot" - }, - { - "item": "rib_armor_trim_smithing_template" - } + "skeleton_skull", + "black_dye", + "netherite_ingot", + "rib_armor_trim_smithing_template" ], "result": { "id": "wither_skeleton_skull" diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/writable_book_pencil.json b/vegancraft-DP/data/dnv.vegancraft/recipe/writable_book_pencil.json index d146b33..12684a6 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/writable_book_pencil.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/writable_book_pencil.json @@ -2,15 +2,9 @@ "type": "crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "book" - }, - { - "item": "stick" - }, - { - "tag": "coals" - } + "book", + "stick", + "#coals" ], "result": { "id": "writable_book", diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/zombie_head.json b/vegancraft-DP/data/dnv.vegancraft/recipe/zombie_head.json index fe91edc..f509ccb 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/zombie_head.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/zombie_head.json @@ -2,15 +2,9 @@ "type": "crafting_shaped", "category": "misc", "key": { - "G": { - "item": "green_dye" - }, - "F": { - "item": "fermented_spider_eye" - }, - "C": { - "item": "carved_pumpkin" - } + "G": "green_dye", + "F": "fermented_spider_eye", + "C": "carved_pumpkin" }, "pattern": [ "GFG", diff --git a/vegancraft-DP/data/global/advancement/dnv.acacia_gum.json b/vegancraft-DP/data/global/advancement/dnv.acacia_gum.json index 700d9b4..af514f7 100644 --- a/vegancraft-DP/data/global/advancement/dnv.acacia_gum.json +++ b/vegancraft-DP/data/global/advancement/dnv.acacia_gum.json @@ -6,7 +6,7 @@ "italic": false }, "description": { - "text": "Daenvil's Acacia Gum 1.2.1 (for MC1.21+)", + "text": "Daenvil's Acacia Gum 1.2.2 (for MC1.21.2+)", "italic": false }, "icon": { diff --git a/vegancraft-DP/data/global/advancement/dnv.ethical_textiles.json b/vegancraft-DP/data/global/advancement/dnv.ethical_textiles.json index 0ba2a20..af50d46 100644 --- a/vegancraft-DP/data/global/advancement/dnv.ethical_textiles.json +++ b/vegancraft-DP/data/global/advancement/dnv.ethical_textiles.json @@ -6,7 +6,7 @@ "italic": false }, "description": { - "text": "Daenvil's Ethical Textiles 2.0.2 (for MC1.21+)", + "text": "Daenvil's Ethical Textiles 2.0.3 (for MC1.21.2+)", "italic": false }, "icon": { diff --git a/vegancraft-DP/data/global/advancement/dnv.magnet_fishing.json b/vegancraft-DP/data/global/advancement/dnv.magnet_fishing.json index d71efce..68cd411 100644 --- a/vegancraft-DP/data/global/advancement/dnv.magnet_fishing.json +++ b/vegancraft-DP/data/global/advancement/dnv.magnet_fishing.json @@ -6,7 +6,7 @@ "italic": false }, "description": { - "text": "Daenvil's Magnet Fishing 2.0.1 (for MC1.21+)", + "text": "Daenvil's Magnet Fishing 2.0.2 (for MC1.21.2+)", "italic": false }, "icon": { diff --git a/vegancraft-DP/data/global/advancement/dnv.plant_wax.json b/vegancraft-DP/data/global/advancement/dnv.plant_wax.json index 9727744..f1f683c 100644 --- a/vegancraft-DP/data/global/advancement/dnv.plant_wax.json +++ b/vegancraft-DP/data/global/advancement/dnv.plant_wax.json @@ -6,7 +6,7 @@ "italic": false }, "description": { - "text": "Daenvil's Plant Wax 2.0.1 (for MC1.21+)", + "text": "Daenvil's Plant Wax 2.0.2 (for MC1.21.2+)", "italic": false }, "icon": { diff --git a/vegancraft-DP/data/global/advancement/dnv.vegan_food.json b/vegancraft-DP/data/global/advancement/dnv.vegan_food.json index 3e944a8..c647de2 100644 --- a/vegancraft-DP/data/global/advancement/dnv.vegan_food.json +++ b/vegancraft-DP/data/global/advancement/dnv.vegan_food.json @@ -6,7 +6,7 @@ "italic": false }, "description": { - "text": "Daenvil's Plant-based Foods 2.0.1 (for MC1.21+)", + "text": "Daenvil's Plant-based Foods 2.0.2 (for MC1.21.2+)", "italic": false }, "icon": { diff --git a/vegancraft-DP/data/global/advancement/dnv.vegancraft.json b/vegancraft-DP/data/global/advancement/dnv.vegancraft.json index 6cbf7b1..680c287 100644 --- a/vegancraft-DP/data/global/advancement/dnv.vegancraft.json +++ b/vegancraft-DP/data/global/advancement/dnv.vegancraft.json @@ -6,7 +6,7 @@ "italic": false }, "description": { - "text": "Daenvil's Vegancraft 1.2.1 (for MC1.21+)", + "text": "Daenvil's Vegancraft 1.2.2 (for MC1.21.2+)", "italic": false }, "icon": { diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction index f54232a..15c3326 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction @@ -1,4 +1,4 @@ -execute store result score @s dnv.acacia_gum.raycast_range run attribute @s player.block_interaction_range get -10 +execute store result score @s dnv.acacia_gum.raycast_range run attribute @s block_interaction_range get -10 scoreboard players operation @s dnv.acacia_gum.raycast_range_doubled = @s dnv.acacia_gum.raycast_range scoreboard players operation @s dnv.acacia_gum.raycast_range_doubled *= #dnv dnv.2 scoreboard players set @s dnv.acacia_gum.found_acacia 0 diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/load_ethical_textiles.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/load_ethical_textiles.mcfunction index 42d3a38..47f7ff0 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/load_ethical_textiles.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/load_ethical_textiles.mcfunction @@ -1 +1,4 @@ -scoreboard objectives add dnv.success dummy \ No newline at end of file +scoreboard objectives add dnv.count.crafted_faux_leather_3to1 dummy +scoreboard objectives add dnv.success dummy +scoreboard objectives add dnv.count.crafted_faux_leather_6to1 dummy +scoreboard objectives add dnv.count.crafted_synthetic_cobweb dummy \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/load_vegan_food.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/load_vegan_food.mcfunction index 42d3a38..f4e80e9 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/load_vegan_food.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/load_vegan_food.mcfunction @@ -1 +1,5 @@ -scoreboard objectives add dnv.success dummy \ No newline at end of file +scoreboard objectives add dnv.count.crafted_vegan_cake dummy +scoreboard objectives add dnv.success dummy +scoreboard objectives add dnv.count.crafted_seitan_stew dummy +scoreboard objectives add dnv.count.crafted_notfish_fillet dummy +scoreboard objectives add dnv.count.crafted_notsalmon_fillet dummy \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/on_load.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/on_load.mcfunction index cd60b15..58cdf4e 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/on_load.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/on_load.mcfunction @@ -10,7 +10,16 @@ scoreboard objectives add dnv.vegancraft.deaths minecraft.custom:deaths schedule function zz.dnv.vegancraft:utils/diet_loop 4000 replace scoreboard objectives add dnv.ate_nonvegan dummy scoreboard objectives add dnv.ate_vegan_alt dummy +scoreboard objectives add dnv.count.crafted_copper_horn dummy scoreboard objectives add dnv.success dummy +scoreboard objectives add dnv.count.crafted_copper_horn_ponder dummy +scoreboard objectives add dnv.count.crafted_copper_horn_sing dummy +scoreboard objectives add dnv.count.crafted_copper_horn_seek dummy +scoreboard objectives add dnv.count.crafted_copper_horn_feel dummy +scoreboard objectives add dnv.count.crafted_copper_horn_admire dummy +scoreboard objectives add dnv.count.crafted_copper_horn_call dummy +scoreboard objectives add dnv.count.crafted_copper_horn_yearn dummy +scoreboard objectives add dnv.count.crafted_copper_horn_dream dummy scoreboard objectives add dnv.xp_from_crops_disabled dummy execute unless score #dnv dnv.xp_from_crops_disabled matches 1 run scoreboard players set #dnv dnv.xp_from_crops_disabled 0 scoreboard objectives add dnv.xp_nerfer dummy diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn.mcfunction index 439732f..804e0c3 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn tag @s add dnv.subject.crafted_copper_horn -schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_delayed 1t replace +scoreboard players add @s dnv.count.crafted_copper_horn 1 +schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_delayed 1t append \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire.mcfunction index 09a7e15..24f06e1 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_admire tag @s add dnv.subject.crafted_copper_horn_admire -schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_admire_delayed 1t replace +scoreboard players add @s dnv.count.crafted_copper_horn_admire 1 +schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_admire_delayed 1t append \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_delayed_player.mcfunction index 864c968..982acb5 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_copper_horn_admire execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_admire 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"admire_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_admire 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="admire_goat_horn",custom_data={"dnv.vegan":false}] \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count copper_horn_admire.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_admire +function zz.dnv.vegancraft:slots/on_crafted_copper_horn_admire_replace_output with storage dnv.vegancraft:craft_count copper_horn_admire +scoreboard players set @s dnv.count.crafted_copper_horn_admire 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_replace_output.mcfunction new file mode 100644 index 0000000..9444914 --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="admire_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_vegan.mcfunction index 5fb547b..69f78d1 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_admire_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call.mcfunction index 28c74f9..c724ffd 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_call tag @s add dnv.subject.crafted_copper_horn_call -schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_call_delayed 1t replace +scoreboard players add @s dnv.count.crafted_copper_horn_call 1 +schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_call_delayed 1t append \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_delayed_player.mcfunction index 55fb38c..6b6e365 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_copper_horn_call execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_call 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"call_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_call 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="call_goat_horn",custom_data={"dnv.vegan":false}] \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count copper_horn_call.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_call +function zz.dnv.vegancraft:slots/on_crafted_copper_horn_call_replace_output with storage dnv.vegancraft:craft_count copper_horn_call +scoreboard players set @s dnv.count.crafted_copper_horn_call 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_replace_output.mcfunction new file mode 100644 index 0000000..6995e16 --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="call_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_vegan.mcfunction index 5b73a0c..66ebc4c 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_call_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_delayed_player.mcfunction index 07eb40e..a6e9a39 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_copper_horn execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"ponder_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="ponder_goat_horn",custom_data={"dnv.vegan":false}] \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count copper_horn.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn +function zz.dnv.vegancraft:slots/on_crafted_copper_horn_replace_output with storage dnv.vegancraft:craft_count copper_horn +scoreboard players set @s dnv.count.crafted_copper_horn 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream.mcfunction index 88080d9..b419ef8 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_dream tag @s add dnv.subject.crafted_copper_horn_dream -schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_dream_delayed 1t replace +scoreboard players add @s dnv.count.crafted_copper_horn_dream 1 +schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_dream_delayed 1t append \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_delayed_player.mcfunction index 4a84d24..c81a171 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_copper_horn_dream execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_dream 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"dream_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_dream 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="dream_goat_horn",custom_data={"dnv.vegan":false}] \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count copper_horn_dream.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_dream +function zz.dnv.vegancraft:slots/on_crafted_copper_horn_dream_replace_output with storage dnv.vegancraft:craft_count copper_horn_dream +scoreboard players set @s dnv.count.crafted_copper_horn_dream 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_replace_output.mcfunction new file mode 100644 index 0000000..3a3eda7 --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="dream_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_vegan.mcfunction index 4743598..d43d528 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_dream_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel.mcfunction index 7c8d0fb..3b1cf18 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_feel tag @s add dnv.subject.crafted_copper_horn_feel -schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_feel_delayed 1t replace +scoreboard players add @s dnv.count.crafted_copper_horn_feel 1 +schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_feel_delayed 1t append \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_delayed_player.mcfunction index ee99b5b..0aff6f5 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_copper_horn_feel execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_feel 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"feel_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_feel 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="feel_goat_horn",custom_data={"dnv.vegan":false}] \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count copper_horn_feel.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_feel +function zz.dnv.vegancraft:slots/on_crafted_copper_horn_feel_replace_output with storage dnv.vegancraft:craft_count copper_horn_feel +scoreboard players set @s dnv.count.crafted_copper_horn_feel 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_replace_output.mcfunction new file mode 100644 index 0000000..9ad4051 --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="feel_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_vegan.mcfunction index 0cac848..4ddb56b 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_feel_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder.mcfunction index 46352a7..968ec6f 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_ponder tag @s add dnv.subject.crafted_copper_horn_ponder -schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_ponder_delayed 1t replace +scoreboard players add @s dnv.count.crafted_copper_horn_ponder 1 +schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_ponder_delayed 1t append \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_delayed_player.mcfunction index 9b8db44..4308e69 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_copper_horn_ponder execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_ponder 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"ponder_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_ponder 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="ponder_goat_horn",custom_data={"dnv.vegan":false}] \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count copper_horn_ponder.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_ponder +function zz.dnv.vegancraft:slots/on_crafted_copper_horn_ponder_replace_output with storage dnv.vegancraft:craft_count copper_horn_ponder +scoreboard players set @s dnv.count.crafted_copper_horn_ponder 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_replace_output.mcfunction new file mode 100644 index 0000000..b396363 --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="ponder_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_vegan.mcfunction index 499e249..3f4e170 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_ponder_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_replace_output.mcfunction new file mode 100644 index 0000000..b396363 --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="ponder_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek.mcfunction index c48ed11..0cd6088 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_seek tag @s add dnv.subject.crafted_copper_horn_seek -schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_seek_delayed 1t replace +scoreboard players add @s dnv.count.crafted_copper_horn_seek 1 +schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_seek_delayed 1t append \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_delayed_player.mcfunction index 6b53f83..1c3dfd4 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_copper_horn_seek execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_seek 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"seek_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_seek 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="seek_goat_horn",custom_data={"dnv.vegan":false}] \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count copper_horn_seek.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_seek +function zz.dnv.vegancraft:slots/on_crafted_copper_horn_seek_replace_output with storage dnv.vegancraft:craft_count copper_horn_seek +scoreboard players set @s dnv.count.crafted_copper_horn_seek 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_replace_output.mcfunction new file mode 100644 index 0000000..647b918 --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="seek_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_vegan.mcfunction index eb25ec0..e7f28d8 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_seek_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing.mcfunction index 7d92f88..571c0ee 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_sing tag @s add dnv.subject.crafted_copper_horn_sing -schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_sing_delayed 1t replace +scoreboard players add @s dnv.count.crafted_copper_horn_sing 1 +schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_sing_delayed 1t append \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_delayed_player.mcfunction index b58cc83..8afc81f 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_copper_horn_sing execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_sing 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"sing_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_sing 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="sing_goat_horn",custom_data={"dnv.vegan":false}] \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count copper_horn_sing.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_sing +function zz.dnv.vegancraft:slots/on_crafted_copper_horn_sing_replace_output with storage dnv.vegancraft:craft_count copper_horn_sing +scoreboard players set @s dnv.count.crafted_copper_horn_sing 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_replace_output.mcfunction new file mode 100644 index 0000000..019e839 --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="sing_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_vegan.mcfunction index 8a5718e..94f0f54 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_sing_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_vegan.mcfunction index 18171e9..291cc94 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn.mcfunction index 0f85c86..bd95dec 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_yearn tag @s add dnv.subject.crafted_copper_horn_yearn -schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_yearn_delayed 1t replace +scoreboard players add @s dnv.count.crafted_copper_horn_yearn 1 +schedule function zz.dnv.vegancraft:slots/on_crafted_copper_horn_yearn_delayed 1t append \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_delayed_player.mcfunction index 9d2a07e..504a8c9 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_copper_horn_yearn execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_yearn 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"yearn_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_yearn 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="yearn_goat_horn",custom_data={"dnv.vegan":false}] \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count copper_horn_yearn.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_yearn +function zz.dnv.vegancraft:slots/on_crafted_copper_horn_yearn_replace_output with storage dnv.vegancraft:craft_count copper_horn_yearn +scoreboard players set @s dnv.count.crafted_copper_horn_yearn 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_replace_output.mcfunction new file mode 100644 index 0000000..d2f501d --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="yearn_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_vegan.mcfunction index 9da31ab..6fa01ca 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_copper_horn_yearn_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1.mcfunction index 4af0917..e686c04 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_faux_leather_3to1 tag @s add dnv.subject.crafted_faux_leather_3to1 -schedule function zz.dnv.vegancraft:slots/on_crafted_faux_leather_3to1_delayed 1t replace +scoreboard players add @s dnv.count.crafted_faux_leather_3to1 3 +schedule function zz.dnv.vegancraft:slots/on_crafted_faux_leather_3to1_delayed 1t append \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction index f8d0205..c0e8518 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_faux_leather_3to1 execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_faux_leather_3to1 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor leather run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261006,"item_name":"{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_faux_leather_3to1 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] 3 -execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] 3 \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count faux_leather_3to1.count int 1 run scoreboard players get @s dnv.count.crafted_faux_leather_3to1 +function zz.dnv.vegancraft:slots/on_crafted_faux_leather_3to1_replace_output with storage dnv.vegancraft:craft_count faux_leather_3to1 +scoreboard players set @s dnv.count.crafted_faux_leather_3to1 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction new file mode 100644 index 0000000..4d84dd5 --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_vegan.mcfunction index e8a17c9..3c1c8da 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_faux_leather_3to1_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1.mcfunction index 5515cee..a59b11e 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_faux_leather_6to1 tag @s add dnv.subject.crafted_faux_leather_6to1 -schedule function zz.dnv.vegancraft:slots/on_crafted_faux_leather_6to1_delayed 1t replace +scoreboard players add @s dnv.count.crafted_faux_leather_6to1 3 +schedule function zz.dnv.vegancraft:slots/on_crafted_faux_leather_6to1_delayed 1t append \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction index d445927..3a5cf76 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_faux_leather_6to1 execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_faux_leather_6to1 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor leather run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261006,"item_name":"{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_faux_leather_6to1 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] 3 -execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] 3 \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count faux_leather_6to1.count int 1 run scoreboard players get @s dnv.count.crafted_faux_leather_6to1 +function zz.dnv.vegancraft:slots/on_crafted_faux_leather_6to1_replace_output with storage dnv.vegancraft:craft_count faux_leather_6to1 +scoreboard players set @s dnv.count.crafted_faux_leather_6to1 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction new file mode 100644 index 0000000..4d84dd5 --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_vegan.mcfunction index dcfc7b0..12f402f 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_faux_leather_6to1_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet.mcfunction index 9d9b7b4..2ce7a75 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet.mcfunction @@ -1,6 +1,6 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_notfish_fillet tag @s add dnv.subject.crafted_notfish_fillet -schedule function zz.dnv.vegancraft:slots/on_crafted_notfish_fillet_delayed 1t replace - +scoreboard players add @s dnv.count.crafted_notfish_fillet 3 +schedule function zz.dnv.vegancraft:slots/on_crafted_notfish_fillet_delayed 1t append function zz.dnv.vegancraft:award_xp {xp:195} \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction index ed904e0..8bdb093 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_notfish_fillet execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_notfish_fillet 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor cod run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":true},"custom_model_data":9261004,"food":{"nutrition":5,"saturation":6},"item_name":"{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"consumable":{},"custom_data":{"dnv.vegan":false},"custom_model_data":9261004,"food":{"nutrition":5,"saturation":6},"item_name":"{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_notfish_fillet 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s cod[custom_data~{dnv.vegan:true}] 3 -execute unless score @s dnv.success matches 0 run give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261004,food={"nutrition":5,"saturation":6},custom_data={"dnv.vegan":true}] 3 \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count notfish_fillet.count int 1 run scoreboard players get @s dnv.count.crafted_notfish_fillet +function zz.dnv.vegancraft:slots/on_crafted_notfish_fillet_replace_output with storage dnv.vegancraft:craft_count notfish_fillet +scoreboard players set @s dnv.count.crafted_notfish_fillet 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction new file mode 100644 index 0000000..f37e688 --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s cod[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261004,food={"nutrition":5,"saturation":6},consumable={},custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_vegan.mcfunction index 0728241..afee95d 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_notfish_fillet_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet.mcfunction index 7dba69c..d8462b0 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet.mcfunction @@ -1,6 +1,6 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_notsalmon_fillet tag @s add dnv.subject.crafted_notsalmon_fillet -schedule function zz.dnv.vegancraft:slots/on_crafted_notsalmon_fillet_delayed 1t replace - +scoreboard players add @s dnv.count.crafted_notsalmon_fillet 1 +schedule function zz.dnv.vegancraft:slots/on_crafted_notsalmon_fillet_delayed 1t append function zz.dnv.vegancraft:award_xp {xp:130} \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction index a08727d..1b34443 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_notsalmon_fillet execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_notsalmon_fillet 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor salmon run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":true},"custom_model_data":9261026,"food":{"nutrition":6,"saturation":9.6},"item_name":"{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"consumable":{},"custom_data":{"dnv.vegan":false},"custom_model_data":9261026,"food":{"nutrition":6,"saturation":9.6},"item_name":"{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_notsalmon_fillet 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s salmon[custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261026,food={"nutrition":6,"saturation":9.6},custom_data={"dnv.vegan":true}] \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count notsalmon_fillet.count int 1 run scoreboard players get @s dnv.count.crafted_notsalmon_fillet +function zz.dnv.vegancraft:slots/on_crafted_notsalmon_fillet_replace_output with storage dnv.vegancraft:craft_count notsalmon_fillet +scoreboard players set @s dnv.count.crafted_notsalmon_fillet 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction new file mode 100644 index 0000000..a0018e7 --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s salmon[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261026,food={"nutrition":6,"saturation":9.6},consumable={},custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_vegan.mcfunction index 587cc93..7e1a600 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_notsalmon_fillet_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew.mcfunction index 382d488..c423c77 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_seitan_stew tag @s add dnv.subject.crafted_seitan_stew -schedule function zz.dnv.vegancraft:slots/on_crafted_seitan_stew_delayed 1t replace +scoreboard players add @s dnv.count.crafted_seitan_stew 1 +schedule function zz.dnv.vegancraft:slots/on_crafted_seitan_stew_delayed 1t append \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction index 54b1ea6..1bfa2b3 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_seitan_stew execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_seitan_stew 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor rabbit_stew run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item replace entity @s player.cursor with suspicious_stew[custom_data={ "dnv.vegan": false }] 1 +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_seitan_stew 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s rabbit_stew[custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s suspicious_stew[custom_data={"dnv.vegan":false}] \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count seitan_stew.count int 1 run scoreboard players get @s dnv.count.crafted_seitan_stew +function zz.dnv.vegancraft:slots/on_crafted_seitan_stew_replace_output with storage dnv.vegancraft:craft_count seitan_stew +scoreboard players set @s dnv.count.crafted_seitan_stew 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction new file mode 100644 index 0000000..6b1167a --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s rabbit_stew[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s suspicious_stew[custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_vegan.mcfunction index 030271a..0eb7472 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_seitan_stew_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb.mcfunction index 53e033b..43801f4 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_synthetic_cobweb tag @s add dnv.subject.crafted_synthetic_cobweb -schedule function zz.dnv.vegancraft:slots/on_crafted_synthetic_cobweb_delayed 1t replace +scoreboard players add @s dnv.count.crafted_synthetic_cobweb 2 +schedule function zz.dnv.vegancraft:slots/on_crafted_synthetic_cobweb_delayed 1t append \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_delayed_player.mcfunction index 6eff710..880e1d8 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_synthetic_cobweb execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_synthetic_cobweb 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor cobweb run scoreboard players set @s dnv.success 1 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"item_name":"{\"translate\":\"dnv.ethical_textiles.item.synthetic_cobweb\",\"fallback\":\"Synthetic Cobweb\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_synthetic_cobweb 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s cobweb[custom_data~{dnv.vegan:true}] 2 -execute unless score @s dnv.success matches 0 run give @s cobweb[item_name="{\"translate\":\"dnv.ethical_textiles.item.synthetic_cobweb\",\"fallback\":\"Synthetic Cobweb\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":false}] 2 \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count synthetic_cobweb.count int 1 run scoreboard players get @s dnv.count.crafted_synthetic_cobweb +function zz.dnv.vegancraft:slots/on_crafted_synthetic_cobweb_replace_output with storage dnv.vegancraft:craft_count synthetic_cobweb +scoreboard players set @s dnv.count.crafted_synthetic_cobweb 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_replace_output.mcfunction new file mode 100644 index 0000000..822a3c0 --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s cobweb[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s cobweb[item_name="{\"translate\":\"dnv.ethical_textiles.item.synthetic_cobweb\",\"fallback\":\"Synthetic Cobweb\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_vegan.mcfunction index 1ef14ed..2980ab7 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_synthetic_cobweb_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake.mcfunction index b4ac138..d371b68 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake.mcfunction @@ -1,3 +1,4 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_vegan_cake tag @s add dnv.subject.crafted_vegan_cake -schedule function zz.dnv.vegancraft:slots/on_crafted_vegan_cake_delayed 1t replace +scoreboard players add @s dnv.count.crafted_vegan_cake 1 +schedule function zz.dnv.vegancraft:slots/on_crafted_vegan_cake_delayed 1t append \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_delayed_player.mcfunction index 9af55de..65ff557 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_delayed_player.mcfunction @@ -1,8 +1,11 @@ tag @s remove dnv.subject.crafted_vegan_cake execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan +execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_vegan_cake 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor cake run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item replace entity @s player.cursor with cake 1 +execute unless score @s dnv.success matches 0 run item replace entity @s player.cursor with cake[custom_data={ "dnv.vegan": false }] 1 +execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_vegan_cake 0 execute unless score @s dnv.success matches 0 run return 0 -execute store success score @s dnv.success run clear @s cake[custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s cake \ No newline at end of file +execute store result storage dnv.vegancraft:craft_count vegan_cake.count int 1 run scoreboard players get @s dnv.count.crafted_vegan_cake +function zz.dnv.vegancraft:slots/on_crafted_vegan_cake_replace_output with storage dnv.vegancraft:craft_count vegan_cake +scoreboard players set @s dnv.count.crafted_vegan_cake 0 \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_replace_output.mcfunction new file mode 100644 index 0000000..a82b68b --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_replace_output.mcfunction @@ -0,0 +1,2 @@ +$execute store success score @s dnv.success run clear @s cake[custom_data~{dnv.vegan:true}] $(count) +$execute unless score @s dnv.success matches 0 run give @s cake[custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_vegan.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_vegan.mcfunction index 7b6f889..ba3ad4f 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_vegan.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_vegan_cake_vegan.mcfunction @@ -1,2 +1,3 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_vegan_cake_vegan + tag @s add dnv.crafted_vegan diff --git a/vegancraft-DP/pack.mcmeta b/vegancraft-DP/pack.mcmeta index d70417b..9c2063d 100644 --- a/vegancraft-DP/pack.mcmeta +++ b/vegancraft-DP/pack.mcmeta @@ -15,7 +15,7 @@ "underlined": true }, { - "text": "\nv1.2.1, for MC1.21+", + "text": "\nv1.2.2, for MC1.21.2+", "color": "gray", "italic": false } @@ -23,10 +23,10 @@ "color": "green", "italic": false }, - "pack_format": 46, + "pack_format": 57, "supported_formats": { - "min_inclusive": 46, - "max_inclusive": 49 + "min_inclusive": 57, + "max_inclusive": 58 } } } \ No newline at end of file diff --git a/vegancraft-RP/README.txt b/vegancraft-RP/README.txt index 193b580..f7a1c17 100644 --- a/vegancraft-RP/README.txt +++ b/vegancraft-RP/README.txt @@ -1,13 +1,13 @@ -# Vegancraft Resourcepack v1.2 +# Vegancraft Resourcepack v1.2.2, for Minecraft 1.21.2+ This resourcepack contains all the required resources for every Vegancraft datapack by Daenvil, including: -- [Plant-based Foods v2.0.1](https://daenvil.github.io/MCDatapacks/plant-based_foods.html) -- [Acacia Gum v1.2.1](https://daenvil.github.io/MCDatapacks/acacia_gum.html) -- [Ethical Textiles v2.0.1](https://daenvil.github.io/MCDatapacks/ethical_Textiles.html) -- [Plant Wax v2.0.1](https://daenvil.github.io/MCDatapacks/plant_wax.html) -- [Magnet Fishing v2.0.1](https://daenvil.github.io/MCDatapacks/magnet_fishing.html) -- [Vegancraft v1.2](https://daenvil.github.io/MCDatapacks/vegancraft.html) +- [Plant-based Foods v2.0.2](https://daenvil.github.io/MCDatapacks/plant-based_foods.html) +- [Acacia Gum v1.2.2](https://daenvil.github.io/MCDatapacks/acacia_gum.html) +- [Ethical Textiles v2.0.3](https://daenvil.github.io/MCDatapacks/ethical_Textiles.html) +- [Plant Wax v2.0.2](https://daenvil.github.io/MCDatapacks/plant_wax.html) +- [Magnet Fishing v2.0.2](https://daenvil.github.io/MCDatapacks/magnet_fishing.html) +- [Vegancraft v1.2.2](https://daenvil.github.io/MCDatapacks/vegancraft.html) Read more on: https://daenvil.github.io/MCDatapacks/vegancraft.html @@ -16,7 +16,7 @@ Read more on: https://daenvil.github.io/MCDatapacks/vegancraft.html - On my website: https://daenvil.github.io/MCDatapacks/vegancraft.html - On GitHub: https://www.github.com/daenvil/vegancraft -- This version was published on the 19th of June 2024. Check the webpages above for possible updates. +- This version was published on the 8th of November 2024. Check the webpages above for possible updates. ## Installation diff --git a/vegancraft-RP/assets/minecraft/models/item/breeze_rod.json b/vegancraft-RP/assets/minecraft/models/item/breeze_rod.json index 9ecfbe0..fd8b196 100644 --- a/vegancraft-RP/assets/minecraft/models/item/breeze_rod.json +++ b/vegancraft-RP/assets/minecraft/models/item/breeze_rod.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "minecraft:item/breeze_rod" }, diff --git a/vegancraft-RP/pack.mcmeta b/vegancraft-RP/pack.mcmeta index e0c1dfa..3936858 100644 --- a/vegancraft-RP/pack.mcmeta +++ b/vegancraft-RP/pack.mcmeta @@ -15,7 +15,7 @@ "underlined": true }, { - "text": "\nv1.2, for MC1.20.5+", + "text": "\nv1.2.2, for MC1.21.2+", "color": "gray", "italic": false } @@ -23,9 +23,9 @@ "color": "green", "italic": false }, - "pack_format": 32, + "pack_format": 42, "supported_formats": { - "min_inclusive": 32, + "min_inclusive": 42, "max_inclusive": 999 } }