Fix modules using Inventory for armor or offhand

misode · misode · commit 9bf3e40002f8 · 2025-05-05T21:23:20.000+02:00
diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/function/pose/paste.mcfunction b/gm4_better_armour_stands/data/gm4_better_armour_stands/function/pose/paste.mcfunction
@@ -5,7 +5,7 @@
 scoreboard players set $valid_code gm4_bas_data 1
 
 # copy item data to armor_stand
-data modify entity @s {} merge from entity @a[tag=gm4_bas_active,limit=1] Inventory[-1].components."minecraft:entity_data"
+data modify entity @s {} merge from entity @a[tag=gm4_bas_active,limit=1] equipment.offhand.components."minecraft:entity_data"
 
 # play a sound to confirm
 playsound minecraft:entity.armor_stand.fall block @a[distance=..6] ~ ~ ~ 0.5 1
diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/cables/shoot_arrow.mcfunction b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/cables/shoot_arrow.mcfunction
@@ -6,7 +6,7 @@
 tag @s add gm4_cb_use
 
 # store amount of string on the player, with max value of 40
-execute store result score @s gm4_cb_string run data get entity @s Inventory[-1].count
+execute store result score @s gm4_cb_string run data get entity @s equipment.offhand.count
 
 # check for tripwire hook on the player
 execute store success score @s gm4_cb_tw_hook run clear @s minecraft:tripwire_hook 0
diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/beehive.mcfunction b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/beehive.mcfunction
@@ -4,7 +4,7 @@
 # run from check_projectile
 
 tag @s add gm4_cb_use
-data modify storage gm4_crossbow_cartridges:temp bees set from entity @s Inventory[{Slot:-106b}].components."minecraft:bees"
+data modify storage gm4_crossbow_cartridges:temp bees set from entity @s equipment.offhand.components."minecraft:bees"
 data modify storage gm4_crossbow_cartridges:temp projectile set from storage gm4_crossbow_cartridges:temp bees[0].entity_data
 data remove storage gm4_crossbow_cartridges:temp bees[0]
 
diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/axolotl.mcfunction b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/axolotl.mcfunction
@@ -7,7 +7,7 @@
 summon minecraft:axolotl ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:regeneration',amplifier:10,duration:200,show_particles:0b}]}
 
 # TODO 1.20.5: changed to copy all bucket entity data, check if this causes problems
