From a8ac725ce14ff4d9f6276db13a075e454b9609c1 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Fri, 4 Jul 2025 13:04:25 +0200 Subject: [PATCH] first attempt for compatibility --- .../dependency/datapack/DataPackDependency.kt | 5 ++ .../enchantplus/enchant_conflicts.yml | 41 ++++++++++++++ .../datapack/enchantplus/item_conflict.yml | 55 +++++++++++++++++++ .../datapack/enchantplus/item_groups.yml | 26 +++++++++ 4 files changed, 127 insertions(+) create mode 100644 src/main/resources/datapack/enchantplus/enchant_conflicts.yml create mode 100644 src/main/resources/datapack/enchantplus/item_conflict.yml create mode 100644 src/main/resources/datapack/enchantplus/item_groups.yml diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackDependency.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackDependency.kt index 59b5649..a70f556 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackDependency.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackDependency.kt @@ -47,6 +47,11 @@ object DataPackDependency { continue } + if (packName.contains("neoenchant", ignoreCase = true)) { + handlePack("enchantplus") + continue + } + } } diff --git a/src/main/resources/datapack/enchantplus/enchant_conflicts.yml b/src/main/resources/datapack/enchantplus/enchant_conflicts.yml new file mode 100644 index 0000000..a57c73a --- /dev/null +++ b/src/main/resources/datapack/enchantplus/enchant_conflicts.yml @@ -0,0 +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'] +"minecraft:mending": ['#enchantplus_durability', '#enchantplus_experience'] +"minecraft:unbreaking": ['#enchantplus_durability'] +"minecraft:channeling": ['#enchantplus_trident'] +"minecraft:fire_aspect": ['#enchantplus_aspect'] +"minecraft:wind_burst": ['#enchantplus_mace'] diff --git a/src/main/resources/datapack/enchantplus/item_conflict.yml b/src/main/resources/datapack/enchantplus/item_conflict.yml new file mode 100644 index 0000000..1c32e9f --- /dev/null +++ b/src/main/resources/datapack/enchantplus/item_conflict.yml @@ -0,0 +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:midas_touch": ['stick'] diff --git a/src/main/resources/datapack/enchantplus/item_groups.yml b/src/main/resources/datapack/enchantplus/item_groups.yml new file mode 100644 index 0000000..f0381fa --- /dev/null +++ b/src/main/resources/datapack/enchantplus/item_groups.yml @@ -0,0 +1,26 @@ +mining_and_damage: + groups: + - melee_weapons + - mace + - bow + - crossbow + - mace + - trident + - tools + +stick: + items: + - stick + +wolf_armor: + items: + - wolf_armor + +mounted_armor: + items: + - diamond_horse_armor + - golden_horse_armor + - iron_horse_armor + - leather_horse_armor + groups: + - wolf_armor