From eb8c25d2aebe63a62ca8c52281387641cf1e5a91 Mon Sep 17 00:00:00 2001
From: Thanathor <73304324+TheThanathor@users.noreply.github.com>
Date: Fri, 14 Nov 2025 13:02:36 +0100
Subject: [PATCH 1/3] update Spawner Minecarts

---
 gm4_spawner_minecarts/README.md               |  3 +-
 gm4_spawner_minecarts/assets/translations.csv |  4 +-
 gm4_spawner_minecarts/beet.yaml               |  2 +-
 .../function/capture_spawner.mcfunction       | 18 +++++++
 .../capture_spawner/enter_minecart.mcfunction | 10 ----
 .../finalize_enter_minecart.mcfunction        |  8 ----
 .../vanilla_spawners.mcfunction               | 12 -----
 .../fuel/active_regeneration.mcfunction       | 23 ---------
 .../fuel/analyze_consumable_block.mcfunction  | 18 -------
 .../check_for_consumable_block.mcfunction     | 24 ----------
 .../function/fuel/consume_flower.mcfunction   | 35 --------------
 .../fuel/consume_normal_flower.mcfunction     |  4 --
 .../fuel/consume_poisonous_flower.mcfunction  |  4 --
 .../fuel/decorative_particle.mcfunction       |  7 ---
 .../function/fuel/detector_rail.mcfunction    | 15 ------
 .../fuel/initiate_flower_types.mcfunction     | 42 ----------------
 .../fuel/passive_regeneration.mcfunction      | 12 -----
 .../unloaded_fuel_calculations.mcfunction     | 10 ----
 .../function/init.mcfunction                  |  8 +---
 .../function/main.mcfunction                  | 20 ++------
 .../function/process.mcfunction               | 33 ++++---------
 .../guidebook/spawner_minecarts.json          | 48 +------------------
 .../tags/block/consumable_block.json          | 18 -------
 .../tags/function/spawner_check.json          |  5 --
 24 files changed, 36 insertions(+), 347 deletions(-)
 create mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner.mcfunction
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner/enter_minecart.mcfunction
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner/finalize_enter_minecart.mcfunction
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner/vanilla_spawners.mcfunction
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/active_regeneration.mcfunction
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/analyze_consumable_block.mcfunction
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/check_for_consumable_block.mcfunction
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/consume_flower.mcfunction
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/consume_normal_flower.mcfunction
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/consume_poisonous_flower.mcfunction
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/decorative_particle.mcfunction
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/detector_rail.mcfunction
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/initiate_flower_types.mcfunction
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/passive_regeneration.mcfunction
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/unloaded_fuel_calculations.mcfunction
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/tags/block/consumable_block.json
 delete mode 100644 gm4_spawner_minecarts/data/gm4_spawner_minecarts/tags/function/spawner_check.json

diff --git a/gm4_spawner_minecarts/README.md b/gm4_spawner_minecarts/README.md
index 8af9875d2e..95a89bad9c 100644
--- a/gm4_spawner_minecarts/README.md
+++ b/gm4_spawner_minecarts/README.md
@@ -4,5 +4,4 @@ Pick up Spawners and move them wherever you want with Minecarts.<!--$pmc:headerS
 
 ### Features
 - Any spawner can be pushed into a Minecart buy pushing it with a piston
-- Spawner Minecarts have a max number of spawns and need to be re-charged by consuming nearby tall grass and flowers
-- Each world has a different set of good/bad flowers for recharging which need to discovered by particles emitted during the charging process
+- Spawner Minecarts have a reduced spawn rate for each nearby spawner minecart
diff --git a/gm4_spawner_minecarts/assets/translations.csv b/gm4_spawner_minecarts/assets/translations.csv
index 9af6708a48..7c76cd466a 100644
--- a/gm4_spawner_minecarts/assets/translations.csv
+++ b/gm4_spawner_minecarts/assets/translations.csv
@@ -2,7 +2,5 @@ key,en_us
 advancement.gm4.spawner_minecarts.title,Don't Go Breaking My Cart
 advancement.gm4.spawner_minecarts.description,Capture a Monster Spawner
 text.gm4.guidebook.module_desc.spawner_minecarts,Pick up Spawners and move them wherever you want with Minecarts.
-text.gm4.guidebook.spawner_minecarts.description,Spawners can be picked up with Minecarts.\n\nOnce a spawner is in a minecart it cannot be ejected and requires charging to spawn mobs.
+text.gm4.guidebook.spawner_minecarts.description,Spawners can be picked up with Minecarts.\n\nOnce a spawner is in a minecart it cannot be ejected and has reduced spawn rates for all carts within a 9x8x9 area around the spawner.
 text.gm4.guidebook.spawner_minecarts.pick_up,"To capture a spawner, place a minecart under it, then a downwards piston above the spawner, and finally a redstone block above the piston."
-text.gm4.guidebook.spawner_minecarts.recharging,"Spawner minecarts require charge to spawn mobs. They passively charge over time.\n\nWhen on a powered rail, it will stop spawning mobs and start actively charging by consuming flowers in a 9x9 area."
-text.gm4.guidebook.spawner_minecarts.recharging_1,"Some flowers charge the spawner minecart twice as fast as others; this differs in each world.\n\nWhen a spawner minecart fully recharges, it will activate any detector rails it is on."
diff --git a/gm4_spawner_minecarts/beet.yaml b/gm4_spawner_minecarts/beet.yaml
index 1e16ffbea5..e065a2381f 100644
--- a/gm4_spawner_minecarts/beet.yaml
+++ b/gm4_spawner_minecarts/beet.yaml
@@ -1,6 +1,6 @@
 id: gm4_spawner_minecarts
 name: Spawner Minecarts
