replace replace with merge

PuckiSilver · PuckiSilver · commit feeba1751191 · 2023-06-18T13:48:04.000+02:00
diff --git a/data/tungsten/functions/init/chest.mcfunction b/data/tungsten/functions/init/chest.mcfunction
@@ -1,3 +1,3 @@
 execute if score .global tungsten.uid.chest matches -2..-1 run scoreboard players set .global tungsten.uid.chest 0
 execute store result score .new tungsten.uid.chest store result storage tungsten:player Item.tag.AttributeModifiers[{AttributeName:"minecraft:generic.luck",UUID:[I;12,42069,0,13]}].Amount double 0.000000000001 run scoreboard players add .global tungsten.uid.chest 1
-item modify entity @s armor.chest tungsten:replace_tags
+item modify entity @s armor.chest tungsten:merge_tags
diff --git a/data/tungsten/functions/init/feet.mcfunction b/data/tungsten/functions/init/feet.mcfunction
@@ -1,3 +1,3 @@
 execute if score .global tungsten.uid.feet matches -2..-1 run scoreboard players set .global tungsten.uid.feet 0
 execute store result score .new tungsten.uid.feet store result storage tungsten:player Item.tag.AttributeModifiers[{AttributeName:"minecraft:generic.luck",UUID:[I;12,42069,0,15]}].Amount double 0.000000000001 run scoreboard players add .global tungsten.uid.feet 1
-item modify entity @s armor.feet tungsten:replace_tags
+item modify entity @s armor.feet tungsten:merge_tags
diff --git a/data/tungsten/functions/init/head.mcfunction b/data/tungsten/functions/init/head.mcfunction
@@ -1,3 +1,3 @@
 execute if score .global tungsten.uid.head matches -2..-1 run scoreboard players set .global tungsten.uid.head 0
 execute store result score .new tungsten.uid.head store result storage tungsten:player Item.tag.AttributeModifiers[{AttributeName:"minecraft:generic.luck",UUID:[I;12,42069,0,12]}].Amount double 0.000000000001 run scoreboard players add .global tungsten.uid.head 1
-item modify entity @s armor.head tungsten:replace_tags
+item modify entity @s armor.head tungsten:merge_tags
diff --git a/data/tungsten/functions/init/legs.mcfunction b/data/tungsten/functions/init/legs.mcfunction
@@ -1,3 +1,3 @@
 execute if score .global tungsten.uid.legs matches -2..-1 run scoreboard players set .global tungsten.uid.legs 0
 execute store result score .new tungsten.uid.legs store result storage tungsten:player Item.tag.AttributeModifiers[{AttributeName:"minecraft:generic.luck",UUID:[I;12,42069,0,14]}].Amount double 0.000000000001 run scoreboard players add .global tungsten.uid.legs 1
-item modify entity @s armor.legs tungsten:replace_tags
+item modify entity @s armor.legs tungsten:merge_tags
diff --git a/data/tungsten/functions/init/mainhand.mcfunction b/data/tungsten/functions/init/mainhand.mcfunction
@@ -1,3 +1,3 @@
 execute if score .global tungsten.uid.mainhand matches -2..-1 run scoreboard players set .global tungsten.uid.mainhand 0
 execute store result score .new tungsten.uid.mainhand store result storage tungsten:player Item.tag.AttributeModifiers[{AttributeName:"minecraft:generic.luck",UUID:[I;12,42069,0,10]}].Amount double 0.000000000001 run scoreboard players add .global tungsten.uid.mainhand 1
-item modify entity @s weapon.mainhand tungsten:replace_tags
+item modify entity @s weapon.mainhand tungsten:merge_tags
diff --git a/data/tungsten/functions/init/offhand.mcfunction b/data/tungsten/functions/init/offhand.mcfunction
@@ -1,3 +1,3 @@
 execute if score .global tungsten.uid.offhand matches -2..-1 run scoreboard players set .global tungsten.uid.offhand 0
 execute store result score .new tungsten.uid.offhand store result storage tungsten:player Item.tag.AttributeModifiers[{AttributeName:"minecraft:generic.luck",UUID:[I;12,42069,0,11]}].Amount double 0.000000000001 run scoreboard players add .global tungsten.uid.offhand 1