-data modify storage gm4_crossbow_cartridges:temp projectile merge from entity @s Inventory[{Slot:-106b}].components."minecraft:bucket_entity_data"
+data modify storage gm4_crossbow_cartridges:temp projectile merge from entity @s equipment.offhand.components."minecraft:bucket_entity_data"
 execute as @e[type=minecraft:axolotl,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 
 # axolotl sound
diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/cod.mcfunction b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/cod.mcfunction
@@ -6,7 +6,7 @@
 # replace arrow with cod and copy data
 summon minecraft:cod ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:regeneration',amplifier:10,duration:200,show_particles:0b}]}
 
-data modify storage gm4_crossbow_cartridges:temp projectile merge from entity @s Inventory[{Slot:-106b}].components."minecraft.bucket_entity_data"
+data modify storage gm4_crossbow_cartridges:temp projectile merge from entity @s equipment.offhand.components."minecraft.bucket_entity_data"
 execute as @e[type=minecraft:cod,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 
 # fish flop sound
diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/pufferfish.mcfunction b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/pufferfish.mcfunction
@@ -6,7 +6,7 @@
 # replace arrow with pufferfish and copy data
 summon minecraft:pufferfish ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:regeneration',amplifier:10,duration:200,show_particles:0b}]}
 
-data modify storage gm4_crossbow_cartridges:temp projectile merge from entity @s Inventory[{Slot:-106b}].components."minecraft.bucket_entity_data"
+data modify storage gm4_crossbow_cartridges:temp projectile merge from entity @s equipment.offhand.components."minecraft.bucket_entity_data"
 execute as @e[type=minecraft:pufferfish,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 
 # fish flop sound
diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/salmon.mcfunction b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/salmon.mcfunction
@@ -6,7 +6,7 @@
 # replace arrow with salmon and copy data
 summon minecraft:salmon ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:regeneration',amplifier:10,duration:200,show_particles:0b}]}
 
-data modify storage gm4_crossbow_cartridges:temp projectile merge from entity @s Inventory[{Slot:-106b}].components."minecraft.bucket_entity_data"
+data modify storage gm4_crossbow_cartridges:temp projectile merge from entity @s equipment.offhand.components."minecraft.bucket_entity_data"
 execute as @e[type=minecraft:salmon,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 
 # fish flop sound
diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/tadpole.mcfunction b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/tadpole.mcfunction
@@ -6,7 +6,7 @@
 # replace arrow with tadpole and copy data
 summon minecraft:tadpole ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:regeneration',amplifier:10,duration:200,show_particles:0b}]}
 
-data modify storage gm4_crossbow_cartridges:temp projectile merge from entity @s Inventory[{Slot:-106b}].components."minecraft.bucket_entity_data"
+data modify storage gm4_crossbow_cartridges:temp projectile merge from entity @s equipment.offhand.components."minecraft.bucket_entity_data"
 execute as @e[type=minecraft:tadpole,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 
 # fish flop sound
diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/tropical.mcfunction b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/tropical.mcfunction
@@ -6,7 +6,7 @@
 # replace arrow with tropical fish and copy data
 summon minecraft:tropical_fish ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:regeneration',amplifier:10,duration:200,show_particles:0b}]}
 
-data modify storage gm4_crossbow_cartridges:temp projectile merge from entity @s Inventory[{Slot:-106b}].components."minecraft.bucket_entity_data"
+data modify storage gm4_crossbow_cartridges:temp projectile merge from entity @s equipment.offhand.components."minecraft.bucket_entity_data"
 execute as @e[type=minecraft:tropical_fish,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 
 # fish flop sound
diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/potions.mcfunction b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/potions.mcfunction
@@ -4,7 +4,7 @@
 # run from check_projectile
 
 tag @s add gm4_cb_use
-data modify storage gm4_crossbow_cartridges:temp projectile.Item.components set from entity @s Inventory[{Slot:-106b}].components
+data modify storage gm4_crossbow_cartridges:temp projectile.Item.components set from entity @s equipment.offhand.components
 data modify storage gm4_crossbow_cartridges:temp projectile.Owner set from entity @s UUID
 
 # replace arrow with splash/lingering potion and copy data
diff --git a/gm4_end_fishing/data/gm4_end_fishing/function/cast_rod/store_data.mcfunction b/gm4_end_fishing/data/gm4_end_fishing/function/cast_rod/store_data.mcfunction
@@ -5,7 +5,7 @@
 tag @p[scores={gm4_cast_rod=1..},distance=..2] add gm4_ef_cast_rod
 
 # store lure value
-execute unless entity @a[tag=gm4_ef_cast_rod,predicate=gm4_end_fishing:holding_fishing_rod,limit=1] store result score @s gm4_ef_lure run data get entity @a[tag=gm4_ef_cast_rod,limit=1] Inventory[{Slot:-106b}].components."minecraft:enchantments"."minecraft:lure"
+execute unless entity @a[tag=gm4_ef_cast_rod,predicate=gm4_end_fishing:holding_fishing_rod,limit=1] store result score @s gm4_ef_lure run data get entity @a[tag=gm4_ef_cast_rod,limit=1] equipment.offhand.components."minecraft:enchantments"."minecraft:lure"
 execute if entity @a[tag=gm4_ef_cast_rod,predicate=gm4_end_fishing:holding_fishing_rod,limit=1] store result score @s gm4_ef_lure run data get entity @a[tag=gm4_ef_cast_rod,limit=1] SelectedItem.components."minecraft:enchantments"."minecraft:lure"
 
 # bobber id
diff --git a/gm4_end_fishing/data/gm4_end_fishing/function/durability/prep_offhand.mcfunction b/gm4_end_fishing/data/gm4_end_fishing/function/durability/prep_offhand.mcfunction
@@ -1,6 +1,6 @@
 # @s = player who reeled in the armor stand w/ fishing rod in offhand
 # run from reel_in/reel_rod and reel_in/reel_loot
 
-execute store result score @s gm4_ef_data run data get entity @s Inventory[{Slot:-106b}].components."minecraft:damage"
+execute store result score @s gm4_ef_data run data get entity @s equipment.offhand.components."minecraft:damage"
 tag @s add gm4_ef_durability_off
 schedule function gm4_end_fishing:durability/check 1t
diff --git a/gm4_end_fishing/data/gm4_end_fishing/function/durability/set_offhand.mcfunction b/gm4_end_fishing/data/gm4_end_fishing/function/durability/set_offhand.mcfunction
@@ -1,7 +1,7 @@
 # @s = player who reeled in the armor stand w/ fishing rod in offhand
 # run from durability/check
 
-execute store result score $unbreaking_lvl gm4_ef_data run data get entity @s Inventory[{Slot:-106b}].components."minecraft:enchantments"."minecraft:unbreaking"
+execute store result score $unbreaking_lvl gm4_ef_data run data get entity @s equipment.offhand.components."minecraft:enchantments"."minecraft:unbreaking"
 function gm4_end_fishing:durability/calc_damage
 item modify entity @s[gamemode=!creative] weapon.offhand gm4_end_fishing:prepare_rod
 item modify entity @s[gamemode=!creative] weapon.offhand gm4_end_fishing:apply_damage
diff --git a/gm4_end_fishing/data/gm4_end_fishing/function/reel_in/reel_loot.mcfunction b/gm4_end_fishing/data/gm4_end_fishing/function/reel_in/reel_loot.mcfunction
@@ -5,8 +5,8 @@ advancement revoke @s only gm4_end_fishing:reel_loot
 advancement grant @s only gm4:end_fishing
 tag @s add gm4_ef_reel_loot
 tag @s add gm4_ef_looted
-execute if entity @s[nbt={SelectedItem:{id:"minecraft:fishing_rod"}}] run function gm4_end_fishing:durability/prep_mainhand
-execute unless entity @s[nbt={SelectedItem:{id:"minecraft:fishing_rod"}}] if entity @s[nbt={Inventory:[{Slot:-106b,id:"minecraft:fishing_rod"}]}] run function gm4_end_fishing:durability/prep_offhand
+execute if items entity @s weapon.mainhand minecraft:fishing_rod run function gm4_end_fishing:durability/prep_mainhand
+execute unless items entity @s weapon.mainhand minecraft:fishing_rod if items entity @s weapon.offhand minecraft:fishing_rod run function gm4_end_fishing:durability/prep_offhand
 
 scoreboard players operation $current gm4_ef_id = @s gm4_ef_id
 execute as @e[type=armor_stand,tag=gm4_ef_has_fish] if score @s gm4_ef_id = $current gm4_ef_id run tag @s add gm4_ef_reeled_in
diff --git a/gm4_end_fishing/data/gm4_end_fishing/function/reel_in/reel_rod.mcfunction b/gm4_end_fishing/data/gm4_end_fishing/function/reel_in/reel_rod.mcfunction
@@ -2,5 +2,5 @@
 # run from advancement "reel_rod"
 
 advancement revoke @s only gm4_end_fishing:reel_rod
-execute if entity @s[gamemode=!creative,nbt={SelectedItem:{id:"minecraft:fishing_rod"}}] run function gm4_end_fishing:durability/prep_mainhand
-execute unless entity @s[nbt={SelectedItem:{id:"minecraft:fishing_rod"}}] if entity @s[gamemode=!creative,nbt={Inventory:[{Slot:-106b,id:"minecraft:fishing_rod"}]}] run function gm4_end_fishing:durability/prep_offhand
+execute if entity @s[gamemode=!creative] if items entity @s weapon.mainhand minecraft:fishing_rod run function gm4_end_fishing:durability/prep_mainhand
+execute if entity @s[gamemode=!creative] unless items entity @s weapon.mainhand minecraft:fishing_rod if items entity @s weapon.offhand minecraft:fishing_rod run function gm4_end_fishing:durability/prep_offhand
diff --git a/gm4_guidebook/data/gm4_guidebook/function/hand/update.mcfunction b/gm4_guidebook/data/gm4_guidebook/function/hand/update.mcfunction
@@ -6,7 +6,7 @@
 # save item count
 scoreboard players set $count gm4_guide 0
 execute store result score $count gm4_guide run data get entity @s[predicate=gm4_guidebook:book_in_mainhand] SelectedItem.count
-execute if score $count gm4_guide matches 0 store result score $count gm4_guide run data get entity @s[predicate=gm4_guidebook:book_in_offhand] Inventory[{Slot:-106b}].count
+execute if score $count gm4_guide matches 0 store result score $count gm4_guide run data get entity @s[predicate=gm4_guidebook:book_in_offhand] equipment.offhand.count
 
 # replace book
 ## short-circuit if it's the table of contents
diff --git a/gm4_guidebook/data/gm4_guidebook/function/lecterns/restore/search.mcfunction b/gm4_guidebook/data/gm4_guidebook/function/lecterns/restore/search.mcfunction
@@ -6,6 +6,7 @@
 
 advancement revoke @s only gm4_guidebook:take_lectern_book
 
+# TODO 1.21.5: this might not work for the offhand
 # get item data
 scoreboard players set $slot gm4_guide -1
 data modify storage gm4_guidebook:temp Inventory set from entity @s Inventory
diff --git a/gm4_metallurgy/data/gm4_moneo_shamir/function/active_armor_chest.mcfunction b/gm4_metallurgy/data/gm4_moneo_shamir/function/active_armor_chest.mcfunction
@@ -4,7 +4,7 @@
 scoreboard players set $tool_current_damage gm4_ml_data 0
 scoreboard players set $tool_max_damage gm4_ml_data 0
 
-execute store result score $tool_current_damage gm4_ml_data run data get entity @s Inventory[{Slot:102b}].components."minecraft:damage"
-execute store result score $tool_max_damage gm4_ml_data run data get entity @s Inventory[{Slot:102b}].components."minecraft:custom_data".MaxDurability
+execute store result score $tool_current_damage gm4_ml_data run data get entity @s equipment.chest.components."minecraft:damage"
+execute store result score $tool_max_damage gm4_ml_data run data get entity @s equipment.chest.components."minecraft:custom_data".MaxDurability
 
 execute if score $tool_max_damage gm4_ml_data matches 432 run function gm4_moneo_shamir:armor/elytra