-version: 2.7.X
+version: 3.0.X
 
 data_pack:
   load: .
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner.mcfunction
new file mode 100644
index 0000000000..d40dd7cd90
--- /dev/null
+++ b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner.mcfunction
@@ -0,0 +1,18 @@
+# try to pick up spawner with minecart
+# @s = minecarts under spawners
+# at @s
+# run from main
+
+# get spawner data
+data modify storage gm4_spawner_minecarts:temp spawner set from block ~ ~1 ~
+
+# check if this spawner is blacklisted
+execute if data storage gm4_spawner_minecarts:temp spawner.SpawnPotentials[{data:{entity:{data:{gm4_spawner_minecrarts:{ban_pickup:1}}}}}] run return run function gm4_spawner_minecarts:capture_spawner/fail_pickup
+execute if data storage gm4_spawner_minecarts:temp spawner.SpawnData[{data:{entity:{data:{gm4_spawner_minecrarts:{ban_pickup:1}}}}}] run return run function gm4_spawner_minecarts:capture_spawner/fail_pickup
+
+# pick up spawner
+summon spawner_minecart ~ ~ ~ {Tags:["gm4_spawner_minecart"],MaxNearbyEntities:6,RequiredPlayerRange:16,SpawnCount:4,SpawnData:{entity:{id:"minecraft:pig"}},MaxSpawnDelay:600s,Delay:-1,SpawnRange:4s,MinSpawnDelay:100s,SpawnPotentials:[],Invulnerable:1b}
+setblock ~ ~1 ~ air destroy
+data modify entity @e[tag=gm4_spawner_minecart,limit=1,distance=..1] {} merge from storage gm4_spawner_minecarts:temp spawner
+advancement grant @a[distance=..5,gamemode=!spectator] only gm4:spawner_minecarts
+kill @s
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner/enter_minecart.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner/enter_minecart.mcfunction
deleted file mode 100644
index caac3d563b..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner/enter_minecart.mcfunction
+++ /dev/null
@@ -1,10 +0,0 @@
-#@s = minecarts under spawners
-#run from main
-
-scoreboard players set $valid_spawner gm4_spawner_data 0
-data modify storage gm4_spawner_minecarts:temp spawner set from block ~ ~1 ~
-function #gm4_spawner_minecarts:spawner_check
-
-execute if score $valid_spawner gm4_spawner_data matches 1.. run summon spawner_minecart ~ ~ ~ {Tags:["gm4_spawner_minecart"],MaxNearbyEntities:6s,RequiredPlayerRange:16s,Spawncount:4s,SpawnData:{entity:{id:"minecraft:pig"}},MaxSpawnDelay:600s,Delay:171s,SpawnRange:4s,MinSpawnDelay:100s,SpawnPotentials:[{data:{entity:{id:"minecraft:pig"}},weight:1}],Invulnerable:1b}
-execute if score $valid_spawner gm4_spawner_data matches 1.. as @e[tag=gm4_spawner_minecart,limit=1,distance=..1] run function gm4_spawner_minecarts:capture_spawner/finalize_enter_minecart
-execute if score $valid_spawner gm4_spawner_data matches 1.. run kill @s
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner/finalize_enter_minecart.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner/finalize_enter_minecart.mcfunction
deleted file mode 100644
index b784374ab9..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner/finalize_enter_minecart.mcfunction
+++ /dev/null
@@ -1,8 +0,0 @@
-#@s = new spawner minecarts
-#run from enter_minecart
-setblock ~ ~1 ~ air destroy
-data modify entity @s {} merge from storage gm4_spawner_minecarts:temp spawner
-scoreboard players set @s gm4_spawner_fuel 2000
-scoreboard players operation @s gm4_spawner_time = spawner_global_time gm4_spawner_time
-advancement grant @a[distance=..5,gamemode=!spectator] only gm4:spawner_minecarts
-kill @e[type=minecart,limit=1,distance=0]
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner/vanilla_spawners.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner/vanilla_spawners.mcfunction
deleted file mode 100644
index 80fdc4d5a2..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner/vanilla_spawners.mcfunction
+++ /dev/null
@@ -1,12 +0,0 @@
-#@s = minecarts under spawners
-#run from enter_minecart via the #spawner_check tag
-
-execute store result score #tags gm4_spawner_data run data get storage gm4_spawner_minecarts:temp spawner.SpawnPotentials[0].data
-
-execute unless score $valid_spawner gm4_spawner_data matches 1 if score #tags gm4_spawner_data matches ..1 if data storage gm4_spawner_minecarts:temp spawner{SpawnData:{entity:{id:"minecraft:zombie"}}} run scoreboard players set $valid_spawner gm4_spawner_data 1
-execute unless score $valid_spawner gm4_spawner_data matches 1 if score #tags gm4_spawner_data matches ..1 if data storage gm4_spawner_minecarts:temp spawner{SpawnData:{entity:{id:"minecraft:skeleton"}}} run scoreboard players set $valid_spawner gm4_spawner_data 1
-execute unless score $valid_spawner gm4_spawner_data matches 1 if score #tags gm4_spawner_data matches ..1 if data storage gm4_spawner_minecarts:temp spawner{SpawnData:{entity:{id:"minecraft:spider"}}} run scoreboard players set $valid_spawner gm4_spawner_data 1
-execute unless score $valid_spawner gm4_spawner_data matches 1 if score #tags gm4_spawner_data matches ..1 if data storage gm4_spawner_minecarts:temp spawner{SpawnData:{entity:{id:"minecraft:cave_spider"}}} run scoreboard players set $valid_spawner gm4_spawner_data 1
-execute unless score $valid_spawner gm4_spawner_data matches 1 if score #tags gm4_spawner_data matches ..1 if data storage gm4_spawner_minecarts:temp spawner{SpawnData:{entity:{id:"minecraft:silverfish"}}} run scoreboard players set $valid_spawner gm4_spawner_data 1
-execute unless score $valid_spawner gm4_spawner_data matches 1 if score #tags gm4_spawner_data matches ..1 if data storage gm4_spawner_minecarts:temp spawner{SpawnData:{entity:{id:"minecraft:blaze"}}} run scoreboard players set $valid_spawner gm4_spawner_data 1
-execute unless score $valid_spawner gm4_spawner_data matches 1 if score #tags gm4_spawner_data matches ..1 if data storage gm4_spawner_minecarts:temp spawner{SpawnData:{entity:{id:"minecraft:magma_cube"}}} run scoreboard players set $valid_spawner gm4_spawner_data 1
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/active_regeneration.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/active_regeneration.mcfunction
deleted file mode 100644
index b3a8a162c1..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/active_regeneration.mcfunction
+++ /dev/null
@@ -1,23 +0,0 @@
-#@s = spawner minecarts
-#run from process
-
-tag @s add gm4_processing_spawner
-summon area_effect_cloud ~-4 ~ ~-4 {Radius:0.0f,custom_particle:{type:"minecraft:block",block_state:"minecraft:air"},Duration:10,CustomName:"gm4_spawner_flower_checker",Tags:["gm4_spawner_flower_checker"]}
-
-#calculate random position
-execute store result score randomX gm4_spawner_fuel run data get entity @e[tag=gm4_spawner_flower_checker,limit=1] UUID[0]
-scoreboard players operation randomZ gm4_spawner_fuel = randomX gm4_spawner_fuel
-
-scoreboard players set 10 gm4_spawner_fuel 10
-scoreboard players operation randomZ gm4_spawner_fuel %= 10 gm4_spawner_fuel
-
-scoreboard players set 9 gm4_spawner_fuel 9
-scoreboard players operation randomX gm4_spawner_fuel %= 9 gm4_spawner_fuel
-scoreboard players operation randomZ gm4_spawner_fuel %= 9 gm4_spawner_fuel
-
-#move the entity
-execute as @e[tag=gm4_spawner_flower_checker] at @s run function gm4_spawner_minecarts:fuel/check_for_consumable_block
-
-tag @s[scores={gm4_spawner_fuel=2000..}] add gm4_spawner_minecart_full
-
-tag @s remove gm4_processing_spawner
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/analyze_consumable_block.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/analyze_consumable_block.mcfunction
deleted file mode 100644
index e9b580c73a..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/analyze_consumable_block.mcfunction
+++ /dev/null
@@ -1,18 +0,0 @@
-# @s = flower_checker area_effect_cloud
-# at @s
-# run from spawner_minecarts:fuel/check_for_consumable_block
-
-# add fuel if block was a flower
-execute at @s if block ~ ~ ~ #minecraft:small_flowers run function gm4_spawner_minecarts:fuel/consume_flower
-
-# destroy target block
-execute if block ~ ~ ~ minecraft:tall_grass run scoreboard players set $found_tall_grass gm4_spawner_data 1
-setblock ~ ~ ~ air replace
-
-# break tall grass silently
-execute if score $found_tall_grass gm4_spawner_data matches 1.. run stopsound @a[distance=..16] block minecraft:block.grass.break
-scoreboard players reset $found_tall_grass gm4_spawner_data
-
-# visuals and sounds
-playsound entity.turtle.egg_break block @a[distance=..8] ~ ~ ~ 0.3 1.4
-particle minecraft:block{block_state:"minecraft:seagrass"} ~ ~.2 ~ 0 0 0 0 7
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/check_for_consumable_block.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/check_for_consumable_block.mcfunction
deleted file mode 100644
index f60564d293..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/check_for_consumable_block.mcfunction
+++ /dev/null
@@ -1,24 +0,0 @@
-#@s = flower_checker area_effect_cloud at @s
-#run from spawner_minecarts:fuel/active_regeneration
-
-#move the AEC to the chosen x and z
-execute at @s if score randomX gm4_spawner_fuel matches 8.. run tp @s ~8 ~ ~
-execute if score randomX gm4_spawner_fuel matches 8.. run scoreboard players remove randomX gm4_spawner_fuel 8
-execute at @s if score randomX gm4_spawner_fuel matches 4.. run tp @s ~4 ~ ~
-execute if score randomX gm4_spawner_fuel matches 4.. run scoreboard players remove randomX gm4_spawner_fuel 4
-execute at @s if score randomX gm4_spawner_fuel matches 2.. run tp @s ~2 ~ ~
-execute if score randomX gm4_spawner_fuel matches 2.. run scoreboard players remove randomX gm4_spawner_fuel 2
-execute at @s if score randomX gm4_spawner_fuel matches 1.. run tp @s ~1 ~ ~
-execute if score randomX gm4_spawner_fuel matches 1.. run scoreboard players remove randomX gm4_spawner_fuel 1
-
-execute at @s if score randomZ gm4_spawner_fuel matches 8.. run tp @s ~ ~ ~8
-execute if score randomZ gm4_spawner_fuel matches 8.. run scoreboard players remove randomZ gm4_spawner_fuel 8
-execute at @s if score randomZ gm4_spawner_fuel matches 4.. run tp @s ~ ~ ~4
-execute if score randomZ gm4_spawner_fuel matches 4.. run scoreboard players remove randomZ gm4_spawner_fuel 4
-execute at @s if score randomZ gm4_spawner_fuel matches 2.. run tp @s ~ ~ ~2
-execute if score randomZ gm4_spawner_fuel matches 2.. run scoreboard players remove randomZ gm4_spawner_fuel 2
-execute at @s if score randomZ gm4_spawner_fuel matches 1.. run tp @s ~ ~ ~1
-execute if score randomZ gm4_spawner_fuel matches 1.. run scoreboard players remove randomZ gm4_spawner_fuel 1
-
-#check if location has a valid fuel source
-execute at @s if block ~ ~ ~ #gm4_spawner_minecarts:consumable_block run function gm4_spawner_minecarts:fuel/analyze_consumable_block
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/consume_flower.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/consume_flower.mcfunction
deleted file mode 100644
index dcb53fe66f..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/consume_flower.mcfunction
+++ /dev/null
@@ -1,35 +0,0 @@
-#@s = flower_checker area_effect_cloud inside a consumable block
-#run from fuel/analyze_consumable_block
-
-execute if block ~ ~ ~ red_tulip if score red_tulip gm4_sm_flowers matches 1 run function gm4_spawner_minecarts:fuel/consume_poisonous_flower
-execute if block ~ ~ ~ red_tulip if score red_tulip gm4_sm_flowers matches 0 run function gm4_spawner_minecarts:fuel/consume_normal_flower
-execute if block ~ ~ ~ orange_tulip if score orange_tulip gm4_sm_flowers matches 1 run function gm4_spawner_minecarts:fuel/consume_poisonous_flower
-execute if block ~ ~ ~ orange_tulip if score orange_tulip gm4_sm_flowers matches 0 run function gm4_spawner_minecarts:fuel/consume_normal_flower
-execute if block ~ ~ ~ white_tulip if score white_tulip gm4_sm_flowers matches 1 run function gm4_spawner_minecarts:fuel/consume_poisonous_flower
-execute if block ~ ~ ~ white_tulip if score white_tulip gm4_sm_flowers matches 0 run function gm4_spawner_minecarts:fuel/consume_normal_flower
-execute if block ~ ~ ~ pink_tulip if score pink_tulip gm4_sm_flowers matches 1 run function gm4_spawner_minecarts:fuel/consume_poisonous_flower
-execute if block ~ ~ ~ pink_tulip if score pink_tulip gm4_sm_flowers matches 0 run function gm4_spawner_minecarts:fuel/consume_normal_flower
-execute if block ~ ~ ~ oxeye_daisy if score oxeye_daisy gm4_sm_flowers matches 1 run function gm4_spawner_minecarts:fuel/consume_poisonous_flower
-execute if block ~ ~ ~ oxeye_daisy if score oxeye_daisy gm4_sm_flowers matches 0 run function gm4_spawner_minecarts:fuel/consume_normal_flower
-execute if block ~ ~ ~ dandelion if score dandelion gm4_sm_flowers matches 1 run function gm4_spawner_minecarts:fuel/consume_poisonous_flower
-execute if block ~ ~ ~ dandelion if score dandelion gm4_sm_flowers matches 0 run function gm4_spawner_minecarts:fuel/consume_normal_flower
-execute if block ~ ~ ~ blue_orchid if score blue_orchid gm4_sm_flowers matches 1 run function gm4_spawner_minecarts:fuel/consume_poisonous_flower
-execute if block ~ ~ ~ blue_orchid if score blue_orchid gm4_sm_flowers matches 0 run function gm4_spawner_minecarts:fuel/consume_normal_flower
-execute if block ~ ~ ~ allium if score allium gm4_sm_flowers matches 1 run function gm4_spawner_minecarts:fuel/consume_poisonous_flower
-execute if block ~ ~ ~ allium if score allium gm4_sm_flowers matches 0 run function gm4_spawner_minecarts:fuel/consume_normal_flower
-execute if block ~ ~ ~ azure_bluet if score azure_bluet gm4_sm_flowers matches 1 run function gm4_spawner_minecarts:fuel/consume_poisonous_flower
-execute if block ~ ~ ~ azure_bluet if score azure_bluet gm4_sm_flowers matches 0 run function gm4_spawner_minecarts:fuel/consume_normal_flower
-execute if block ~ ~ ~ poppy if score poppy gm4_sm_flowers matches 1 run function gm4_spawner_minecarts:fuel/consume_poisonous_flower
-execute if block ~ ~ ~ poppy if score poppy gm4_sm_flowers matches 0 run function gm4_spawner_minecarts:fuel/consume_normal_flower
-execute if block ~ ~ ~ cornflower if score cornflower gm4_sm_flowers matches 1 run function gm4_spawner_minecarts:fuel/consume_poisonous_flower
-execute if block ~ ~ ~ cornflower if score cornflower gm4_sm_flowers matches 0 run function gm4_spawner_minecarts:fuel/consume_normal_flower
-execute if block ~ ~ ~ lily_of_the_valley if score lily_of_the_valley gm4_sm_flowers matches 1 run function gm4_spawner_minecarts:fuel/consume_poisonous_flower
-execute if block ~ ~ ~ lily_of_the_valley if score lily_of_the_valley gm4_sm_flowers matches 0 run function gm4_spawner_minecarts:fuel/consume_normal_flower
-
-#summon pretty entity line
-summon area_effect_cloud ~ ~ ~ {Radius:0.0f,Tags:["gm4_spawner_minecart_decorative_particle","gm4_unrotated_particle_cloud"],Duration:200,custom_particle:{type:"minecraft:block",block_state:"minecraft:air"},CustomName:"Spawner Minecart Decorative Particle"}
-teleport @e[type=area_effect_cloud,tag=gm4_unrotated_particle_cloud,limit=1] ~ ~ ~ facing entity @e[type=spawner_minecart,tag=gm4_processing_spawner,limit=1] eyes
-tag @e[type=area_effect_cloud,tag=gm4_unrotated_particle_cloud] remove gm4_unrotated_particle_cloud
-
-# sounds
-playsound minecraft:block.candle.extinguish block @a[distance=..8] ~ ~ ~ 1 0.6
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/consume_normal_flower.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/consume_normal_flower.mcfunction
deleted file mode 100644
index 136a2b117b..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/consume_normal_flower.mcfunction
+++ /dev/null
@@ -1,4 +0,0 @@
-#@s = gm4_spawner_flower_checker inside a normal (good) flower.
-#run from consume_flower
-scoreboard players add @e[type=spawner_minecart,tag=gm4_processing_spawner] gm4_spawner_fuel 40
-particle minecraft:flame ~ ~ ~ 0.05 0.05 0.05 0.03 16
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/consume_poisonous_flower.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/consume_poisonous_flower.mcfunction
deleted file mode 100644
index 454b634edd..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/consume_poisonous_flower.mcfunction
+++ /dev/null
@@ -1,4 +0,0 @@
-#@s = gm4_spawner_flower_checker inside a poisonous (bad) flower.
-#run from consume_flower
-scoreboard players add @e[type=spawner_minecart,tag=gm4_processing_spawner] gm4_spawner_fuel 20
-particle minecraft:flame ~ ~ ~ 0.05 0.05 0.05 0.02 8
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/decorative_particle.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/decorative_particle.mcfunction
deleted file mode 100644
index f5f5e9b2d7..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/decorative_particle.mcfunction
+++ /dev/null
@@ -1,7 +0,0 @@
-# @s = gm4_spawner_minecart_decorative_particle
-# at @s
-# run from main
-
-execute if entity @e[type=spawner_minecart,distance=..1] run kill @s
-particle minecraft:flame ~ ~ ~ 0.05 0.05 0.05 0.01 1
-teleport ^ ^ ^0.4
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/detector_rail.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/detector_rail.mcfunction
deleted file mode 100644
index e0690f943a..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/detector_rail.mcfunction
+++ /dev/null
@@ -1,15 +0,0 @@
-# @s = spawner minecarts (fully fueled)
-# run from process
-
-execute positioned ~.29 ~ ~ if block ~ ~ ~ detector_rail[shape=east_west] run setblock ~ ~ ~ detector_rail[powered=false,shape=east_west]
-execute positioned ~-.29 ~ ~ if block ~ ~ ~ detector_rail[shape=east_west] run setblock ~ ~ ~ detector_rail[powered=false,shape=east_west]
-execute positioned ~ ~ ~.29 if block ~ ~ ~ detector_rail[shape=north_south] run setblock ~ ~ ~ detector_rail[powered=false,shape=north_south]
-execute positioned ~ ~ ~-.29 if block ~ ~ ~ detector_rail[shape=north_south] run setblock ~ ~ ~ detector_rail[powered=false,shape=north_south]
-execute positioned ~.29 ~ ~ if block ~ ~ ~ detector_rail[shape=ascending_east] run setblock ~ ~ ~ detector_rail[powered=false,shape=ascending_east]
-execute positioned ~-.29 ~ ~ if block ~ ~ ~ detector_rail[shape=ascending_west] run setblock ~ ~ ~ detector_rail[powered=false,shape=ascending_west]
-execute positioned ~ ~ ~.29 if block ~ ~ ~ detector_rail[shape=ascending_south] run setblock ~ ~ ~ detector_rail[powered=false,shape=ascending_south]
-execute positioned ~ ~ ~-.29 if block ~ ~ ~ detector_rail[shape=ascending_north] run setblock ~ ~ ~ detector_rail[powered=false,shape=ascending_north]
-
-# cap the fuel at 2000 and remove temporary tag
-scoreboard players set @s gm4_spawner_fuel 2000
-tag @s remove gm4_spawner_minecart_full
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/initiate_flower_types.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/initiate_flower_types.mcfunction
deleted file mode 100644
index 0500ec47fc..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/initiate_flower_types.mcfunction
+++ /dev/null
@@ -1,42 +0,0 @@
-#no @s.
-#at world spawn
-#called by init
-
-#randomly marks flower types as poisonous on module installation
-
-# initialize randomizer
-random reset gm4_zauber_cauldrons:flowers/poisonous_flowers 0 true true
-
-# assign poisonous/lucky score
-# NOTE the order these flowers are assigned scores in MUST be the same as the one in Zauber Cauldrons, otherwise the lucky/unlucky flowers won't match up
-# in the future we should probably find a way to not make this depend on the order these flowers have their values rolled in
-# as spawner minecarts should receive a complete overhaul soon anyways, this fix was put in place to ensure lucky flower parity between Zauber & Spawner Minecarts for now
-# -Bloo, Feb 2024
-execute store result score dandelion gm4_sm_flowers run random value 0..1 gm4_zauber_cauldrons:flowers/poisonous_flowers
-execute store result score poppy gm4_sm_flowers run random value 0..1 gm4_zauber_cauldrons:flowers/poisonous_flowers
-execute store result score blue_orchid gm4_sm_flowers run random value 0..1 gm4_zauber_cauldrons:flowers/poisonous_flowers
-execute store result score allium gm4_sm_flowers run random value 0..1 gm4_zauber_cauldrons:flowers/poisonous_flowers
-execute store result score azure_bluet gm4_sm_flowers run random value 0..1 gm4_zauber_cauldrons:flowers/poisonous_flowers
-execute store result score red_tulip gm4_sm_flowers run random value 0..1 gm4_zauber_cauldrons:flowers/poisonous_flowers
-execute store result score orange_tulip gm4_sm_flowers run random value 0..1 gm4_zauber_cauldrons:flowers/poisonous_flowers
-execute store result score white_tulip gm4_sm_flowers run random value 0..1 gm4_zauber_cauldrons:flowers/poisonous_flowers
-execute store result score pink_tulip gm4_sm_flowers run random value 0..1 gm4_zauber_cauldrons:flowers/poisonous_flowers
-execute store result score oxeye_daisy gm4_sm_flowers run random value 0..1 gm4_zauber_cauldrons:flowers/poisonous_flowers
-execute store result score cornflower gm4_sm_flowers run random value 0..1 gm4_zauber_cauldrons:flowers/poisonous_flowers
-execute store result score lily_of_the_valley gm4_sm_flowers run random value 0..1 gm4_zauber_cauldrons:flowers/poisonous_flowers
-
-# calculate amount of required flowers
-scoreboard players set required_flowers gm4_sm_flowers 12
-
-scoreboard players operation required_flowers gm4_sm_flowers -= dandelion gm4_sm_flowers
-scoreboard players operation required_flowers gm4_sm_flowers -= poppy gm4_sm_flowers
-scoreboard players operation required_flowers gm4_sm_flowers -= blue_orchid gm4_sm_flowers
-scoreboard players operation required_flowers gm4_sm_flowers -= allium gm4_sm_flowers
-scoreboard players operation required_flowers gm4_sm_flowers -= azure_bluet gm4_sm_flowers
-scoreboard players operation required_flowers gm4_sm_flowers -= red_tulip gm4_sm_flowers
-scoreboard players operation required_flowers gm4_sm_flowers -= orange_tulip gm4_sm_flowers
-scoreboard players operation required_flowers gm4_sm_flowers -= white_tulip gm4_sm_flowers
-scoreboard players operation required_flowers gm4_sm_flowers -= pink_tulip gm4_sm_flowers
-scoreboard players operation required_flowers gm4_sm_flowers -= oxeye_daisy gm4_sm_flowers
-scoreboard players operation required_flowers gm4_sm_flowers -= cornflower gm4_sm_flowers
-scoreboard players operation required_flowers gm4_sm_flowers -= lily_of_the_valley gm4_sm_flowers
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/passive_regeneration.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/passive_regeneration.mcfunction
deleted file mode 100644
index 5b4d7178b2..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/passive_regeneration.mcfunction
+++ /dev/null
@@ -1,12 +0,0 @@
-#@s = spawner minecarts
-#at world spawn
-#run from process
-
-#add fuel to every spawner minecart
-scoreboard players add @s gm4_spawner_time 1
-scoreboard players add @s gm4_spawner_fuel 10
-
-#minecarts compare
-execute unless score @s gm4_spawner_time = spawner_global_time gm4_spawner_time run function gm4_spawner_minecarts:fuel/unloaded_fuel_calculations
-
-tag @s[scores={gm4_spawner_fuel=2000..}] add gm4_spawner_minecart_full
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/unloaded_fuel_calculations.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/unloaded_fuel_calculations.mcfunction
deleted file mode 100644
index d12ea5c79d..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/fuel/unloaded_fuel_calculations.mcfunction
+++ /dev/null
@@ -1,10 +0,0 @@
-#@s = spawner minecarts
-#at world spawn
-#run slowly from passive_regeneration
-
-scoreboard players operation @s gm4_spawner_time -= spawner_global_time gm4_spawner_time
-#add fuel
-scoreboard players operation @s gm4_spawner_fuel -= @s gm4_spawner_time
-
-#sync spawner clock
-scoreboard players operation @s gm4_spawner_time = spawner_global_time gm4_spawner_time
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/init.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/init.mcfunction
index 3471050ee1..4caa18eae8 100644
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/init.mcfunction
+++ b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/init.mcfunction
@@ -1,13 +1,9 @@
-scoreboard objectives add gm4_spawner_fuel dummy
-scoreboard objectives add gm4_spawner_time dummy
-scoreboard objectives add gm4_spawner_data dummy
-scoreboard objectives add gm4_sm_flowers dummy
-execute unless score required_flowers gm4_sm_flowers matches -2147483648..2147483647 run function gm4_spawner_minecarts:fuel/initiate_flower_types
-
 execute unless score spawner_minecarts gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Spawner Minecarts"}
 execute unless score spawner_minecarts gm4_earliest_version < spawner_minecarts gm4_modules run scoreboard players operation spawner_minecarts gm4_earliest_version = spawner_minecarts gm4_modules
 scoreboard players set spawner_minecarts gm4_modules 1
 
