Combat Expanded 1.20.5 #996

TheThanathor · 2024-05-02T16:40:37Z

To-do list:

Additional patch notes:

removed compatibility with older versions - Devouring will no longer work
improved chances for better stats on gear
killing mobs now reduces regen cooldown down to 2.4 instead of 0.8 seconds

…hor/GM4_Datapacks into combat-expanded-1.20.5

misode · 2024-05-08T23:00:45Z

...d/data/gm4_combat_expanded/functions/armor/modifier/type/canine/wolf_remove_armor.mcfunction

+data modify storage gm4_combat_expanded:temp body_armor_item.data set from entity @s body_armor_item
+function gm4_combat_expanded:armor/modifier/type/canine/eval_dropped_armor with storage gm4_combat_expanded:temp body_armor_item


Instead of using a macro for this, you can summon the item and then use item replace entity <item> contents from entity @s body_armor_item

...t_expanded/functions/armor/modifier/type/sword_ring/damage_dealt/apply_durability.mcfunction

gm4_combat_expanded/data/gm4_combat_expanded/functions/item_modify_eval/chest_update.mcfunction

...combat_expanded/data/gm4_combat_expanded/loot_tables/armor/identification/modifier/vamp.json

...ombat_expanded/data/gm4_combat_expanded/loot_tables/armor/identification/modifier/totem.json

misode · 2024-05-15T16:24:17Z

I'll merge this so it can be tested with the rest of the 1.20.5 changes. Thanks!

