Effect renames and ID changes

Gamemode4Dev · Oct 18, 2023 · d011014 · d011014
1 parent ace7e8b
commit d011014
Show file tree

Hide file tree

Showing 100 changed files with 173 additions and 173 deletions.
diff --git a/gm4_chairs/overlay_18/data/gm4_chairs/functions/create_chair.mcfunction b/gm4_chairs/overlay_18/data/gm4_chairs/functions/create_chair.mcfunction
@@ -4,7 +4,7 @@
 # run from main
 
 # spawn chair
-summon minecraft:pig ~ ~-10000.39 ~ {CustomName:'"gm4_chair"',Tags:["gm4_chairs","smithed.entity","smithed.strict","smithed.block"],Team:"gm4_chairs",NoAI:1b,Saddle:1b,NoGravity:1b,Silent:1b,DeathTime:19s,InLove:2147483647,Attributes:[{Name:"generic.max_health",Base:1.0},{Name:"generic.movement_speed",Base:0.0}],ActiveEffects:[{Id:14,Amplifier:0,Duration:2147483647,ShowParticles:0b},{Id:11,Amplifier:10b,Duration:2147483647,ShowParticles:0b}],DeathLootTable:"minecraft:empty"}
+summon minecraft:pig ~ ~-10000.39 ~ {CustomName:'"gm4_chair"',Tags:["gm4_chairs","smithed.entity","smithed.strict","smithed.block"],Team:"gm4_chairs",NoAI:1b,Saddle:1b,NoGravity:1b,Silent:1b,DeathTime:19s,InLove:2147483647,Attributes:[{Name:"generic.max_health",Base:1.0},{Name:"generic.movement_speed",Base:0.0}],active_effects:[{id:'minecraft:invisibility',amplifier:0,duration:2147483647,show_particles:0b},{id:'minecraft:resistance',amplifier:10b,duration:2147483647,show_particles:0b}],DeathLootTable:"minecraft:empty"}
 
 # set chair to orientation of stairs
 execute if block ~ ~ ~ #minecraft:stairs[facing=north] positioned ~ ~-10000 ~ as @e[type=minecraft:pig,tag=gm4_chairs,distance=..0.4,limit=1] at @s run tp @s ~ ~10000 ~.05 0 0

diff --git a/gm4_chairs/overlay_18/data/gm4_chairs/functions/lightning/revive_chair.mcfunction b/gm4_chairs/overlay_18/data/gm4_chairs/functions/lightning/revive_chair.mcfunction
@@ -4,7 +4,7 @@
 # runs from lightning/delay
 
 # spawn chair
-summon minecraft:pig ~ ~-10000 ~ {Tags:["gm4_chairs","smithed.entity","smithed.strict","smithed.block"],Team:"gm4_chairs",NoAI:1b,Saddle:1b,NoGravity:1b,Silent:1b,DeathTime:19s,InLove:2147483647,Attributes:[{Name:"generic.movement_speed",Base:0.0}],ActiveEffects:[{Id:14,Amplifier:0,Duration:2147483647,ShowParticles:0b},{Id:11,Amplifier:10b,Duration:2147483647,ShowParticles:0b}],DeathLootTable:"minecraft:empty"}
+summon minecraft:pig ~ ~-10000 ~ {Tags:["gm4_chairs","smithed.entity","smithed.strict","smithed.block"],Team:"gm4_chairs",NoAI:1b,Saddle:1b,NoGravity:1b,Silent:1b,DeathTime:19s,InLove:2147483647,Attributes:[{Name:"generic.movement_speed",Base:0.0}],active_effects:[{id:'minecraft:invisibility',amplifier:0,duration:2147483647,show_particles:0b},{id:'minecraft:resistance',amplifier:10b,duration:2147483647,show_particles:0b}],DeathLootTable:"minecraft:empty"}
 execute positioned ~ ~-10000 ~ run scoreboard players set @e[type=pig,tag=gm4_chairs,limit=1,distance=..0.1] gm4_entity_version 1
 
 # copy zombified piglin rotation