+scoreboard objectives add gm4_spawner_minecarts_data dummy
+
 schedule function gm4_spawner_minecarts:main 1t
 
 
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/main.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/main.mcfunction
index dcb7538124..73eb9c80a4 100644
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/main.mcfunction
+++ b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/main.mcfunction
@@ -1,21 +1,7 @@
-# check for minecarts under spawners
-execute as @e[type=minecart,tag=!smithed.entity] at @s if block ~ ~1 ~ spawner align xyz positioned ~0.5 ~1.5 ~0.5 unless entity @e[tag=smithed.block,distance=..0.5] at @s if block ~ ~2 ~ #gm4_spawner_minecarts:piston[facing=down] if block ~ ~3 ~ redstone_block run function gm4_spawner_minecarts:capture_spawner/enter_minecart
-
-# slow clock for passive regeneration
-scoreboard players add passive_clock gm4_spawner_fuel 1
-execute if score passive_clock gm4_spawner_fuel matches 750.. run scoreboard players set passive_clock gm4_spawner_fuel 0
-
-# slow clock for active regeneration
-scoreboard players add active_clock gm4_spawner_fuel 1
-execute if score active_clock gm4_spawner_fuel matches 2.. run scoreboard players set active_clock gm4_spawner_fuel 0
+schedule function gm4_spawner_minecarts:main 16t
 
