Use Templates, Adjust Size Increments

Bloo-dev · Bloo-dev · commit 6e5bb6320b23 · 2025-11-08T11:22:43.000+01:00
diff --git a/gm4_lavish_livestock/beet.yaml b/gm4_lavish_livestock/beet.yaml
@@ -8,26 +8,28 @@ data_pack:
 resource_pack:
   load: .
 
+require:
+  - bolt
+
 pipeline:
+  - gm4_lavish_livestock.generate
   - gm4.plugins.extend.module
 
 meta:
   gm4:
     versioning:
       schedule_loops: []
     website:
-      description: Huh?
+      description: Selectively breed your livestock for increased yields! Commercialize your farming!
       recommended:
-        - gm4_enderman_support_class
-      notes:
-        - Modifies loot tables.
+        - gm4_pig_tractors
+        - metallurgy
     #modrinth: 
-    #  project_id: qWQqEQMY
+    #  project_id: 
     #smithed:
-    #  pack_id: gm4_bat_grenades
+    #  pack_id: 
     #planetminecraft: 
-    #  uid: 4293806
-    #video: https://www.youtube.com/watch?v=uUoEKtte1GQ
+    #  uid: 
     wiki: https://wiki.gm4.co/wiki/Lavish_Livestock
     credits:
       Creator:
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
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
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/advancement/breed.json b/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/advancement/breed.json
@@ -4,12 +4,12 @@
             "trigger": "minecraft:bred_animals",
             "conditions": {
                 "child": {
-                    "type": "pig"
+                    "type": "{{ entity_id }}"
                 }
             }
         }
     },
     "rewards": {
-        "function": "gm4_lavish_livestock:revoke_advancement"
+        "function": "gm4_lavish_livestock:{{ entity_id }}/revoke_advancement"
     }
 }
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/function/cache_size.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/function/cache_size.mcfunction
@@ -1,11 +1,11 @@
 # Selects babies near the breeding site
 # @s = breeding site
 # at @s
-# run from gm4_lavish_livestock:find_baby
+# run from gm4_lavish_livestock:{{ entity_id }}/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] run function gm4_lavish_livestock:modify_baby
+execute as @e[type={{ entity_id }},distance=..10,nbt={Age:-24000},limit=1,sort=nearest] run function gm4_lavish_livestock:{{ entity_id }}/modify_baby
 
 # remove breeding site marker
 kill @s
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/function/determine_parent.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/function/determine_parent.mcfunction
@@ -1,23 +1,23 @@
 # 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
+# run from gm4_lavish_livestock:{{ entity_id }}/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
+execute if score $parent_selected gm4_lavish_livestock_size matches 1.. run return fail
 
 # no parent selected yet
 # if the other parent candidate was already tested but not selected as the parent, make this candidate the parent
-execute if score $parent_selected gm4_lavish_livestock_data matches 0 run scoreboard players set $parent_selected gm4_lavish_livestock_data 1
+execute if score $parent_selected gm4_lavish_livestock_size matches 0 run scoreboard players set $parent_selected gm4_lavish_livestock_size 1
 # if the other parent candidate was not tested yet, roll a 50/50 whether this candidate should be the parent
-execute if score $parent_selected gm4_lavish_livestock_data matches -1 store result score $parent_selected gm4_lavish_livestock_data run random roll 0..1
+execute if score $parent_selected gm4_lavish_livestock_size matches -1 store result score $parent_selected gm4_lavish_livestock_size run random value 0..1
 # if this candidate was not selected, abort
-execute if score $parent_selected gm4_lavish_livestock_data matches 0 run return fail
+execute if score $parent_selected gm4_lavish_livestock_size matches 0 run return fail
 
 # 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:initialize_marker
+execute summon marker run function gm4_lavish_livestock:{{ entity_id }}/initialize_marker
 
 # delay for one tick until child is alive
-schedule function gm4_lavish_livestock:find_baby 1t
+schedule function gm4_lavish_livestock:{{ entity_id }}/find_baby 1t
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/function/find_baby.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/function/find_baby.mcfunction
@@ -1,6 +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
+# scheduled from gm4_lavish_livestock:{{ entity_id }}/revoke_advancement
 
-execute as @e[type=marker,tag=gm4_lavish_livestock_breeding_site] at @s run function gm4_lavish_livestock:pick_type
+execute as @e[type=marker,tag=gm4_lavish_livestock_breeding_site,tag=gm4_lavish_livestock_{{ entity_id }}] at @s run function gm4_lavish_livestock:{{ entity_id }}/cache_size
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/function/init.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/function/init.mcfunction
@@ -2,7 +2,6 @@ execute unless score lavish_livestock gm4_modules matches 1 run data modify stor
 execute unless score lavish_livestock gm4_earliest_version < lavish_livestock gm4_modules run scoreboard players operation lavish_livestock gm4_earliest_version = lavish_livestock gm4_modules
 scoreboard players set lavish_livestock gm4_modules 1
 
-scoreboard objectives add gm4_lavish_livestock_data dummy
 scoreboard objectives add gm4_lavish_livestock_size dummy
 
 #$moduleUpdateList
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/function/initialize_marker.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/function/initialize_marker.mcfunction
@@ -1,7 +1,8 @@
 # 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
