alexcrea/CustomAnvil
1
0
Fork 0
mirror of https://github.com/alexcrea/CustomAnvil.git synced 2026-06-23 16:16:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use actual file name

Browse source
This commit is contained in:
alexcrea 2025-07-04 14:07:46 +02:00
parent af2d2c45b6
commit 1076e60bf1
2 changed files with 91 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/main/resources/datapack/enchantplus/enchant_conflicts.yml
View file

@ -1,41 +1,41 @@
"enchantplus:echo_shot": ['#enchantplus_bow'] "enchantplus:bow/echo_shot": ['#enchantplus_bow']
"enchantplus:storm_arrow": ['#enchantplus_bow'] "enchantplus:bow/storm_arrow": ['#enchantplus_bow']
"enchantplus:eternal_frost": ['#enchantplus_bow'] "enchantplus:bow/eternal_frost": ['#enchantplus_bow']
"enchantplus:breezing_arrow": ['#enchantplus_bow'] "enchantplus:bow/breezing_arrow": ['#enchantplus_bow']
"enchantplus:explosive_arrow": ['#enchantplus_bow'] "enchantplus:bow/explosive_arrow": ['#enchantplus_bow']
"enchantplus:teluric_wave": ['#enchantplus_mace'] "enchantplus:mace/teluric_wave": ['#enchantplus_mace']
"enchantplus:fury": ['#enchantplus_armor'] "enchantplus:armor/fury": ['#enchantplus_armor']
"enchantplus:lifeplus": ['#enchantplus_armor'] "enchantplus:armor/lifeplus": ['#enchantplus_armor']
"enchantplus:venom_protection": ['#protection_enchant_conflict'] "enchantplus:armor/venom_protection": ['#protection_enchant_conflict']
"enchantplus:lava_walker": ['#boot_conflict'] "enchantplus:boots/lava_walker": ['#boot_conflict']
"enchantplus:step_assist": ['#boot_conflict'] "enchantplus:boots/step_assist": ['#boot_conflict']
"enchantplus:fear": ['#enchantplus_sword_effect'] "enchantplus:sword/fear": ['#enchantplus_sword_effect']
"enchantplus:pull": ['#enchantplus_sword_effect'] "enchantplus:sword/pull": ['#enchantplus_sword_effect']
"enchantplus:reach": ['#enchantplus_sword_attribute'] "enchantplus:sword/reach": ['#enchantplus_sword_attribute']
"enchantplus:critical": ['#enchantplus_sword_attribute'] "enchantplus:sword/critical": ['#enchantplus_sword_attribute']
"enchantplus:xp_boost": ['#enchantplus_experience'] "enchantplus:sword/xp_boost": ['#enchantplus_experience']
"enchantplus:last_hope": ['#enchantplus_sword_effect'] "enchantplus:sword/last_hope": ['#enchantplus_sword_effect']
"enchantplus:life_steal": ['#enchantplus_sword_effect'] "enchantplus:sword/life_steal": ['#enchantplus_sword_effect']
"enchantplus:death_touch": ['#enchantplus_sword_effect'] "enchantplus:sword/death_touch": ['#enchantplus_sword_effect']
"enchantplus:attack_speed": ['#enchantplus_sword_attribute'] "enchantplus:sword/attack_speed": ['#enchantplus_sword_attribute']
"enchantplus:poison_aspect": ['#enchantplus_aspect'] "enchantplus:sword/poison_aspect": ['#enchantplus_aspect']
"enchantplus:runic_despair": ['#enchantplus_sword_attribute'] "enchantplus:sword/runic_despair": ['#enchantplus_sword_attribute']
"enchantplus:dimensional_hit": ['#enchantplus_sword_attribute'] "enchantplus:sword/dimensional_hit": ['#enchantplus_sword_attribute']
"enchantplus:tears_of_asflors": ['#enchantplus_sword_effect'] "enchantplus:sword/tears_of_asflors": ['#enchantplus_sword_effect']
"enchantplus:auto_smelt": ['minecraft:silk_touch'] "enchantplus:tools/auto_smelt": ['minecraft:silk_touch']
"enchantplus:miningplus": ['#enchantplus_mining'] "enchantplus:tools/miningplus": ['#enchantplus_mining']
"enchantplus:vein_miner": ['#enchantplus_mining'] "enchantplus:pickaxe/vein_miner": ['#enchantplus_mining']
"enchantplus:spawner_touch": ['#enchantplus_mining'] "enchantplus:pickaxe/spawner_touch": ['#enchantplus_mining']
"enchantplus:bedrock_breaker": ['#enchantplus_mining'] "enchantplus:pickaxe/bedrock_breaker": ['#enchantplus_mining']
"enchantplus:gungnir_breath": ['#enchantplus_trident'] "enchantplus:trident/gungnir_breath": ['#enchantplus_trident']
"enchantplus:dwarfed": ['#enchantplus_size'] "enchantplus:leggings/dwarfed": ['#enchantplus_size']
"enchantplus:oversize": ['#enchantplus_size'] "enchantplus:leggings/oversize": ['#enchantplus_size']
"enchantplus:curse_of_enchant": ['#enchantplus_durability'] "enchantplus:durability/curse_of_enchant": ['#enchantplus_durability']
"enchantplus:curse_of_breaking": ['#enchantplus_durability'] "enchantplus:durability/curse_of_breaking": ['#enchantplus_durability']
"minecraft:protection": ['#enchantplus_armor']
"minecraft:quick_charge": ['#enchantplus_bow']
"minecraft:mending": ['#enchantplus_durability', '#enchantplus_experience'] "minecraft:mending": ['#enchantplus_durability', '#enchantplus_experience']
"minecraft:unbreaking": ['#enchantplus_durability'] "minecraft:unbreaking": ['#enchantplus_durability']
"minecraft:channeling": ['#enchantplus_trident']
"minecraft:fire_aspect": ['#enchantplus_aspect'] "minecraft:fire_aspect": ['#enchantplus_aspect']
"minecraft:wind_burst": ['#enchantplus_mace'] "minecraft:wind_burst": ['#enchantplus_mace']
"minecraft:quick_charge": ['#enchantplus_bow']
"minecraft:channeling": ['#enchantplus_trident']
"minecraft:protection": ['#enchantplus_armor']