-# global timer
-execute if score passive_clock gm4_spawner_fuel matches 0 run scoreboard players add spawner_global_time gm4_spawner_time 1
+# check for minecarts under spawners
+execute as @e[type=minecart,tag=!smithed.entity] at @s if block ~ ~1 ~ spawner align xyz positioned ~0.5 ~1.5 ~0.5 unless entity @e[tag=smithed.block,distance=..0.5] at @s if block ~ ~2 ~ #gm4_spawner_minecarts:piston[facing=down] if block ~ ~3 ~ redstone_block run function gm4_spawner_minecarts:capture_spawner
 
 #process all spawner minecarts
 execute as @e[type=spawner_minecart,tag=gm4_spawner_minecart] at @s run function gm4_spawner_minecarts:process
-
-#check for successfull spawns
-execute as @e[type=area_effect_cloud,tag=gm4_spawner_minecart_decorative_particle] at @s run function gm4_spawner_minecarts:fuel/decorative_particle
-
-schedule function gm4_spawner_minecarts:main 16t
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/process.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/process.mcfunction
index 18ccf8e961..c6a83ba0f0 100644
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/process.mcfunction
+++ b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/process.mcfunction
@@ -1,27 +1,12 @@
-# @s = spawner minecarts
+# process spawner minecarts
+# @s = spawner minecart
+# at @s
 # run from main
 