diff --git a/...18/data/gm4_combat_expanded/functions/armor/modifier/type/canine/wolf_initiate.mcfunction b/...18/data/gm4_combat_expanded/functions/armor/modifier/type/canine/wolf_initiate.mcfunction
@@ -3,7 +3,7 @@
 # at unspecified
 # run from armor/type/canine/wolf_spawn
 
-data merge entity @s {CollarColor:15b,Tags:["gm4_ce_wolf"],ActiveEffects:[{Id:11,Amplifier:9b,Duration:-1,ShowParticles:0b}],Attributes:[{Name:"generic.attack_damage",Base:4}]}
+data merge entity @s {CollarColor:15b,Tags:["gm4_ce_wolf"],active_effects:[{id:'minecraft:resistance',amplifier:9b,duration:-1,show_particles:0b}],Attributes:[{Name:"generic.attack_damage",Base:4}]}
 
 scoreboard players operation @s gm4_ce_id = $curr_id gm4_ce_id
 scoreboard players operation @s gm4_ce_data = $slot gm4_ce_data

diff --git a/...panded/overlay_18/data/gm4_combat_expanded/functions/weapon/modifier/glow/glow.mcfunction b/...panded/overlay_18/data/gm4_combat_expanded/functions/weapon/modifier/glow/glow.mcfunction
@@ -4,4 +4,4 @@
 # run from weapon/modifier/glow/activate
 
 # if not hit with glow yet activate first strike