-item modify entity @s weapon.offhand tungsten:replace_tags
+item modify entity @s weapon.offhand tungsten:merge_tags
diff --git a/data/tungsten/functions/swap/chest.mcfunction b/data/tungsten/functions/swap/chest.mcfunction
@@ -5,4 +5,4 @@ execute if score .new tungsten.uid.chest matches -1 run function tungsten:init/c
 scoreboard players operation @s tungsten.uid.chest = .new tungsten.uid.chest
 scoreboard players set .modified tungsten 0
 function #tungsten:swap/chest
-execute if score .modified tungsten matches 1 run item modify entity @s armor.chest tungsten:replace_tags
+execute if score .modified tungsten matches 1 run item modify entity @s armor.chest tungsten:merge_tags
diff --git a/data/tungsten/functions/swap/feet.mcfunction b/data/tungsten/functions/swap/feet.mcfunction
@@ -5,4 +5,4 @@ execute if score .new tungsten.uid.feet matches -1 run function tungsten:init/fe
 scoreboard players operation @s tungsten.uid.feet = .new tungsten.uid.feet
 scoreboard players set .modified tungsten 0
 function #tungsten:swap/feet
-execute if score .modified tungsten matches 1 run item modify entity @s armor.feet tungsten:replace_tags
+execute if score .modified tungsten matches 1 run item modify entity @s armor.feet tungsten:merge_tags
diff --git a/data/tungsten/functions/swap/head.mcfunction b/data/tungsten/functions/swap/head.mcfunction
@@ -5,4 +5,4 @@ execute if score .new tungsten.uid.head matches -1 run function tungsten:init/he
 scoreboard players operation @s tungsten.uid.head = .new tungsten.uid.head
 scoreboard players set .modified tungsten 0
 function #tungsten:swap/head
-execute if score .modified tungsten matches 1 run item modify entity @s armor.head tungsten:replace_tags
+execute if score .modified tungsten matches 1 run item modify entity @s armor.head tungsten:merge_tags
diff --git a/data/tungsten/functions/swap/legs.mcfunction b/data/tungsten/functions/swap/legs.mcfunction
@@ -5,4 +5,4 @@ execute if score .new tungsten.uid.legs matches -1 run function tungsten:init/le
 scoreboard players operation @s tungsten.uid.legs = .new tungsten.uid.legs
 scoreboard players set .modified tungsten 0
 function #tungsten:swap/legs
-execute if score .modified tungsten matches 1 run item modify entity @s armor.legs tungsten:replace_tags
+execute if score .modified tungsten matches 1 run item modify entity @s armor.legs tungsten:merge_tags
diff --git a/data/tungsten/functions/swap/mainhand.mcfunction b/data/tungsten/functions/swap/mainhand.mcfunction
@@ -5,4 +5,4 @@ execute if score .new tungsten.uid.mainhand matches -1 run function tungsten:ini
 scoreboard players operation @s tungsten.uid.mainhand = .new tungsten.uid.mainhand
 scoreboard players set .modified tungsten 0
 function #tungsten:swap/mainhand
-execute if score .modified tungsten matches 1 run item modify entity @s weapon.mainhand tungsten:replace_tags
+execute if score .modified tungsten matches 1 run item modify entity @s weapon.mainhand tungsten:merge_tags
diff --git a/data/tungsten/functions/swap/offhand.mcfunction b/data/tungsten/functions/swap/offhand.mcfunction
@@ -5,4 +5,4 @@ execute if score .new tungsten.uid.offhand matches -1 run function tungsten:init
 scoreboard players operation @s tungsten.uid.offhand = .new tungsten.uid.offhand
 scoreboard players set .modified tungsten 0
 function #tungsten:swap/offhand
-execute if score .modified tungsten matches 1 run item modify entity @s weapon.offhand tungsten:replace_tags
+execute if score .modified tungsten matches 1 run item modify entity @s weapon.offhand tungsten:merge_tags
diff --git a/data/tungsten/item_modifiers/merge_tags.json b/data/tungsten/item_modifiers/merge_tags.json
@@ -8,7 +8,7 @@
         {
             "source": "Item.tag",
             "target": "{}",
-            "op": "replace"
+            "op": "merge"
         }
     ]
 }