* Apply overlays * Update version numbers and pack format for 1.20.5 * Update all tests to 1.20.5 * Temporarily disable player heads plugins * Fix location predicates * Fix nested loot tables * Fix set lore mode field * Fix block/fluid/item predicates * Fix attribute operations * Potion contents item sub predicates * Enchantment item sub predicates * Advancement icons * Sweeping edge rename * Update yellow shulker box loot table * Fix set_nbt loot functions * Fix component issues with last commit - set_custom_data function only accepts stringified snbt - profile properties were incorrectly upgraded - written_book_content component had a typo * Upgrade custom model data substitutions * Fix advancement icon components * More set_nbt fixes * Misc errors * Replace horse jump strength attribute with max_stack_size=1 * Remove lib player heads, update skin cache plugin * Fix item predicate NBT field to sub predicates * Count -> count * scute -> turtle_scute * Fix remaining issues in loot table, recipe, advancements ignoring copy_nbt * Fix attribute operations in commands * Update mecha * Update copy_nbt in better armour stands, boots of ostara, chairs, and crossbow cartridges * Update copy_nbt in arborenda and mountaineering * Metallurgy item validity + update commands * Update item nbt checks in a few places + sunken treasure * Update lib trades, DecorItem -> body_armor_item * Lib trees * A bunch of tag -> components * Fix machine block placing * More tag -> components fixes + re-add b suffix in set_custom_data * Update mecha * Update particle syntax * Display frames + lightning in a bottle * Update to java 21 and 1.20.5-pre1 * Fix int providers no long wrapped in value field * Fix remaining particle commands * Update yellow shulker box loot table * Some balloon animals updates * Update packtest to 1.20.5 * Fix some errors in the tests * Even more tag -> components fixes * Final tag -> components fixes (except combat expanded) * Temporarily disable guidebook copy_nbt functions * Fix some leftover item nbt * biome -> biomes, structure -> structures, potion * Fix some more tests - amplifier:0b is not stored - add skyaccess to some tests - replace ambient_entity_effect * Combat expanded tag -> components fixes * Replace CMD in item components * Fix particles in area effect clouds * Replace some item_used_on_block with default_block_use * Fix a few more tests * Fix auto crafting item tag predicates * Random fixes (enchantment checks, phantom scarecrows, animi) * Fix area effect cloud NBT * Fix custom GUI fonts * Update beet and support 1.20.6 * Remove non-modules from build artifact * Substitute profile data in mcfunction files * Update biome extensions to 1.20.5 * Remove debug commands in cozy campfires * Fix poses pack and bookshelf book title * Allow module aliases in beet dev * Fix boots of ostara crafting * Fix washing tanks not clearing dyed_color component * Keep boots custom name when crafting boots of ostara * Fix soul glass has_beam predicate * Fix block compressors * Fix Tunnel Bores item drops * Fix tinkering compressors *this one was Misodes fault* And since we're retiring this in 1.21, I didn't do any efficiency refactors * Remove redundant tc check Actually we can make it little better without major refactors yay * Fix bookshelf inspectors * Fix: Liquid Minecart breaking, glow ink signs, floating potion advancement * Lightning in a bottle 1.20.5 (#997) * Fix brewing LiaB * Fix lib brewing custom potion predicate --------- Co-authored-by: Misode <misoloo64@gmail.com> * Refactor supported versions and releases in beet.yaml * Disable trouble modules * Minor version bump for all modules * Fix Relocators loot function (#999) * Update Balloon Animals to 1.20.5 (#998) - remove extra animal custom data value - remove modifier since the loot table can now copy just the expected value - Leash to leash - loot table reference name key is now value - animal type is now lead item name * Fix crossbow cartridges tnt fuse * Fix typo in record crafting * Update beet to use latest vanilla assets - fix turtle helmet disassembler issue - fix issues in guidebook and crafting plugins * Various fixes (moneo, standard crafting, teleportation anchors, dangerous dungeons) - fix moneo netherrite update (blame Epyon) - fix bamboo mosaic stairs decrafting (blame Special) - fix unused teleportation anchors destroy (blame BPR) - fix dangerous dungeons snowy tag (blame kruthers) - fix moneo tools tag (blame Misode) * Book Binders: 1.20.5 update (#1000) * Fix * Fixes dupe by removing foot stored enchants - Prevents duplicate enchant&level page from being absorbed - Updated run from comment that misode pointed out * Update mecha to 0.94.2 * Combat Expanded 1.20.5 (#996) * move tag storage to components * update identification loot tables * update identification loot tables * remove use of item_modifiers * honestly don't remember half of what this is... but updates? * fix up boss fight and final few modifiers * misode's review * change armor toughness vanilla UUID * Update mecha * Disable zauber and guidebook in tests * Switch to the ubuntu-24.04 beta runner * Fix mountaineering crafting recipe * Revert debug logging * Store block compressor old components in a new field and merge old tag with custom data * Remove tnt landmines * Remove trapped signs --------- Co-authored-by: SpecialBuilder <specialbuilder32@gmail.com> Co-authored-by: Epyon <66185010+EpyonProjects@users.noreply.github.com> Co-authored-by: Thanathor <73304324+TheThanathor@users.noreply.github.com>

* Apply overlays * Update version numbers and pack format for 1.20.5 * Update all tests to 1.20.5 * Temporarily disable player heads plugins * Fix location predicates * Fix nested loot tables * Fix set lore mode field * Fix block/fluid/item predicates * Fix attribute operations * Potion contents item sub predicates * Enchantment item sub predicates * Advancement icons * Sweeping edge rename * Update yellow shulker box loot table * Fix set_nbt loot functions * Fix component issues with last commit - set_custom_data function only accepts stringified snbt - profile properties were incorrectly upgraded - written_book_content component had a typo * Upgrade custom model data substitutions * Fix advancement icon components * More set_nbt fixes * Misc errors * Replace horse jump strength attribute with max_stack_size=1 * Remove lib player heads, update skin cache plugin * Fix item predicate NBT field to sub predicates * Count -> count * scute -> turtle_scute * Fix remaining issues in loot table, recipe, advancements ignoring copy_nbt * Fix attribute operations in commands * Update mecha * Update copy_nbt in better armour stands, boots of ostara, chairs, and crossbow cartridges * Update copy_nbt in arborenda and mountaineering * Metallurgy item validity + update commands * Update item nbt checks in a few places + sunken treasure * Update lib trades, DecorItem -> body_armor_item * Lib trees * A bunch of tag -> components * Fix machine block placing * More tag -> components fixes + re-add b suffix in set_custom_data * Update mecha * Update particle syntax * Display frames + lightning in a bottle * Update to java 21 and 1.20.5-pre1 * Fix int providers no long wrapped in value field * Fix remaining particle commands * Update yellow shulker box loot table * Some balloon animals updates * Update packtest to 1.20.5 * Fix some errors in the tests * Even more tag -> components fixes * Final tag -> components fixes (except combat expanded) * Temporarily disable guidebook copy_nbt functions * Fix some leftover item nbt * biome -> biomes, structure -> structures, potion * Fix some more tests - amplifier:0b is not stored - add skyaccess to some tests - replace ambient_entity_effect * Combat expanded tag -> components fixes * Replace CMD in item components * Fix particles in area effect clouds * Replace some item_used_on_block with default_block_use * Fix a few more tests * Fix auto crafting item tag predicates * Random fixes (enchantment checks, phantom scarecrows, animi) * Fix area effect cloud NBT * Fix custom GUI fonts * Update beet and support 1.20.6 * Remove non-modules from build artifact * Substitute profile data in mcfunction files * Update biome extensions to 1.20.5 * Remove debug commands in cozy campfires * Fix poses pack and bookshelf book title * Allow module aliases in beet dev * Fix boots of ostara crafting * Fix washing tanks not clearing dyed_color component * Keep boots custom name when crafting boots of ostara * Fix soul glass has_beam predicate * Fix block compressors * Fix Tunnel Bores item drops * Fix tinkering compressors *this one was Misodes fault* And since we're retiring this in 1.21, I didn't do any efficiency refactors * Remove redundant tc check Actually we can make it little better without major refactors yay * Fix bookshelf inspectors * Fix: Liquid Minecart breaking, glow ink signs, floating potion advancement * Lightning in a bottle 1.20.5 (Gamemode4Dev#997) * Fix brewing LiaB * Fix lib brewing custom potion predicate --------- Co-authored-by: Misode <misoloo64@gmail.com> * Refactor supported versions and releases in beet.yaml * Disable trouble modules * Minor version bump for all modules * Fix Relocators loot function (Gamemode4Dev#999) * Update Balloon Animals to 1.20.5 (Gamemode4Dev#998) - remove extra animal custom data value - remove modifier since the loot table can now copy just the expected value - Leash to leash - loot table reference name key is now value - animal type is now lead item name * Fix crossbow cartridges tnt fuse * Fix typo in record crafting * Update beet to use latest vanilla assets - fix turtle helmet disassembler issue - fix issues in guidebook and crafting plugins * Various fixes (moneo, standard crafting, teleportation anchors, dangerous dungeons) - fix moneo netherrite update (blame Epyon) - fix bamboo mosaic stairs decrafting (blame Special) - fix unused teleportation anchors destroy (blame BPR) - fix dangerous dungeons snowy tag (blame kruthers) - fix moneo tools tag (blame Misode) * Book Binders: 1.20.5 update (Gamemode4Dev#1000) * Fix * Fixes dupe by removing foot stored enchants - Prevents duplicate enchant&level page from being absorbed - Updated run from comment that misode pointed out * Update mecha to 0.94.2 * Combat Expanded 1.20.5 (Gamemode4Dev#996) * move tag storage to components * update identification loot tables * update identification loot tables * remove use of item_modifiers * honestly don't remember half of what this is... but updates? * fix up boss fight and final few modifiers * misode's review * change armor toughness vanilla UUID * Update mecha * Disable zauber and guidebook in tests * Switch to the ubuntu-24.04 beta runner * Fix mountaineering crafting recipe * Revert debug logging * Store block compressor old components in a new field and merge old tag with custom data * Remove tnt landmines * Remove trapped signs --------- Co-authored-by: SpecialBuilder <specialbuilder32@gmail.com> Co-authored-by: Epyon <66185010+EpyonProjects@users.noreply.github.com> Co-authored-by: Thanathor <73304324+TheThanathor@users.noreply.github.com>

move tag storage to components

5f29896

TheThanathor marked this pull request as draft May 2, 2024 16:41

TheThanathor added 2 commits May 2, 2024 19:00

update identification loot tables

4eb7dd4

update identification loot tables

13d7d4f

misode force-pushed the combat-expanded-1.20.5 branch from 4eb7dd4 to 13d7d4f Compare May 2, 2024 18:09

TheThanathor added 3 commits May 2, 2024 20:17

Merge branch 'combat-expanded-1.20.5' of https://github.com/TheThanat…

ef653dc

…hor/GM4_Datapacks into combat-expanded-1.20.5

remove use of item_modifiers

8d8b434

honestly don't remember half of what this is... but updates?

3a02bfa

TheThanathor marked this pull request as ready for review May 8, 2024 09:15

fix up boss fight and final few modifiers

5e1c217

misode reviewed May 8, 2024

View reviewed changes

TheThanathor and others added 4 commits May 9, 2024 13:00

misode's review

fab4513

change armor toughness vanilla UUID

654b8f3

Update mecha

74338ff

Merge branch 'update-1.20.5'

1769eaf

misode merged commit b0736c9 into Gamemode4Dev:update-1.20.5 May 15, 2024
1 of 2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Combat Expanded 1.20.5 #996

Combat Expanded 1.20.5 #996

TheThanathor commented May 2, 2024 •

edited

Loading

misode May 8, 2024

misode commented May 15, 2024

		data modify storage gm4_combat_expanded:temp body_armor_item.data set from entity @s body_armor_item
		function gm4_combat_expanded:armor/modifier/type/canine/eval_dropped_armor with storage gm4_combat_expanded:temp body_armor_item

Combat Expanded 1.20.5 #996

Combat Expanded 1.20.5 #996

Conversation

TheThanathor commented May 2, 2024 • edited Loading

misode May 8, 2024

Choose a reason for hiding this comment

misode commented May 15, 2024

TheThanathor commented May 2, 2024 •

edited

Loading