Refactor

Bloo-dev · Bloo-dev · commit 797894e61021 · 2025-11-07T22:24:28.000+01:00
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/advancements/breed.json b/gm4_lavish_livestock/data/gm4_lavish_livestock/advancements/breed.json
@@ -10,6 +10,6 @@
         }
     },
     "rewards": {
-        "function": "gm4_lavish_livestock:breed/revoke_advancement"
+        "function": "gm4_lavish_livestock:revoke_advancement"
     }
 }
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/advancements/feed_livestock.json b/gm4_lavish_livestock/data/gm4_lavish_livestock/advancements/feed_livestock.json
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/function/breed/initialize_marker.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/function/breed/initialize_marker.mcfunction
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/function/breed/revoke_advancement.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/function/breed/revoke_advancement.mcfunction
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/function/determine_parent.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/function/determine_parent.mcfunction
@@ -1,3 +1,7 @@
+# Selects one of the two parents of the baby as the source of the inherited size
+# @s = parent of the baby
+# at location of player who has fed the parent
+# run from gm4_lavish_livestock:revoke_advancement
 
 # if the other parent candidate was already tested and selected as the parent, abort 
 execute if score $parent_selected gm4_lavish_livestock_data matches 1.. run return fail
@@ -13,10 +17,7 @@ execute if score $parent_selected gm4_lavish_livestock_data matches 0 run return
 # this candidate is the parent, transfer its stats to breeding site marker
 execute unless score @s gm4_lavish_livestock_size matches 0..2 run scoreboard players set @s gm4_lavish_livestock_size 0
 scoreboard players operation $size gm4_lavish_livestock_size = @s gm4_lavish_livestock_size
-execute summon marker run function gm4_lavish_livestock:breed/initialize_marker
-
-say am parent!
-effect give @s regeneration infinite 0 false
+execute summon marker run function gm4_lavish_livestock:initialize_marker
 
 # delay for one tick until child is alive
 schedule function gm4_lavish_livestock:find_baby 1t
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/function/feed/revoke_advancement.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/function/feed/revoke_advancement.mcfunction
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/function/find_baby.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/function/find_baby.mcfunction
@@ -1 +1,6 @@
+# Called once the parent has given birth and initiates breeding sites to look for babies.
+# @s = undefined
+# at undefined
+# scheduled from gm4_lavish_livestock:revoke_advancement
+
 execute as @e[type=marker,tag=gm4_lavish_livestock_breeding_site] at @s run function gm4_lavish_livestock:pick_type
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/function/init.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/function/init.mcfunction
@@ -5,8 +5,4 @@ scoreboard players set lavish_livestock gm4_modules 1
 scoreboard objectives add gm4_lavish_livestock_data dummy
 scoreboard objectives add gm4_lavish_livestock_size dummy
 
-schedule function gm4_lavish_livestock:main 1t
-
-
-
 #$moduleUpdateList
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/function/initialize_marker.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/function/initialize_marker.mcfunction
@@ -0,0 +1,7 @@
+# Initializes the breeding site marker which sticks around awaiting birth
+# @s = new breeding site marker
+# at location of player who has fed the parent
+# run from gm4_lavish_livestock:determine_parent
+
+scoreboard players operation @s gm4_lavish_livestock_size = $size gm4_lavish_livestock_size
+tag @s add gm4_lavish_livestock_breeding_site
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/function/modify_baby.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/function/modify_baby.mcfunction
@@ -1,5 +1,7 @@
-say found me!
-effect give @s absorption infinite 0 false
+# Sets the size of the newborn baby
+# @s = the newborn baby
+# at location of breeding site marker
+# run from gm4_lavish_livestock:pick_type
 
 scoreboard players operation @s gm4_lavish_livestock_size = $size gm4_lavish_livestock_size
 execute if score @s gm4_lavish_livestock_size matches 0..1 if predicate {condition:"minecraft:random_chance",chance:1} run scoreboard players add @s gm4_lavish_livestock_size 1
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/function/pick_type.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/function/pick_type.mcfunction
@@ -1,4 +1,11 @@
+# Selects babies near the breeding site
+# @s = breeding site
+# at @s
+# run from gm4_lavish_livestock:find_baby
+
+# cache parent size
 scoreboard players operation $size gm4_lavish_livestock_size = @s gm4_lavish_livestock_size
-execute as @e[type=pig,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] at @s run function gm4_lavish_livestock:modify_baby
+execute as @e[type=pig,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] run function gm4_lavish_livestock:modify_baby
 
+# remove breeding site marker
 kill @s
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/function/revoke_advancement.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/function/revoke_advancement.mcfunction
@@ -0,0 +1,13 @@
+# Revokes the breeding advancement and initiates baby tracking
+# @s = player who bred livestock
+# at @s
+# run from advancement gm4_lavish_livestock:breed
+
+advancement revoke @s only gm4_lavish_livestock:breed
+
+# determine parent to inherit size from
+scoreboard players set $parent_selected gm4_lavish_livestock_data -1
+execute as @e[type=pig,distance=..10,limit=2,sort=nearest,nbt=!{InLove:0}] run function gm4_lavish_livestock:determine_parent
+
+# await birth
+schedule function gm4_lavish_livestock:find_baby 1t

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`	`"rewards": {`
`13`		`- "function": "gm4_lavish_livestock:breed/revoke_advancement"`
	`13`	`+ "function": "gm4_lavish_livestock:revoke_advancement"`
`14`	`14`	`}`
`15`	`15`	`}`