-# fix broken spawner minecarts, caused by MC-96131 (probably no longer required)
-scoreboard players add @s gm4_spawner_fuel 0
+# check nearby spawner minecarts, each gives a +25% chance to not reduce delay
+execute positioned ~-4.5 ~-4 ~-4.5 store result score $nearby_carts gm4_spawner_minecarts_data if entity @e[type=spawner_minecart,tag=gm4_spawner_minecart,dx=8,dy=7,dz=8]
+execute unless predicate {condition:"random_chance",chance:{type:"score",score:"gm4_spawner_minecarts_data",target:{type:"fixed",name:"$nearby_carts"},scale:0.25}} run return fail
 
-# check if the spawner minecart is on powered activator rails
-# which enables refueling, otherwise it enables spawning
-scoreboard players set can_spawn gm4_spawner_data 0
-execute unless block ~.29 ~ ~ activator_rail[powered=true] unless block ~-.29 ~ ~ activator_rail[powered=true] unless block ~ ~ ~.29 activator_rail[powered=true] unless block ~ ~ ~-.29 activator_rail[powered=true] run scoreboard players set can_spawn gm4_spawner_data 1
-
-# attempt to refuel
-execute if score active_clock gm4_spawner_fuel matches 1 if score can_spawn gm4_spawner_data matches 0 if score @s gm4_spawner_fuel matches ..1999 run function gm4_spawner_minecarts:fuel/active_regeneration
-execute if score passive_clock gm4_spawner_fuel matches 1 if score @s gm4_spawner_fuel matches ..1999 run function gm4_spawner_minecarts:fuel/passive_regeneration
-execute if entity @s[tag=gm4_spawner_minecart_full] run function gm4_spawner_minecarts:fuel/detector_rail
-
-# remove fuel if a spawn happend
-execute store result score current_delay gm4_spawner_data run data get entity @s Delay
-execute if score @s gm4_spawner_data < current_delay gm4_spawner_data run scoreboard players remove @s gm4_spawner_fuel 10
-
-# enable or disable spawning
-execute if score @s gm4_spawner_data < current_delay gm4_spawner_data if score @s gm4_spawner_fuel matches ..0 run scoreboard players set can_spawn gm4_spawner_data 0
-execute if score can_spawn gm4_spawner_data matches 0 run data merge entity @s {RequiredPlayerRange:0s}
-execute if score can_spawn gm4_spawner_data matches 1 run data merge entity @s {RequiredPlayerRange:16s}
-
-# store delay to compare next cycle
-scoreboard players operation @s gm4_spawner_data = current_delay gm4_spawner_data
+execute store result score $delay gm4_spawner_minecarts_data run data get entity @s Delay
+execute store result entity @s Delay int 1 run scoreboard players add $delay gm4_spawner_minecarts_data 16
+particle angry_villager ~ ~ ~ 0.4 0.4 0.4 0 1
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/guidebook/spawner_minecarts.json b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/guidebook/spawner_minecarts.json
index 0c031aa232..a7468d87e9 100644
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/guidebook/spawner_minecarts.json
+++ b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/guidebook/spawner_minecarts.json
@@ -29,26 +29,6 @@
           }
         ]
       }