+# run from gm4_lavish_livestock:{{ entity_id }}/determine_parent
 
 scoreboard players operation @s gm4_lavish_livestock_size = $size gm4_lavish_livestock_size
 tag @s add gm4_lavish_livestock_breeding_site
+tag @s add gm4_lavish_livestock_{{ entity_id }}
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/function/modify_baby.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/function/modify_baby.mcfunction
@@ -0,0 +1,16 @@
+# Sets the size of the newborn baby
+# @s = the newborn baby
+# at location of breeding site marker
+# run from gm4_lavish_livestock:{{ entity_id }}/cache_size
+
+# get parent size and roll chance to increase in size
+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:0.05} run scoreboard players add @s gm4_lavish_livestock_size 1
+
+# if non-vanilla size: add loot table and tag entity (tag is for future-proofing only, it is not currently read)
+execute if score @s gm4_lavish_livestock_size matches 1.. run tag @s add gm4_lavish_livestock_{{ entity_id }}
+execute if score @s gm4_lavish_livestock_size matches 1.. run data modify entity @s DeathLootTable set value "gm4_lavish_livestock:{{ entity_id }}/lavish_death"
+
+# set scale attribute
+execute if score @s gm4_lavish_livestock_size matches 1 run attribute @s minecraft:scale modifier add gm4_lavish_livestock:size 0.125 add_multiplied_base
+execute if score @s gm4_lavish_livestock_size matches 2 run attribute @s minecraft:scale modifier add gm4_lavish_livestock:size 0.25 add_multiplied_base
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/function/revoke_advancement.mcfunction b/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/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:{{ entity_id }}/breed
+
+advancement revoke @s only gm4_lavish_livestock:{{ entity_id }}/breed
+
+# determine parent to inherit size from
+scoreboard players set $parent_selected gm4_lavish_livestock_size -1
+execute as @e[type={{ entity_id }},distance=..10,limit=2,sort=nearest,nbt=!{InLove:0}] run function gm4_lavish_livestock:{{ entity_id }}/determine_parent
+
+# await birth
+schedule function gm4_lavish_livestock:find_baby 1t
diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/loot_table/lavish_death.json b/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/loot_table/lavish_death.json
@@ -0,0 +1,23 @@
+{
+    "type": "minecraft:entity",
+    "pools": [
+        {
+            "rolls": {
+                "type": "minecraft:score",
+                "target": {
+                    "type": "minecraft:context",
+                    "target": "this"
+                },
+                "score": "gm4_lavish_livestock_size",
+                "scale": 2.5
+            },
+            "entries": [
+                {
+                    "type": "minecraft:loot_table",
+                    "value": "minecraft:entities/{{ entity_id }}"
+                }
+            ]
+        }
+    ],
+    "random_sequence": "minecraft:entities/{{ entity_id }}"
+}
diff --git a/gm4_lavish_livestock/generate.py b/gm4_lavish_livestock/generate.py
@@ -0,0 +1,40 @@
+from pathlib import Path
+import logging
+
+from beet import Context, subproject
+from gm4.utils import CSV
+
+logger = logging.getLogger(__name__)
+
+def beet_default(ctx: Context):
+
+    # load csv
+    csv = CSV.from_file(Path('gm4_lavish_livestock', 'raw', 'livestock.csv'))
+
+    # prepare list of supported entities
+    entity_ids = [e.get('entity_id', "").removeprefix('minecraft:').strip() for e in csv]
+
+    # for each wood type in the vanilla doors tag, render a copy of the "templates" directory with the appropriate wood-type
+    for entity in entity_ids:
+        logger.info(f"adding entity type {entity}")
+        subproject_config = {
+            "data_pack": {
+                "load": [
+                    {
+                        f"data/gm4_lavish_livestock/advancement/{entity}": "data/gm4_lavish_livestock/templates/advancement",
+                        f"data/gm4_lavish_livestock/function/{entity}": "data/gm4_lavish_livestock/templates/function",
+                        f"data/gm4_lavish_livestock/loot_table/{entity}": "data/gm4_lavish_livestock/templates/loot_table",
+                    }
+                ],
+                "render": {
+                    "advancement": "*",
+                    "function": "*",
+                    "loot_table": "*"
+                }
+            },
+            "meta": {
+                "entity_id": entity
+            }
+        }
+
+        ctx.require(subproject(subproject_config))
diff --git a/gm4_lavish_livestock/raw/livestock.csv b/gm4_lavish_livestock/raw/livestock.csv
@@ -0,0 +1,7 @@
+entity_id,
+chicken,
+cow,
+mooshroom,
+pig,
+rabbit,
+sheep,

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@`
`4`	`4`	`"trigger": "minecraft:bred_animals",`
`5`	`5`	`"conditions": {`
`6`	`6`	`"child": {`
`7`		`- "type": "pig"`
	`7`	`+ "type": "{{ entity_id }}"`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`	`"rewards": {`
`13`		`- "function": "gm4_lavish_livestock:revoke_advancement"`
	`13`	`+ "function": "gm4_lavish_livestock:{{ entity_id }}/revoke_advancement"`
`14`	`14`	`}`
`15`	`15`	`}`