From a8ac725ce14ff4d9f6276db13a075e454b9609c1 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Fri, 4 Jul 2025 13:04:25 +0200 Subject: [PATCH 1/5] 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 From bd17d5534639bd8636abc5a5ab6285a20ed48c2f Mon Sep 17 00:00:00 2001 From: alexcrea Date: Fri, 4 Jul 2025 13:38:22 +0200 Subject: [PATCH 2/5] small utility I forgot --- .../cuanvil/dependency/datapack/DataPackTester.kt | 8 ++++++++ .../cuanvil/dependency/datapack/DataPackDependency.kt | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nms/v1_20R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackTester.kt b/nms/v1_20R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackTester.kt index 831ba58..9003fdf 100644 --- a/nms/v1_20R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackTester.kt +++ b/nms/v1_20R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackTester.kt @@ -2,6 +2,7 @@ package xyz.alexcrea.cuanvil.dependency.datapack import io.papermc.paper.datapack.Datapack import org.bukkit.Bukkit +import org.bukkit.packs.DataPack import java.util.* object DataPackTester { @@ -21,6 +22,13 @@ object DataPackTester { .stream().map { obj: Datapack -> obj.name } .toList() } catch (e: NoSuchMethodException) { + try { + DataPack::class.java.getDeclaredMethod("getKey") + } catch (e: NoSuchMethodException) { + System.err.println("Could not find compatible datapack manager") + System.err.println("If you are using a datapack that should be compatible with CustomAnvil. It will not get detected...") + return emptyList() + } return legacyNames } catch (e: Exception){ // Assume cause UnimplementedOperationException on mock server 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 a70f556..cea768e 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackDependency.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackDependency.kt @@ -23,7 +23,8 @@ object DataPackDependency { * Map of the latest CustomAnvil update related to the pack */ private val LASTEST_VERSION = mapOf( - Pair("bracken", Version(1, 11, 0)) + Pair("bracken", Version(1, 11, 0)), + Pair("neoenchant", Version(1, 13, 0)) ) val enabledDatapacks: List From af2d2c45b639f1ac5ee3fab9217be2c033b10945 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Fri, 4 Jul 2025 13:44:47 +0200 Subject: [PATCH 3/5] small fix --- .../cuanvil/dependency/datapack/DataPackDependency.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 cea768e..1474d80 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackDependency.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackDependency.kt @@ -24,7 +24,7 @@ object DataPackDependency { */ private val LASTEST_VERSION = mapOf( Pair("bracken", Version(1, 11, 0)), - Pair("neoenchant", Version(1, 13, 0)) + Pair("enchantplus", Version(1, 13, 0)) ) val enabledDatapacks: List @@ -66,9 +66,12 @@ object DataPackDependency { private fun handlePackInitialConfig(pack: String) { val defConfig = ConfigHolder.DEFAULT_CONFIG val version = LASTEST_VERSION[pack] + if(version == null) { + throw RuntimeException("The pack $pack has no latest version hard coded in the plugin") + } val currentVersion = Version.fromString(defConfig.config.getString("datapack.$pack")) - if (currentVersion.greaterEqual(version!!)) { + if (currentVersion.greaterEqual(version)) { handleEnchantAllConflict(pack) return } From 1076e60bf1f90f9f261fa99dd69896cbc8fa692b Mon Sep 17 00:00:00 2001 From: alexcrea Date: Fri, 4 Jul 2025 14:07:46 +0200 Subject: [PATCH 4/5] 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'] From 3bb109c31be098073c0a91870bc670a456c6d378 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Fri, 4 Jul 2025 14:32:18 +0200 Subject: [PATCH 5/5] forgot elytra group --- src/main/resources/datapack/enchantplus/item_groups.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/datapack/enchantplus/item_groups.yml b/src/main/resources/datapack/enchantplus/item_groups.yml index f0381fa..74854de 100644 --- a/src/main/resources/datapack/enchantplus/item_groups.yml +++ b/src/main/resources/datapack/enchantplus/item_groups.yml @@ -24,3 +24,7 @@ mounted_armor: - leather_horse_armor groups: - wolf_armor + +elytra: + items: + - elytra \ No newline at end of file