-    },
-    "find_spawner_minecart": {
-      "trigger": "minecraft:tick",
-      "conditions": {
-        "player": [
-          {
-            "condition": "minecraft:entity_properties",
-            "entity": "this",
-            "predicate": {
-              "type_specific": {
-                "type": "player",
-                "looking_at": {
-                  "type": "minecraft:spawner_minecart",
-                  "nbt": "{Tags:['gm4_spawner_minecart']}"
-                }
-              }
-            }
-          }
-        ]
-      }
     }
   },
   "sections": [
@@ -63,7 +43,7 @@
           },
           {
             "translate": "text.gm4.guidebook.spawner_minecarts.description",
-            "fallback": "Spawners can be picked up with Minecarts.\n\nOnce a spawner is in a minecart it cannot be ejected and requires charging to spawn mobs."
+            "fallback": "Spawners can be picked up with Minecarts.\n\nOnce a spawner is in a minecart it cannot be ejected and has reduced spawn rates for all carts within a 9x8x9 area around the spawner."
           }
         ]
       ]
@@ -87,32 +67,6 @@
           }
         ]
       ]
-    },
-    {
-      "name": "recharging",
-      "enable": [],
-      "requirements": [
-        [
-          "find_spawner_minecart"
-        ]
-      ],
-      "pages": [
-        [
-          {
-            "translate": "text.gm4.guidebook.spawner_minecarts.recharging",
-            "fallback": "Spawner minecarts require charge to spawn mobs. They passively charge over time.\n\nWhen on a powered rail, it will stop spawning mobs and start actively charging by consuming flowers in a 9x9 area."
-          }
-        ],
-        [
-          {
-            "translate": "text.gm4.guidebook.spawner_minecarts.recharging_1",
-            "fallback": "Some flowers charge the spawner minecart twice as fast as others; this differs in each world.\n\nWhen a spawner minecart fully recharges, it will activate any detector rails it is on."
-          }
-        ]
-      ],
-      "grants": [
-        "pick_up"
-      ]
     }
   ]
 }
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/tags/block/consumable_block.json b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/tags/block/consumable_block.json
deleted file mode 100644
index adf0a6cc2a..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/tags/block/consumable_block.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "values": [
-    "minecraft:dandelion",
-    "minecraft:poppy",
-    "minecraft:allium",
-    "minecraft:blue_orchid",
-    "minecraft:azure_bluet",
-    "minecraft:red_tulip",
-    "minecraft:orange_tulip",
-    "minecraft:white_tulip",
-    "minecraft:pink_tulip",
-    "minecraft:oxeye_daisy",
-    "minecraft:cornflower",
-    "minecraft:lily_of_the_valley",
-    "minecraft:short_grass",
-    "minecraft:tall_grass"
-  ]
-}
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/tags/function/spawner_check.json b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/tags/function/spawner_check.json
deleted file mode 100644
index c6fe20119c..0000000000
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/tags/function/spawner_check.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "values":[
-        "gm4_spawner_minecarts:capture_spawner/vanilla_spawners"
-    ]
-}