-execute unless data entity @s ActiveEffects[{Id:24}] run function gm4_combat_expanded:weapon/modifier/glow/first_strike
+execute unless data entity @s ActiveEffects[{id:'minecraft:glowing'}] run function gm4_combat_expanded:weapon/modifier/glow/first_strike
diff --git a/...anded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/skeleton_toxic.json b/...anded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/skeleton_toxic.json
@@ -9,7 +9,7 @@
           "functions": [
             {
               "function": "minecraft:set_nbt",
-              "tag": "{CustomPotionEffects:[{Id:18,Amplifier:0b,Duration:100},{Id:17,Amplifier:1b,Duration:100},{Id:19,Amplifier:0b,Duration:100}],CustomPotionColor:5149489,HideFlags:32}"
+              "tag": "{custom_potion_effects:[{id:'minecraft:weakness',amplifier:0b,duration:100},{id:'minecraft:hunger',amplifier:1b,duration:100},{id:'minecraft:poison',amplifier:0b,duration:100}],CustomPotionColor:5149489,HideFlags:32}"
             },
             {
               "function": "minecraft:set_lore",

diff --git a/...panded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/stray_harming.json b/...panded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/stray_harming.json
@@ -9,7 +9,7 @@
           "functions": [
             {
               "function": "minecraft:set_nbt",
-              "tag": "{CustomPotionEffects:[{Id:2,Amplifier:0b,Duration:600}],Potion:\"minecraft:harming\",HideFlags:32,CustomPotionColor:4393481}"
+              "tag": "{custom_potion_effects:[{id:'minecraft:slowness',amplifier:0b,duration:600}],Potion:\"minecraft:harming\",HideFlags:32,CustomPotionColor:4393481}"
             },
             {
               "function": "minecraft:set_lore",

diff --git a/...expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/stray_snowy.json b/...expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/stray_snowy.json
@@ -9,7 +9,7 @@
           "functions": [
             {
               "function": "minecraft:set_nbt",
-              "tag": "{CustomPotionEffects:[{Id:2,Amplifier:2b,Duration:600}],CustomPotionColor:5926017,HideFlags:32}"
+              "tag": "{custom_potion_effects:[{id:'minecraft:slowness',amplifier:2b,duration:600}],CustomPotionColor:5926017,HideFlags:32}"
             },
             {
               "function": "minecraft:set_lore",

diff --git a/...expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/stray_toxic.json b/...expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/stray_toxic.json
@@ -9,7 +9,7 @@
           "functions": [
             {
               "function": "minecraft:set_nbt",
-              "tag": "{CustomPotionEffects:[{Id:18,Amplifier:0b,Duration:100},{Id:19,Amplifier:1b,Duration:100},{Id:2,Amplifier:0b,Duration:600}],CustomPotionColor:5149489,HideFlags:32}"
+              "tag": "{custom_potion_effects:[{id:'minecraft:weakness',amplifier:0b,duration:100},{id:'minecraft:poison',amplifier:1b,duration:100},{id:'minecraft:slowness',amplifier:0b,duration:600}],CustomPotionColor:5149489,HideFlags:32}"
             },
             {
               "function": "minecraft:set_lore",

diff --git a/...t_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/withering.json b/...t_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/withering.json
@@ -9,7 +9,7 @@
           "functions": [
             {
               "function": "minecraft:set_nbt",
-              "tag": "{CustomPotionEffects:[{Id:20,Amplifier:0b,Duration:200}],CustomPotionColor:3484199,HideFlags:32}"
+              "tag": "{custom_potion_effects:[{id:'minecraft:wither',amplifier:0b,duration:200}],CustomPotionColor:3484199,HideFlags:32}"
             },
             {
               "function": "minecraft:set_lore",

diff --git a/...es/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/axolotl.mcfunction b/...es/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/axolotl.mcfunction
@@ -4,7 +4,7 @@
 # run from projectile/bucket
 
 # replace arrow with axolotl and copy data
-summon minecraft:axolotl ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],ActiveEffects:[{Id:10,Amplifier:10,Duration:200,ShowParticles:0b}]}
+summon minecraft:axolotl ~ ~ ~ {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.Variant set from entity @s Inventory[{Slot:-106b}].tag.Variant
 execute as @e[type=minecraft:axolotl,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion

diff --git a/...ridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/cod.mcfunction b/...ridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/cod.mcfunction
@@ -4,7 +4,7 @@
 # run from projectile/bucket
 
 # replace arrow with cod and copy data
-summon minecraft:cod ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],ActiveEffects:[{Id:10,Amplifier:10,Duration:200,ShowParticles:0b}]}
+summon minecraft:cod ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:regeneration',amplifier:10,duration:200,show_particles:0b}]}
 
 execute as @e[type=minecraft:cod,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 

diff --git a/..._18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/axolotl.mcfunction b/..._18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/axolotl.mcfunction
@@ -4,7 +4,7 @@
 # run from projectile/bucket
 
 # replace arrow with axolotl and copy data
-summon minecraft:axolotl ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],ActiveEffects:[{Id:7,Amplifier:10,Duration:1}],Silent:1b,DeathLootTable:"minecraft:empty"}
+summon minecraft:axolotl ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:instant_damage',amplifier:10,duration:1}],Silent:1b,DeathLootTable:"minecraft:empty"}
 
 execute as @e[type=minecraft:axolotl,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 

diff --git a/...rlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/cod.mcfunction b/...rlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/cod.mcfunction
@@ -4,7 +4,7 @@
 # run from projectile/bucket
 
 # replace arrow with cod and copy data
-summon minecraft:cod ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],ActiveEffects:[{Id:7,Amplifier:10,Duration:1}],Silent:1b,DeathLootTable:"minecraft:empty"}
+summon minecraft:cod ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:instant_damage',amplifier:10,duration:1}],Silent:1b,DeathLootTable:"minecraft:empty"}
 
 execute as @e[type=minecraft:cod,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 

diff --git a/.../data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/pufferfish.mcfunction b/.../data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/pufferfish.mcfunction
@@ -4,7 +4,7 @@
 # run from projectile/bucket
 
 # replace arrow with pufferfish and copy data
-summon minecraft:pufferfish ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],ActiveEffects:[{Id:7,Amplifier:10,Duration:1}],Silent:1b,DeathLootTable:"minecraft:empty"}
+summon minecraft:pufferfish ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:instant_damage',amplifier:10,duration:1}],Silent:1b,DeathLootTable:"minecraft:empty"}
 
 execute as @e[type=minecraft:pufferfish,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 

diff --git a/...y_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/salmon.mcfunction b/...y_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/salmon.mcfunction
@@ -4,7 +4,7 @@
 # run from projectile/bucket
 
 # replace arrow with salmon and copy data
-summon minecraft:salmon ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],ActiveEffects:[{Id:7,Amplifier:10,Duration:1}],Silent:1b,DeathLootTable:"minecraft:empty"}
+summon minecraft:salmon ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:instant_damage',amplifier:10,duration:1}],Silent:1b,DeathLootTable:"minecraft:empty"}
 
 execute as @e[type=minecraft:salmon,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 

diff --git a/..._18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/tadpole.mcfunction b/..._18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/tadpole.mcfunction
@@ -4,7 +4,7 @@
 # run from projectile/bucket
 
 # replace arrow with tadpole and copy data
-summon minecraft:tadpole ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],ActiveEffects:[{Id:7,Amplifier:10,Duration:1}],Silent:1b,DeathLootTable:"minecraft:empty"}
+summon minecraft:tadpole ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:instant_damage',amplifier:10,duration:1}],Silent:1b,DeathLootTable:"minecraft:empty"}
 
 execute as @e[type=minecraft:tadpole,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 

diff --git a/...18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/tropical.mcfunction b/...18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/tropical.mcfunction
@@ -4,7 +4,7 @@
 # run from projectile/bucket
 
 # replace arrow with tropical fish and copy data
-summon minecraft:tropical_fish ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],ActiveEffects:[{Id:7,Amplifier:10,Duration:1}],Silent:1b,DeathLootTable:"minecraft:empty"}
+summon minecraft:tropical_fish ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:instant_damage',amplifier:10,duration:1}],Silent:1b,DeathLootTable:"minecraft:empty"}
 
 execute as @e[type=minecraft:tropical_fish,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 

diff --git a/...overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/pufferfish.mcfunction b/...overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/pufferfish.mcfunction
@@ -4,7 +4,7 @@
 # run from projectile/bucket
 
 # replace arrow with pufferfish and copy data
-summon minecraft:pufferfish ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],ActiveEffects:[{Id:10,Amplifier:10,Duration:200,ShowParticles:0b}]}
+summon minecraft:pufferfish ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:regeneration',amplifier:10,duration:200,show_particles:0b}]}
 
 execute as @e[type=minecraft:pufferfish,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 

diff --git a/...ges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/salmon.mcfunction b/...ges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/salmon.mcfunction
@@ -4,7 +4,7 @@
 # run from projectile/bucket
 
 # replace arrow with salmon and copy data
-summon minecraft:salmon ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],ActiveEffects:[{Id:10,Amplifier:10,Duration:200,ShowParticles:0b}]}
+summon minecraft:salmon ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:regeneration',amplifier:10,duration:200,show_particles:0b}]}
 
 execute as @e[type=minecraft:salmon,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 

diff --git a/...es/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/tadpole.mcfunction b/...es/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/tadpole.mcfunction
@@ -4,7 +4,7 @@
 # run from projectile/bucket
 
 # replace arrow with tadpole and copy data
-summon minecraft:tadpole ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],ActiveEffects:[{Id:10,Amplifier:10,Duration:200,ShowParticles:0b}]}
+summon minecraft:tadpole ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:regeneration',amplifier:10,duration:200,show_particles:0b}]}
 
 execute as @e[type=minecraft:tadpole,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion
 

diff --git a/...s/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/tropical.mcfunction b/...s/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/tropical.mcfunction
@@ -4,7 +4,7 @@
 # run from projectile/bucket
 
 # replace arrow with tropical fish and copy data
-summon minecraft:tropical_fish ~ ~ ~ {FromBucket:1b,Tags:["gm4_cb_projectile"],ActiveEffects:[{Id:10,Amplifier:10,Duration:200,ShowParticles:0b}]}
+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.Variant set from entity @s Inventory[{Slot:-106b}].tag.BucketVariantTag
 execute as @e[type=minecraft:tropical_fish,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion