From 5cc48aa822b5450eca0f790bbd01c29d8c3ff083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Fri, 15 Nov 2019 14:19:51 +0000 Subject: [PATCH] Deleted datapacks/enchantment_merger/data/ench_merger/functions/merge/check_all.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_bow.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_carrot_on_a_stick.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_crossbow.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_axe.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_boots.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_chestplate.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_helmet.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_hoe.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_leggings.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_pickaxe.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_shovel.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_sword.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_elytra.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_fishing_rod.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_flint_and_steel.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_shears.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_shield.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_trident.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_turtle_shell.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/finish.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_bow.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_carrot_on_a_stick.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_crossbow.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_axe.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_boots.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_chestplate.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_helmet.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_hoe.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_leggings.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_pickaxe.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_shovel.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_sword.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_elytra.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_fishing_rod.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_flint_and_steel.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_shears.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_shield.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_trident.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_turtle_shell.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/setup.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merger/check_combine.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merger/check_combine_start.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merger/check_destroy.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merger/combine.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merger/destroy.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merger/particle.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/aqua_affinity.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/bane_of_arthropods.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/binding_curse.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/blast_protection.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/channeling.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/depth_strider.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/efficiency.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/feather_falling.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/fire_aspect.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/fire_protection.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/flame.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/fortune.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/frost_walker.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/impaling.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/infinity.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/knockback.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/looting.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/loyalty.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/luck_of_the_sea.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/lure.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/mending.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/multishot.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/piercing.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/power.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/projectile_protection.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/protection.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/punch.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/quick_charge.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/respiration.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/riptide.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/sharpness.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/silk_touch.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/smite.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/sweeping.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/thorns.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/unbreaking.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/vanishing_curse.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/init.mcfunction, datapacks/enchantment_merger/data/fh_main/functions/init.mcfunction, datapacks/enchantment_merger/data/fh_main/functions/tick.mcfunction, datapacks/enchantment_merger/data/fh_main/tags/functions/five_second.json, datapacks/enchantment_merger/data/fh_main/tags/functions/half_second.json, datapacks/enchantment_merger/data/fh_main/tags/functions/init.json, datapacks/enchantment_merger/data/fh_main/tags/functions/second.json, datapacks/enchantment_merger/data/fh_main/tags/functions/tick.json, datapacks/enchantment_merger/data/fh_main/tags/functions/two_and_half_second.json, datapacks/enchantment_merger/data/minecraft/tags/functions/load.json, datapacks/enchantment_merger/data/minecraft/tags/functions/tick.json, datapacks/enchantment_merger/pack.mcmeta files --- .../ench_merger/functions/init.mcfunction | 5 --- .../functions/merge/check_all.mcfunction | 22 ------------ .../functions/merge/check_bow.mcfunction | 9 ----- .../merge/check_carrot_on_a_stick.mcfunction | 9 ----- .../functions/merge/check_crossbow.mcfunction | 9 ----- .../merge/check_diamond_axe.mcfunction | 9 ----- .../merge/check_diamond_boots.mcfunction | 9 ----- .../merge/check_diamond_chestplate.mcfunction | 9 ----- .../merge/check_diamond_helmet.mcfunction | 9 ----- .../merge/check_diamond_hoe.mcfunction | 9 ----- .../merge/check_diamond_leggings.mcfunction | 9 ----- .../merge/check_diamond_pickaxe.mcfunction | 9 ----- .../merge/check_diamond_shovel.mcfunction | 9 ----- .../merge/check_diamond_sword.mcfunction | 9 ----- .../functions/merge/check_elytra.mcfunction | 9 ----- .../merge/check_fishing_rod.mcfunction | 9 ----- .../merge/check_flint_and_steel.mcfunction | 9 ----- .../functions/merge/check_shears.mcfunction | 9 ----- .../functions/merge/check_shield.mcfunction | 9 ----- .../functions/merge/check_trident.mcfunction | 9 ----- .../merge/check_turtle_shell.mcfunction | 9 ----- .../functions/merge/finish.mcfunction | 20 ----------- .../functions/merge/merge_bow.mcfunction | 20 ----------- .../merge/merge_carrot_on_a_stick.mcfunction | 16 --------- .../functions/merge/merge_crossbow.mcfunction | 19 ---------- .../merge/merge_diamond_axe.mcfunction | 22 ------------ .../merge/merge_diamond_boots.mcfunction | 25 ------------- .../merge/merge_diamond_chestplate.mcfunction | 22 ------------ .../merge/merge_diamond_helmet.mcfunction | 24 ------------- .../merge/merge_diamond_hoe.mcfunction | 16 --------- .../merge/merge_diamond_leggings.mcfunction | 22 ------------ .../merge/merge_diamond_pickaxe.mcfunction | 19 ---------- .../merge/merge_diamond_shovel.mcfunction | 19 ---------- .../merge/merge_diamond_sword.mcfunction | 23 ------------ .../functions/merge/merge_elytra.mcfunction | 17 --------- .../merge/merge_fishing_rod.mcfunction | 18 ---------- .../merge/merge_flint_and_steel.mcfunction | 16 --------- .../functions/merge/merge_shears.mcfunction | 17 --------- .../functions/merge/merge_shield.mcfunction | 16 --------- .../functions/merge/merge_trident.mcfunction | 20 ----------- .../merge/merge_turtle_shell.mcfunction | 24 ------------- .../functions/merge/setup.mcfunction | 16 --------- .../functions/merger/check_combine.mcfunction | 5 --- .../merger/check_combine_start.mcfunction | 5 --- .../functions/merger/check_destroy.mcfunction | 5 --- .../functions/merger/combine.mcfunction | 13 ------- .../functions/merger/destroy.mcfunction | 10 ------ .../functions/merger/particle.mcfunction | 5 --- .../recipes/aqua_affinity.mcfunction | 11 ------ .../recipes/bane_of_arthropods.mcfunction | 23 ------------ .../recipes/binding_curse.mcfunction | 11 ------ .../recipes/blast_protection.mcfunction | 20 ----------- .../functions/recipes/channeling.mcfunction | 11 ------ .../recipes/depth_strider.mcfunction | 17 --------- .../functions/recipes/efficiency.mcfunction | 23 ------------ .../recipes/feather_falling.mcfunction | 20 ----------- .../functions/recipes/fire_aspect.mcfunction | 14 -------- .../recipes/fire_protection.mcfunction | 20 ----------- .../functions/recipes/flame.mcfunction | 11 ------ .../functions/recipes/fortune.mcfunction | 17 --------- .../functions/recipes/frost_walker.mcfunction | 14 -------- .../functions/recipes/impaling.mcfunction | 23 ------------ .../functions/recipes/infinity.mcfunction | 11 ------ .../functions/recipes/knockback.mcfunction | 14 -------- .../functions/recipes/looting.mcfunction | 17 --------- .../functions/recipes/loyalty.mcfunction | 17 --------- .../recipes/luck_of_the_sea.mcfunction | 17 --------- .../functions/recipes/lure.mcfunction | 17 --------- .../functions/recipes/mending.mcfunction | 11 ------ .../functions/recipes/multishot.mcfunction | 11 ------ .../functions/recipes/piercing.mcfunction | 20 ----------- .../functions/recipes/power.mcfunction | 23 ------------ .../recipes/projectile_protection.mcfunction | 20 ----------- .../functions/recipes/protection.mcfunction | 20 ----------- .../functions/recipes/punch.mcfunction | 14 -------- .../functions/recipes/quick_charge.mcfunction | 17 --------- .../functions/recipes/respiration.mcfunction | 17 --------- .../functions/recipes/riptide.mcfunction | 17 --------- .../functions/recipes/sharpness.mcfunction | 23 ------------ .../functions/recipes/silk_touch.mcfunction | 11 ------ .../functions/recipes/smite.mcfunction | 23 ------------ .../functions/recipes/sweeping.mcfunction | 17 --------- .../functions/recipes/thorns.mcfunction | 17 --------- .../functions/recipes/unbreaking.mcfunction | 17 --------- .../recipes/vanishing_curse.mcfunction | 11 ------ .../data/fh_main/functions/init.mcfunction | 5 --- .../data/fh_main/functions/tick.mcfunction | 36 ------------------- .../fh_main/tags/functions/five_second.json | 5 --- .../fh_main/tags/functions/half_second.json | 5 --- .../data/fh_main/tags/functions/init.json | 6 ---- .../data/fh_main/tags/functions/second.json | 6 ---- .../data/fh_main/tags/functions/tick.json | 5 --- .../tags/functions/two_and_half_second.json | 5 --- .../data/minecraft/tags/functions/load.json | 5 --- .../data/minecraft/tags/functions/tick.json | 5 --- datapacks/enchantment_merger/pack.mcmeta | 6 ---- 96 files changed, 1358 deletions(-) delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/init.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_all.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_bow.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_carrot_on_a_stick.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_crossbow.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_axe.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_boots.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_chestplate.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_helmet.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_hoe.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_leggings.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_pickaxe.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_shovel.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_sword.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_elytra.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_fishing_rod.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_flint_and_steel.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_shears.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_shield.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_trident.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/check_turtle_shell.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/finish.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_bow.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_carrot_on_a_stick.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_crossbow.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_axe.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_boots.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_chestplate.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_helmet.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_hoe.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_leggings.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_pickaxe.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_shovel.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_sword.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_elytra.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_fishing_rod.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_flint_and_steel.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_shears.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_shield.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_trident.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_turtle_shell.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merge/setup.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merger/check_combine.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merger/check_combine_start.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merger/check_destroy.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merger/combine.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merger/destroy.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/merger/particle.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/aqua_affinity.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/bane_of_arthropods.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/binding_curse.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/blast_protection.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/channeling.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/depth_strider.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/efficiency.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/feather_falling.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/fire_aspect.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/fire_protection.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/flame.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/fortune.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/frost_walker.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/impaling.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/infinity.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/knockback.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/looting.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/loyalty.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/luck_of_the_sea.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/lure.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/mending.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/multishot.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/piercing.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/power.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/projectile_protection.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/protection.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/punch.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/quick_charge.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/respiration.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/riptide.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/sharpness.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/silk_touch.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/smite.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/sweeping.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/thorns.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/unbreaking.mcfunction delete mode 100644 datapacks/enchantment_merger/data/ench_merger/functions/recipes/vanishing_curse.mcfunction delete mode 100644 datapacks/enchantment_merger/data/fh_main/functions/init.mcfunction delete mode 100644 datapacks/enchantment_merger/data/fh_main/functions/tick.mcfunction delete mode 100644 datapacks/enchantment_merger/data/fh_main/tags/functions/five_second.json delete mode 100644 datapacks/enchantment_merger/data/fh_main/tags/functions/half_second.json delete mode 100644 datapacks/enchantment_merger/data/fh_main/tags/functions/init.json delete mode 100644 datapacks/enchantment_merger/data/fh_main/tags/functions/second.json delete mode 100644 datapacks/enchantment_merger/data/fh_main/tags/functions/tick.json delete mode 100644 datapacks/enchantment_merger/data/fh_main/tags/functions/two_and_half_second.json delete mode 100644 datapacks/enchantment_merger/data/minecraft/tags/functions/load.json delete mode 100644 datapacks/enchantment_merger/data/minecraft/tags/functions/tick.json delete mode 100644 datapacks/enchantment_merger/pack.mcmeta diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/init.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/init.mcfunction deleted file mode 100644 index 28a31a9..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/init.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -# Desc: Creates the required scoreboard(s) -# Called by: #fh_main/init -# Datapack made by FieryHammer - -scoreboard objectives add fh_em_level dummy diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_all.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_all.mcfunction deleted file mode 100644 index 768f669..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_all.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -# Desc: Runs the check for all supported items -# Called by: #fh_main/second -# Datapack made by FieryHammer - -function ench_merger:merge/check_diamond_helmet -function ench_merger:merge/check_diamond_chestplate -function ench_merger:merge/check_diamond_leggings -function ench_merger:merge/check_diamond_boots -function ench_merger:merge/check_turtle_shell -function ench_merger:merge/check_diamond_sword -function ench_merger:merge/check_diamond_pickaxe -function ench_merger:merge/check_diamond_axe -function ench_merger:merge/check_diamond_shovel -function ench_merger:merge/check_diamond_hoe -function ench_merger:merge/check_bow -function ench_merger:merge/check_crossbow -function ench_merger:merge/check_fishing_rod -function ench_merger:merge/check_flint_and_steel -function ench_merger:merge/check_shears -function ench_merger:merge/check_carrot_on_a_stick -function ench_merger:merge/check_elytra -function ench_merger:merge/check_shield diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_bow.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_bow.mcfunction deleted file mode 100644 index 9acaa00..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_bow.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for bow merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:bow"}, {Slot:5b, id:"minecraft:bow"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:bow"}, {Slot:5b, id:"minecraft:bow"}]} run function ench_merger:merge/merge_bow diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_carrot_on_a_stick.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_carrot_on_a_stick.mcfunction deleted file mode 100644 index c2b4f04..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_carrot_on_a_stick.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for carrot_on_a_stick merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:carrot_on_a_stick"}, {Slot:5b, id:"minecraft:carrot_on_a_stick"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:carrot_on_a_stick"}, {Slot:5b, id:"minecraft:carrot_on_a_stick"}]} run function ench_merger:merge/merge_carrot_on_a_stick diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_crossbow.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_crossbow.mcfunction deleted file mode 100644 index 3d82c7d..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_crossbow.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for crossbow merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:crossbow"}, {Slot:5b, id:"minecraft:crossbow"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:crossbow"}, {Slot:5b, id:"minecraft:crossbow"}]} run function ench_merger:merge/merge_crossbow diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_axe.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_axe.mcfunction deleted file mode 100644 index 99ea01f..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_axe.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for diamond_axe merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_axe"}, {Slot:5b, id:"minecraft:diamond_axe"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_axe"}, {Slot:5b, id:"minecraft:diamond_axe"}]} run function ench_merger:merge/merge_diamond_axe diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_boots.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_boots.mcfunction deleted file mode 100644 index acf75a9..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_boots.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for diamond_boots merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_boots"}, {Slot:5b, id:"minecraft:diamond_boots"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_boots"}, {Slot:5b, id:"minecraft:diamond_boots"}]} run function ench_merger:merge/merge_diamond_boots diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_chestplate.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_chestplate.mcfunction deleted file mode 100644 index 7ebe155..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_chestplate.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for diamond_chestplate merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_chestplate"}, {Slot:5b, id:"minecraft:diamond_chestplate"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_chestplate"}, {Slot:5b, id:"minecraft:diamond_chestplate"}]} run function ench_merger:merge/merge_diamond_chestplate diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_helmet.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_helmet.mcfunction deleted file mode 100644 index fa70aec..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_helmet.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for diamond_helmet merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_helmet"}, {Slot:5b, id:"minecraft:diamond_helmet"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_helmet"}, {Slot:5b, id:"minecraft:diamond_helmet"}]} run function ench_merger:merge/merge_diamond_helmet diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_hoe.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_hoe.mcfunction deleted file mode 100644 index c4ac64c..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_hoe.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for diamond_hoe merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_hoe"}, {Slot:5b, id:"minecraft:diamond_hoe"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_hoe"}, {Slot:5b, id:"minecraft:diamond_hoe"}]} run function ench_merger:merge/merge_diamond_hoe diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_leggings.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_leggings.mcfunction deleted file mode 100644 index 1a0e744..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_leggings.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for diamond_leggings merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_leggings"}, {Slot:5b, id:"minecraft:diamond_leggings"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_leggings"}, {Slot:5b, id:"minecraft:diamond_leggings"}]} run function ench_merger:merge/merge_diamond_leggings diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_pickaxe.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_pickaxe.mcfunction deleted file mode 100644 index b7ad19c..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_pickaxe.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for diamond_pickaxe merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_pickaxe"}, {Slot:5b, id:"minecraft:diamond_pickaxe"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_pickaxe"}, {Slot:5b, id:"minecraft:diamond_pickaxe"}]} run function ench_merger:merge/merge_diamond_pickaxe diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_shovel.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_shovel.mcfunction deleted file mode 100644 index 39f5478..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_shovel.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for diamond_shovel merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_shovel"}, {Slot:5b, id:"minecraft:diamond_shovel"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_shovel"}, {Slot:5b, id:"minecraft:diamond_shovel"}]} run function ench_merger:merge/merge_diamond_shovel diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_sword.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_sword.mcfunction deleted file mode 100644 index 8f64ae2..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_sword.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for diamond_sword merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_sword"}, {Slot:5b, id:"minecraft:diamond_sword"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:diamond_sword"}, {Slot:5b, id:"minecraft:diamond_sword"}]} run function ench_merger:merge/merge_diamond_sword diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_elytra.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_elytra.mcfunction deleted file mode 100644 index 48f5e08..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_elytra.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for elytra merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:elytra"}, {Slot:5b, id:"minecraft:elytra"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:elytra"}, {Slot:5b, id:"minecraft:elytra"}]} run function ench_merger:merge/merge_elytra diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_fishing_rod.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_fishing_rod.mcfunction deleted file mode 100644 index 7572d3e..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_fishing_rod.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for fishing_rod merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:fishing_rod"}, {Slot:5b, id:"minecraft:fishing_rod"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:fishing_rod"}, {Slot:5b, id:"minecraft:fishing_rod"}]} run function ench_merger:merge/merge_fishing_rod diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_flint_and_steel.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_flint_and_steel.mcfunction deleted file mode 100644 index b7b0baf..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_flint_and_steel.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for flint_and_steel merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:flint_and_steel"}, {Slot:5b, id:"minecraft:flint_and_steel"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:flint_and_steel"}, {Slot:5b, id:"minecraft:flint_and_steel"}]} run function ench_merger:merge/merge_flint_and_steel diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_shears.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_shears.mcfunction deleted file mode 100644 index 299535c..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_shears.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for shears merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:shears"}, {Slot:5b, id:"minecraft:shears"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:shears"}, {Slot:5b, id:"minecraft:shears"}]} run function ench_merger:merge/merge_shears diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_shield.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_shield.mcfunction deleted file mode 100644 index 751ddb1..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_shield.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for shield merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:shield"}, {Slot:5b, id:"minecraft:shield"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:shield"}, {Slot:5b, id:"minecraft:shield"}]} run function ench_merger:merge/merge_shield diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_trident.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_trident.mcfunction deleted file mode 100644 index ab23744..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_trident.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for trident merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:trident"}, {Slot:5b, id:"minecraft:trident"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:trident"}, {Slot:5b, id:"minecraft:trident"}]} run function ench_merger:merge/merge_trident diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_turtle_shell.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_turtle_shell.mcfunction deleted file mode 100644 index f251994..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/check_turtle_shell.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Desc: Checks the conditions for turtle_shell merging and runs the merge if possible -# Called by: ench_merger:merge/check_all -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run execute store result score @p[distance=..5] fh_em_level run experience query @p[distance=..5] levels - -execute at @e[tag=fh_merger] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:turtle_shell"}, {Slot:5b, id:"minecraft:turtle_shell"}]} run tag @e[tag=fh_merger, limit=1, sort=nearest] add fh_merger_active - -execute at @e[tag=fh_merger_active] if score @p[distance=..5] fh_em_level matches 15.. if block ~ ~1 ~ minecraft:dropper[facing=up, triggered=false]{Items:[{Slot:3b, id:"minecraft:turtle_shell"}, {Slot:5b, id:"minecraft:turtle_shell"}]} run function ench_merger:merge/merge_turtle_shell diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/finish.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/finish.mcfunction deleted file mode 100644 index 6208a83..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/finish.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -# Desc: Runs after all merging, plays sound, makes effects, reduces exp level -# Called by: ench_merger:merge/check_* -# Datapack made by FieryHammer - -# Reduce levels -experience add @p -15 levels - -# Kill dummy Items -kill @e[tag=left_item] -kill @e[tag=right_item] - -# Empty merger -data merge block ~ ~1 ~ {Items:[]} - -particle minecraft:cloud ~ ~2.2 ~ 0.1 0.1 0.1 0.01 20 -playsound minecraft:item.trident.thunder block @p ~ ~ ~ 1 2 -playsound minecraft:block.enchantment_table.use block @p ~ ~ ~ 1 1.5 - -tag @e[tag=fh_merger_active] remove fh_merger_active -tag @e[tag=new_item] remove new_item diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_bow.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_bow.mcfunction deleted file mode 100644 index bb05abc..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_bow.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -# Desc: Merges the two bows -# Called by: ench_merger:merge/check_bow -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:bow", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/power -function ench_merger:recipes/punch -function ench_merger:recipes/flame -function ench_merger:recipes/infinity -function ench_merger:recipes/unbreaking -function ench_merger:recipes/mending -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_carrot_on_a_stick.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_carrot_on_a_stick.mcfunction deleted file mode 100644 index 19ce97a..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_carrot_on_a_stick.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# Desc: Merges the two carrot_on_a_sticks -# Called by: ench_merger:merge/check_carrot_on_a_stick -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:carrot_on_a_stick", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/unbreaking -function ench_merger:recipes/mending -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_crossbow.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_crossbow.mcfunction deleted file mode 100644 index 483147c..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_crossbow.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -# Desc: Merges the two crossbows -# Called by: ench_merger:merge/check_crossbow -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:crossbow", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/quick_charge -function ench_merger:recipes/multishot -function ench_merger:recipes/piercing -function ench_merger:recipes/unbreaking -function ench_merger:recipes/mending -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_axe.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_axe.mcfunction deleted file mode 100644 index 69e2514..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_axe.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -# Desc: Merges the two diamond_axes -# Called by: ench_merger:merge/check_diamond_axe -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:diamond_axe", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/efficiency -function ench_merger:recipes/fortune -function ench_merger:recipes/silk_touch -function ench_merger:recipes/unbreaking -function ench_merger:recipes/sharpness -function ench_merger:recipes/smite -function ench_merger:recipes/bane_of_arthropods -function ench_merger:recipes/mending -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_boots.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_boots.mcfunction deleted file mode 100644 index b053e30..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_boots.mcfunction +++ /dev/null @@ -1,25 +0,0 @@ -# Desc: Merges the two diamond_bootss -# Called by: ench_merger:merge/check_diamond_boots -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:diamond_boots", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/fire_protection -function ench_merger:recipes/projectile_protection -function ench_merger:recipes/blast_protection -function ench_merger:recipes/protection -function ench_merger:recipes/feather_falling -function ench_merger:recipes/unbreaking -function ench_merger:recipes/thorns -function ench_merger:recipes/frost_walker -function ench_merger:recipes/depth_strider -function ench_merger:recipes/mending -function ench_merger:recipes/binding_curse -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_chestplate.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_chestplate.mcfunction deleted file mode 100644 index 6dbaf79..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_chestplate.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -# Desc: Merges the two diamond_chestplates -# Called by: ench_merger:merge/check_diamond_chestplate -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:diamond_chestplate", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/fire_protection -function ench_merger:recipes/projectile_protection -function ench_merger:recipes/blast_protection -function ench_merger:recipes/protection -function ench_merger:recipes/unbreaking -function ench_merger:recipes/thorns -function ench_merger:recipes/mending -function ench_merger:recipes/binding_curse -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_helmet.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_helmet.mcfunction deleted file mode 100644 index 81492f0..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_helmet.mcfunction +++ /dev/null @@ -1,24 +0,0 @@ -# Desc: Merges the two diamond_helmets -# Called by: ench_merger:merge/check_diamond_helmet -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:diamond_helmet", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/fire_protection -function ench_merger:recipes/projectile_protection -function ench_merger:recipes/blast_protection -function ench_merger:recipes/protection -function ench_merger:recipes/unbreaking -function ench_merger:recipes/respiration -function ench_merger:recipes/aqua_affinity -function ench_merger:recipes/thorns -function ench_merger:recipes/mending -function ench_merger:recipes/binding_curse -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_hoe.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_hoe.mcfunction deleted file mode 100644 index 4e0d19f..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_hoe.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# Desc: Merges the two diamond_hoes -# Called by: ench_merger:merge/check_diamond_hoe -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:diamond_hoe", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/unbreaking -function ench_merger:recipes/mending -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_leggings.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_leggings.mcfunction deleted file mode 100644 index b987da7..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_leggings.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -# Desc: Merges the two diamond_leggingss -# Called by: ench_merger:merge/check_diamond_leggings -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:diamond_leggings", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/fire_protection -function ench_merger:recipes/projectile_protection -function ench_merger:recipes/blast_protection -function ench_merger:recipes/protection -function ench_merger:recipes/unbreaking -function ench_merger:recipes/thorns -function ench_merger:recipes/mending -function ench_merger:recipes/binding_curse -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_pickaxe.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_pickaxe.mcfunction deleted file mode 100644 index 028248b..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_pickaxe.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -# Desc: Merges the two diamond_pickaxes -# Called by: ench_merger:merge/check_diamond_pickaxe -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:diamond_pickaxe", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/efficiency -function ench_merger:recipes/fortune -function ench_merger:recipes/silk_touch -function ench_merger:recipes/unbreaking -function ench_merger:recipes/mending -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_shovel.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_shovel.mcfunction deleted file mode 100644 index 3b1eda3..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_shovel.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -# Desc: Merges the two diamond_shovels -# Called by: ench_merger:merge/check_diamond_shovel -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:diamond_shovel", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/efficiency -function ench_merger:recipes/fortune -function ench_merger:recipes/silk_touch -function ench_merger:recipes/unbreaking -function ench_merger:recipes/mending -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_sword.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_sword.mcfunction deleted file mode 100644 index c5aca69..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_sword.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -# Desc: Merges the two diamond_swords -# Called by: ench_merger:merge/check_diamond_sword -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:diamond_sword", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/fire_aspect -function ench_merger:recipes/looting -function ench_merger:recipes/unbreaking -function ench_merger:recipes/sharpness -function ench_merger:recipes/smite -function ench_merger:recipes/bane_of_arthropods -function ench_merger:recipes/knockback -function ench_merger:recipes/mending -function ench_merger:recipes/sweeping -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_elytra.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_elytra.mcfunction deleted file mode 100644 index 26e5c06..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_elytra.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Desc: Merges the two elytras -# Called by: ench_merger:merge/check_elytra -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:elytra", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/unbreaking -function ench_merger:recipes/mending -function ench_merger:recipes/binding_curse -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_fishing_rod.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_fishing_rod.mcfunction deleted file mode 100644 index 4d842c8..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_fishing_rod.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -# Desc: Merges the two fishing_rods -# Called by: ench_merger:merge/check_fishing_rod -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:fishing_rod", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/lure -function ench_merger:recipes/luck_of_the_sea -function ench_merger:recipes/unbreaking -function ench_merger:recipes/mending -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_flint_and_steel.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_flint_and_steel.mcfunction deleted file mode 100644 index 9b41420..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_flint_and_steel.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# Desc: Merges the two flint_and_steels -# Called by: ench_merger:merge/check_flint_and_steel -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:flint_and_steel", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/unbreaking -function ench_merger:recipes/mending -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_shears.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_shears.mcfunction deleted file mode 100644 index c81604e..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_shears.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Desc: Merges the two shearss -# Called by: ench_merger:merge/check_shears -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:shears", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/efficiency -function ench_merger:recipes/unbreaking -function ench_merger:recipes/mending -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_shield.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_shield.mcfunction deleted file mode 100644 index 41f4b50..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_shield.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# Desc: Merges the two shields -# Called by: ench_merger:merge/check_shield -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:shield", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/unbreaking -function ench_merger:recipes/mending -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_trident.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_trident.mcfunction deleted file mode 100644 index 8f87f2f..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_trident.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -# Desc: Merges the two tridents -# Called by: ench_merger:merge/check_trident -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:trident", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/loyalty -function ench_merger:recipes/channeling -function ench_merger:recipes/riptide -function ench_merger:recipes/impaling -function ench_merger:recipes/unbreaking -function ench_merger:recipes/mending -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_turtle_shell.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_turtle_shell.mcfunction deleted file mode 100644 index bc28dd4..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_turtle_shell.mcfunction +++ /dev/null @@ -1,24 +0,0 @@ -# Desc: Merges the two turtle_shells -# Called by: ench_merger:merge/check_turtle_shell -# Datapack made by FieryHammer - -# Summon new basic item -execute at @e[tag=fh_merger_active, sort=nearest] run summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:turtle_shell", Count: 1b}, Tags:["new_item"], PickupDelay:60, NoGravity:1b} - -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/setup - -# Run enchantments check for item -function ench_merger:recipes/fire_protection -function ench_merger:recipes/projectile_protection -function ench_merger:recipes/blast_protection -function ench_merger:recipes/protection -function ench_merger:recipes/unbreaking -function ench_merger:recipes/respiration -function ench_merger:recipes/aqua_affinity -function ench_merger:recipes/thorns -function ench_merger:recipes/mending -function ench_merger:recipes/binding_curse -function ench_merger:recipes/vanishing_curse - -# Finish -execute at @e[tag=fh_merger_active, sort=nearest] run function ench_merger:merge/finish diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merge/setup.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merge/setup.mcfunction deleted file mode 100644 index b3e10e4..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merge/setup.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# Desc: -# Called by: -# Datapack made by FieryHammer - -# Summon two dummy items -summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:stone", Count: 1b}, Tags:["left_item"], PickupDelay:40} -summon minecraft:item ~ ~2 ~ {Item:{id:"minecraft:dirt", Count: 1b}, Tags:["right_item"], PickupDelay:40} - -# Create a copy of the items in the Merger onto dummy items -data modify entity @e[tag=left_item, limit=1] Item set from block ~ ~1 ~ Items[0] -data modify entity @e[tag=right_item, limit=1] Item set from block ~ ~1 ~ Items[1] - -# Copy the name and damage from the left item -data modify entity @e[tag=new_item, limit=1] Item.tag.display set from entity @e[tag=left_item, limit=1] Item.tag.display -data modify entity @e[tag=new_item, limit=1] Item.tag.Damage set from entity @e[tag=left_item, limit=1] Item.tag.Damage -data modify entity @e[tag=new_item, limit=1] Item.tag.BlockEntityTag set from entity @e[tag=left_item, limit=1] Item.tag.BlockEntityTag \ No newline at end of file diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merger/check_combine.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merger/check_combine.mcfunction deleted file mode 100644 index 8a88a03..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merger/check_combine.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -# Desc: If there are valid items around, calls the function that creates the Merger -# Called by: ench_merger:merger/check_combine_start -# Datapack made by FieryHammer - -execute if entity @e[type=item, distance=..0.75, nbt={Item:{id:"minecraft:enchanting_table", Count:1b}}, tag=!fh_dropped] if entity @e[type=item, distance=..0.75, nbt={Item:{id:"minecraft:anvil", Count:1b}}, tag=!fh_dropped] run function ench_merger:merger/combine diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merger/check_combine_start.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merger/check_combine_start.mcfunction deleted file mode 100644 index 347502b..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merger/check_combine_start.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -# Desc: Checks a thrown crafting table if can be combined to a Merger -# Called by: #fh_main/second -# Datapack made by FieryHammer - -execute at @e[type=item, limit=1, nbt={Item:{id:"minecraft:crafting_table", Count:1b}}, tag=!fh_dropped] run function ench_merger:merger/check_combine diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merger/check_destroy.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merger/check_destroy.mcfunction deleted file mode 100644 index d5b1785..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merger/check_destroy.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -# Desc: If the dropper for the merger is destroyed, calls the destroy function -# Called by: #fh_main/half_second -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] if block ~ ~1 ~ minecraft:air run function ench_merger:merger/destroy diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merger/combine.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merger/combine.mcfunction deleted file mode 100644 index 9035f62..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merger/combine.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# Desc: Creates the Merger -# Called by: ench_merger:merger/check_combine -# Datapack made by FieryHammer - -execute align xyz run summon minecraft:armor_stand ~0.5 ~-0.40 ~0.5 {NoGravity:1b, Invisible:1b, DisabledSlots:2039583, ArmorItems:[{},{},{},{id:"minecraft:anvil", Count: 1b}], Tags:["fh_merger"]} -setblock ~ ~ ~ dropper[facing=up]{CustomName: '{"text":"Enchantment Merger","color":"dark_purple"}'} - -playsound minecraft:block.anvil.place block @a ~ ~0.5 ~ 0.5 0.45 -playsound minecraft:block.portal.ambient block @a ~ ~0.5 ~ 0.45 1.5 - -kill @e[type=item, limit=1, nbt={Item:{id:"minecraft:enchanting_table"}}, distance=..1] -kill @e[type=item, limit=1, nbt={Item:{id:"minecraft:anvil"}}, distance=..1] -kill @e[type=item, limit=1, nbt={Item:{id:"minecraft:crafting_table"}}, distance=..1] diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merger/destroy.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merger/destroy.mcfunction deleted file mode 100644 index 41c9100..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merger/destroy.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# Desc: Kills the Merger armor stand and drops the build items -# Called by: ench_merger:merger/check_destroy -# Datapack made by FieryHammer - -kill @e[tag=fh_merger, distance=..1] - -summon item ~0.1 ~0.2 ~0.2 {Item:{id:"minecraft:anvil", Count: 1b}, Tags:["fh_dropped"]} -summon item ~-0.1 ~0.3 ~-0.1 {Item:{id:"minecraft:enchanting_table", Count: 1b}, Tags:["fh_dropped"]} -summon item ~0.3 ~0.3 ~-0.2 {Item:{id:"minecraft:crafting_table", Count: 1b}, Tags:["fh_dropped"]} -kill @e[type=item, limit=1, nbt={Item:{id:"minecraft:dropper"}}, sort=nearest] diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/merger/particle.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/merger/particle.mcfunction deleted file mode 100644 index 6cd5f7e..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/merger/particle.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -# Desc: Creates particle effects around merger -# Called by: #fh_main/particle -# Datapack made by FieryHammer - -execute at @e[tag=fh_merger] run particle minecraft:dust 0.8 0.45 0.9 1 ~ ~1 ~ .5 .75 .5 1 1 diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/aqua_affinity.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/aqua_affinity.mcfunction deleted file mode 100644 index fc5953d..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/aqua_affinity.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# Desc: Merge instructions for aqua_affinity -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:aqua_affinity", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:aqua_affinity", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:aqua_affinity", lvl:1s} - -# Checking level matching - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:aqua_affinity", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:aqua_affinity", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:aqua_affinity", lvl:1s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/bane_of_arthropods.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/bane_of_arthropods.mcfunction deleted file mode 100644 index 964b0c8..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/bane_of_arthropods.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -# Desc: Merge instructions for bane_of_arthropods -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:bane_of_arthropods", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:bane_of_arthropods", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:bane_of_arthropods", lvl:3s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:4s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:bane_of_arthropods", lvl:4s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:5s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:bane_of_arthropods", lvl:5s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:bane_of_arthropods", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:bane_of_arthropods", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:3s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:bane_of_arthropods", lvl:4s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:4s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:bane_of_arthropods", lvl:5s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:bane_of_arthropods", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:bane_of_arthropods", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:bane_of_arthropods", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:4s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:bane_of_arthropods", lvl:4s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:5s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:bane_of_arthropods", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:bane_of_arthropods", lvl:5s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/binding_curse.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/binding_curse.mcfunction deleted file mode 100644 index babe1bd..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/binding_curse.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# Desc: Merge instructions for binding_curse -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:binding_curse", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:binding_curse", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:binding_curse", lvl:1s} - -# Checking level matching - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:binding_curse", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:binding_curse", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:binding_curse", lvl:1s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/blast_protection.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/blast_protection.mcfunction deleted file mode 100644 index b595673..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/blast_protection.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -# Desc: Merge instructions for blast_protection -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:blast_protection", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:blast_protection", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:blast_protection", lvl:3s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:4s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:blast_protection", lvl:4s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:blast_protection", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:blast_protection", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:3s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:blast_protection", lvl:4s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:blast_protection", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:blast_protection", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:blast_protection", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:4s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:blast_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:blast_protection", lvl:4s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/channeling.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/channeling.mcfunction deleted file mode 100644 index 0435378..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/channeling.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# Desc: Merge instructions for channeling -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:channeling", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:channeling", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:channeling", lvl:1s} - -# Checking level matching - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:channeling", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:channeling", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:channeling", lvl:1s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/depth_strider.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/depth_strider.mcfunction deleted file mode 100644 index 58ac486..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/depth_strider.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Desc: Merge instructions for depth_strider -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:depth_strider", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:depth_strider", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:depth_strider", lvl:3s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:depth_strider", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:depth_strider", lvl:3s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:depth_strider", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:depth_strider", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:depth_strider", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:depth_strider", lvl:3s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/efficiency.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/efficiency.mcfunction deleted file mode 100644 index ce88888..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/efficiency.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -# Desc: Merge instructions for efficiency -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:efficiency", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:efficiency", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:efficiency", lvl:3s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:4s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:efficiency", lvl:4s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:5s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:efficiency", lvl:5s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:efficiency", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:efficiency", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:3s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:efficiency", lvl:4s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:4s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:efficiency", lvl:5s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:efficiency", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:efficiency", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:efficiency", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:4s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:efficiency", lvl:4s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:5s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:efficiency", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:efficiency", lvl:5s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/feather_falling.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/feather_falling.mcfunction deleted file mode 100644 index bdf1b7c..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/feather_falling.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -# Desc: Merge instructions for feather_falling -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:feather_falling", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:feather_falling", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:feather_falling", lvl:3s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:4s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:feather_falling", lvl:4s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:feather_falling", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:feather_falling", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:3s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:feather_falling", lvl:4s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:feather_falling", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:feather_falling", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:feather_falling", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:4s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:feather_falling", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:feather_falling", lvl:4s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/fire_aspect.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/fire_aspect.mcfunction deleted file mode 100644 index faa6ad0..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/fire_aspect.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# Desc: Merge instructions for fire_aspect -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_aspect", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_aspect", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_aspect", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_aspect", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_aspect", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_aspect", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_aspect", lvl:2s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_aspect", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_aspect", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_aspect", lvl:2s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_aspect", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_aspect", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_aspect", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_aspect", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_aspect", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_aspect", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_aspect", lvl:2s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/fire_protection.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/fire_protection.mcfunction deleted file mode 100644 index 32a7c57..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/fire_protection.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -# Desc: Merge instructions for fire_protection -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_protection", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_protection", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_protection", lvl:3s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:4s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_protection", lvl:4s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_protection", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_protection", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:3s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_protection", lvl:4s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_protection", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_protection", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_protection", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:4s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fire_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fire_protection", lvl:4s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/flame.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/flame.mcfunction deleted file mode 100644 index cf6f588..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/flame.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# Desc: Merge instructions for flame -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:flame", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:flame", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:flame", lvl:1s} - -# Checking level matching - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:flame", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:flame", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:flame", lvl:1s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/fortune.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/fortune.mcfunction deleted file mode 100644 index 435d1f2..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/fortune.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Desc: Merge instructions for fortune -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fortune", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fortune", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fortune", lvl:3s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fortune", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fortune", lvl:3s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fortune", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fortune", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:fortune", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:fortune", lvl:3s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/frost_walker.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/frost_walker.mcfunction deleted file mode 100644 index ca77752..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/frost_walker.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# Desc: Merge instructions for frost_walker -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:frost_walker", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:frost_walker", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:frost_walker", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:frost_walker", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:frost_walker", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:frost_walker", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:frost_walker", lvl:2s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:frost_walker", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:frost_walker", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:frost_walker", lvl:2s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:frost_walker", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:frost_walker", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:frost_walker", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:frost_walker", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:frost_walker", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:frost_walker", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:frost_walker", lvl:2s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/impaling.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/impaling.mcfunction deleted file mode 100644 index 8d7e109..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/impaling.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -# Desc: Merge instructions for impaling -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:impaling", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:impaling", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:impaling", lvl:3s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:4s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:impaling", lvl:4s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:5s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:impaling", lvl:5s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:impaling", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:impaling", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:3s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:impaling", lvl:4s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:4s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:impaling", lvl:5s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:impaling", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:impaling", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:impaling", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:4s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:impaling", lvl:4s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:5s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:impaling", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:impaling", lvl:5s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/infinity.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/infinity.mcfunction deleted file mode 100644 index a2a7d90..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/infinity.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# Desc: Merge instructions for infinity -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:infinity", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:infinity", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:infinity", lvl:1s} - -# Checking level matching - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:infinity", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:infinity", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:infinity", lvl:1s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/knockback.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/knockback.mcfunction deleted file mode 100644 index e79b5e8..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/knockback.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# Desc: Merge instructions for knockback -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:knockback", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:knockback", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:knockback", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:knockback", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:knockback", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:knockback", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:knockback", lvl:2s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:knockback", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:knockback", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:knockback", lvl:2s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:knockback", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:knockback", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:knockback", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:knockback", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:knockback", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:knockback", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:knockback", lvl:2s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/looting.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/looting.mcfunction deleted file mode 100644 index fcf1fae..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/looting.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Desc: Merge instructions for looting -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:looting", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:looting", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:looting", lvl:3s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:looting", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:looting", lvl:3s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:looting", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:looting", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:looting", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:looting", lvl:3s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/loyalty.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/loyalty.mcfunction deleted file mode 100644 index 96efbc3..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/loyalty.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Desc: Merge instructions for loyalty -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:loyalty", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:loyalty", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:loyalty", lvl:3s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:loyalty", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:loyalty", lvl:3s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:loyalty", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:loyalty", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:loyalty", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:loyalty", lvl:3s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/luck_of_the_sea.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/luck_of_the_sea.mcfunction deleted file mode 100644 index b782937..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/luck_of_the_sea.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Desc: Merge instructions for luck_of_the_sea -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:luck_of_the_sea", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:luck_of_the_sea", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:luck_of_the_sea", lvl:3s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:luck_of_the_sea", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:luck_of_the_sea", lvl:3s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:luck_of_the_sea", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:luck_of_the_sea", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:luck_of_the_sea", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:luck_of_the_sea", lvl:3s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/lure.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/lure.mcfunction deleted file mode 100644 index c79293c..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/lure.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Desc: Merge instructions for lure -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:lure", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:lure", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:lure", lvl:3s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:lure", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:lure", lvl:3s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:lure", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:lure", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:lure", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:lure", lvl:3s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/mending.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/mending.mcfunction deleted file mode 100644 index c0225b9..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/mending.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# Desc: Merge instructions for mending -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:mending", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:mending", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:mending", lvl:1s} - -# Checking level matching - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:mending", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:mending", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:mending", lvl:1s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/multishot.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/multishot.mcfunction deleted file mode 100644 index 3e9b242..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/multishot.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# Desc: Merge instructions for multishot -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:multishot", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:multishot", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:multishot", lvl:1s} - -# Checking level matching - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:multishot", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:multishot", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:multishot", lvl:1s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/piercing.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/piercing.mcfunction deleted file mode 100644 index d9f53fd..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/piercing.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -# Desc: Merge instructions for piercing -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:piercing", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:piercing", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:piercing", lvl:3s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:4s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:piercing", lvl:4s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:piercing", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:piercing", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:3s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:piercing", lvl:4s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:piercing", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:piercing", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:piercing", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:4s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:piercing", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:piercing", lvl:4s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/power.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/power.mcfunction deleted file mode 100644 index 513276a..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/power.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -# Desc: Merge instructions for power -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:power", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:power", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:power", lvl:3s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:4s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:power", lvl:4s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:5s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:power", lvl:5s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:power", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:power", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:3s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:power", lvl:4s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:4s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:power", lvl:5s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:power", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:power", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:power", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:4s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:power", lvl:4s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:5s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:power", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:power", lvl:5s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/projectile_protection.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/projectile_protection.mcfunction deleted file mode 100644 index 34944ea..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/projectile_protection.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -# Desc: Merge instructions for projectile_protection -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:projectile_protection", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:projectile_protection", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:projectile_protection", lvl:3s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:4s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:projectile_protection", lvl:4s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:projectile_protection", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:projectile_protection", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:3s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:projectile_protection", lvl:4s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:projectile_protection", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:projectile_protection", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:projectile_protection", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:4s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:projectile_protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:projectile_protection", lvl:4s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/protection.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/protection.mcfunction deleted file mode 100644 index dc1507d..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/protection.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -# Desc: Merge instructions for protection -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:protection", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:protection", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:protection", lvl:3s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:4s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:protection", lvl:4s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:protection", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:protection", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:3s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:protection", lvl:4s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:protection", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:protection", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:protection", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:4s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:protection", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:protection", lvl:4s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/punch.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/punch.mcfunction deleted file mode 100644 index 2d0c666..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/punch.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# Desc: Merge instructions for punch -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:punch", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:punch", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:punch", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:punch", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:punch", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:punch", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:punch", lvl:2s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:punch", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:punch", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:punch", lvl:2s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:punch", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:punch", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:punch", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:punch", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:punch", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:punch", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:punch", lvl:2s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/quick_charge.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/quick_charge.mcfunction deleted file mode 100644 index 7ff2b3d..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/quick_charge.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Desc: Merge instructions for quick_charge -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:quick_charge", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:quick_charge", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:quick_charge", lvl:3s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:quick_charge", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:quick_charge", lvl:3s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:quick_charge", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:quick_charge", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:quick_charge", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:quick_charge", lvl:3s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/respiration.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/respiration.mcfunction deleted file mode 100644 index bc4bca8..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/respiration.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Desc: Merge instructions for respiration -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:respiration", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:respiration", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:respiration", lvl:3s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:respiration", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:respiration", lvl:3s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:respiration", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:respiration", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:respiration", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:respiration", lvl:3s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/riptide.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/riptide.mcfunction deleted file mode 100644 index 1a2a776..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/riptide.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Desc: Merge instructions for riptide -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:riptide", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:riptide", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:riptide", lvl:3s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:riptide", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:riptide", lvl:3s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:riptide", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:riptide", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:riptide", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:riptide", lvl:3s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/sharpness.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/sharpness.mcfunction deleted file mode 100644 index 860471f..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/sharpness.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -# Desc: Merge instructions for sharpness -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sharpness", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sharpness", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sharpness", lvl:3s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:4s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sharpness", lvl:4s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:5s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sharpness", lvl:5s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sharpness", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sharpness", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:3s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sharpness", lvl:4s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:4s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sharpness", lvl:5s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sharpness", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sharpness", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sharpness", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:4s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sharpness", lvl:4s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:5s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sharpness", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sharpness", lvl:5s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/silk_touch.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/silk_touch.mcfunction deleted file mode 100644 index 0ee0104..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/silk_touch.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# Desc: Merge instructions for silk_touch -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:silk_touch", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:silk_touch", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:silk_touch", lvl:1s} - -# Checking level matching - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:silk_touch", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:silk_touch", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:silk_touch", lvl:1s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/smite.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/smite.mcfunction deleted file mode 100644 index a0c6bcb..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/smite.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -# Desc: Merge instructions for smite -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:smite", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:smite", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:smite", lvl:3s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:4s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:smite", lvl:4s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:5s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:smite", lvl:5s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:smite", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:smite", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:3s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:smite", lvl:4s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:4s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:4s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:smite", lvl:5s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:smite", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:smite", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:3s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:smite", lvl:3s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:4s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:4s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:smite", lvl:4s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:5s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:smite", lvl:5s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:smite", lvl:5s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/sweeping.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/sweeping.mcfunction deleted file mode 100644 index df18d41..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/sweeping.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Desc: Merge instructions for sweeping -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sweeping", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sweeping", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sweeping", lvl:3s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sweeping", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sweeping", lvl:3s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sweeping", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sweeping", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:sweeping", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:sweeping", lvl:3s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/thorns.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/thorns.mcfunction deleted file mode 100644 index dd32038..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/thorns.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Desc: Merge instructions for thorns -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:thorns", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:thorns", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:thorns", lvl:3s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:thorns", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:thorns", lvl:3s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:thorns", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:thorns", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:thorns", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:thorns", lvl:3s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/unbreaking.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/unbreaking.mcfunction deleted file mode 100644 index deb64e4..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/unbreaking.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Desc: Merge instructions for unbreaking -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:unbreaking", lvl:1s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:2s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:unbreaking", lvl:2s} -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:3s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:unbreaking", lvl:3s} - -# Checking level matching -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:1s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:unbreaking", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:2s}]}}}] if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:2s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:unbreaking", lvl:3s} - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:1s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:unbreaking", lvl:1s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:2s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:2s}]}}}, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:unbreaking", lvl:2s} -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:3s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:unbreaking", lvl:3s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:unbreaking", lvl:3s} diff --git a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/vanishing_curse.mcfunction b/datapacks/enchantment_merger/data/ench_merger/functions/recipes/vanishing_curse.mcfunction deleted file mode 100644 index 2ac8680..0000000 --- a/datapacks/enchantment_merger/data/ench_merger/functions/recipes/vanishing_curse.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# Desc: Merge instructions for vanishing_curse -# Called by: ench_merge:merge/merge_* -# Datapack made by FieryHammer - -# Checking left item -execute if entity @e[tag=left_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:vanishing_curse", lvl:1s}]}}}] if entity @e[tag=right_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:vanishing_curse", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:vanishing_curse", lvl:1s} - -# Checking level matching - -# Checking right item -execute if entity @e[tag=right_item, nbt={Item:{tag:{Enchantments:[{id:"minecraft:vanishing_curse", lvl:1s}]}}}] if entity @e[tag=new_item, nbt=!{Item:{tag:{Enchantments:[{id:"minecraft:vanishing_curse", lvl:1s}]}}}] run data modify entity @e[tag=new_item, limit=1] Item.tag.Enchantments append value {id:"minecraft:vanishing_curse", lvl:1s} diff --git a/datapacks/enchantment_merger/data/fh_main/functions/init.mcfunction b/datapacks/enchantment_merger/data/fh_main/functions/init.mcfunction deleted file mode 100644 index d2796a0..0000000 --- a/datapacks/enchantment_merger/data/fh_main/functions/init.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -# Desc: Setting up the scoreboard(s) -# Called by: #fh_main:init -# Datapack made by FieryHammer - -scoreboard objectives add fh_tick dummy \ No newline at end of file diff --git a/datapacks/enchantment_merger/data/fh_main/functions/tick.mcfunction b/datapacks/enchantment_merger/data/fh_main/functions/tick.mcfunction deleted file mode 100644 index 17407bd..0000000 --- a/datapacks/enchantment_merger/data/fh_main/functions/tick.mcfunction +++ /dev/null @@ -1,36 +0,0 @@ -# Desc: Setting up the scoreboard(s) -# Called by: #minecraft:tick -# Datapack made by FieryHammer - -scoreboard players add #fh_tick fh_tick 1 - -# Every tick -function #fh_main:tick - -# Every half second -execute if score #fh_tick fh_tick matches 1 run function #fh_main:half_second -execute if score #fh_tick fh_tick matches 11 run function #fh_main:half_second -execute if score #fh_tick fh_tick matches 21 run function #fh_main:half_second -execute if score #fh_tick fh_tick matches 31 run function #fh_main:half_second -execute if score #fh_tick fh_tick matches 41 run function #fh_main:half_second -execute if score #fh_tick fh_tick matches 51 run function #fh_main:half_second -execute if score #fh_tick fh_tick matches 61 run function #fh_main:half_second -execute if score #fh_tick fh_tick matches 71 run function #fh_main:half_second -execute if score #fh_tick fh_tick matches 81 run function #fh_main:half_second -execute if score #fh_tick fh_tick matches 91 run function #fh_main:half_second - -# Every second -execute if score #fh_tick fh_tick matches 1 run function #fh_main:second -execute if score #fh_tick fh_tick matches 21 run function #fh_main:second -execute if score #fh_tick fh_tick matches 41 run function #fh_main:second -execute if score #fh_tick fh_tick matches 61 run function #fh_main:second -execute if score #fh_tick fh_tick matches 81 run function #fh_main:second - -# Every 2.5 seconds -execute if score #fh_tick fh_tick matches 1 run function #fh_main:two_and_half_second -execute if score #fh_tick fh_tick matches 51 run function #fh_main:two_and_half_second - -# Every 5 seconds -execute if score #fh_tick fh_tick matches 1 run function #fh_main:five_second - -execute if score #fh_tick fh_tick matches 100.. run scoreboard players set #fh_tick fh_tick 0 \ No newline at end of file diff --git a/datapacks/enchantment_merger/data/fh_main/tags/functions/five_second.json b/datapacks/enchantment_merger/data/fh_main/tags/functions/five_second.json deleted file mode 100644 index 77d02ba..0000000 --- a/datapacks/enchantment_merger/data/fh_main/tags/functions/five_second.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values":[ - - ] -} diff --git a/datapacks/enchantment_merger/data/fh_main/tags/functions/half_second.json b/datapacks/enchantment_merger/data/fh_main/tags/functions/half_second.json deleted file mode 100644 index 0af1bc1..0000000 --- a/datapacks/enchantment_merger/data/fh_main/tags/functions/half_second.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values":[ - "ench_merger:merger/check_destroy" - ] -} diff --git a/datapacks/enchantment_merger/data/fh_main/tags/functions/init.json b/datapacks/enchantment_merger/data/fh_main/tags/functions/init.json deleted file mode 100644 index 5ae5edb..0000000 --- a/datapacks/enchantment_merger/data/fh_main/tags/functions/init.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values":[ - "fh_main:init", - "ench_merger:init" - ] -} diff --git a/datapacks/enchantment_merger/data/fh_main/tags/functions/second.json b/datapacks/enchantment_merger/data/fh_main/tags/functions/second.json deleted file mode 100644 index b69c126..0000000 --- a/datapacks/enchantment_merger/data/fh_main/tags/functions/second.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values":[ - "ench_merger:merger/check_combine_start", - "ench_merger:merge/check_all" - ] -} diff --git a/datapacks/enchantment_merger/data/fh_main/tags/functions/tick.json b/datapacks/enchantment_merger/data/fh_main/tags/functions/tick.json deleted file mode 100644 index 08f48af..0000000 --- a/datapacks/enchantment_merger/data/fh_main/tags/functions/tick.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values":[ - "ench_merger:merger/particle" - ] -} diff --git a/datapacks/enchantment_merger/data/fh_main/tags/functions/two_and_half_second.json b/datapacks/enchantment_merger/data/fh_main/tags/functions/two_and_half_second.json deleted file mode 100644 index 77d02ba..0000000 --- a/datapacks/enchantment_merger/data/fh_main/tags/functions/two_and_half_second.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values":[ - - ] -} diff --git a/datapacks/enchantment_merger/data/minecraft/tags/functions/load.json b/datapacks/enchantment_merger/data/minecraft/tags/functions/load.json deleted file mode 100644 index 7d4474f..0000000 --- a/datapacks/enchantment_merger/data/minecraft/tags/functions/load.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "#fh_main:init" - ] -} diff --git a/datapacks/enchantment_merger/data/minecraft/tags/functions/tick.json b/datapacks/enchantment_merger/data/minecraft/tags/functions/tick.json deleted file mode 100644 index 30941a5..0000000 --- a/datapacks/enchantment_merger/data/minecraft/tags/functions/tick.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "fh_main:tick" - ] -} diff --git a/datapacks/enchantment_merger/pack.mcmeta b/datapacks/enchantment_merger/pack.mcmeta deleted file mode 100644 index 68da8ea..0000000 --- a/datapacks/enchantment_merger/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack":{ - "pack_format":2, - "description":"Merges enchantments without exclusion" - } -}