108
src/main/resources/datapack/enchantplus/item_conflict.yml
View file

@ -1,55 +1,55 @@
"enchantplus:timber": ['axes'] "enchantplus:axe/timber": ['axes']
"enchantplus:rebound": ['bow', 'crossbow'] "enchantplus:bow/rebound": ['bow', 'crossbow']
"enchantplus:echo_shot": ['bow', 'crossbow'] "enchantplus:bow/echo_shot": ['bow', 'crossbow']
"enchantplus:storm_arrow": ['bow', 'crossbow'] "enchantplus:bow/storm_arrow": ['bow', 'crossbow']
"enchantplus:accuracy_shot": ['bow', 'crossbow'] "enchantplus:bow/accuracy_shot": ['bow', 'crossbow']
"enchantplus:eternal_frost": ['bow', 'crossbow'] "enchantplus:bow/eternal_frost": ['bow', 'crossbow']
"enchantplus:breezing_arrow": ['bow', 'crossbow'] "enchantplus:bow/breezing_arrow": ['bow', 'crossbow']
"enchantplus:explosive_arrow": ['bow', 'crossbow'] "enchantplus:bow/explosive_arrow": ['bow', 'crossbow']
"enchantplus:harvest": ['hoes'] "enchantplus:hoe/harvest": ['hoes']
"enchantplus:scyther": ['hoes'] "enchantplus:hoe/scyther": ['hoes']
"enchantplus:striker": ['mace'] "enchantplus:mace/striker": ['mace']
"enchantplus:teluric_wave": ['mace'] "enchantplus:mace/teluric_wave": ['mace']
"enchantplus:wind_propulsion": ['mace'] "enchantplus:mace/wind_propulsion": ['mace']
"enchantplus:fury": ['armors'] "enchantplus:armor/fury": ['armors']
"enchantplus:lifeplus": ['armors'] "enchantplus:armor/lifeplus": ['armors']
"enchantplus:venom_protection": ['armors'] "enchantplus:armor/venom_protection": ['armors']
"enchantplus:agility": ['boots'] "enchantplus:boots/agility": ['boots']
"enchantplus:lava_walker": ['boots'] "enchantplus:boots/lava_walker": ['boots']
"enchantplus:step_assist": ['boots'] "enchantplus:boots/step_assist": ['boots']
"enchantplus:fear": ['swords'] "enchantplus:sword/fear": ['swords']
"enchantplus:pull": ['melee_weapons'] "enchantplus:sword/pull": ['melee_weapons']
"enchantplus:reach": ['swords'] "enchantplus:sword/reach": ['swords']
"enchantplus:critical": ['swords'] "enchantplus:sword/critical": ['swords']
"enchantplus:xp_boost": ['mining_and_damage'] "enchantplus:sword/xp_boost": ['mining_and_damage']
"enchantplus:last_hope": ['swords'] "enchantplus:sword/last_hope": ['swords']
"enchantplus:life_steal": ['melee_weapons'] "enchantplus:sword/life_steal": ['melee_weapons']
"enchantplus:death_touch": ['melee_weapons'] "enchantplus:sword/death_touch": ['melee_weapons']
"enchantplus:attack_speed": ['swords'] "enchantplus:sword/attack_speed": ['swords']
"enchantplus:poison_aspect": ['melee_weapons'] "enchantplus:sword/poison_aspect": ['melee_weapons']
"enchantplus:runic_despair": ['swords'] "enchantplus:sword/runic_despair": ['swords']
"enchantplus:dimensional_hit": ['swords'] "enchantplus:sword/dimensional_hit": ['swords']
"enchantplus:tears_of_asflors": ['swords'] "enchantplus:sword/tears_of_asflors": ['swords']
"enchantplus:auto_smelt": ['axes', 'pickaxes', 'shovels', 'hoes'] "enchantplus:tools/auto_smelt": ['axes', 'pickaxes', 'shovels', 'hoes']
"enchantplus:miningplus": ['axes', 'pickaxes', 'shovels', 'hoes'] "enchantplus:tools/miningplus": ['axes', 'pickaxes', 'shovels', 'hoes']
"enchantplus:armored": ['elytra'] "enchantplus:elytra/armored": ['elytra']
"enchantplus:kinetic_protection": ['elytra'] "enchantplus:elytra/kinetic_protection": ['elytra']
"enchantplus:voidless": ['helmets'] "enchantplus:helmet/voidless": ['helmets']
"enchantplus:auto_feed": ['helmets'] "enchantplus:helmet/auto_feed": ['helmets']
"enchantplus:bright_vision": ['helmets'] "enchantplus:helmet/bright_vision": ['helmets']
"enchantplus:velocity": ['mounted_armor'] "enchantplus:mounted/velocity": ['mounted_armor']
"enchantplus:steel_fang": ['wolf_armor'] "enchantplus:mounted/steel_fang": ['wolf_armor']
"enchantplus:cavalier_egis": ['mounted_armor'] "enchantplus:mounted/cavalier_egis": ['mounted_armor']
"enchantplus:ethereal_leap": ['mounted_armor'] "enchantplus:mounted/ethereal_leap": ['mounted_armor']
"enchantplus:vein_miner": ['pickaxes'] "enchantplus:pickaxe/vein_miner": ['pickaxes']
"enchantplus:spawner_touch": ['pickaxes'] "enchantplus:pickaxe/spawner_touch": ['pickaxes']
"enchantplus:bedrock_breaker": ['pickaxes'] "enchantplus:pickaxe/bedrock_breaker": ['pickaxes']
"enchantplus:gungnir_breath": ['trident'] "enchantplus:trident/gungnir_breath": ['trident']
"enchantplus:dwarfed": ['leggings'] "enchantplus:leggings/dwarfed": ['leggings']
"enchantplus:leaping": ['leggings'] "enchantplus:leggings/leaping": ['leggings']
"enchantplus:oversize": ['leggings'] "enchantplus:leggings/oversize": ['leggings']
"enchantplus:fast_swim": ['leggings'] "enchantplus:leggings/fast_swim": ['leggings']
"enchantplus:builder_arm": ['chestplate'] "enchantplus:chestplate/builder_arm": ['chestplate']
"enchantplus:curse_of_enchant": ['can_unbreak'] "enchantplus:durability/curse_of_enchant": ['can_unbreak']
"enchantplus:curse_of_breaking": ['can_unbreak'] "enchantplus:durability/curse_of_breaking": ['can_unbreak']
"enchantplus:midas_touch": ['stick'] "enchantplus:midas_touch": ['stick']