From 7eb9c1f787e7df3bf320785ae7555ac72fa06ecd Mon Sep 17 00:00:00 2001
From: Thanathor <73304324+TheThanathor@users.noreply.github.com>
Date: Fri, 14 Nov 2025 16:05:36 +0100
Subject: [PATCH 2/3] don't count yourself, what are you doing?

---
 .../data/gm4_spawner_minecarts/function/process.mcfunction       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/process.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/process.mcfunction
index c6a83ba0f0..88731f7999 100644
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/process.mcfunction
+++ b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/process.mcfunction
@@ -5,6 +5,7 @@
 
 # check nearby spawner minecarts, each gives a +25% chance to not reduce delay
 execute positioned ~-4.5 ~-4 ~-4.5 store result score $nearby_carts gm4_spawner_minecarts_data if entity @e[type=spawner_minecart,tag=gm4_spawner_minecart,dx=8,dy=7,dz=8]
+scoreboard players remove $nearby_carts gm4_spawner_minecarts_data 1
 execute unless predicate {condition:"random_chance",chance:{type:"score",score:"gm4_spawner_minecarts_data",target:{type:"fixed",name:"$nearby_carts"},scale:0.25}} run return fail
 
 execute store result score $delay gm4_spawner_minecarts_data run data get entity @s Delay

