From d01101476dc75668dd42f2f06b14860a1c7063e7 Mon Sep 17 00:00:00 2001 From: Misode Date: Wed, 18 Oct 2023 13:59:53 +0200 Subject: [PATCH] Effect renames and ID changes --- .../functions/create_chair.mcfunction | 2 +- .../lightning/revive_chair.mcfunction | 2 +- .../type/canine/wolf_initiate.mcfunction | 2 +- .../weapon/modifier/glow/glow.mcfunction | 2 +- .../mob/equip_arrow/skeleton_toxic.json | 2 +- .../mob/equip_arrow/stray_harming.json | 2 +- .../mob/equip_arrow/stray_snowy.json | 2 +- .../mob/equip_arrow/stray_toxic.json | 2 +- .../mob/equip_arrow/withering.json | 2 +- .../projectile/bucket/axolotl.mcfunction | 2 +- .../projectile/bucket/cod.mcfunction | 2 +- .../bucket/multishot/axolotl.mcfunction | 2 +- .../bucket/multishot/cod.mcfunction | 2 +- .../bucket/multishot/pufferfish.mcfunction | 2 +- .../bucket/multishot/salmon.mcfunction | 2 +- .../bucket/multishot/tadpole.mcfunction | 2 +- .../bucket/multishot/tropical.mcfunction | 2 +- .../projectile/bucket/pufferfish.mcfunction | 2 +- .../projectile/bucket/salmon.mcfunction | 2 +- .../projectile/bucket/tadpole.mcfunction | 2 +- .../projectile/bucket/tropical.mcfunction | 2 +- .../functions/shoot/effect.mcfunction | 68 +++++++++---------- .../functions/shoot/spectral.mcfunction | 2 +- .../potion_tracking/tag_potion.mcfunction | 2 +- .../verify_landed_potion.mcfunction | 2 +- .../functions/launch.mcfunction | 2 +- .../functions/entity/guardian.mcfunction | 2 +- .../functions/entity/shulker.mcfunction | 2 +- .../potion_tracking/potion_landed.mcfunction | 2 +- .../items/lingering_bottle_of_lightning.json | 2 +- .../functions/util_below.mcfunction | 8 +-- .../loot_tables/glow_ink_bottle.json | 2 +- .../loot_tables/ink_bottle.json | 2 +- .../loot_tables/entities/illusioner.json | 2 +- .../functions/goblin_transform.mcfunction | 2 +- .../functions/spawn_slime.mcfunction | 2 +- .../functions/check_item.mcfunction | 6 +- .../functions/cure/liab/check.mcfunction | 4 +- .../functions/cure/zombified_check.mcfunction | 4 +- .../add_climb_effects.mcfunction | 8 +-- .../functions/falling_star/spawn.mcfunction | 2 +- .../functions/spawn_skeleton.mcfunction | 2 +- .../functions/spawn_zombie.mcfunction | 2 +- .../entities/congealed_shard.mcfunction | 2 +- .../entities/fire_sprite.mcfunction | 2 +- .../soul_forge/entities/living_orb.mcfunction | 2 +- .../entities/severed_soul.mcfunction | 2 +- .../entities/summon_extra_orb.mcfunction | 2 +- .../entities/summon_extra_shard.mcfunction | 2 +- .../entities/wandering_tear.mcfunction | 2 +- .../entities/withering_magic.mcfunction | 2 +- .../outputs/create_shard.mcfunction | 2 +- .../functions/util_below.mcfunction | 44 ++++++------ .../loot_tables/floating_potion.json | 2 +- .../lingering_floating_potion.json | 2 +- .../loot_tables/splash_floating_potion.json | 2 +- .../functions/wither_potion.mcfunction | 2 +- .../functions/wither_transform.mcfunction | 4 +- .../mob/track_movement/check_d.mcfunction | 4 +- .../mob/track_movement/check_dx.mcfunction | 4 +- .../mob/track_movement/check_dz.mcfunction | 4 +- .../check_enderman_falling.mcfunction | 4 +- .../functions/blowup/safe.mcfunction | 2 +- .../create_possessed_items.mcfunction | 2 +- .../functions/recipes/flowers/luck.mcfunction | 2 +- .../recipes/flowers/poison.mcfunction | 2 +- .../instant_damage.mcfunction | 2 +- .../instant_health.mcfunction | 2 +- .../jump_boost.mcfunction | 2 +- .../regeneration.mcfunction | 2 +- .../potions/drinkable/instant_damage.json | 2 +- .../potions/drinkable/instant_health.json | 2 +- .../recipes/potions/drinkable/jump_boost.json | 2 +- .../recipes/potions/drinkable/poison.json | 2 +- .../potions/drinkable/regeneration.json | 2 +- .../recipes/potions/drinkable/speed.json | 2 +- .../recipes/potions/drinkable/strength.json | 2 +- .../potions/lingering/instant_damage.json | 2 +- .../potions/lingering/instant_health.json | 2 +- .../recipes/potions/lingering/jump_boost.json | 2 +- .../recipes/potions/lingering/poison.json | 2 +- .../potions/lingering/regeneration.json | 2 +- .../recipes/potions/lingering/speed.json | 2 +- .../recipes/potions/lingering/strength.json | 2 +- .../potions/splash/instant_damage.json | 2 +- .../potions/splash/instant_health.json | 2 +- .../recipes/potions/splash/jump_boost.json | 2 +- .../recipes/potions/splash/poison.json | 2 +- .../recipes/potions/splash/regeneration.json | 2 +- .../recipes/potions/splash/speed.json | 2 +- .../recipes/potions/splash/strength.json | 2 +- .../functions/util_below.mcfunction | 10 +-- .../loot_tables/items/booze.json | 2 +- .../loot_tables/items/lingering_booze.json | 2 +- .../items/lingering_resistance_potion.json | 2 +- .../loot_tables/items/resistance_potion.json | 2 +- .../loot_tables/items/splash_booze.json | 2 +- .../items/splash_resistance_potion.json | 2 +- .../items/splash_vanishing_potion.json | 2 +- .../loot_tables/items/vanishing_potion.json | 2 +- 100 files changed, 173 insertions(+), 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 index 6f5350b15b..7515af8020 100644 --- 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 index 3676635a98..a54586b235 100644 --- 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/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/functions/armor/modifier/type/canine/wolf_initiate.mcfunction b/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/functions/armor/modifier/type/canine/wolf_initiate.mcfunction index e92f921da2..398478d326 100644 --- a/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/functions/armor/modifier/type/canine/wolf_initiate.mcfunction +++ b/gm4_combat_expanded/overlay_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/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/functions/weapon/modifier/glow/glow.mcfunction b/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/functions/weapon/modifier/glow/glow.mcfunction index 24ce6987ec..495b231445 100644 --- a/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/functions/weapon/modifier/glow/glow.mcfunction +++ b/gm4_combat_expanded/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/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/skeleton_toxic.json b/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/skeleton_toxic.json index 775474592a..8d409f50c1 100644 --- a/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/skeleton_toxic.json +++ b/gm4_combat_expanded/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/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/stray_harming.json b/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/stray_harming.json index 1a50cfa279..43921e6254 100644 --- a/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/stray_harming.json +++ b/gm4_combat_expanded/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/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/stray_snowy.json b/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/stray_snowy.json index 5e182ef648..1892a56b25 100644 --- a/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/stray_snowy.json +++ b/gm4_combat_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/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/stray_toxic.json b/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/stray_toxic.json index 3082abcde3..e06178a3c7 100644 --- a/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/stray_toxic.json +++ b/gm4_combat_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/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/withering.json b/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/withering.json index 9ec71ab9b9..4d721b8686 100644 --- a/gm4_combat_expanded/overlay_18/data/gm4_combat_expanded/loot_tables/mob/equip_arrow/withering.json +++ b/gm4_combat_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/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/axolotl.mcfunction b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/axolotl.mcfunction index 17532f8431..d1736497c5 100644 --- a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/axolotl.mcfunction +++ b/gm4_crossbow_cartridges/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/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/cod.mcfunction b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/cod.mcfunction index 55cc54089b..a80d494e28 100644 --- a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/cod.mcfunction +++ b/gm4_crossbow_cartridges/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/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/axolotl.mcfunction b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/axolotl.mcfunction index a1237dd6f9..8495de5e07 100644 --- a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/axolotl.mcfunction +++ b/gm4_crossbow_cartridges/overlay_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/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/cod.mcfunction b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/cod.mcfunction index dd82ca9268..785aa45b8e 100644 --- a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/cod.mcfunction +++ b/gm4_crossbow_cartridges/overlay_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/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/pufferfish.mcfunction b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/pufferfish.mcfunction index bf4ea90a15..0634e67814 100644 --- a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/pufferfish.mcfunction +++ b/gm4_crossbow_cartridges/overlay_18/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/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/salmon.mcfunction b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/salmon.mcfunction index 3fd9f31a02..8034e0bc8e 100644 --- a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/salmon.mcfunction +++ b/gm4_crossbow_cartridges/overlay_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/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/tadpole.mcfunction b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/tadpole.mcfunction index 9cfeaf3cfb..2fd003bfbc 100644 --- a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/tadpole.mcfunction +++ b/gm4_crossbow_cartridges/overlay_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/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/tropical.mcfunction b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/tropical.mcfunction index 87402950d0..6ceeba76fc 100644 --- a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/multishot/tropical.mcfunction +++ b/gm4_crossbow_cartridges/overlay_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/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/pufferfish.mcfunction b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/pufferfish.mcfunction index cc818b9931..45ec99fcde 100644 --- a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/pufferfish.mcfunction +++ b/gm4_crossbow_cartridges/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/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/salmon.mcfunction b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/salmon.mcfunction index acce4c3ace..a34353806e 100644 --- a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/salmon.mcfunction +++ b/gm4_crossbow_cartridges/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/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/tadpole.mcfunction b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/tadpole.mcfunction index a50333ae8f..4d1dc49cbc 100644 --- a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/tadpole.mcfunction +++ b/gm4_crossbow_cartridges/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/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/tropical.mcfunction b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/tropical.mcfunction index 9f5986a82d..4bf4c4636e 100644 --- a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/projectile/bucket/tropical.mcfunction +++ b/gm4_crossbow_cartridges/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 diff --git a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/shoot/effect.mcfunction b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/shoot/effect.mcfunction index 1612563ffa..ebf5d780d1 100644 --- a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/shoot/effect.mcfunction +++ b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/shoot/effect.mcfunction @@ -2,50 +2,50 @@ # at @s # run from shoot/tipped -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:swiftness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:1,Amplifier:0b,Duration:440}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_swiftness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:1,Amplifier:0b,Duration:1200}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_swiftness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:1,Amplifier:1b,Duration:220}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:swiftness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:speed',amplifier:0b,duration:440}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_swiftness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:speed',amplifier:0b,duration:1200}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_swiftness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:speed',amplifier:1b,duration:220}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:slowness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:2,Amplifier:0b,Duration:220}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_slowness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:2,Amplifier:0b,Duration:600}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_slowness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:2,Amplifier:3b,Duration:40}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:slowness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:slowness',amplifier:0b,duration:220}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_slowness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:slowness',amplifier:0b,duration:600}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_slowness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:slowness',amplifier:3b,duration:40}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strength"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:5,Amplifier:0b,Duration:440}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_strength"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:5,Amplifier:0b,Duration:1200}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_strength"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:5,Amplifier:1b,Duration:220}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strength"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:strength',amplifier:0b,duration:440}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_strength"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:strength',amplifier:0b,duration:1200}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_strength"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:strength',amplifier:1b,duration:220}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:healing"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:6,Amplifier:0b,Duration:1}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_healing"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:6,Amplifier:1b,Duration:1}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:healing"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:instant_health',amplifier:0b,duration:1}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_healing"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:instant_health',amplifier:1b,duration:1}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:harming"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:7,Amplifier:0b,Duration:1}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_harming"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:7,Amplifier:1b,Duration:1}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:harming"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:instant_damage',amplifier:0b,duration:1}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_harming"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:instant_damage',amplifier:1b,duration:1}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:leaping"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:8,Amplifier:0b,Duration:440}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_leaping"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:8,Amplifier:0b,Duration:1200}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_leaping"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:8,Amplifier:1b,Duration:220}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:leaping"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:jump_boost',amplifier:0b,duration:440}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_leaping"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:jump_boost',amplifier:0b,duration:1200}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_leaping"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:jump_boost',amplifier:1b,duration:220}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:regeneration"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:10,Amplifier:0b,Duration:100}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_regeneration"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:10,Amplifier:0b,Duration:220}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_regeneration"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:10,Amplifier:1b,Duration:40}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:regeneration"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:regeneration',amplifier:0b,duration:100}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_regeneration"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:regeneration',amplifier:0b,duration:220}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_regeneration"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:regeneration',amplifier:1b,duration:40}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:fire_resistance"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:12,Amplifier:0b,Duration:440}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_fire_resistance"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:12,Amplifier:0b,Duration:1200}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:fire_resistance"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:fire_resistance',amplifier:0b,duration:440}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_fire_resistance"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:fire_resistance',amplifier:0b,duration:1200}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:water_breathing"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:13,Amplifier:0b,Duration:440}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_water_breathing"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:13,Amplifier:0b,Duration:1200}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:water_breathing"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:water_breathing',amplifier:0b,duration:440}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_water_breathing"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:water_breathing',amplifier:0b,duration:1200}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:invisibility"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:14,Amplifier:0b,Duration:440}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_invisibility"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:14,Amplifier:0b,Duration:1200}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:invisibility"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:invisibility',amplifier:0b,duration:440}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_invisibility"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:invisibility',amplifier:0b,duration:1200}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:night_vision"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:16,Amplifier:0b,Duration:440}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_night_vision"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:16,Amplifier:0b,Duration:1200}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:night_vision"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:night_vision',amplifier:0b,duration:440}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_night_vision"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:night_vision',amplifier:0b,duration:1200}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:weakness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:18,Amplifier:0b,Duration:220}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_weakness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:18,Amplifier:0b,Duration:600}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:weakness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:weakness',amplifier:0b,duration:220}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_weakness"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:weakness',amplifier:0b,duration:600}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:poison"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:19,Amplifier:0b,Duration:100}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_poison"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:19,Amplifier:0b,Duration:220}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_poison"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:19,Amplifier:1b,Duration:40}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:poison"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:poison',amplifier:0b,duration:100}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_poison"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:poison',amplifier:0b,duration:220}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:strong_poison"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:poison',amplifier:1b,duration:40}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:slow_falling"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:28,Amplifier:0b,Duration:220}] -execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_slow_falling"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:28,Amplifier:0b,Duration:600}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:slow_falling"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:slow_falling',amplifier:0b,duration:220}] +execute if data storage gm4_crossbow_cartridges:temp {effect:"minecraft:long_slow_falling"} run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:slow_falling',amplifier:0b,duration:600}] diff --git a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/shoot/spectral.mcfunction b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/shoot/spectral.mcfunction index c0c4a58a88..982c777dde 100644 --- a/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/shoot/spectral.mcfunction +++ b/gm4_crossbow_cartridges/overlay_18/data/gm4_crossbow_cartridges/functions/shoot/spectral.mcfunction @@ -5,7 +5,7 @@ advancement revoke @s only gm4_crossbow_cartridges:shoot/spectral # store type of glowing -execute if predicate gm4_crossbow_cartridges:items/bucket run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{Id:24,Amplifier:0b,Duration:200}] +execute if predicate gm4_crossbow_cartridges:items/bucket run data modify storage gm4_crossbow_cartridges:temp projectile.ActiveEffects set value [{id:'minecraft:glowing',amplifier:0b,duration:200}] execute unless predicate gm4_crossbow_cartridges:items/bucket run data modify storage gm4_crossbow_cartridges:temp projectile.Glowing set value 1 # tag arrow, 3 if multishot diff --git a/gm4_display_frames/overlay_18/data/gm4_display_frames/functions/potion_tracking/tag_potion.mcfunction b/gm4_display_frames/overlay_18/data/gm4_display_frames/functions/potion_tracking/tag_potion.mcfunction index 57c7a405ca..50abfe6282 100644 --- a/gm4_display_frames/overlay_18/data/gm4_display_frames/functions/potion_tracking/tag_potion.mcfunction +++ b/gm4_display_frames/overlay_18/data/gm4_display_frames/functions/potion_tracking/tag_potion.mcfunction @@ -3,4 +3,4 @@ tag @s[tag=!gm4_potion,nbt={Item:{tag:{Potion:"minecraft:invisibility"}}}] add gm4_potion tag @s[tag=!gm4_potion,nbt={Item:{tag:{Potion:"minecraft:long_invisibility"}}}] add gm4_potion -tag @s[tag=!gm4_potion,nbt={Item:{tag:{CustomPotionEffects:[{Id:14}]}}}] add gm4_potion +tag @s[tag=!gm4_potion,nbt={Item:{tag:{custom_potion_effects:[{id:'minecraft:invisibility'}]}}}] add gm4_potion diff --git a/gm4_display_frames/overlay_18/data/gm4_display_frames/functions/potion_tracking/verify_landed_potion.mcfunction b/gm4_display_frames/overlay_18/data/gm4_display_frames/functions/potion_tracking/verify_landed_potion.mcfunction index dd022cb611..2a8461ad7e 100644 --- a/gm4_display_frames/overlay_18/data/gm4_display_frames/functions/potion_tracking/verify_landed_potion.mcfunction +++ b/gm4_display_frames/overlay_18/data/gm4_display_frames/functions/potion_tracking/verify_landed_potion.mcfunction @@ -3,4 +3,4 @@ execute if data storage gm4_potion_tracking:temp entity_data.Item.tag{Potion:"minecraft:invisibility"} run function gm4_display_frames:potion_tracking/splash_item_frames execute if data storage gm4_potion_tracking:temp entity_data.Item.tag{Potion:"minecraft:long_invisibility"} run function gm4_display_frames:potion_tracking/splash_item_frames -execute if data storage gm4_potion_tracking:temp entity_data.Item.tag{CustomPotionEffects:[{Id:14}]} run function gm4_display_frames:potion_tracking/splash_item_frames +execute if data storage gm4_potion_tracking:temp entity_data.Item.tag{custom_potion_effects:[{id:'minecraft:invisibility'}]} run function gm4_display_frames:potion_tracking/splash_item_frames diff --git a/gm4_dripleaf_launchers/overlay_18/data/gm4_dripleaf_launchers/functions/launch.mcfunction b/gm4_dripleaf_launchers/overlay_18/data/gm4_dripleaf_launchers/functions/launch.mcfunction index e0fea66a84..9aa35643e1 100644 --- a/gm4_dripleaf_launchers/overlay_18/data/gm4_dripleaf_launchers/functions/launch.mcfunction +++ b/gm4_dripleaf_launchers/overlay_18/data/gm4_dripleaf_launchers/functions/launch.mcfunction @@ -11,4 +11,4 @@ playsound minecraft:block.beehive.enter player @s ~ ~1 ~ 1 1.6 1 execute align xyz run particle block big_dripleaf ~.5 ~.93751 ~.5 0.25 0.01 0.25 0 12 # grant levitation for 4 ticks -summon minecraft:area_effect_cloud ~ ~ ~ {Particle:"minecraft:block minecraft:air",ReapplicationDelay:0,Age:-1,Radius:0.5f,RadiusPerTick:0f,RadiusOnUse:-0.5f,Duration:4,WaitTime:0,Effects:[{Id:25,Amplifier:40b,Duration:4,ShowParticles:0b,ShowIcon:0b,Ambient:1b}]} +summon minecraft:area_effect_cloud ~ ~ ~ {Particle:"minecraft:block minecraft:air",ReapplicationDelay:0,Age:-1,Radius:0.5f,RadiusPerTick:0f,RadiusOnUse:-0.5f,duration:4,WaitTime:0,effects:[{id:'minecraft:levitation',amplifier:40b,duration:4,show_particles:0b,show_icon:0b,ambient:1b}]} diff --git a/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/functions/entity/guardian.mcfunction b/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/functions/entity/guardian.mcfunction index cea1fd5c11..1cbfb513c0 100644 --- a/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/functions/entity/guardian.mcfunction +++ b/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/functions/entity/guardian.mcfunction @@ -4,7 +4,7 @@ # run from lightning/check setblock ~ ~ ~ air -summon guardian ~ ~ ~ {ActiveEffects:[{Id:10,Duration:20,Amplifier:10b,ShowParticles:0b}]} +summon guardian ~ ~ ~ {active_effects:[{id:'minecraft:regeneration',duration:20,amplifier:10b,show_particles:0b}]} # set fake player flag scoreboard players set $found_block gm4_liab_data 1 diff --git a/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/functions/entity/shulker.mcfunction b/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/functions/entity/shulker.mcfunction index 1fa2683929..1887e29a67 100644 --- a/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/functions/entity/shulker.mcfunction +++ b/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/functions/entity/shulker.mcfunction @@ -4,7 +4,7 @@ # run from lightning/check setblock ~ ~ ~ air -summon shulker ~ ~-.49 ~ {ActiveEffects:[{Id:10,Duration:20,Amplifier:10b,ShowParticles:0b}],Color:16,DeathLootTable:"gm4_lightning_in_a_bottle:entities/shulker"} +summon shulker ~ ~-.49 ~ {active_effects:[{id:'minecraft:regeneration',duration:20,amplifier:10b,show_particles:0b}],Color:16,DeathLootTable:"gm4_lightning_in_a_bottle:entities/shulker"} advancement grant @a[distance=..5,gamemode=!spectator] only gm4:lightning_in_a_bottle_shulker diff --git a/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/functions/potion_tracking/potion_landed.mcfunction b/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/functions/potion_tracking/potion_landed.mcfunction index a4e3ef8029..29500d9474 100644 --- a/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/functions/potion_tracking/potion_landed.mcfunction +++ b/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/functions/potion_tracking/potion_landed.mcfunction @@ -5,4 +5,4 @@ execute if block ~ ~-1 ~ lightning_rod align y run summon lightning_bolt ~ ~ ~ execute unless block ~ ~-1 ~ lightning_rod run summon lightning_bolt ~ ~ ~ -execute as @e[type=area_effect_cloud,distance=..0.05,limit=1,sort=nearest] if data entity @s Effects[{Id:16,Amplifier:12b,Duration:1,Ambient:0b,ShowIcon:1b,ShowParticles:1b}] run function gm4_lightning_in_a_bottle:potion_tracking/modify_cloud +execute as @e[type=area_effect_cloud,distance=..0.05,limit=1,sort=nearest] if data entity @s Effects[{id:'minecraft:night_vision',amplifier:12b,duration:1,ambient:0b,show_icon:1b,show_particles:1b}] run function gm4_lightning_in_a_bottle:potion_tracking/modify_cloud diff --git a/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/loot_tables/items/lingering_bottle_of_lightning.json b/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/loot_tables/items/lingering_bottle_of_lightning.json index df4c520a1a..8f1a9e368e 100644 --- a/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/loot_tables/items/lingering_bottle_of_lightning.json +++ b/gm4_lightning_in_a_bottle/overlay_18/data/gm4_lightning_in_a_bottle/loot_tables/items/lingering_bottle_of_lightning.json @@ -37,7 +37,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{Potion:\"gm4:lightning\",gm4_lightning_in_a_bottle:1b,CustomModelData:3420004,HideFlags:33,Enchantments:[{id:\"minecraft:protection\",lvl:0s}],CustomPotionEffects:[{Id:16,Amplifier:12b,Duration:1}],CustomPotionColor:11985402,Particle:\"electric_spark\",RadiusOnUse:0f}" + "tag": "{Potion:\"gm4:lightning\",gm4_lightning_in_a_bottle:1b,CustomModelData:3420004,HideFlags:33,Enchantments:[{id:\"minecraft:protection\",lvl:0s}],custom_potion_effects:[{id:'minecraft:night_vision',amplifier:12b,duration:1}],CustomPotionColor:11985402,Particle:\"electric_spark\",RadiusOnUse:0f}" } ] } diff --git a/gm4_liquid_tanks/overlay_18/data/gm4_standard_liquids/functions/util_below.mcfunction b/gm4_liquid_tanks/overlay_18/data/gm4_standard_liquids/functions/util_below.mcfunction index be874be65c..5b9d85561f 100644 --- a/gm4_liquid_tanks/overlay_18/data/gm4_standard_liquids/functions/util_below.mcfunction +++ b/gm4_liquid_tanks/overlay_18/data/gm4_standard_liquids/functions/util_below.mcfunction @@ -4,10 +4,10 @@ tag @s add gm4_processing_tank #milk clearing potion effects -execute if score @s[tag=gm4_lt_milk] gm4_lt_value matches 3.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt={ActiveEffects:[{}]}] run function gm4_standard_liquids:util/liquid_dispensing/milk +execute if score @s[tag=gm4_lt_milk] gm4_lt_value matches 3.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt={active_effects:[{}]}] run function gm4_standard_liquids:util/liquid_dispensing/milk #honey clearing poison and applying saturation -execute if score @s[tag=gm4_lt_honey] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt={ActiveEffects:[{Id:19}]}] run function gm4_standard_liquids:util/liquid_dispensing/honey +execute if score @s[tag=gm4_lt_honey] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt={active_effects:[{id:'minecraft:poison'}]}] run function gm4_standard_liquids:util/liquid_dispensing/honey execute if score @s[tag=gm4_lt_honey] gm4_lt_value matches 1.. as @a[gamemode=!spectator,limit=1,dx=0] unless entity @s[nbt={foodLevel:20}] run function gm4_standard_liquids:util/liquid_dispensing/honey #mushroom soup applying saturation @@ -20,8 +20,8 @@ execute if score @s[tag=gm4_lt_rabbit_stew] gm4_lt_value matches 1.. as @a[gamem execute if score @s[tag=gm4_lt_beetroot_soup] gm4_lt_value matches 1.. as @a[gamemode=!spectator,limit=1,dx=0] unless entity @s[nbt={foodLevel:20}] run function gm4_standard_liquids:util/liquid_dispensing/beetroot_soup #ink tanks applying effects -execute if score @s[tag=gm4_lt_ink] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:15}]}] run function gm4_standard_liquids:util/liquid_dispensing/ink -execute if score @s[tag=gm4_lt_glow_ink] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:24}]}] run function gm4_standard_liquids:util/liquid_dispensing/glow_ink +execute if score @s[tag=gm4_lt_ink] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:blindness'}]}] run function gm4_standard_liquids:util/liquid_dispensing/ink +execute if score @s[tag=gm4_lt_glow_ink] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:glowing'}]}] run function gm4_standard_liquids:util/liquid_dispensing/glow_ink #player withdrawing experience execute if score $schedule_withdraw_exp gm4_lt_util matches 2.. run schedule clear gm4_standard_liquids:util/scheduled_withdraw_exp diff --git a/gm4_liquid_tanks/overlay_18/data/gm4_standard_liquids/loot_tables/glow_ink_bottle.json b/gm4_liquid_tanks/overlay_18/data/gm4_standard_liquids/loot_tables/glow_ink_bottle.json index dc99d929a3..1d21a105c7 100644 --- a/gm4_liquid_tanks/overlay_18/data/gm4_standard_liquids/loot_tables/glow_ink_bottle.json +++ b/gm4_liquid_tanks/overlay_18/data/gm4_standard_liquids/loot_tables/glow_ink_bottle.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{gm4_standard_liquids:{potion:\"glowing\"},CustomPotionEffects:[{Id:24,Amplifier:0b,Duration:1200},{Id:16,Amplifier:0b,Duration:1800}],CustomPotionColor:9828808,CustomModelData:3420008}" + "tag": "{gm4_standard_liquids:{potion:\"glowing\"},custom_potion_effects:[{id:'minecraft:glowing',amplifier:0b,duration:1200},{id:'minecraft:night_vision',amplifier:0b,duration:1800}],CustomPotionColor:9828808,CustomModelData:3420008}" }, { "function": "set_name", diff --git a/gm4_liquid_tanks/overlay_18/data/gm4_standard_liquids/loot_tables/ink_bottle.json b/gm4_liquid_tanks/overlay_18/data/gm4_standard_liquids/loot_tables/ink_bottle.json index 95434ad04f..7d29544fd8 100644 --- a/gm4_liquid_tanks/overlay_18/data/gm4_standard_liquids/loot_tables/ink_bottle.json +++ b/gm4_liquid_tanks/overlay_18/data/gm4_standard_liquids/loot_tables/ink_bottle.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{gm4_standard_liquids:{potion:\"blindness\"},CustomPotionEffects:[{Id:15,Amplifier:0b,Duration:2400}],CustomPotionColor:68378,CustomModelData:3420007}" + "tag": "{gm4_standard_liquids:{potion:\"blindness\"},custom_potion_effects:[{id:'minecraft:blindness',amplifier:0b,duration:2400}],CustomPotionColor:68378,CustomModelData:3420007}" }, { "function": "set_name", diff --git a/gm4_midnight_menaces/overlay_18/data/gm4_illusioner_nights/loot_tables/entities/illusioner.json b/gm4_midnight_menaces/overlay_18/data/gm4_illusioner_nights/loot_tables/entities/illusioner.json index 088b88c0c7..da124ac433 100644 --- a/gm4_midnight_menaces/overlay_18/data/gm4_illusioner_nights/loot_tables/entities/illusioner.json +++ b/gm4_midnight_menaces/overlay_18/data/gm4_illusioner_nights/loot_tables/entities/illusioner.json @@ -65,7 +65,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{CustomPotionEffects:[{Duration:1200,Id:15,Amplifier:0b}],Potion: \"minecraft:mundane\",display:{Name:\"{\\\"text\\\":\\\"Lingering Potion of Blindness\\\",\\\"italic\\\":false}\"}}" + "tag": "{custom_potion_effects:[{duration:1200,id:'minecraft:blindness',amplifier:0b}],Potion: \"minecraft:mundane\",display:{Name:\"{\\\"text\\\":\\\"Lingering Potion of Blindness\\\",\\\"italic\\\":false}\"}}" } ] } diff --git a/gm4_midnight_menaces/overlay_18/data/gm4_menacing_goblins/functions/goblin_transform.mcfunction b/gm4_midnight_menaces/overlay_18/data/gm4_menacing_goblins/functions/goblin_transform.mcfunction index 4b7fdc6fea..d73c3d0354 100644 --- a/gm4_midnight_menaces/overlay_18/data/gm4_menacing_goblins/functions/goblin_transform.mcfunction +++ b/gm4_midnight_menaces/overlay_18/data/gm4_menacing_goblins/functions/goblin_transform.mcfunction @@ -1,7 +1,7 @@ # @s = skeleton, zombie, or creeper to be converted into a goblin # called by event -summon zombie ~ ~ ~ {CustomName:'{"translate":"entity.gm4.goblin","fallback":"Goblin§"}',CustomNameVisible:0,Team:"gm4_hide_name",DeathLootTable:"gm4_menacing_goblins:entities/goblin",LeftHanded:1b,CanPickUpLoot:0b,Health:24f,IsBaby:1b,CanBreakDoors:0b,Tags:["gm4_goblin","smithed.entity"],HandItems:[{id:"minecraft:golden_sword",Count:1b},{}],HandDropChances:[0.3F,-327.67F],ArmorItems:[{},{},{},{id:"minecraft:carved_pumpkin",Count:1b,tag:{Enchantments:[{id:"minecraft:thorns",lvl:3s}]}}],ArmorDropChances:[2.0F,2.0F,2.0F,-327.67F],ActiveEffects:[{Id:11,Amplifier:4b,Duration:20,ShowParticles:1b}],Attributes:[{Name:"minecraft:generic.max_health",Base:24.0d},{Name:"minecraft:generic.follow_range",Base:48.0d}]} +summon zombie ~ ~ ~ {CustomName:'{"translate":"entity.gm4.goblin","fallback":"Goblin§"}',CustomNameVisible:0,Team:"gm4_hide_name",DeathLootTable:"gm4_menacing_goblins:entities/goblin",LeftHanded:1b,CanPickUpLoot:0b,Health:24f,IsBaby:1b,CanBreakDoors:0b,Tags:["gm4_goblin","smithed.entity"],HandItems:[{id:"minecraft:golden_sword",Count:1b},{}],HandDropChances:[0.3F,-327.67F],ArmorItems:[{},{},{},{id:"minecraft:carved_pumpkin",Count:1b,tag:{Enchantments:[{id:"minecraft:thorns",lvl:3s}]}}],ArmorDropChances:[2.0F,2.0F,2.0F,-327.67F],active_effects:[{id:'minecraft:resistance',amplifier:4b,duration:20,show_particles:1b}],Attributes:[{Name:"minecraft:generic.max_health",Base:24.0d},{Name:"minecraft:generic.follow_range",Base:48.0d}]} scoreboard players set @e[type=zombie,tag=gm4_goblin,distance=0] gm4_entity_version 1 tp @e[type=zombie,limit=1,distance=0] @s diff --git a/gm4_midnight_menaces/overlay_18/data/gm4_slime_fests/functions/spawn_slime.mcfunction b/gm4_midnight_menaces/overlay_18/data/gm4_slime_fests/functions/spawn_slime.mcfunction index a692d0d9da..db72a11e1e 100644 --- a/gm4_midnight_menaces/overlay_18/data/gm4_slime_fests/functions/spawn_slime.mcfunction +++ b/gm4_midnight_menaces/overlay_18/data/gm4_slime_fests/functions/spawn_slime.mcfunction @@ -2,7 +2,7 @@ # at @s # called by event -summon slime ~ ~ ~ {Size:0,DeathLootTable:"minecraft:empty",ActiveEffects:[{Id:9,Amplifier:1,Duration:30}]} +summon slime ~ ~ ~ {Size:0,DeathLootTable:"minecraft:empty",active_effects:[{id:'minecraft:nausea',amplifier:1,duration:30}]} playsound block.slime_block.hit hostile @a[distance=..16] ~ ~ ~ .6 .8 function gm4_slime_fests:absorb_slime_ball diff --git a/gm4_mob_curing/overlay_18/data/gm4_mob_curing/functions/check_item.mcfunction b/gm4_mob_curing/overlay_18/data/gm4_mob_curing/functions/check_item.mcfunction index 17864fdbc5..e78caa9762 100644 --- a/gm4_mob_curing/overlay_18/data/gm4_mob_curing/functions/check_item.mcfunction +++ b/gm4_mob_curing/overlay_18/data/gm4_mob_curing/functions/check_item.mcfunction @@ -3,8 +3,8 @@ # at @s # run from main -execute if entity @s[nbt={Item:{id:"minecraft:red_mushroom"}}] if entity @e[type=item,distance=..1.5,limit=1,nbt={Item:{id:"minecraft:brown_mushroom"}}] as @e[type=cow,tag=!smithed.entity,distance=..1.5,limit=1,nbt={ActiveEffects:[{Id:2}]}] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/mooshroom +execute if entity @s[nbt={Item:{id:"minecraft:red_mushroom"}}] if entity @e[type=item,distance=..1.5,limit=1,nbt={Item:{id:"minecraft:brown_mushroom"}}] as @e[type=cow,tag=!smithed.entity,distance=..1.5,limit=1,nbt={active_effects:[{id:'minecraft:slowness'}]}] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/mooshroom execute if entity @s[nbt={Item:{id:"minecraft:golden_carrot"}}] as @e[type=zombified_piglin,tag=!smithed.entity,distance=..1.5,limit=1] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/zombified_check -execute if entity @s[nbt={Item:{id:"minecraft:golden_carrot"}}] as @e[type=zoglin,tag=!smithed.entity,distance=..1.5,limit=1,nbt={ActiveEffects:[{Id:1}]}] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/zoglin -execute if entity @s[nbt={Item:{id:"minecraft:golden_apple"}}] as @e[type=witch,tag=!smithed.entity,distance=..1.5,limit=1,nbt={ActiveEffects:[{Id:18}]}] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/witch +execute if entity @s[nbt={Item:{id:"minecraft:golden_carrot"}}] as @e[type=zoglin,tag=!smithed.entity,distance=..1.5,limit=1,nbt={active_effects:[{id:'minecraft:speed'}]}] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/zoglin +execute if entity @s[nbt={Item:{id:"minecraft:golden_apple"}}] as @e[type=witch,tag=!smithed.entity,distance=..1.5,limit=1,nbt={active_effects:[{id:'minecraft:weakness'}]}] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/witch execute if score gm4_lightning_in_a_bottle load.status matches 1.. run function gm4_mob_curing:cure/liab/check diff --git a/gm4_mob_curing/overlay_18/data/gm4_mob_curing/functions/cure/liab/check.mcfunction b/gm4_mob_curing/overlay_18/data/gm4_mob_curing/functions/cure/liab/check.mcfunction index a6b2fa33ce..067c18722f 100644 --- a/gm4_mob_curing/overlay_18/data/gm4_mob_curing/functions/cure/liab/check.mcfunction +++ b/gm4_mob_curing/overlay_18/data/gm4_mob_curing/functions/cure/liab/check.mcfunction @@ -3,5 +3,5 @@ # at @s # run from check_item -execute if entity @s[nbt={Item:{id:"minecraft:totem_of_undying"}}] as @e[type=illusioner,tag=!smithed.entity,distance=..1.5,limit=1,nbt={ActiveEffects:[{Id:1}]}] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/liab/illusioner -execute if entity @s[nbt={Item:{id:"minecraft:crossbow"}}] as @e[type=evoker,tag=!smithed.entity,distance=..1.5,limit=1,nbt={ActiveEffects:[{Id:2,Amplifier:3b}]}] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/liab/evoker +execute if entity @s[nbt={Item:{id:"minecraft:totem_of_undying"}}] as @e[type=illusioner,tag=!smithed.entity,distance=..1.5,limit=1,nbt={active_effects:[{id:'minecraft:speed'}]}] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/liab/illusioner +execute if entity @s[nbt={Item:{id:"minecraft:crossbow"}}] as @e[type=evoker,tag=!smithed.entity,distance=..1.5,limit=1,nbt={active_effects:[{id:'minecraft:slowness',amplifier:3b}]}] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/liab/evoker diff --git a/gm4_mob_curing/overlay_18/data/gm4_mob_curing/functions/cure/zombified_check.mcfunction b/gm4_mob_curing/overlay_18/data/gm4_mob_curing/functions/cure/zombified_check.mcfunction index b7cad07035..589854efd4 100644 --- a/gm4_mob_curing/overlay_18/data/gm4_mob_curing/functions/cure/zombified_check.mcfunction +++ b/gm4_mob_curing/overlay_18/data/gm4_mob_curing/functions/cure/zombified_check.mcfunction @@ -3,5 +3,5 @@ # at @s # run from main -execute if entity @s[nbt={ActiveEffects:[{Id:18}]}] run function gm4_mob_curing:cure/zombified_piglin -execute if entity @s[nbt={ActiveEffects:[{Id:1}]}] run function gm4_mob_curing:cure/zombified_pig +execute if entity @s[nbt={active_effects:[{id:'minecraft:weakness'}]}] run function gm4_mob_curing:cure/zombified_piglin +execute if entity @s[nbt={active_effects:[{id:'minecraft:speed'}]}] run function gm4_mob_curing:cure/zombified_pig diff --git a/gm4_mountaineering/overlay_18/data/gm4_mountaineering/functions/climbing_effects/add_climb_effects.mcfunction b/gm4_mountaineering/overlay_18/data/gm4_mountaineering/functions/climbing_effects/add_climb_effects.mcfunction index 7f0f0f9754..8649219315 100644 --- a/gm4_mountaineering/overlay_18/data/gm4_mountaineering/functions/climbing_effects/add_climb_effects.mcfunction +++ b/gm4_mountaineering/overlay_18/data/gm4_mountaineering/functions/climbing_effects/add_climb_effects.mcfunction @@ -7,10 +7,10 @@ effect give @s jump_boost 1 1 true # summon shulker in front and below player, but 1000 blocks up, facing towards them -execute if entity @s[y_rotation=135..-135] positioned ~ ~-1.5 ~-1 align xyz unless entity @e[type=shulker, tag=gm4_mountaineering_climb_assist, dx=0.5, dz=0.5, dy=1] unless block ~0.5 ~1 ~0.5 minecraft:air run summon minecraft:shulker ~0.5 ~1000 ~0.5 {Color:7,AttachFace:2,Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,Silent:1b,Tags:[gm4_mountaineering_climb_assist, gm4_mountaineering_new_shulker, gm4_mountaineering_peek_unset],DeathLootTable:"minecraft:empty",ActiveEffects:[{Id:14,Duration:100000,ShowParticles:0b}]} -execute if entity @s[y_rotation=-135..-45] positioned ~1 ~-1.5 ~ align xyz unless entity @e[type=shulker, tag=gm4_mountaineering_climb_assist, dx=0.5, dz=0.5, dy=1] unless block ~0.5 ~1 ~0.5 minecraft:air run summon minecraft:shulker ~0.5 ~1000 ~0.5 {Color:7,AttachFace:5,Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,Silent:1b,Tags:[gm4_mountaineering_climb_assist, gm4_mountaineering_new_shulker, gm4_mountaineering_peek_unset],DeathLootTable:"minecraft:empty",ActiveEffects:[{Id:14,Duration:100000,ShowParticles:0b}]} -execute if entity @s[y_rotation=-45..45] positioned ~ ~-1.5 ~1 align xyz unless entity @e[type=shulker, tag=gm4_mountaineering_climb_assist, dx=0.5, dz=0.5, dy=1] unless block ~0.5 ~1 ~0.5 minecraft:air run summon minecraft:shulker ~0.5 ~1000 ~0.5 {Color:7,AttachFace:3,Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,Silent:1b,Tags:[gm4_mountaineering_climb_assist, gm4_mountaineering_new_shulker, gm4_mountaineering_peek_unset],DeathLootTable:"minecraft:empty",ActiveEffects:[{Id:14,Duration:100000,ShowParticles:0b}]} -execute if entity @s[y_rotation=45..135] positioned ~-1 ~-1.5 ~ align xyz unless entity @e[type=shulker, tag=gm4_mountaineering_climb_assist, dx=0.5, dz=0.5, dy=1] unless block ~0.5 ~1 ~0.5 minecraft:air run summon minecraft:shulker ~0.5 ~1000 ~0.5 {Color:7,AttachFace:4,Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,Silent:1b,Tags:[gm4_mountaineering_climb_assist, gm4_mountaineering_new_shulker, gm4_mountaineering_peek_unset],DeathLootTable:"minecraft:empty",ActiveEffects:[{Id:14,Duration:100000,ShowParticles:0b}]} +execute if entity @s[y_rotation=135..-135] positioned ~ ~-1.5 ~-1 align xyz unless entity @e[type=shulker, tag=gm4_mountaineering_climb_assist, dx=0.5, dz=0.5, dy=1] unless block ~0.5 ~1 ~0.5 minecraft:air run summon minecraft:shulker ~0.5 ~1000 ~0.5 {Color:7,AttachFace:2,Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,Silent:1b,Tags:[gm4_mountaineering_climb_assist, gm4_mountaineering_new_shulker, gm4_mountaineering_peek_unset],DeathLootTable:"minecraft:empty",active_effects:[{id:'minecraft:invisibility',duration:100000,show_particles:0b}]} +execute if entity @s[y_rotation=-135..-45] positioned ~1 ~-1.5 ~ align xyz unless entity @e[type=shulker, tag=gm4_mountaineering_climb_assist, dx=0.5, dz=0.5, dy=1] unless block ~0.5 ~1 ~0.5 minecraft:air run summon minecraft:shulker ~0.5 ~1000 ~0.5 {Color:7,AttachFace:5,Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,Silent:1b,Tags:[gm4_mountaineering_climb_assist, gm4_mountaineering_new_shulker, gm4_mountaineering_peek_unset],DeathLootTable:"minecraft:empty",active_effects:[{id:'minecraft:invisibility',duration:100000,show_particles:0b}]} +execute if entity @s[y_rotation=-45..45] positioned ~ ~-1.5 ~1 align xyz unless entity @e[type=shulker, tag=gm4_mountaineering_climb_assist, dx=0.5, dz=0.5, dy=1] unless block ~0.5 ~1 ~0.5 minecraft:air run summon minecraft:shulker ~0.5 ~1000 ~0.5 {Color:7,AttachFace:3,Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,Silent:1b,Tags:[gm4_mountaineering_climb_assist, gm4_mountaineering_new_shulker, gm4_mountaineering_peek_unset],DeathLootTable:"minecraft:empty",active_effects:[{id:'minecraft:invisibility',duration:100000,show_particles:0b}]} +execute if entity @s[y_rotation=45..135] positioned ~-1 ~-1.5 ~ align xyz unless entity @e[type=shulker, tag=gm4_mountaineering_climb_assist, dx=0.5, dz=0.5, dy=1] unless block ~0.5 ~1 ~0.5 minecraft:air run summon minecraft:shulker ~0.5 ~1000 ~0.5 {Color:7,AttachFace:4,Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,Silent:1b,Tags:[gm4_mountaineering_climb_assist, gm4_mountaineering_new_shulker, gm4_mountaineering_peek_unset],DeathLootTable:"minecraft:empty",active_effects:[{id:'minecraft:invisibility',duration:100000,show_particles:0b}]} # teleport shulker down 999 blocks to bring them into position (999 to put the shulker one block below feet) execute positioned ~ ~1000 ~ as @e[type=shulker, tag=gm4_mountaineering_climb_assist, tag=gm4_mountaineering_new_shulker] at @s run teleport @s ~ ~-999 ~ diff --git a/gm4_mysterious_midnights/overlay_18/data/gm4_falling_stars/functions/falling_star/spawn.mcfunction b/gm4_mysterious_midnights/overlay_18/data/gm4_falling_stars/functions/falling_star/spawn.mcfunction index 35c5ee9ca7..4745163e6a 100644 --- a/gm4_mysterious_midnights/overlay_18/data/gm4_falling_stars/functions/falling_star/spawn.mcfunction +++ b/gm4_mysterious_midnights/overlay_18/data/gm4_falling_stars/functions/falling_star/spawn.mcfunction @@ -3,7 +3,7 @@ # run from gm4_falling_stars:event # summon falling star -summon shulker_bullet ~ ~ ~ {Motion:[0.0d,0.0d,0.0d],Tags:["gm4_falling_star","gm4_new_falling_star"],CustomName:'{"translate":"entity.gm4.falling_star","fallback":"Falling Star"}',Steps:0,Passengers:[{id:"potion",Tags:["gm4_falling_star"],CustomName:'"Falling Star"',Item:{Count:1b,id:"splash_potion",tag:{CustomPotionEffects:[{Id:25,Amplifier:0,Duration:300}],Potion:"thick",CustomPotionColor:16777215}}},{id:"area_effect_cloud",Tags:["gm4_falling_star"],Duration:600,CustomName:'"gm4_falling_star_particle"',Radius:0.5f,Particle:"end_rod"},{id:"item",Age:3600,Tags:["gm4_falling_star","gm4_falling_stars_item"],Item:{Count:1b,id:"minecraft:end_stone"}}]} +summon shulker_bullet ~ ~ ~ {Motion:[0.0d,0.0d,0.0d],Tags:["gm4_falling_star","gm4_new_falling_star"],CustomName:'{"translate":"entity.gm4.falling_star","fallback":"Falling Star"}',Steps:0,Passengers:[{id:"potion",Tags:["gm4_falling_star"],CustomName:'"Falling Star"',Item:{Count:1b,id:"splash_potion",tag:{custom_potion_effects:[{id:'minecraft:levitation',amplifier:0,duration:300}],Potion:"thick",CustomPotionColor:16777215}}},{id:"area_effect_cloud",Tags:["gm4_falling_star"],duration:600,CustomName:'"gm4_falling_star_particle"',Radius:0.5f,Particle:"end_rod"},{id:"item",Age:3600,Tags:["gm4_falling_star","gm4_falling_stars_item"],Item:{Count:1b,id:"minecraft:end_stone"}}]} # set random motion vector data modify storage gm4_falling_stars:motion temp.uuid set from entity @e[type=shulker_bullet,tag=gm4_new_falling_star,limit=1] UUID diff --git a/gm4_mysterious_midnights/overlay_18/data/gm4_resurrecting_skeletons/functions/spawn_skeleton.mcfunction b/gm4_mysterious_midnights/overlay_18/data/gm4_resurrecting_skeletons/functions/spawn_skeleton.mcfunction index 2613f44445..39f732fba3 100644 --- a/gm4_mysterious_midnights/overlay_18/data/gm4_resurrecting_skeletons/functions/spawn_skeleton.mcfunction +++ b/gm4_mysterious_midnights/overlay_18/data/gm4_resurrecting_skeletons/functions/spawn_skeleton.mcfunction @@ -2,7 +2,7 @@ #at @s #called by event -summon skeleton ~ ~ ~ {DeathLootTable:"minecraft:empty",ArmorItems:[],HandItems:[],ActiveEffects:[{Id:9,Amplifier:1,Duration:30}],Attributes:[{Name:"generic.attack_damage",Base:10.0}]} +summon skeleton ~ ~ ~ {DeathLootTable:"minecraft:empty",ArmorItems:[],HandItems:[],active_effects:[{id:'minecraft:nausea',amplifier:1,duration:30}],Attributes:[{Name:"generic.attack_damage",Base:10.0}]} playsound block.redstone_torch.burnout hostile @a[distance=..16] ~ ~ ~ 1 .1 function gm4_resurrecting_skeletons:absorb_bone diff --git a/gm4_mysterious_midnights/overlay_18/data/gm4_resurrecting_zombies/functions/spawn_zombie.mcfunction b/gm4_mysterious_midnights/overlay_18/data/gm4_resurrecting_zombies/functions/spawn_zombie.mcfunction index eee97295b1..f2cd436291 100644 --- a/gm4_mysterious_midnights/overlay_18/data/gm4_resurrecting_zombies/functions/spawn_zombie.mcfunction +++ b/gm4_mysterious_midnights/overlay_18/data/gm4_resurrecting_zombies/functions/spawn_zombie.mcfunction @@ -2,7 +2,7 @@ #at @s #called by event -summon zombie ~ ~ ~ {DeathLootTable:"minecraft:empty",ArmorItems:[],HandItems:[],ActiveEffects:[{Id:9,Amplifier:1,Duration:30}],Attributes:[{Name:"generic.attack_damage",Base:10.0}]} +summon zombie ~ ~ ~ {DeathLootTable:"minecraft:empty",ArmorItems:[],HandItems:[],active_effects:[{id:'minecraft:nausea',amplifier:1,duration:30}],Attributes:[{Name:"generic.attack_damage",Base:10.0}]} playsound block.redstone_torch.burnout hostile @a[distance=..16] ~ ~ ~ 1 .1 function gm4_resurrecting_zombies:absorb_rotten_flesh diff --git a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/congealed_shard.mcfunction b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/congealed_shard.mcfunction index 6d32afb74a..da82e17c2e 100644 --- a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/congealed_shard.mcfunction +++ b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/congealed_shard.mcfunction @@ -2,7 +2,7 @@ # run from soul_forge/entities/summon_congealed_shard # spawn bat -summon bat ~ ~0.2 ~ {CustomName:'{"translate":"entity.gm4.congealed_shard","fallback":"Congealed Soul Shard§"}',CustomNameVisible:0,Team:"gm4_hide_name",Health:2.0f,DeathLootTable:"minecraft:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_congealed_shard","gm4_oa_ignore","gm4_defused_bat"],HandDropChances:[2.0f,1.0f],Motion:[0.0,0.6,0.0],ActiveEffects:[{Id:12,Amplifier:0b,Duration:1000000,ShowParticles:0b}]} +summon bat ~ ~0.2 ~ {CustomName:'{"translate":"entity.gm4.congealed_shard","fallback":"Congealed Soul Shard§"}',CustomNameVisible:0,Team:"gm4_hide_name",Health:2.0f,DeathLootTable:"minecraft:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_congealed_shard","gm4_oa_ignore","gm4_defused_bat"],HandDropChances:[2.0f,1.0f],Motion:[0.0,0.6,0.0],active_effects:[{id:'minecraft:fire_resistance',amplifier:0b,duration:1000000,show_particles:0b}]} # set loot drop to soul shard data modify entity @e[type=bat,tag=gm4_oa_unset,limit=1] HandItems[0] set from storage gm4_orb_of_ankou:temp Item diff --git a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/fire_sprite.mcfunction b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/fire_sprite.mcfunction index 4b7d61aa91..8831acdf77 100644 --- a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/fire_sprite.mcfunction +++ b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/fire_sprite.mcfunction @@ -2,7 +2,7 @@ # run from both soul_forge/entities/summon_powder_sprite and soul_forge/entities/summon_glowstone_sprite # spawn zombie -summon minecraft:zombie ~ ~0.2 ~ {Fire:1000000,Motion:[0.0,0.6,0.0],Silent:1b,CustomNameVisible:0b,DeathLootTable:"minecraft:empty",Health:10.0f,IsBaby:1b,CanBreakDoors:0b,CanPickUpLoot:0b,Tags:["gm4_oa_unset","gm4_oa_ignore","gm4_oa_fire_sprite"],CustomName:'{"translate":"entity.gm4.fire_sprite","fallback":"Fire Sprite§"}',Team:"gm4_hide_name",ArmorItems:[{},{},{},{id:"minecraft:golden_helmet",Count:1b,tag:{CustomModelData:3420006,Enchantments:[{id:"minecraft:protection",lvl:0s}],HideFlags:1}}],ArmorDropChances:[0.0F,0.0F,0.0F,-327.670F],ActiveEffects:[{Id:14,Amplifier:0b,Duration:1000000,ShowParticles:0b}],Attributes:[{Name:"generic.follow_range",Base:8},{Name:"generic.attack_damage",Base:1},{Name:"generic.attack_knockback",Base:0},{Name:"zombie.spawn_reinforcements",Base:0}]} +summon minecraft:zombie ~ ~0.2 ~ {Fire:1000000,Motion:[0.0,0.6,0.0],Silent:1b,CustomNameVisible:0b,DeathLootTable:"minecraft:empty",Health:10.0f,IsBaby:1b,CanBreakDoors:0b,CanPickUpLoot:0b,Tags:["gm4_oa_unset","gm4_oa_ignore","gm4_oa_fire_sprite"],CustomName:'{"translate":"entity.gm4.fire_sprite","fallback":"Fire Sprite§"}',Team:"gm4_hide_name",ArmorItems:[{},{},{},{id:"minecraft:golden_helmet",Count:1b,tag:{CustomModelData:3420006,Enchantments:[{id:"minecraft:protection",lvl:0s}],HideFlags:1}}],ArmorDropChances:[0.0F,0.0F,0.0F,-327.670F],active_effects:[{id:'minecraft:invisibility',amplifier:0b,duration:1000000,show_particles:0b}],Attributes:[{Name:"generic.follow_range",Base:8},{Name:"generic.attack_damage",Base:1},{Name:"generic.attack_knockback",Base:0},{Name:"zombie.spawn_reinforcements",Base:0}]} # randomize motion in x and z execute as @e[type=zombie,tag=gm4_oa_unset,limit=1] run function gm4_orb_of_ankou:soul_forge/entities/randomize_motion diff --git a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/living_orb.mcfunction b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/living_orb.mcfunction index 7c1e568882..14aa8b33dc 100644 --- a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/living_orb.mcfunction +++ b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/living_orb.mcfunction @@ -2,7 +2,7 @@ # run from soul_forge/entities/summon_living_orb # spawn silverfish -summon silverfish ~ ~0.2 ~ {CustomName:'{"translate":"entity.gm4.living_orb","fallback":"Living Orb§"}',CustomNameVisible:0,Team:"gm4_hide_name",Health:2.0f,DeathLootTable:"minecraft:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_living_orb","gm4_oa_ignore"],HandDropChances:[2.0f,1.0f],Motion:[0.0,0.6,0.0],ActiveEffects:[{Id:12,Amplifier:0b,Duration:1000000,ShowParticles:0b}]} +summon silverfish ~ ~0.2 ~ {CustomName:'{"translate":"entity.gm4.living_orb","fallback":"Living Orb§"}',CustomNameVisible:0,Team:"gm4_hide_name",Health:2.0f,DeathLootTable:"minecraft:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_living_orb","gm4_oa_ignore"],HandDropChances:[2.0f,1.0f],Motion:[0.0,0.6,0.0],active_effects:[{id:'minecraft:fire_resistance',amplifier:0b,duration:1000000,show_particles:0b}]} # set loot drop to orb of ankou data modify entity @e[type=silverfish,tag=gm4_oa_unset,limit=1] HandItems[0] set from storage gm4_orb_of_ankou:temp Item diff --git a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/severed_soul.mcfunction b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/severed_soul.mcfunction index 3498916558..759128ec36 100644 --- a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/severed_soul.mcfunction +++ b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/severed_soul.mcfunction @@ -2,7 +2,7 @@ # run from both soul_forge/entities/summon_failed_essence and soul_forge/entities/summon_congealed_essence # spawn endermite -summon endermite ~ ~0.2 ~ {CustomName:'{"translate":"entity.gm4.severed_soul","fallback":"Severed Soul§"}',CustomNameVisible:0,Team:"gm4_hide_name",Health:2.0f,DeathLootTable:"minecraft:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_severed_soul","gm4_oa_ignore"],HandDropChances:[2.0f,1.0f],Motion:[0.0,0.6,0.0],ActiveEffects:[{Id:12,Amplifier:0b,Duration:1000000,ShowParticles:0b}]} +summon endermite ~ ~0.2 ~ {CustomName:'{"translate":"entity.gm4.severed_soul","fallback":"Severed Soul§"}',CustomNameVisible:0,Team:"gm4_hide_name",Health:2.0f,DeathLootTable:"minecraft:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_severed_soul","gm4_oa_ignore"],HandDropChances:[2.0f,1.0f],Motion:[0.0,0.6,0.0],active_effects:[{id:'minecraft:fire_resistance',amplifier:0b,duration:1000000,show_particles:0b}]} # set loot drop to soul essence data modify entity @e[type=endermite,tag=gm4_oa_unset,limit=1] HandItems[0] set from storage gm4_orb_of_ankou:temp ArmorItems[0] diff --git a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/summon_extra_orb.mcfunction b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/summon_extra_orb.mcfunction index 7db8b963c8..9052488f17 100644 --- a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/summon_extra_orb.mcfunction +++ b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/summon_extra_orb.mcfunction @@ -2,7 +2,7 @@ # run from soul_forge/destroy # spawn silverfish -summon silverfish ~ ~0.2 ~ {CustomName:'{"translate":"entity.gm4.living_orb","fallback":"Living Orb"}',CustomNameVisible:0,Team:"gm4_hide_name",DeathLootTable:"minecraft:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_living_orb","gm4_oa_ignore"],HandDropChances:[2.0f,1.0f],Motion:[0.0,0.6,0.0],ActiveEffects:[{Id:12,Amplifier:0b,Duration:1000000,ShowParticles:0b}]} +summon silverfish ~ ~0.2 ~ {CustomName:'{"translate":"entity.gm4.living_orb","fallback":"Living Orb"}',CustomNameVisible:0,Team:"gm4_hide_name",DeathLootTable:"minecraft:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_living_orb","gm4_oa_ignore"],HandDropChances:[2.0f,1.0f],Motion:[0.0,0.6,0.0],active_effects:[{id:'minecraft:fire_resistance',amplifier:0b,duration:1000000,show_particles:0b}]} # set loot drop to orb of ankou data modify entity @e[type=silverfish,tag=gm4_oa_unset,limit=1] HandItems[0] set from storage gm4_orb_of_ankou:temp ArmorItems[3] diff --git a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/summon_extra_shard.mcfunction b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/summon_extra_shard.mcfunction index 172697b1e2..acc673b67d 100644 --- a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/summon_extra_shard.mcfunction +++ b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/summon_extra_shard.mcfunction @@ -2,7 +2,7 @@ # run from soul_forge/destroy # spawn bat -summon bat ~ ~0.2 ~ {CustomName:'{"translate":"entity.gm4.congealed_shard","fallback":"Congealed Soul Shard§"}',CustomNameVisible:0,Team:"gm4_hide_name",DeathLootTable:"minecraft:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_congealed_shard","gm4_oa_ignore","gm4_defused_bat"],HandDropChances:[2.0f,1.0f],Motion:[0.0,0.6,0.0],ActiveEffects:[{Id:12,Amplifier:0b,Duration:1000000,ShowParticles:0b}]} +summon bat ~ ~0.2 ~ {CustomName:'{"translate":"entity.gm4.congealed_shard","fallback":"Congealed Soul Shard§"}',CustomNameVisible:0,Team:"gm4_hide_name",DeathLootTable:"minecraft:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_congealed_shard","gm4_oa_ignore","gm4_defused_bat"],HandDropChances:[2.0f,1.0f],Motion:[0.0,0.6,0.0],active_effects:[{id:'minecraft:fire_resistance',amplifier:0b,duration:1000000,show_particles:0b}]} # set loot drop to soul shard data modify entity @e[type=bat,tag=gm4_oa_unset,limit=1] HandItems[0] set from storage gm4_orb_of_ankou:temp ArmorItems[2] diff --git a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/wandering_tear.mcfunction b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/wandering_tear.mcfunction index d58b48dc97..8231786c8a 100644 --- a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/wandering_tear.mcfunction +++ b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/wandering_tear.mcfunction @@ -2,7 +2,7 @@ # run from soul_forge/entities/summon_wandering_tear # spawn vex -summon minecraft:vex ~ ~0.2 ~ {Silent:1b,Glowing:1b,CustomNameVisible:0b,LifeTicks:1200,DeathLootTable:"minecraft:empty",Tags:["gm4_oa_ignore","gm4_oa_wandering_tear"],CustomName:'{"translate":"entity.gm4.wandering_tear","fallback":"Wandering Tear§"}',Team:"gm4_hide_name",ActiveEffects:[{Id:14,Amplifier:0b,Duration:1000000,ShowParticles:0b}],Attributes:[{Name:"generic.follow_range",Base:48},{Name:"generic.attack_damage",Base:3}]} +summon minecraft:vex ~ ~0.2 ~ {Silent:1b,Glowing:1b,CustomNameVisible:0b,LifeTicks:1200,DeathLootTable:"minecraft:empty",Tags:["gm4_oa_ignore","gm4_oa_wandering_tear"],CustomName:'{"translate":"entity.gm4.wandering_tear","fallback":"Wandering Tear§"}',Team:"gm4_hide_name",active_effects:[{id:'minecraft:invisibility',amplifier:0b,duration:1000000,show_particles:0b}],Attributes:[{Name:"generic.follow_range",Base:48},{Name:"generic.attack_damage",Base:3}]} # visuals playsound minecraft:entity.vex.hurt hostile @a[distance=..12] ~ ~ ~ 0.6 1.2 diff --git a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/withering_magic.mcfunction b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/withering_magic.mcfunction index 401778631f..6070ffad94 100644 --- a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/withering_magic.mcfunction +++ b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/entities/withering_magic.mcfunction @@ -2,7 +2,7 @@ # run from both soul_forge/destroy # spawn area_effect_cloud -summon minecraft:area_effect_cloud ~ ~0.8 ~ {ReapplicationDelay:200,Radius:4f,RadiusPerTick:-0.001f,Duration:1800,Effects:[{Id:20,Amplifier:1b,Duration:300}],CustomName:'{"translate":"entity.gm4.withering_magic","fallback":"Withering Magic"}'} +summon minecraft:area_effect_cloud ~ ~0.8 ~ {ReapplicationDelay:200,Radius:4f,RadiusPerTick:-0.001f,duration:1800,effects:[{id:'minecraft:wither',amplifier:1b,duration:300}],CustomName:'{"translate":"entity.gm4.withering_magic","fallback":"Withering Magic"}'} # visuals playsound minecraft:entity.wither.hurt hostile @a[distance=..12] ~ ~ ~ 0.6 1.2 diff --git a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/outputs/create_shard.mcfunction b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/outputs/create_shard.mcfunction index 6d521d38ab..03ae84c102 100644 --- a/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/outputs/create_shard.mcfunction +++ b/gm4_orb_of_ankou/overlay_18/data/gm4_orb_of_ankou/functions/soul_forge/outputs/create_shard.mcfunction @@ -2,7 +2,7 @@ # run from soul_forge/destroy # spawn bat -summon minecraft:bat ~ ~ ~ {CustomName:'{"translate":"entity.gm4.possessed_shard","fallback":"Possessed Soul Shard§"}',CustomNameVisible:0b,Team:"gm4_hide_name",DeathLootTable:"minecraft:empty",PersistenceRequired:1b,Health:2.0f,Tags:["gm4_oa_unset","gm4_oa_possessed_soul_shard","gm4_oa_ignore","gm4_defused_bat"],ActiveEffects:[{Id:12,Amplifier:0b,Duration:1000000,ShowParticles:0b}],ArmorDropChances:[0.0f,0.0f,0.0f,2.0f],ArmorItems:[{},{},{},{id:"minecraft:flint",Count:1b,tag:{AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"generic.attack_damage",Amount:-0.2,Operation:1,UUID:[I;0,612411,0,482012],Slot:"offhand"}],gm4_orb_of_ankou:{item:"soul_shard"},Enchantments:[{id:"minecraft:protection",lvl:0s}],HideFlags:1,display:{Name:'{"translate":"item.gm4.soul_shard","fallback":"Soul Shard","italic":false,"color":"white"}'}}}]} +summon minecraft:bat ~ ~ ~ {CustomName:'{"translate":"entity.gm4.possessed_shard","fallback":"Possessed Soul Shard§"}',CustomNameVisible:0b,Team:"gm4_hide_name",DeathLootTable:"minecraft:empty",PersistenceRequired:1b,Health:2.0f,Tags:["gm4_oa_unset","gm4_oa_possessed_soul_shard","gm4_oa_ignore","gm4_defused_bat"],active_effects:[{id:'minecraft:fire_resistance',amplifier:0b,duration:1000000,show_particles:0b}],ArmorDropChances:[0.0f,0.0f,0.0f,2.0f],ArmorItems:[{},{},{},{id:"minecraft:flint",Count:1b,tag:{AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"generic.attack_damage",Amount:-0.2,Operation:1,UUID:[I;0,612411,0,482012],Slot:"offhand"}],gm4_orb_of_ankou:{item:"soul_shard"},Enchantments:[{id:"minecraft:protection",lvl:0s}],HideFlags:1,display:{Name:'{"translate":"item.gm4.soul_shard","fallback":"Soul Shard","italic":false,"color":"white"}'}}}]} # set data of soul essence into soul shard data modify storage gm4_orb_of_ankou:temp Drop set from entity @e[type=bat,tag=gm4_oa_unset,limit=1] ArmorItems[3] diff --git a/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/functions/util_below.mcfunction b/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/functions/util_below.mcfunction index 84688996d2..414c54435a 100644 --- a/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/functions/util_below.mcfunction +++ b/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/functions/util_below.mcfunction @@ -4,40 +4,40 @@ tag @s add gm4_processing_tank #night_vision -execute if score @s[tag=gm4_lt_night_vision] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:16}]}] run function gm4_potion_liquids:util/night_vision +execute if score @s[tag=gm4_lt_night_vision] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:night_vision'}]}] run function gm4_potion_liquids:util/night_vision #invisibility -execute if score @s[tag=gm4_lt_invisibility] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:14}]}] run function gm4_potion_liquids:util/invisibility +execute if score @s[tag=gm4_lt_invisibility] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:invisibility'}]}] run function gm4_potion_liquids:util/invisibility #leaping -execute if score @s[tag=gm4_lt_leaping] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:8}]}] run function gm4_potion_liquids:util/leaping +execute if score @s[tag=gm4_lt_leaping] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:jump_boost'}]}] run function gm4_potion_liquids:util/leaping #strong_leaping -execute if score @s[tag=gm4_lt_strong_leaping] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:8,Amplifier:1b}]}] run function gm4_potion_liquids:util/strong_leaping +execute if score @s[tag=gm4_lt_strong_leaping] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:jump_boost',amplifier:1b}]}] run function gm4_potion_liquids:util/strong_leaping #fire_resistance -execute if score @s[tag=gm4_lt_fire_resistance] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:12}]}] run function gm4_potion_liquids:util/fire_resistance +execute if score @s[tag=gm4_lt_fire_resistance] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:fire_resistance'}]}] run function gm4_potion_liquids:util/fire_resistance #swiftness -execute if score @s[tag=gm4_lt_swiftness] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:1}]}] run function gm4_potion_liquids:util/swiftness +execute if score @s[tag=gm4_lt_swiftness] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:speed'}]}] run function gm4_potion_liquids:util/swiftness #strong_swiftness -execute if score @s[tag=gm4_lt_strong_swiftness] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:1,Amplifier:1b}]}] run function gm4_potion_liquids:util/strong_swiftness +execute if score @s[tag=gm4_lt_strong_swiftness] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:speed',amplifier:1b}]}] run function gm4_potion_liquids:util/strong_swiftness #slowness -execute if score @s[tag=gm4_lt_slowness] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:2}]}] run function gm4_potion_liquids:util/slowness +execute if score @s[tag=gm4_lt_slowness] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:slowness'}]}] run function gm4_potion_liquids:util/slowness #strong_slowness -execute if score @s[tag=gm4_lt_strong_slowness] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:2,Amplifier:1b}]}] run function gm4_potion_liquids:util/strong_slowness +execute if score @s[tag=gm4_lt_strong_slowness] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:slowness',amplifier:1b}]}] run function gm4_potion_liquids:util/strong_slowness #turtle_master -execute if score @s[tag=gm4_lt_turtle_master] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:2,Amplifier:3b},{Id:11,Amplifier:2b}]}] run function gm4_potion_liquids:util/turtle_master +execute if score @s[tag=gm4_lt_turtle_master] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:slowness',amplifier:3b},{id:'minecraft:resistance',amplifier:2b}]}] run function gm4_potion_liquids:util/turtle_master #strong_turtle_master -execute if score @s[tag=gm4_lt_strong_turtle_master] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:2,Amplifier:5b},{Id:11,Amplifier:3b}]}] run function gm4_potion_liquids:util/strong_turtle_master +execute if score @s[tag=gm4_lt_strong_turtle_master] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:slowness',amplifier:5b},{id:'minecraft:resistance',amplifier:3b}]}] run function gm4_potion_liquids:util/strong_turtle_master #water_breathing -execute if score @s[tag=gm4_lt_water_breathing] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:13}]}] run function gm4_potion_liquids:util/water_breathing +execute if score @s[tag=gm4_lt_water_breathing] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:water_breathing'}]}] run function gm4_potion_liquids:util/water_breathing #healing execute if score @s[tag=gm4_lt_healing] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] run function gm4_potion_liquids:util/healing @@ -52,33 +52,33 @@ execute if score @s[tag=gm4_lt_harming] gm4_lt_value matches 1.. as @e[team=!inv execute if score @s[tag=gm4_lt_strong_harming] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] run function gm4_potion_liquids:util/strong_harming #poison -execute if score @s[tag=gm4_lt_poison] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:19}]}] run function gm4_potion_liquids:util/poison +execute if score @s[tag=gm4_lt_poison] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:poison'}]}] run function gm4_potion_liquids:util/poison #strong poison -execute if score @s[tag=gm4_lt_strong_poison] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:19,Amplifier:1b}]}] run function gm4_potion_liquids:util/strong_poison +execute if score @s[tag=gm4_lt_strong_poison] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:poison',amplifier:1b}]}] run function gm4_potion_liquids:util/strong_poison #regeneration -execute if score @s[tag=gm4_lt_regeneration] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:10}]}] run function gm4_potion_liquids:util/regeneration +execute if score @s[tag=gm4_lt_regeneration] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:regeneration'}]}] run function gm4_potion_liquids:util/regeneration #strong regeneration -execute if score @s[tag=gm4_lt_strong_regeneration] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:10,Amplifier:1b}]}] run function gm4_potion_liquids:util/strong_regeneration +execute if score @s[tag=gm4_lt_strong_regeneration] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:regeneration',amplifier:1b}]}] run function gm4_potion_liquids:util/strong_regeneration #strength -execute if score @s[tag=gm4_lt_strength] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:5}]}] run function gm4_potion_liquids:util/strength +execute if score @s[tag=gm4_lt_strength] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:strength'}]}] run function gm4_potion_liquids:util/strength #strong strength -execute if score @s[tag=gm4_lt_strong_strength] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:5,Amplifier:1b}]}] run function gm4_potion_liquids:util/strong_strength +execute if score @s[tag=gm4_lt_strong_strength] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:strength',amplifier:1b}]}] run function gm4_potion_liquids:util/strong_strength #weakness -execute if score @s[tag=gm4_lt_weakness] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:18}]}] run function gm4_potion_liquids:util/weakness +execute if score @s[tag=gm4_lt_weakness] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:weakness'}]}] run function gm4_potion_liquids:util/weakness #luck -execute if score @s[tag=gm4_lt_luck] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:26}]}] run function gm4_potion_liquids:util/luck +execute if score @s[tag=gm4_lt_luck] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:luck'}]}] run function gm4_potion_liquids:util/luck #slow falling -execute if score @s[tag=gm4_lt_slow_falling] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:28}]}] run function gm4_potion_liquids:util/slow_falling +execute if score @s[tag=gm4_lt_slow_falling] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:slow_falling'}]}] run function gm4_potion_liquids:util/slow_falling #floating -execute if score @s[tag=gm4_lt_floating] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:25}]}] run function gm4_potion_liquids:util/floating +execute if score @s[tag=gm4_lt_floating] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:levitation'}]}] run function gm4_potion_liquids:util/floating tag @s remove gm4_processing_tank diff --git a/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/loot_tables/floating_potion.json b/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/loot_tables/floating_potion.json index 2e40e1297a..c30df18341 100644 --- a/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/loot_tables/floating_potion.json +++ b/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/loot_tables/floating_potion.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{Potion:\"potion_liquids:floating\",CustomPotionEffects:[{Id:25,Amplifier:2b,Duration:900}],CustomPotionColor:13631487}" + "tag": "{Potion:\"potion_liquids:floating\",custom_potion_effects:[{id:'minecraft:levitation',amplifier:2b,duration:900}],CustomPotionColor:13631487}" }, { "function": "set_name", diff --git a/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/loot_tables/lingering_floating_potion.json b/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/loot_tables/lingering_floating_potion.json index 4fbf29c62c..497d8205da 100644 --- a/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/loot_tables/lingering_floating_potion.json +++ b/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/loot_tables/lingering_floating_potion.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{Potion:\"potion_liquids:floating\",HideFlags:32,CustomPotionEffects:[{Id:25,Amplifier:2b,Duration:225}],CustomPotionColor:13631487}" + "tag": "{Potion:\"potion_liquids:floating\",HideFlags:32,custom_potion_effects:[{id:'minecraft:levitation',amplifier:2b,duration:225}],CustomPotionColor:13631487}" }, { "function": "set_name", diff --git a/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/loot_tables/splash_floating_potion.json b/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/loot_tables/splash_floating_potion.json index fc5670478a..f8a3e60b5c 100644 --- a/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/loot_tables/splash_floating_potion.json +++ b/gm4_potion_liquids/overlay_18/data/gm4_potion_liquids/loot_tables/splash_floating_potion.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{Potion:\"potion_liquids:floating\",CustomPotionEffects:[{Id:25,Amplifier:2b,Duration:900}],CustomPotionColor:13631487}" + "tag": "{Potion:\"potion_liquids:floating\",custom_potion_effects:[{id:'minecraft:levitation',amplifier:2b,duration:900}],CustomPotionColor:13631487}" }, { "function": "set_name", diff --git a/gm4_potion_swords/overlay_18/data/gm4_potion_swords/functions/wither_potion.mcfunction b/gm4_potion_swords/overlay_18/data/gm4_potion_swords/functions/wither_potion.mcfunction index 0bb1d3a886..332ddc5a46 100644 --- a/gm4_potion_swords/overlay_18/data/gm4_potion_swords/functions/wither_potion.mcfunction +++ b/gm4_potion_swords/overlay_18/data/gm4_potion_swords/functions/wither_potion.mcfunction @@ -1,3 +1,3 @@ #@s = @s[scores={gm4_gold_sword=109} = @a[score_GM4_useGSword_min=1] effect give @e[distance=..2.5,tag=!smithed.strict,tag=!gm4_gold_user] wither 4 1 -execute as @e[type=skeleton,tag=!smithed.entity,nbt={ActiveEffects:[{Id:20}],HurtTime:10s},distance=..5] at @s run function gm4_potion_swords:wither_transform +execute as @e[type=skeleton,tag=!smithed.entity,nbt={active_effects:[{id:'minecraft:wither'}],HurtTime:10s},distance=..5] at @s run function gm4_potion_swords:wither_transform diff --git a/gm4_potion_swords/overlay_18/data/gm4_potion_swords/functions/wither_transform.mcfunction b/gm4_potion_swords/overlay_18/data/gm4_potion_swords/functions/wither_transform.mcfunction index 6a980627af..f3494863cc 100644 --- a/gm4_potion_swords/overlay_18/data/gm4_potion_swords/functions/wither_transform.mcfunction +++ b/gm4_potion_swords/overlay_18/data/gm4_potion_swords/functions/wither_transform.mcfunction @@ -1,5 +1,5 @@ -#@s = @e[type=skeleton,nbt={ActiveEffects:[{Id:20}]}] -summon wither_skeleton ~ ~ ~ {ActiveEffects:[{Id:20,Amplifier:1,Duration:20}],DeathLootTable:"minecraft:empty"} +#@s = @e[type=skeleton,nbt={active_effects:[{id:'minecraft:wither'}]}] +summon wither_skeleton ~ ~ ~ {active_effects:[{id:'minecraft:wither',amplifier:1,duration:20}],DeathLootTable:"minecraft:empty"} data modify entity @e[type=wither_skeleton,limit=1,distance=0] ArmorItems set from entity @s ArmorItems data modify entity @e[type=wither_skeleton,limit=1,distance=0] HandItems set from entity @s HandItems teleport @e[type=wither_skeleton,limit=1,distance=0] @s diff --git a/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_d.mcfunction b/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_d.mcfunction index aec40e9f39..c7f5af9351 100644 --- a/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_d.mcfunction +++ b/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_d.mcfunction @@ -8,7 +8,7 @@ execute store result entity @e[type=marker,tag=gm4_ta_pos_tracker,limit=1] Pos[1 execute store result entity @e[type=marker,tag=gm4_ta_pos_tracker,limit=1] Pos[2] double 0.01 run scoreboard players get @s gm4_ta_pos_z execute at @e[type=marker,tag=gm4_ta_pos_tracker,limit=1] run tag @s[distance=5.8..] add gm4_ta_teleported -execute if entity @s[tag=gm4_ta_teleported] at @e[type=marker,tag=gm4_ta_pos_tracker,limit=1] run tag @s[type=enderman,distance=5.8..7.2,nbt={ActiveEffects:[{Id:1,Amplifier:0b}]}] remove gm4_ta_teleported -execute if entity @s[tag=gm4_ta_teleported] at @e[type=marker,tag=gm4_ta_pos_tracker,limit=1] run tag @s[type=enderman,distance=5.8..10.1,nbt={ActiveEffects:[{Id:1,Amplifier:1b}]}] remove gm4_ta_teleported +execute if entity @s[tag=gm4_ta_teleported] at @e[type=marker,tag=gm4_ta_pos_tracker,limit=1] run tag @s[type=enderman,distance=5.8..7.2,nbt={active_effects:[{id:'minecraft:speed',amplifier:0b}]}] remove gm4_ta_teleported +execute if entity @s[tag=gm4_ta_teleported] at @e[type=marker,tag=gm4_ta_pos_tracker,limit=1] run tag @s[type=enderman,distance=5.8..10.1,nbt={active_effects:[{id:'minecraft:speed',amplifier:1b}]}] remove gm4_ta_teleported kill @e[type=marker,tag=gm4_ta_pos_tracker,limit=1] diff --git a/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_dx.mcfunction b/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_dx.mcfunction index 6fda164ef1..834fc3848d 100644 --- a/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_dx.mcfunction +++ b/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_dx.mcfunction @@ -14,7 +14,7 @@ execute if score difference gm4_ta_pos_x matches ..0 run scoreboard players oper # mark entity as teleported if they moved too far execute if entity @s[type=enderman] if score difference gm4_ta_pos_x matches 360.. run tag @s add gm4_ta_teleported -execute if score difference gm4_ta_pos_x matches 360..510 run tag @s[type=enderman,nbt={ActiveEffects:[{Id:1,Amplifier:0b}]}] remove gm4_ta_teleported -execute if score difference gm4_ta_pos_x matches 360..690 run tag @s[type=enderman,nbt={ActiveEffects:[{Id:1,Amplifier:1b}]}] remove gm4_ta_teleported +execute if score difference gm4_ta_pos_x matches 360..510 run tag @s[type=enderman,nbt={active_effects:[{id:'minecraft:speed',amplifier:0b}]}] remove gm4_ta_teleported +execute if score difference gm4_ta_pos_x matches 360..690 run tag @s[type=enderman,nbt={active_effects:[{id:'minecraft:speed',amplifier:1b}]}] remove gm4_ta_teleported execute if entity @s[type=shulker] if score difference gm4_ta_pos_x matches 90.. run tag @s add gm4_ta_teleported diff --git a/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_dz.mcfunction b/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_dz.mcfunction index 9b3febad3f..fc4cd218ad 100644 --- a/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_dz.mcfunction +++ b/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_dz.mcfunction @@ -14,7 +14,7 @@ execute if score difference gm4_ta_pos_z matches ..0 run scoreboard players oper # mark entity as teleported if they moved too far execute if entity @s[type=enderman] if score difference gm4_ta_pos_z matches 360.. run tag @s add gm4_ta_teleported -execute if score difference gm4_ta_pos_z matches 360..510 run tag @s[type=enderman,nbt={ActiveEffects:[{Id:1,Amplifier:0b}]}] remove gm4_ta_teleported -execute if score difference gm4_ta_pos_z matches 360..690 run tag @s[type=enderman,nbt={ActiveEffects:[{Id:1,Amplifier:1b}]}] remove gm4_ta_teleported +execute if score difference gm4_ta_pos_z matches 360..510 run tag @s[type=enderman,nbt={active_effects:[{id:'minecraft:speed',amplifier:0b}]}] remove gm4_ta_teleported +execute if score difference gm4_ta_pos_z matches 360..690 run tag @s[type=enderman,nbt={active_effects:[{id:'minecraft:speed',amplifier:1b}]}] remove gm4_ta_teleported execute if entity @s[type=shulker] if score difference gm4_ta_pos_z matches 90.. run tag @s add gm4_ta_teleported diff --git a/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_enderman_falling.mcfunction b/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_enderman_falling.mcfunction index 77bccfe906..1ebb321adf 100644 --- a/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_enderman_falling.mcfunction +++ b/gm4_teleportation_anchors/overlay_18/data/gm4_teleportation_anchors/functions/mob/track_movement/check_enderman_falling.mcfunction @@ -5,5 +5,5 @@ execute store result score fall gm4_ta_pos_y run data get entity @s FallDistance execute if score fall gm4_ta_pos_y matches 0..90 run tag @s add gm4_ta_teleported execute if score fall gm4_ta_pos_y matches 91.. run tag @s add gm4_ta_falling -execute if entity @s[type=enderman,tag=gm4_ta_teleported,nbt={ActiveEffects:[{Id:1,Amplifier:0b}]}] if score difference gm4_ta_pos_x matches 410..510 run tag @s remove gm4_ta_teleported -execute if entity @s[type=enderman,tag=gm4_ta_teleported,nbt={ActiveEffects:[{Id:1,Amplifier:1b}]}] if score difference gm4_ta_pos_x matches 410..690 run tag @s remove gm4_ta_teleported +execute if entity @s[type=enderman,tag=gm4_ta_teleported,nbt={active_effects:[{id:'minecraft:speed',amplifier:0b}]}] if score difference gm4_ta_pos_x matches 410..510 run tag @s remove gm4_ta_teleported +execute if entity @s[type=enderman,tag=gm4_ta_teleported,nbt={active_effects:[{id:'minecraft:speed',amplifier:1b}]}] if score difference gm4_ta_pos_x matches 410..690 run tag @s remove gm4_ta_teleported diff --git a/gm4_tnt_landmines/overlay_18/data/gm4_tnt_landmines/functions/blowup/safe.mcfunction b/gm4_tnt_landmines/overlay_18/data/gm4_tnt_landmines/functions/blowup/safe.mcfunction index be26bdb858..29af0ee8cf 100644 --- a/gm4_tnt_landmines/overlay_18/data/gm4_tnt_landmines/functions/blowup/safe.mcfunction +++ b/gm4_tnt_landmines/overlay_18/data/gm4_tnt_landmines/functions/blowup/safe.mcfunction @@ -1,4 +1,4 @@ # @s = detonated (terrain-safe) landmine # run from blowup/type_check -summon area_effect_cloud ~ ~1.3 ~ {Particle:"entity_effect",Radius:3f,Duration:60,CustomName:'{"italic":false,"translate":"entity.gm4.tnt_landmine","fallback":"a landmine"}',Effects:[{Id:7,Amplifier:4b,Duration:1,ShowParticles:0b}]} +summon area_effect_cloud ~ ~1.3 ~ {Particle:"entity_effect",Radius:3f,duration:60,CustomName:'{"italic":false,"translate":"entity.gm4.tnt_landmine","fallback":"a landmine"}',effects:[{id:'minecraft:instant_damage',amplifier:4b,duration:1,show_particles:0b}]} kill @s diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/cauldron/extra_items/create_possessed_items.mcfunction b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/cauldron/extra_items/create_possessed_items.mcfunction index f07472c981..b0108292c3 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/cauldron/extra_items/create_possessed_items.mcfunction +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/cauldron/extra_items/create_possessed_items.mcfunction @@ -3,6 +3,6 @@ # at @s # summons 1 vex for every unused item entity in a cauldron or every vex in bottle (on recipe processing) -summon vex ~ ~ ~ {CustomName:'{"translate":"entity.gm4.possessed_item","fallback":"Possessed Item§"}',CustomNameVisible:0,Team:"gm4_hide_name",LifeTicks:320,Attributes:[{Name:"generic.attack_damage",Base:2}],Health:4.0f,Motion:[0.0,0.25,0.0],ActiveEffects:[{Id:11,Amplifier:10,Duration:20,ShowParticles:0b}]} +summon vex ~ ~ ~ {CustomName:'{"translate":"entity.gm4.possessed_item","fallback":"Possessed Item§"}',CustomNameVisible:0,Team:"gm4_hide_name",LifeTicks:320,Attributes:[{Name:"generic.attack_damage",Base:2}],Health:4.0f,Motion:[0.0,0.25,0.0],active_effects:[{id:'minecraft:resistance',amplifier:10,duration:20,show_particles:0b}]} scoreboard players remove @s gm4_zc_fullness 1 execute if score @s gm4_zc_fullness matches 1.. run function gm4_zauber_cauldrons:cauldron/extra_items/create_possessed_items diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/flowers/luck.mcfunction b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/flowers/luck.mcfunction index 8111d06a27..c130741693 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/flowers/luck.mcfunction +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/flowers/luck.mcfunction @@ -4,6 +4,6 @@ execute align xyz run kill @e[type=item,dx=0,dy=0,dz=0] execute align y positioned ~ ~.75 ~ run tag @a[distance=..2,gamemode=!spectator] add gm4_zc_luck -summon area_effect_cloud ~ ~.75 ~ {Tags:["gm4_zc_luck_cloud"],Radius:1.6f,Duration:10,RadiusOnUse:0.0f,RadiusPerTick:0.0f,ReapplicationDelay:100,Particle:"happy_villager",Effects:[{Duration:12,Id:26,Amplifier:0b,ShowParticles:0b}]} +summon area_effect_cloud ~ ~.75 ~ {Tags:["gm4_zc_luck_cloud"],Radius:1.6f,duration:10,RadiusOnUse:0.0f,RadiusPerTick:0.0f,ReapplicationDelay:100,Particle:"happy_villager",effects:[{duration:12,id:'minecraft:luck',amplifier:0b,show_particles:0b}]} playsound entity.player.levelup block @a[distance=..16] ~ ~ ~ 1 1.5 scoreboard players set $recipe_success gm4_zc_data 1 diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/flowers/poison.mcfunction b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/flowers/poison.mcfunction index 501a2108c2..26b8d9cb03 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/flowers/poison.mcfunction +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/flowers/poison.mcfunction @@ -3,7 +3,7 @@ # run from recipes/flowers/check_poisonous_flowers execute align xyz run kill @e[type=item,dx=0,dy=0,dz=0] -summon area_effect_cloud ~ ~.75 ~ {CustomName:'"the mess they made"',Radius:2.1f,Duration:2147483647,RadiusOnUse:-0.1f,RadiusPerTick:-0.005f,ReapplicationDelay:40,Effects:[{Duration:3200,Id:19,Amplifier:2b}]} +summon area_effect_cloud ~ ~.75 ~ {CustomName:'"the mess they made"',Radius:2.1f,duration:2147483647,RadiusOnUse:-0.1f,RadiusPerTick:-0.005f,ReapplicationDelay:40,effects:[{duration:3200,id:'minecraft:poison',amplifier:2b}]} playsound entity.elder_guardian.curse block @a[distance=..16] ~ ~ ~ 0.6 0.7 scoreboard players set $recipe_success gm4_zc_data 1 diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/instant_damage.mcfunction b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/instant_damage.mcfunction index 7c69168f02..452908bb45 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/instant_damage.mcfunction +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/instant_damage.mcfunction @@ -4,4 +4,4 @@ # applies environmental effects caused by recipes particle block red_nether_bricks ~ ~.2 ~ .1 .1 .1 10 30 -summon area_effect_cloud ~ ~.75 ~ {Radius:1.25f,Duration:2147483647,RadiusOnUse:-0.09f,RadiusPerTick:0.0f,ReapplicationDelay:20,Effects:[{Duration:1,Id:6,Amplifier:2b}]} +summon area_effect_cloud ~ ~.75 ~ {Radius:1.25f,duration:2147483647,RadiusOnUse:-0.09f,RadiusPerTick:0.0f,ReapplicationDelay:20,effects:[{duration:1,id:'minecraft:instant_health',amplifier:2b}]} diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/instant_health.mcfunction b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/instant_health.mcfunction index 75dc4cd4bb..8e75aa7435 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/instant_health.mcfunction +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/instant_health.mcfunction @@ -3,4 +3,4 @@ # run from recipes/potions/ recipes # applies environmental effects caused by recipes -summon area_effect_cloud ~ ~.75 ~ {CustomName:'"their own incompetence"',Radius:2.1f,Duration:2147483647,RadiusOnUse:-0.75f,RadiusPerTick:-0.0005f,ReapplicationDelay:0,Effects:[{Duration:40,Id:7,Amplifier:8b,ShowParticles:1b}]} +summon area_effect_cloud ~ ~.75 ~ {CustomName:'"their own incompetence"',Radius:2.1f,duration:2147483647,RadiusOnUse:-0.75f,RadiusPerTick:-0.0005f,ReapplicationDelay:0,effects:[{duration:40,id:'minecraft:instant_damage',amplifier:8b,show_particles:1b}]} diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/jump_boost.mcfunction b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/jump_boost.mcfunction index d224f17748..f4c13c6c5f 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/jump_boost.mcfunction +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/jump_boost.mcfunction @@ -4,5 +4,5 @@ # applies environmental effects caused by recipes particle minecraft:effect ~0.2 ~.7 ~ 0.2 0.2 0.2 0 30 -summon rabbit ~0.2 ~.7 ~ {RabbitType:99,Tags:["gm4_zc_killer_rabbit"],Attributes:[{Name:"generic.max_health",Base:31.0}],Health:31,ActiveEffects:[{Id:10,Amplifier:0,Duration:2147483647,ShowParticles:0b},{Id:5,Amplifier:3,Duration:2147483647,ShowParticles:0b}]} +summon rabbit ~0.2 ~.7 ~ {RabbitType:99,Tags:["gm4_zc_killer_rabbit"],Attributes:[{Name:"generic.max_health",Base:31.0}],Health:31,active_effects:[{id:'minecraft:regeneration',amplifier:0,duration:2147483647,show_particles:0b},{id:'minecraft:strength',amplifier:3,duration:2147483647,show_particles:0b}]} playsound minecraft:entity.illusioner.mirror_move block @a[distance=..16] ~0.2 ~.7 ~ 0.4 0.5 diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/regeneration.mcfunction b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/regeneration.mcfunction index 5c3d5fd489..891707fd08 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/regeneration.mcfunction +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/functions/recipes/potions/environmental_effects/regeneration.mcfunction @@ -3,4 +3,4 @@ # run from recipes/potions/ recipes # applies environmental effects caused by recipes -summon area_effect_cloud ~ ~.75 ~ {CustomName:'"the mess they made"',Radius:1.8f,Duration:2147483647,RadiusOnUse:-0.01f,RadiusPerTick:-0.0002f,ReapplicationDelay:40,Effects:[{Duration:1280,Id:20,Amplifier:5b},{Duration:40,Id:7,Amplifier:1b}]} +summon area_effect_cloud ~ ~.75 ~ {CustomName:'"the mess they made"',Radius:1.8f,duration:2147483647,RadiusOnUse:-0.01f,RadiusPerTick:-0.0002f,ReapplicationDelay:40,effects:[{duration:1280,id:'minecraft:wither',amplifier:5b},{duration:40,id:'minecraft:instant_damage',amplifier:1b}]} diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/instant_damage.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/instant_damage.json index 5f975304e0..e2027e6a29 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/instant_damage.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/instant_damage.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"potion\",type:\"instant_damage\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:4393481,CustomPotionEffects:[{Id:7,Amplifier:3,Duration:1}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"potion\",type:\"instant_damage\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:4393481,custom_potion_effects:[{id:'minecraft:instant_damage',amplifier:3,duration:1}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/instant_health.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/instant_health.json index c062e9ff7f..ce7533c969 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/instant_health.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/instant_health.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"potion\",type:\"instant_health\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:16262179,CustomPotionEffects:[{Id:6,Amplifier:3,Duration:1},{Id:9,Amplifier:0,Duration:160}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"potion\",type:\"instant_health\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:16262179,custom_potion_effects:[{id:'minecraft:instant_health',amplifier:3,duration:1},{id:'minecraft:nausea',amplifier:0,duration:160}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/jump_boost.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/jump_boost.json index 4fdf61527a..f95fac6f7c 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/jump_boost.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/jump_boost.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"potion\",type:\"jump_boost\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:2293580,CustomPotionEffects:[{Id:8,Amplifier:3,Duration:1800}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"potion\",type:\"jump_boost\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:2293580,custom_potion_effects:[{id:'minecraft:jump_boost',amplifier:3,duration:1800}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/poison.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/poison.json index 240f44089a..abe8ecffd9 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/poison.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/poison.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"potion\",type:\"poison\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:5149489,CustomPotionEffects:[{Id:19,Amplifier:3,Duration:640}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"potion\",type:\"poison\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:5149489,custom_potion_effects:[{id:'minecraft:poison',amplifier:3,duration:640}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/regeneration.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/regeneration.json index 8af38ed678..86fe1bd3e0 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/regeneration.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/regeneration.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"potion\",type:\"regeneration\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:13458603,CustomPotionEffects:[{Id:10,Amplifier:3,Duration:440},{Id:1,Amplifier:1,Duration:320}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"potion\",type:\"regeneration\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:13458603,custom_potion_effects:[{id:'minecraft:regeneration',amplifier:3,duration:440},{id:'minecraft:speed',amplifier:1,duration:320}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/speed.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/speed.json index fca46dc513..e2c4e46fa8 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/speed.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/speed.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"potion\",type:\"speed\",bottle:{multi_use:0}},HideFlags:32,CustomPotionColor:8171462,CustomPotionEffects:[{Id:1,Amplifier:3,Duration:4000},{Id:18,Amplifier:2,Duration:4000}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"potion\",type:\"speed\",bottle:{multi_use:0}},HideFlags:32,CustomPotionColor:8171462,custom_potion_effects:[{id:'minecraft:speed',amplifier:3,duration:4000},{id:'minecraft:weakness',amplifier:2,duration:4000}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/strength.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/strength.json index 7e3164d026..de0cc042f2 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/strength.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/drinkable/strength.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"potion\",type:\"strength\",bottle:{multi_use:0}},HideFlags:32,CustomPotionColor:9643043,CustomPotionEffects:[{Id:5,Amplifier:3,Duration:1800},{Id:12,Amplifier:0,Duration:320}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"potion\",type:\"strength\",bottle:{multi_use:0}},HideFlags:32,CustomPotionColor:9643043,custom_potion_effects:[{id:'minecraft:strength',amplifier:3,duration:1800},{id:'minecraft:fire_resistance',amplifier:0,duration:320}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/instant_damage.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/instant_damage.json index 0ce5f00597..e47510cb5d 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/instant_damage.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/instant_damage.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"lingering_potion\",type:\"instant_damage\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:4393481,CustomPotionEffects:[{Id:7,Amplifier:2,Duration:1}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"lingering_potion\",type:\"instant_damage\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:4393481,custom_potion_effects:[{id:'minecraft:instant_damage',amplifier:2,duration:1}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/instant_health.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/instant_health.json index 23347640fe..0b5f56157d 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/instant_health.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/instant_health.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"lingering_potion\",type:\"instant_health\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:16262179,CustomPotionEffects:[{Id:6,Amplifier:2,Duration:1},{Id:9,Amplifier:0,Duration:40}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"lingering_potion\",type:\"instant_health\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:16262179,custom_potion_effects:[{id:'minecraft:instant_health',amplifier:2,duration:1},{id:'minecraft:nausea',amplifier:0,duration:40}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/jump_boost.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/jump_boost.json index ad7e04dbb1..ffd79add6c 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/jump_boost.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/jump_boost.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"lingering_potion\",type:\"jump_boost\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:2293580,CustomPotionEffects:[{Id:8,Amplifier:3,Duration:450}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"lingering_potion\",type:\"jump_boost\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:2293580,custom_potion_effects:[{id:'minecraft:jump_boost',amplifier:3,duration:450}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/poison.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/poison.json index 480f1982eb..424758ebab 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/poison.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/poison.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"lingering_potion\",type:\"poison\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:5149489,CustomPotionEffects:[{Id:19,Amplifier:3,Duration:160}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"lingering_potion\",type:\"poison\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:5149489,custom_potion_effects:[{id:'minecraft:poison',amplifier:3,duration:160}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/regeneration.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/regeneration.json index 391712753c..590a1dece9 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/regeneration.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/regeneration.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"lingering_potion\",type:\"regeneration\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:13458603,CustomPotionEffects:[{Id:10,Amplifier:3,Duration:110},{Id:1,Amplifier:1,Duration:80}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"lingering_potion\",type:\"regeneration\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:13458603,custom_potion_effects:[{id:'minecraft:regeneration',amplifier:3,duration:110},{id:'minecraft:speed',amplifier:1,duration:80}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/speed.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/speed.json index e005751f5e..773e4dfe3a 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/speed.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/speed.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"lingering_potion\",type:\"speed\",bottle:{multi_use:0}},HideFlags:32,CustomPotionColor:8171462,CustomPotionEffects:[{Id:1,Amplifier:3,Duration:1000},{Id:18,Amplifier:2,Duration:1000}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"lingering_potion\",type:\"speed\",bottle:{multi_use:0}},HideFlags:32,CustomPotionColor:8171462,custom_potion_effects:[{id:'minecraft:speed',amplifier:3,duration:1000},{id:'minecraft:weakness',amplifier:2,duration:1000}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/strength.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/strength.json index 11d99c02e4..98284a4f02 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/strength.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/lingering/strength.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"lingering_potion\",type:\"strength\",bottle:{multi_use:0}},HideFlags:32,CustomPotionColor:9643043,CustomPotionEffects:[{Id:5,Amplifier:3,Duration:450},{Id:12,Amplifier:0,Duration:80}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"lingering_potion\",type:\"strength\",bottle:{multi_use:0}},HideFlags:32,CustomPotionColor:9643043,custom_potion_effects:[{id:'minecraft:strength',amplifier:3,duration:450},{id:'minecraft:fire_resistance',amplifier:0,duration:80}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/instant_damage.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/instant_damage.json index 26f7b65dc6..1842ef8b9d 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/instant_damage.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/instant_damage.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"splash_potion\",type:\"instant_damage\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:4393481,CustomPotionEffects:[{Id:7,Amplifier:3,Duration:1}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"splash_potion\",type:\"instant_damage\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:4393481,custom_potion_effects:[{id:'minecraft:instant_damage',amplifier:3,duration:1}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/instant_health.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/instant_health.json index b2610cde9b..f41ac1da2a 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/instant_health.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/instant_health.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"splash_potion\",type:\"instant_health\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:16262179,CustomPotionEffects:[{Id:6,Amplifier:3,Duration:1},{Id:9,Amplifier:0,Duration:160}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"splash_potion\",type:\"instant_health\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:16262179,custom_potion_effects:[{id:'minecraft:instant_health',amplifier:3,duration:1},{id:'minecraft:nausea',amplifier:0,duration:160}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/jump_boost.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/jump_boost.json index bf8af5acd5..0c517541d2 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/jump_boost.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/jump_boost.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"splash_potion\",type:\"jump_boost\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:2293580,CustomPotionEffects:[{Id:8,Amplifier:3,Duration:1800}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"splash_potion\",type:\"jump_boost\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:2293580,custom_potion_effects:[{id:'minecraft:jump_boost',amplifier:3,duration:1800}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/poison.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/poison.json index bb8eef857b..0764c89da1 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/poison.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/poison.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"splash_potion\",type:\"poison\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:5149489,CustomPotionEffects:[{Id:19,Amplifier:3,Duration:640}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"splash_potion\",type:\"poison\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:5149489,custom_potion_effects:[{id:'minecraft:poison',amplifier:3,duration:640}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/regeneration.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/regeneration.json index 7dcc4700ac..1994f8fb31 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/regeneration.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/regeneration.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"splash_potion\",type:\"regeneration\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:13458603,CustomPotionEffects:[{Id:10,Amplifier:3,Duration:440},{Id:1,Amplifier:1,Duration:320}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"splash_potion\",type:\"regeneration\",bottle:{multi_use:0b}},HideFlags:32,CustomPotionColor:13458603,custom_potion_effects:[{id:'minecraft:regeneration',amplifier:3,duration:440},{id:'minecraft:speed',amplifier:1,duration:320}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/speed.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/speed.json index b7fcbaaf52..8a6661f7a7 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/speed.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/speed.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"splash_potion\",type:\"speed\",bottle:{multi_use:0}},HideFlags:32,CustomPotionColor:8171462,CustomPotionEffects:[{Id:1,Amplifier:3,Duration:4000},{Id:18,Amplifier:2,Duration:4000}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"splash_potion\",type:\"speed\",bottle:{multi_use:0}},HideFlags:32,CustomPotionColor:8171462,custom_potion_effects:[{id:'minecraft:speed',amplifier:3,duration:4000},{id:'minecraft:weakness',amplifier:2,duration:4000}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/strength.json b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/strength.json index a62a96843b..dbc7f5f9d5 100644 --- a/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/strength.json +++ b/gm4_zauber_cauldrons/overlay_18/data/gm4_zauber_cauldrons/loot_tables/recipes/potions/splash/strength.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_zauber_cauldrons:{item:\"splash_potion\",type:\"strength\",bottle:{multi_use:0}},HideFlags:32,CustomPotionColor:9643043,CustomPotionEffects:[{Id:5,Amplifier:3,Duration:1800},{Id:12,Amplifier:0,Duration:320}]}" + "tag": "{gm4_zauber_cauldrons:{item:\"splash_potion\",type:\"strength\",bottle:{multi_use:0}},HideFlags:32,CustomPotionColor:9643043,custom_potion_effects:[{id:'minecraft:strength',amplifier:3,duration:1800},{id:'minecraft:fire_resistance',amplifier:0,duration:320}]}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_liquids/overlay_18/data/gm4_zauber_liquids/functions/util_below.mcfunction b/gm4_zauber_liquids/overlay_18/data/gm4_zauber_liquids/functions/util_below.mcfunction index 991c736270..05113cdb16 100644 --- a/gm4_zauber_liquids/overlay_18/data/gm4_zauber_liquids/functions/util_below.mcfunction +++ b/gm4_zauber_liquids/overlay_18/data/gm4_zauber_liquids/functions/util_below.mcfunction @@ -10,19 +10,19 @@ execute if score @s[tag=gm4_lt_zauber_harming_potion] gm4_lt_value matches 1.. a execute if score @s[tag=gm4_lt_zauber_healing_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] run function gm4_zauber_liquids:util/healing #leaping -execute if score @s[tag=gm4_lt_zauber_leaping_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:8}]}] run function gm4_zauber_liquids:util/leaping +execute if score @s[tag=gm4_lt_zauber_leaping_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:jump_boost'}]}] run function gm4_zauber_liquids:util/leaping #poison -execute if score @s[tag=gm4_lt_zauber_poison_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:19}]}] run function gm4_zauber_liquids:util/poison +execute if score @s[tag=gm4_lt_zauber_poison_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:poison'}]}] run function gm4_zauber_liquids:util/poison #regeneration -execute if score @s[tag=gm4_lt_zauber_regeneration_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:10}]}] run function gm4_zauber_liquids:util/regeneration +execute if score @s[tag=gm4_lt_zauber_regeneration_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:regeneration'}]}] run function gm4_zauber_liquids:util/regeneration #speed -execute if score @s[tag=gm4_lt_zauber_swiftness_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:1}]}] run function gm4_zauber_liquids:util/swiftness +execute if score @s[tag=gm4_lt_zauber_swiftness_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:speed'}]}] run function gm4_zauber_liquids:util/swiftness #strength -execute if score @s[tag=gm4_lt_zauber_strength_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{ActiveEffects:[{Id:5}]}] run function gm4_zauber_liquids:util/strength +execute if score @s[tag=gm4_lt_zauber_strength_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:strength'}]}] run function gm4_zauber_liquids:util/strength #wormhole execute if score @s[tag=gm4_lt_zauber_wormhole_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[tag=!gm4_zl_wormhole_ignore] run function gm4_zauber_liquids:util/wormhole diff --git a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/booze.json b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/booze.json index 31799d9181..0f46520201 100644 --- a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/booze.json +++ b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/booze.json @@ -15,7 +15,7 @@ }, { "function": "set_nbt", - "tag": "{custom_potion:\"booze\",CustomPotionEffects:[{Id:2,Amplifier:0b,Duration:1200},{Id:5,Amplifier:0b,Duration:1200},{Id:9,Amplifier:1b,Duration:400},{Id:19,Amplifier:0b,Duration:400},{Id:22,Amplifier:1b,Duration:1200}],CustomPotionColor:11236936}" + "tag": "{custom_potion:\"booze\",custom_potion_effects:[{id:'minecraft:slowness',amplifier:0b,duration:1200},{id:'minecraft:strength',amplifier:0b,duration:1200},{id:'minecraft:nausea',amplifier:1b,duration:400},{id:'minecraft:poison',amplifier:0b,duration:400},{id:'minecraft:absorption',amplifier:1b,duration:1200}],CustomPotionColor:11236936}" }, { "function": "set_name", diff --git a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/lingering_booze.json b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/lingering_booze.json index fef6a20d6f..83efa0a67b 100644 --- a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/lingering_booze.json +++ b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/lingering_booze.json @@ -15,7 +15,7 @@ }, { "function": "set_nbt", - "tag": "{custom_potion:\"booze\",CustomPotionEffects:[{Id:2,Amplifier:0b,Duration:300},{Id:5,Amplifier:0b,Duration:300},{Id:9,Amplifier:1b,Duration:100},{Id:19,Amplifier:0b,Duration:100},{Id:22,Amplifier:1b,Duration:300}],CustomPotionColor:11236936}" + "tag": "{custom_potion:\"booze\",custom_potion_effects:[{id:'minecraft:slowness',amplifier:0b,duration:300},{id:'minecraft:strength',amplifier:0b,duration:300},{id:'minecraft:nausea',amplifier:1b,duration:100},{id:'minecraft:poison',amplifier:0b,duration:100},{id:'minecraft:absorption',amplifier:1b,duration:300}],CustomPotionColor:11236936}" }, { "function": "set_name", diff --git a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/lingering_resistance_potion.json b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/lingering_resistance_potion.json index 35a84521bc..1bb4dfad8e 100644 --- a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/lingering_resistance_potion.json +++ b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/lingering_resistance_potion.json @@ -15,7 +15,7 @@ }, { "function": "set_nbt", - "tag": "{custom_potion:\"resistance\",Potion:\"minecraft:mundane\",CustomPotionEffects:[{Id:11,Amplifier:0b,Duration:150}]}" + "tag": "{custom_potion:\"resistance\",Potion:\"minecraft:mundane\",custom_potion_effects:[{id:'minecraft:resistance',amplifier:0b,duration:150}]}" }, { "function": "set_name", diff --git a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/resistance_potion.json b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/resistance_potion.json index 447f2f0e3f..0b5c290381 100644 --- a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/resistance_potion.json +++ b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/resistance_potion.json @@ -15,7 +15,7 @@ }, { "function": "set_nbt", - "tag": "{custom_potion:\"resistance\",Potion:\"minecraft:mundane\",CustomPotionEffects:[{Id:11,Amplifier:0b,Duration:600}]}" + "tag": "{custom_potion:\"resistance\",Potion:\"minecraft:mundane\",custom_potion_effects:[{id:'minecraft:resistance',amplifier:0b,duration:600}]}" }, { "function": "set_name", diff --git a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/splash_booze.json b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/splash_booze.json index 34b210dac1..010ba2e708 100644 --- a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/splash_booze.json +++ b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/splash_booze.json @@ -15,7 +15,7 @@ }, { "function": "set_nbt", - "tag": "{custom_potion:\"booze\",CustomPotionEffects:[{Id:2,Amplifier:0b,Duration:1200},{Id:5,Amplifier:0b,Duration:1200},{Id:9,Amplifier:1b,Duration:400},{Id:19,Amplifier:0b,Duration:400},{Id:22,Amplifier:1b,Duration:1200}],CustomPotionColor:11236936}" + "tag": "{custom_potion:\"booze\",custom_potion_effects:[{id:'minecraft:slowness',amplifier:0b,duration:1200},{id:'minecraft:strength',amplifier:0b,duration:1200},{id:'minecraft:nausea',amplifier:1b,duration:400},{id:'minecraft:poison',amplifier:0b,duration:400},{id:'minecraft:absorption',amplifier:1b,duration:1200}],CustomPotionColor:11236936}" }, { "function": "set_name", diff --git a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/splash_resistance_potion.json b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/splash_resistance_potion.json index 19c02fbfaa..1debabec88 100644 --- a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/splash_resistance_potion.json +++ b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/splash_resistance_potion.json @@ -15,7 +15,7 @@ }, { "function": "set_nbt", - "tag": "{custom_potion:\"resistance\",Potion:\"minecraft:mundane\",CustomPotionEffects:[{Id:11,Amplifier:0b,Duration:600}]}" + "tag": "{custom_potion:\"resistance\",Potion:\"minecraft:mundane\",custom_potion_effects:[{id:'minecraft:resistance',amplifier:0b,duration:600}]}" }, { "function": "set_name", diff --git a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/splash_vanishing_potion.json b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/splash_vanishing_potion.json index 63daf51102..510142a414 100644 --- a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/splash_vanishing_potion.json +++ b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/splash_vanishing_potion.json @@ -15,7 +15,7 @@ }, { "function": "set_nbt", - "tag": "{custom_potion:\"vanishing\",Potion:\"minecraft:mundane\",CustomPotionEffects:[{Id:14,Amplifier:9b,Duration:600}]}" + "tag": "{custom_potion:\"vanishing\",Potion:\"minecraft:mundane\",custom_potion_effects:[{id:'minecraft:invisibility',amplifier:9b,duration:600}]}" }, { "function": "set_name", diff --git a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/vanishing_potion.json b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/vanishing_potion.json index c01f06df08..2ba6272cd2 100644 --- a/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/vanishing_potion.json +++ b/lib_brewing/overlay_18/example_use/data/gm4_example_pack/loot_tables/items/vanishing_potion.json @@ -15,7 +15,7 @@ }, { "function": "set_nbt", - "tag": "{custom_potion:\"vanishing\",Potion:\"minecraft:mundane\",CustomPotionEffects:[{Id:14,Amplifier:9b,Duration:600}]}" + "tag": "{custom_potion:\"vanishing\",Potion:\"minecraft:mundane\",custom_potion_effects:[{id:'minecraft:invisibility',amplifier:9b,duration:600}]}" }, { "function": "set_name",