From 1076e60bf1f90f9f261fa99dd69896cbc8fa692b Mon Sep 17 00:00:00 2001 From: alexcrea Date: Fri, 4 Jul 2025 14:07:46 +0200 Subject: [PATCH] use actual file name --- .../enchantplus/enchant_conflicts.yml | 74 ++++++------ .../datapack/enchantplus/item_conflict.yml | 108 +++++++++--------- 2 files changed, 91 insertions(+), 91 deletions(-) diff --git a/src/main/resources/datapack/enchantplus/enchant_conflicts.yml b/src/main/resources/datapack/enchantplus/enchant_conflicts.yml index a57c73a..afa16b4 100644 --- a/src/main/resources/datapack/enchantplus/enchant_conflicts.yml +++ b/src/main/resources/datapack/enchantplus/enchant_conflicts.yml @@ -1,41 +1,41 @@ -"enchantplus:echo_shot": ['#enchantplus_bow'] -"enchantplus:storm_arrow": ['#enchantplus_bow'] -"enchantplus:eternal_frost": ['#enchantplus_bow'] -"enchantplus:breezing_arrow": ['#enchantplus_bow'] -"enchantplus:explosive_arrow": ['#enchantplus_bow'] -"enchantplus:teluric_wave": ['#enchantplus_mace'] -"enchantplus:fury": ['#enchantplus_armor'] -"enchantplus:lifeplus": ['#enchantplus_armor'] -"enchantplus:venom_protection": ['#protection_enchant_conflict'] -"enchantplus:lava_walker": ['#boot_conflict'] -"enchantplus:step_assist": ['#boot_conflict'] -"enchantplus:fear": ['#enchantplus_sword_effect'] -"enchantplus:pull": ['#enchantplus_sword_effect'] -"enchantplus:reach": ['#enchantplus_sword_attribute'] -"enchantplus:critical": ['#enchantplus_sword_attribute'] -"enchantplus:xp_boost": ['#enchantplus_experience'] -"enchantplus:last_hope": ['#enchantplus_sword_effect'] -"enchantplus:life_steal": ['#enchantplus_sword_effect'] -"enchantplus:death_touch": ['#enchantplus_sword_effect'] -"enchantplus:attack_speed": ['#enchantplus_sword_attribute'] -"enchantplus:poison_aspect": ['#enchantplus_aspect'] -"enchantplus:runic_despair": ['#enchantplus_sword_attribute'] -"enchantplus:dimensional_hit": ['#enchantplus_sword_attribute'] -"enchantplus:tears_of_asflors": ['#enchantplus_sword_effect'] -"enchantplus:auto_smelt": ['minecraft:silk_touch'] -"enchantplus:miningplus": ['#enchantplus_mining'] -"enchantplus:vein_miner": ['#enchantplus_mining'] -"enchantplus:spawner_touch": ['#enchantplus_mining'] -"enchantplus:bedrock_breaker": ['#enchantplus_mining'] -"enchantplus:gungnir_breath": ['#enchantplus_trident'] -"enchantplus:dwarfed": ['#enchantplus_size'] -"enchantplus:oversize": ['#enchantplus_size'] -"enchantplus:curse_of_enchant": ['#enchantplus_durability'] -"enchantplus:curse_of_breaking": ['#enchantplus_durability'] -"minecraft:protection": ['#enchantplus_armor'] -"minecraft:quick_charge": ['#enchantplus_bow'] +"enchantplus:bow/echo_shot": ['#enchantplus_bow'] +"enchantplus:bow/storm_arrow": ['#enchantplus_bow'] +"enchantplus:bow/eternal_frost": ['#enchantplus_bow'] +"enchantplus:bow/breezing_arrow": ['#enchantplus_bow'] +"enchantplus:bow/explosive_arrow": ['#enchantplus_bow'] +"enchantplus:mace/teluric_wave": ['#enchantplus_mace'] +"enchantplus:armor/fury": ['#enchantplus_armor'] +"enchantplus:armor/lifeplus": ['#enchantplus_armor'] +"enchantplus:armor/venom_protection": ['#protection_enchant_conflict'] +"enchantplus:boots/lava_walker": ['#boot_conflict'] +"enchantplus:boots/step_assist": ['#boot_conflict'] +"enchantplus:sword/fear": ['#enchantplus_sword_effect'] +"enchantplus:sword/pull": ['#enchantplus_sword_effect'] +"enchantplus:sword/reach": ['#enchantplus_sword_attribute'] +"enchantplus:sword/critical": ['#enchantplus_sword_attribute'] +"enchantplus:sword/xp_boost": ['#enchantplus_experience'] +"enchantplus:sword/last_hope": ['#enchantplus_sword_effect'] +"enchantplus:sword/life_steal": ['#enchantplus_sword_effect'] +"enchantplus:sword/death_touch": ['#enchantplus_sword_effect'] +"enchantplus:sword/attack_speed": ['#enchantplus_sword_attribute'] +"enchantplus:sword/poison_aspect": ['#enchantplus_aspect'] +"enchantplus:sword/runic_despair": ['#enchantplus_sword_attribute'] +"enchantplus:sword/dimensional_hit": ['#enchantplus_sword_attribute'] +"enchantplus:sword/tears_of_asflors": ['#enchantplus_sword_effect'] +"enchantplus:tools/auto_smelt": ['minecraft:silk_touch'] +"enchantplus:tools/miningplus": ['#enchantplus_mining'] +"enchantplus:pickaxe/vein_miner": ['#enchantplus_mining'] +"enchantplus:pickaxe/spawner_touch": ['#enchantplus_mining'] +"enchantplus:pickaxe/bedrock_breaker": ['#enchantplus_mining'] +"enchantplus:trident/gungnir_breath": ['#enchantplus_trident'] +"enchantplus:leggings/dwarfed": ['#enchantplus_size'] +"enchantplus:leggings/oversize": ['#enchantplus_size'] +"enchantplus:durability/curse_of_enchant": ['#enchantplus_durability'] +"enchantplus:durability/curse_of_breaking": ['#enchantplus_durability'] "minecraft:mending": ['#enchantplus_durability', '#enchantplus_experience'] "minecraft:unbreaking": ['#enchantplus_durability'] -"minecraft:channeling": ['#enchantplus_trident'] "minecraft:fire_aspect": ['#enchantplus_aspect'] "minecraft:wind_burst": ['#enchantplus_mace'] +"minecraft:quick_charge": ['#enchantplus_bow'] +"minecraft:channeling": ['#enchantplus_trident'] +"minecraft:protection": ['#enchantplus_armor'] diff --git a/src/main/resources/datapack/enchantplus/item_conflict.yml b/src/main/resources/datapack/enchantplus/item_conflict.yml index 1c32e9f..8dafc57 100644 --- a/src/main/resources/datapack/enchantplus/item_conflict.yml +++ b/src/main/resources/datapack/enchantplus/item_conflict.yml @@ -1,55 +1,55 @@ -"enchantplus:timber": ['axes'] -"enchantplus:rebound": ['bow', 'crossbow'] -"enchantplus:echo_shot": ['bow', 'crossbow'] -"enchantplus:storm_arrow": ['bow', 'crossbow'] -"enchantplus:accuracy_shot": ['bow', 'crossbow'] -"enchantplus:eternal_frost": ['bow', 'crossbow'] -"enchantplus:breezing_arrow": ['bow', 'crossbow'] -"enchantplus:explosive_arrow": ['bow', 'crossbow'] -"enchantplus:harvest": ['hoes'] -"enchantplus:scyther": ['hoes'] -"enchantplus:striker": ['mace'] -"enchantplus:teluric_wave": ['mace'] -"enchantplus:wind_propulsion": ['mace'] -"enchantplus:fury": ['armors'] -"enchantplus:lifeplus": ['armors'] -"enchantplus:venom_protection": ['armors'] -"enchantplus:agility": ['boots'] -"enchantplus:lava_walker": ['boots'] -"enchantplus:step_assist": ['boots'] -"enchantplus:fear": ['swords'] -"enchantplus:pull": ['melee_weapons'] -"enchantplus:reach": ['swords'] -"enchantplus:critical": ['swords'] -"enchantplus:xp_boost": ['mining_and_damage'] -"enchantplus:last_hope": ['swords'] -"enchantplus:life_steal": ['melee_weapons'] -"enchantplus:death_touch": ['melee_weapons'] -"enchantplus:attack_speed": ['swords'] -"enchantplus:poison_aspect": ['melee_weapons'] -"enchantplus:runic_despair": ['swords'] -"enchantplus:dimensional_hit": ['swords'] -"enchantplus:tears_of_asflors": ['swords'] -"enchantplus:auto_smelt": ['axes', 'pickaxes', 'shovels', 'hoes'] -"enchantplus:miningplus": ['axes', 'pickaxes', 'shovels', 'hoes'] -"enchantplus:armored": ['elytra'] -"enchantplus:kinetic_protection": ['elytra'] -"enchantplus:voidless": ['helmets'] -"enchantplus:auto_feed": ['helmets'] -"enchantplus:bright_vision": ['helmets'] -"enchantplus:velocity": ['mounted_armor'] -"enchantplus:steel_fang": ['wolf_armor'] -"enchantplus:cavalier_egis": ['mounted_armor'] -"enchantplus:ethereal_leap": ['mounted_armor'] -"enchantplus:vein_miner": ['pickaxes'] -"enchantplus:spawner_touch": ['pickaxes'] -"enchantplus:bedrock_breaker": ['pickaxes'] -"enchantplus:gungnir_breath": ['trident'] -"enchantplus:dwarfed": ['leggings'] -"enchantplus:leaping": ['leggings'] -"enchantplus:oversize": ['leggings'] -"enchantplus:fast_swim": ['leggings'] -"enchantplus:builder_arm": ['chestplate'] -"enchantplus:curse_of_enchant": ['can_unbreak'] -"enchantplus:curse_of_breaking": ['can_unbreak'] +"enchantplus:axe/timber": ['axes'] +"enchantplus:bow/rebound": ['bow', 'crossbow'] +"enchantplus:bow/echo_shot": ['bow', 'crossbow'] +"enchantplus:bow/storm_arrow": ['bow', 'crossbow'] +"enchantplus:bow/accuracy_shot": ['bow', 'crossbow'] +"enchantplus:bow/eternal_frost": ['bow', 'crossbow'] +"enchantplus:bow/breezing_arrow": ['bow', 'crossbow'] +"enchantplus:bow/explosive_arrow": ['bow', 'crossbow'] +"enchantplus:hoe/harvest": ['hoes'] +"enchantplus:hoe/scyther": ['hoes'] +"enchantplus:mace/striker": ['mace'] +"enchantplus:mace/teluric_wave": ['mace'] +"enchantplus:mace/wind_propulsion": ['mace'] +"enchantplus:armor/fury": ['armors'] +"enchantplus:armor/lifeplus": ['armors'] +"enchantplus:armor/venom_protection": ['armors'] +"enchantplus:boots/agility": ['boots'] +"enchantplus:boots/lava_walker": ['boots'] +"enchantplus:boots/step_assist": ['boots'] +"enchantplus:sword/fear": ['swords'] +"enchantplus:sword/pull": ['melee_weapons'] +"enchantplus:sword/reach": ['swords'] +"enchantplus:sword/critical": ['swords'] +"enchantplus:sword/xp_boost": ['mining_and_damage'] +"enchantplus:sword/last_hope": ['swords'] +"enchantplus:sword/life_steal": ['melee_weapons'] +"enchantplus:sword/death_touch": ['melee_weapons'] +"enchantplus:sword/attack_speed": ['swords'] +"enchantplus:sword/poison_aspect": ['melee_weapons'] +"enchantplus:sword/runic_despair": ['swords'] +"enchantplus:sword/dimensional_hit": ['swords'] +"enchantplus:sword/tears_of_asflors": ['swords'] +"enchantplus:tools/auto_smelt": ['axes', 'pickaxes', 'shovels', 'hoes'] +"enchantplus:tools/miningplus": ['axes', 'pickaxes', 'shovels', 'hoes'] +"enchantplus:elytra/armored": ['elytra'] +"enchantplus:elytra/kinetic_protection": ['elytra'] +"enchantplus:helmet/voidless": ['helmets'] +"enchantplus:helmet/auto_feed": ['helmets'] +"enchantplus:helmet/bright_vision": ['helmets'] +"enchantplus:mounted/velocity": ['mounted_armor'] +"enchantplus:mounted/steel_fang": ['wolf_armor'] +"enchantplus:mounted/cavalier_egis": ['mounted_armor'] +"enchantplus:mounted/ethereal_leap": ['mounted_armor'] +"enchantplus:pickaxe/vein_miner": ['pickaxes'] +"enchantplus:pickaxe/spawner_touch": ['pickaxes'] +"enchantplus:pickaxe/bedrock_breaker": ['pickaxes'] +"enchantplus:trident/gungnir_breath": ['trident'] +"enchantplus:leggings/dwarfed": ['leggings'] +"enchantplus:leggings/leaping": ['leggings'] +"enchantplus:leggings/oversize": ['leggings'] +"enchantplus:leggings/fast_swim": ['leggings'] +"enchantplus:chestplate/builder_arm": ['chestplate'] +"enchantplus:durability/curse_of_enchant": ['can_unbreak'] +"enchantplus:durability/curse_of_breaking": ['can_unbreak'] "enchantplus:midas_touch": ['stick']