From 5f24e4e9b93997ace231df510e71c08b421180a3 Mon Sep 17 00:00:00 2001
From: Thanathor <73304324+TheThanathor@users.noreply.github.com>
Date: Thu, 20 Nov 2025 10:56:12 +0100
Subject: [PATCH 3/3] beeps' comments

---
 .../function/capture_spawner.mcfunction                      | 5 +++--
 .../data/gm4_spawner_minecarts/function/main.mcfunction      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner.mcfunction
index d40dd7cd90..f6efd15d63 100644
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner.mcfunction
+++ b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/capture_spawner.mcfunction
@@ -11,8 +11,9 @@ execute if data storage gm4_spawner_minecarts:temp spawner.SpawnPotentials[{data
 execute if data storage gm4_spawner_minecarts:temp spawner.SpawnData[{data:{entity:{data:{gm4_spawner_minecrarts:{ban_pickup:1}}}}}] run return run function gm4_spawner_minecarts:capture_spawner/fail_pickup
 
 # pick up spawner
-summon spawner_minecart ~ ~ ~ {Tags:["gm4_spawner_minecart"],MaxNearbyEntities:6,RequiredPlayerRange:16,SpawnCount:4,SpawnData:{entity:{id:"minecraft:pig"}},MaxSpawnDelay:600s,Delay:-1,SpawnRange:4s,MinSpawnDelay:100s,SpawnPotentials:[],Invulnerable:1b}
+summon spawner_minecart ~ ~ ~ {Tags:["gm4_spawner_minecart","gm4_spawner_minecart.new"],MaxNearbyEntities:6,RequiredPlayerRange:16,SpawnCount:4,SpawnData:{entity:{id:"minecraft:pig"}},MaxSpawnDelay:600s,Delay:-1,SpawnRange:4s,MinSpawnDelay:100s,SpawnPotentials:[],Invulnerable:1b}
 setblock ~ ~1 ~ air destroy
-data modify entity @e[tag=gm4_spawner_minecart,limit=1,distance=..1] {} merge from storage gm4_spawner_minecarts:temp spawner
+data modify entity @e[tag=gm4_spawner_minecart.new,limit=1,distance=..1] {} merge from storage gm4_spawner_minecarts:temp spawner
+tag @e[tag=gm4_spawner_minecart.new,limit=1,distance=..1] remove gm4_spawner_minecart.new
 advancement grant @a[distance=..5,gamemode=!spectator] only gm4:spawner_minecarts
 kill @s
diff --git a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/main.mcfunction b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/main.mcfunction
index 73eb9c80a4..592761a6f3 100644
--- a/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/main.mcfunction
+++ b/gm4_spawner_minecarts/data/gm4_spawner_minecarts/function/main.mcfunction
@@ -1,7 +1,7 @@
 schedule function gm4_spawner_minecarts:main 16t
 
 # check for minecarts under spawners
-execute as @e[type=minecart,tag=!smithed.entity] at @s if block ~ ~1 ~ spawner align xyz positioned ~0.5 ~1.5 ~0.5 unless entity @e[tag=smithed.block,distance=..0.5] at @s if block ~ ~2 ~ #gm4_spawner_minecarts:piston[facing=down] if block ~ ~3 ~ redstone_block run function gm4_spawner_minecarts:capture_spawner
+execute as @e[type=minecart,tag=!smithed.entity] at @s if block ~ ~1 ~ spawner align xyz positioned ~0.5 ~1.5 ~0.5 unless entity @e[tag=smithed.block,distance=..0.5,limit=1] at @s if block ~ ~2 ~ #gm4_spawner_minecarts:piston[facing=down] if block ~ ~3 ~ redstone_block run function gm4_spawner_minecarts:capture_spawner
 
 #process all spawner minecarts
 execute as @e[type=spawner_minecart,tag=gm4_spawner_minecart] at @s run function gm4_spawner_minecarts:process