From a2c003766626bbb05ebf95b7996a9cdaed9b6404 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Tue, 8 Jul 2025 21:41:05 +0200 Subject: [PATCH 1/3] add support for dungeon and taverns datapack --- .../dependency/datapack/DataPackDependency.kt | 8 ++- .../enchant_conflicts.yml | 21 ++++++++ .../dungeons_and_taverns/item_conflict.yml | 18 +++++++ .../dungeons_and_taverns/item_groups.yml | 51 +++++++++++++++++++ 4 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/datapack/dungeons_and_taverns/enchant_conflicts.yml create mode 100644 src/main/resources/datapack/dungeons_and_taverns/item_conflict.yml create mode 100644 src/main/resources/datapack/dungeons_and_taverns/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 1474d80..f397200 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,8 @@ object DataPackDependency { */ private val LASTEST_VERSION = mapOf( Pair("bracken", Version(1, 11, 0)), - Pair("enchantplus", Version(1, 13, 0)) + Pair("enchantplus", Version(1, 13, 0)), + Pair("dungeons_and_taverns", Version(1, 13, 0)) ) val enabledDatapacks: List @@ -53,6 +54,11 @@ object DataPackDependency { continue } + if (packName.contains("Dungeons and Taverns", ignoreCase = true)) { + handlePack("dungeons_and_taverns") + continue + } + } } diff --git a/src/main/resources/datapack/dungeons_and_taverns/enchant_conflicts.yml b/src/main/resources/datapack/dungeons_and_taverns/enchant_conflicts.yml new file mode 100644 index 0000000..5ebd042 --- /dev/null +++ b/src/main/resources/datapack/dungeons_and_taverns/enchant_conflicts.yml @@ -0,0 +1,21 @@ +"nova_structures:power": ['#dungeon_at_might', '#dungeon_at_powah'] +"nova_structures:ghasted": ['#crossbow_conflict'] +"nova_structures:gravity": ['#crossbow_conflict'] +"nova_structures:antidote": ['#protection_enchant_conflict'] +"nova_structures:piercing": ['#dungeon_at_structure_bow'] +"nova_structures:traveler": ['#dungeon_at_boots'] +"nova_structures:multishot": ['#dungeon_at_structure_bow'] +"nova_structures:wax_wings": ['#dungeon_at_elytra'] +"nova_structures:aerials_bane": ['#dungeon_at_powah', '#sword_enchant_conflict'] +"nova_structures:shulker_boss": ['minecraft:unbreaking'] +"nova_structures:illagers_bane": ['#sword_enchant_conflict'] +"nova_structures:wither_coated": ['#dungeon_at_sword_effect'] +"nova_structures:boss_behaviour": ['minecraft:unbreaking'] +"nova_structures:photosynthesis": ['#dungeon_at_repair'] +"nova_structures:shulker_miniboss": ['minecraft:unbreaking'] +"minecraft:soul_speed": ['#dungeon_at_boots'] +"minecraft:mending": ['#dungeon_at_repair'] +"minecraft:power": ['#dungeon_at_powah'] +"minecraft:unbreaking": ['#dungeon_at_elytra'] +"minecraft:infinity": ['#dungeon_at_structure_bow'] +"minecraft:fire_aspect": ['#dungeon_at_sword_effect'] diff --git a/src/main/resources/datapack/dungeons_and_taverns/item_conflict.yml b/src/main/resources/datapack/dungeons_and_taverns/item_conflict.yml new file mode 100644 index 0000000..d98c5dd --- /dev/null +++ b/src/main/resources/datapack/dungeons_and_taverns/item_conflict.yml @@ -0,0 +1,18 @@ +"nova_structures:power": ['crossbow'] +"nova_structures:ghasted": ['crossbow'] +"nova_structures:gravity": ['crossbow'] +"nova_structures:antidote": ['chestplate'] +"nova_structures:outreach": ['chestplate'] +"nova_structures:piercing": ['bow'] +"nova_structures:spiteful": ['melee_weapons'] +"nova_structures:traveler": ['boots'] +"nova_structures:multishot": ['bow'] +"nova_structures:wax_wings": ['elytra'] +"nova_structures:aerials_bane": ['combat_tools'] +"nova_structures:shulker_boss": ['stick'] +"nova_structures:illagers_bane": ['melee_weapons'] +"nova_structures:wither_coated": ['mace', 'melee_weapons'] +"nova_structures:boss_behaviour": ['stick', 'flint'] +"nova_structures:photosynthesis": ['can_unbreak'] +"nova_structures:shulker_miniboss": ['stick'] +"nova_structures:conductivity_curse": ['metal'] diff --git a/src/main/resources/datapack/dungeons_and_taverns/item_groups.yml b/src/main/resources/datapack/dungeons_and_taverns/item_groups.yml new file mode 100644 index 0000000..db3580e --- /dev/null +++ b/src/main/resources/datapack/dungeons_and_taverns/item_groups.yml @@ -0,0 +1,51 @@ +metal: + type: include + items: + - shield + - trident + - flint_and_steel + - shears + - brush + - mace + - chainmail_chestplate + - golden_chestplate + - iron_chestplate + - netherite_chestplate + - chainmail_boots + - golden_boots + - iron_boots + - netherite_boots + - chainmail_leggings + - golden_leggings + - iron_leggings + - netherite_leggings + - chainmail_helmet + - golden_helmet + - iron_helmet + - netherite_helmet + - golden_pickaxe + - iron_pickaxe + - netherite_pickaxe + - golden_axe + - iron_axe + - netherite_axe + - golden_shovel + - iron_shovel + - netherite_shovel + - golden_sword + - iron_sword + - netherite_sword + - golden_hoe + - iron_hoe + - netherite_hoe + - trial_key + - ominous_trial_key + +combat_tools: + type: include + groups: + - melee_weapons + - bow + - crossbow + - trident + - mace \ No newline at end of file From 52c5773118d1fb9fa8b0aba64c7fe4a7493ed9d7 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Tue, 8 Jul 2025 22:00:32 +0200 Subject: [PATCH 2/3] forgot flint group --- .../datapack/dungeons_and_taverns/item_groups.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/resources/datapack/dungeons_and_taverns/item_groups.yml b/src/main/resources/datapack/dungeons_and_taverns/item_groups.yml index db3580e..45fc3b7 100644 --- a/src/main/resources/datapack/dungeons_and_taverns/item_groups.yml +++ b/src/main/resources/datapack/dungeons_and_taverns/item_groups.yml @@ -48,4 +48,9 @@ combat_tools: - bow - crossbow - trident - - mace \ No newline at end of file + - mace + +flint: + type: include + items: + - flint \ No newline at end of file From c7787676ac0c3ea83ea37b99bed72180ec1fe4f1 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Tue, 8 Jul 2025 22:58:32 +0200 Subject: [PATCH 3/3] fix enchant conflict file having the wrong name --- .../{enchant_conflicts.yml => enchant_conflict.yml} | 0 .../enchantplus/{enchant_conflicts.yml => enchant_conflict.yml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/datapack/dungeons_and_taverns/{enchant_conflicts.yml => enchant_conflict.yml} (100%) rename src/main/resources/datapack/enchantplus/{enchant_conflicts.yml => enchant_conflict.yml} (100%) diff --git a/src/main/resources/datapack/dungeons_and_taverns/enchant_conflicts.yml b/src/main/resources/datapack/dungeons_and_taverns/enchant_conflict.yml similarity index 100% rename from src/main/resources/datapack/dungeons_and_taverns/enchant_conflicts.yml rename to src/main/resources/datapack/dungeons_and_taverns/enchant_conflict.yml diff --git a/src/main/resources/datapack/enchantplus/enchant_conflicts.yml b/src/main/resources/datapack/enchantplus/enchant_conflict.yml similarity index 100% rename from src/main/resources/datapack/enchantplus/enchant_conflicts.yml rename to src/main/resources/datapack/enchantplus/enchant_conflict.yml