From 487646072be213bcf63e1857d07bc6bf78e73a8d Mon Sep 17 00:00:00 2001 From: runcows <124551271+runcows@users.noreply.github.com> Date: Wed, 16 Apr 2025 20:35:42 +0900 Subject: [PATCH 1/7] Fix pig tractors unresponsive (#1109) --- .../data/gm4_pig_tractors/advancement/block_detection/air.json | 2 +- .../advancement/block_detection/empty_farmland.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gm4_pig_tractors/data/gm4_pig_tractors/advancement/block_detection/air.json b/gm4_pig_tractors/data/gm4_pig_tractors/advancement/block_detection/air.json index f3a63313b2..3a89b8ecb2 100644 --- a/gm4_pig_tractors/data/gm4_pig_tractors/advancement/block_detection/air.json +++ b/gm4_pig_tractors/data/gm4_pig_tractors/advancement/block_detection/air.json @@ -1,7 +1,7 @@ { "criteria": { "requirement": { - "trigger": "minecraft:enter_block", + "trigger": "minecraft:tick", "conditions": { "player": [ { diff --git a/gm4_pig_tractors/data/gm4_pig_tractors/advancement/block_detection/empty_farmland.json b/gm4_pig_tractors/data/gm4_pig_tractors/advancement/block_detection/empty_farmland.json index c324d8810c..f192a63c23 100644 --- a/gm4_pig_tractors/data/gm4_pig_tractors/advancement/block_detection/empty_farmland.json +++ b/gm4_pig_tractors/data/gm4_pig_tractors/advancement/block_detection/empty_farmland.json @@ -1,7 +1,7 @@ { "criteria": { "requirement": { - "trigger": "minecraft:enter_block", + "trigger": "minecraft:tick", "conditions": { "player": [ { From 22355686b022b72a2dff8df9d59710d36ed5fdad Mon Sep 17 00:00:00 2001 From: runcows Date: Wed, 23 Apr 2025 19:14:26 +0900 Subject: [PATCH 2/7] Fix NBI area affect cloud showing particles --- .../function/interface/create.mcfunction | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/gm4_note_block_interface/data/gm4_note_block_interface/function/interface/create.mcfunction b/gm4_note_block_interface/data/gm4_note_block_interface/function/interface/create.mcfunction index d76ffeb7d0..204d4cd953 100644 --- a/gm4_note_block_interface/data/gm4_note_block_interface/function/interface/create.mcfunction +++ b/gm4_note_block_interface/data/gm4_note_block_interface/function/interface/create.mcfunction @@ -9,28 +9,28 @@ kill @e[distance=..0.5,type=area_effect_cloud,tag=gm4_nbi_display] # summons new AEC with correct note -execute if block ~ ~ ~ note_block[note=0] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"F♯"}} -execute if block ~ ~ ~ note_block[note=1] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"G"}} -execute if block ~ ~ ~ note_block[note=2] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"G♯"}} -execute if block ~ ~ ~ note_block[note=3] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"A"}} -execute if block ~ ~ ~ note_block[note=4] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"A♯"}} -execute if block ~ ~ ~ note_block[note=5] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"B"}} -execute if block ~ ~ ~ note_block[note=6] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"C"}} -execute if block ~ ~ ~ note_block[note=7] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"C♯"}} -execute if block ~ ~ ~ note_block[note=8] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"D"}} -execute if block ~ ~ ~ note_block[note=9] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"D♯"}} -execute if block ~ ~ ~ note_block[note=10] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"E"}} -execute if block ~ ~ ~ note_block[note=11] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"F"}} -execute if block ~ ~ ~ note_block[note=12] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"F♯"}} -execute if block ~ ~ ~ note_block[note=13] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"G"}} -execute if block ~ ~ ~ note_block[note=14] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"G♯"}} -execute if block ~ ~ ~ note_block[note=15] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"A"}} -execute if block ~ ~ ~ note_block[note=16] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"A♯"}} -execute if block ~ ~ ~ note_block[note=17] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"B"}} -execute if block ~ ~ ~ note_block[note=18] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"C"}} -execute if block ~ ~ ~ note_block[note=19] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"C♯"}} -execute if block ~ ~ ~ note_block[note=20] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"D"}} -execute if block ~ ~ ~ note_block[note=21] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"D♯"}} -execute if block ~ ~ ~ note_block[note=22] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"E"}} -execute if block ~ ~ ~ note_block[note=23] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"F"}} -execute if block ~ ~ ~ note_block[note=24] run summon area_effect_cloud ~ ~ ~ {Duration:20,Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"F♯"}} +execute if block ~ ~ ~ note_block[note=0] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"F♯"}} +execute if block ~ ~ ~ note_block[note=1] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"G"}} +execute if block ~ ~ ~ note_block[note=2] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"G♯"}} +execute if block ~ ~ ~ note_block[note=3] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"A"}} +execute if block ~ ~ ~ note_block[note=4] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"A♯"}} +execute if block ~ ~ ~ note_block[note=5] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"B"}} +execute if block ~ ~ ~ note_block[note=6] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"C"}} +execute if block ~ ~ ~ note_block[note=7] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"C♯"}} +execute if block ~ ~ ~ note_block[note=8] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"D"}} +execute if block ~ ~ ~ note_block[note=9] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"D♯"}} +execute if block ~ ~ ~ note_block[note=10] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"E"}} +execute if block ~ ~ ~ note_block[note=11] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"F"}} +execute if block ~ ~ ~ note_block[note=12] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"F♯"}} +execute if block ~ ~ ~ note_block[note=13] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"G"}} +execute if block ~ ~ ~ note_block[note=14] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"G♯"}} +execute if block ~ ~ ~ note_block[note=15] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"A"}} +execute if block ~ ~ ~ note_block[note=16] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"A♯"}} +execute if block ~ ~ ~ note_block[note=17] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"B"}} +execute if block ~ ~ ~ note_block[note=18] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"C"}} +execute if block ~ ~ ~ note_block[note=19] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"C♯"}} +execute if block ~ ~ ~ note_block[note=20] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"D"}} +execute if block ~ ~ ~ note_block[note=21] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"D♯"}} +execute if block ~ ~ ~ note_block[note=22] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"E"}} +execute if block ~ ~ ~ note_block[note=23] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"F"}} +execute if block ~ ~ ~ note_block[note=24] run summon area_effect_cloud ~ ~ ~ {Duration:20,Particle:{type:"minecraft:block",block_state:{Name:"minecraft:air"}},Tags:["gm4_nbi_display"],CustomNameVisible:1b,CustomName:{"text":"F♯"}} From 20f7e096145ecde9bf5b50d45fc01f918d5e2667 Mon Sep 17 00:00:00 2001 From: runcows Date: Wed, 23 Apr 2025 20:00:09 +0900 Subject: [PATCH 3/7] Fix DripleafLaunchers broken from "stepping_on" change --- .../gm4_dripleaf_launchers/predicate/dripleaf_no_tilt.json | 2 +- .../gm4_dripleaf_launchers/predicate/dripleaf_tilted.json | 2 +- .../gm4_dripleaf_launchers/predicate/dripleaf_triggered.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gm4_dripleaf_launchers/data/gm4_dripleaf_launchers/predicate/dripleaf_no_tilt.json b/gm4_dripleaf_launchers/data/gm4_dripleaf_launchers/predicate/dripleaf_no_tilt.json index b36177d86e..cb0f962330 100644 --- a/gm4_dripleaf_launchers/data/gm4_dripleaf_launchers/predicate/dripleaf_no_tilt.json +++ b/gm4_dripleaf_launchers/data/gm4_dripleaf_launchers/predicate/dripleaf_no_tilt.json @@ -2,7 +2,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "stepping_on": { + "location": { "block": { "blocks": [ "minecraft:big_dripleaf" diff --git a/gm4_dripleaf_launchers/data/gm4_dripleaf_launchers/predicate/dripleaf_tilted.json b/gm4_dripleaf_launchers/data/gm4_dripleaf_launchers/predicate/dripleaf_tilted.json index c584972af1..08eab4281b 100644 --- a/gm4_dripleaf_launchers/data/gm4_dripleaf_launchers/predicate/dripleaf_tilted.json +++ b/gm4_dripleaf_launchers/data/gm4_dripleaf_launchers/predicate/dripleaf_tilted.json @@ -2,7 +2,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "stepping_on": { + "location": { "block": { "blocks": [ "minecraft:big_dripleaf" diff --git a/gm4_dripleaf_launchers/data/gm4_dripleaf_launchers/predicate/dripleaf_triggered.json b/gm4_dripleaf_launchers/data/gm4_dripleaf_launchers/predicate/dripleaf_triggered.json index 80fa3308cd..8ddc211da1 100644 --- a/gm4_dripleaf_launchers/data/gm4_dripleaf_launchers/predicate/dripleaf_triggered.json +++ b/gm4_dripleaf_launchers/data/gm4_dripleaf_launchers/predicate/dripleaf_triggered.json @@ -5,7 +5,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "stepping_on": { + "location": { "block": { "blocks": [ "minecraft:big_dripleaf" @@ -21,7 +21,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "stepping_on": { + "location": { "block": { "blocks": [ "minecraft:big_dripleaf" From 5474df29afdd353f9f550e58ae0aa747cdaddeba Mon Sep 17 00:00:00 2001 From: runcows Date: Wed, 23 Apr 2025 21:15:12 +0900 Subject: [PATCH 4/7] Fix Gemini Shamir extra farm animal baby not having same variant as other baby / parents --- .../gm4_gemini_shamir/function/baby/pick_type.mcfunction | 3 +++ .../function/baby/spawn_chicken.mcfunction | 6 ++++++ .../gm4_gemini_shamir/function/baby/spawn_cow.mcfunction | 6 ++++++ .../gm4_gemini_shamir/function/baby/spawn_pig.mcfunction | 6 ++++++ .../function/breed/check_chicken.mcfunction | 4 ++-- .../gm4_gemini_shamir/function/breed/check_cow.mcfunction | 4 ++-- .../gm4_gemini_shamir/function/breed/check_pig.mcfunction | 4 ++-- 7 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_chicken.mcfunction create mode 100644 gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_cow.mcfunction create mode 100644 gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_pig.mcfunction diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/pick_type.mcfunction b/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/pick_type.mcfunction index f3992f1856..83c6b55fc3 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/pick_type.mcfunction +++ b/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/pick_type.mcfunction @@ -3,6 +3,8 @@ execute if entity @s[tag=gm4_gemini_axolotl] as @e[type=axolotl,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] at @s run function gm4_gemini_shamir:baby/spawn_axolotl execute if entity @s[tag=gm4_gemini_cat] as @e[type=cat,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] at @s run function gm4_gemini_shamir:baby/spawn_cat +execute if entity @s[tag=gm4_gemini_chicken] as @e[type=chicken,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] at @s run function gm4_gemini_shamir:baby/spawn_chicken +execute if entity @s[tag=gm4_gemini_cow] as @e[type=cow,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] at @s run function gm4_gemini_shamir:baby/spawn_cow execute if entity @s[tag=gm4_gemini_donkey] as @e[type=donkey,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] at @s run function gm4_gemini_shamir:baby/spawn_donkey execute if entity @s[tag=gm4_gemini_fox] as @e[type=fox,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] at @s run function gm4_gemini_shamir:baby/spawn_fox execute if entity @s[tag=gm4_gemini_goat] as @e[type=goat,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] at @s run function gm4_gemini_shamir:baby/spawn_goat @@ -11,6 +13,7 @@ execute if entity @s[tag=gm4_gemini_llama] as @e[type=llama,distance=..10,nbt={A execute if entity @s[tag=gm4_gemini_mule] as @e[type=mule,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] at @s run function gm4_gemini_shamir:baby/spawn_mule execute if entity @s[tag=gm4_gemini_ocelot] as @e[type=ocelot,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] at @s run function gm4_gemini_shamir:baby/spawn_ocelot execute if entity @s[tag=gm4_gemini_panda] as @e[type=panda,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] at @s run function gm4_gemini_shamir:baby/spawn_panda +execute if entity @s[tag=gm4_gemini_pig] as @e[type=pig,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] at @s run function gm4_gemini_shamir:baby/spawn_pig execute if entity @s[tag=gm4_gemini_rabbit] as @e[type=rabbit,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] at @s run function gm4_gemini_shamir:baby/spawn_rabbit execute if entity @s[tag=gm4_gemini_sheep] as @e[type=sheep,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] at @s run function gm4_gemini_shamir:baby/spawn_sheep execute if entity @s[tag=gm4_gemini_trader_llama] as @e[type=trader_llama,distance=..10,nbt={Age:-24000},limit=1,sort=nearest] at @s run function gm4_gemini_shamir:baby/spawn_trader_llama diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_chicken.mcfunction b/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_chicken.mcfunction new file mode 100644 index 0000000000..3d702440e3 --- /dev/null +++ b/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_chicken.mcfunction @@ -0,0 +1,6 @@ +# run from gm4_gemini_shamir:baby/pick_type +# @s = recently bred chicken + +summon chicken ~ ~ ~ {Tags:["gm4_gemini_baby"],Age:-23999} +data modify entity @e[type=chicken,tag=gm4_gemini_baby,distance=..2,sort=nearest,limit=1] variant set from entity @s variant +tag @e[type=chicken,tag=gm4_gemini_baby,sort=nearest,limit=1] remove gm4_gemini_baby diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_cow.mcfunction b/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_cow.mcfunction new file mode 100644 index 0000000000..59a7a7b40c --- /dev/null +++ b/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_cow.mcfunction @@ -0,0 +1,6 @@ +# run from gm4_gemini_shamir:baby/pick_type +# @s = recently bred cow + +summon cow ~ ~ ~ {Tags:["gm4_gemini_baby"],Age:-23999} +data modify entity @e[type=cow,tag=gm4_gemini_baby,distance=..2,sort=nearest,limit=1] variant set from entity @s variant +tag @e[type=cow,tag=gm4_gemini_baby,sort=nearest,limit=1] remove gm4_gemini_baby diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_pig.mcfunction b/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_pig.mcfunction new file mode 100644 index 0000000000..d8066199ab --- /dev/null +++ b/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_pig.mcfunction @@ -0,0 +1,6 @@ +# run from gm4_gemini_shamir:baby/pick_type +# @s = recently bred pig + +summon pig ~ ~ ~ {Tags:["gm4_gemini_baby"],Age:-23999} +data modify entity @e[type=pig,tag=gm4_gemini_baby,distance=..2,sort=nearest,limit=1] variant set from entity @s variant +tag @e[type=pig,tag=gm4_gemini_baby,sort=nearest,limit=1] remove gm4_gemini_baby diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/function/breed/check_chicken.mcfunction b/gm4_metallurgy/data/gm4_gemini_shamir/function/breed/check_chicken.mcfunction index f4b7fd640a..bcd411634e 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/function/breed/check_chicken.mcfunction +++ b/gm4_metallurgy/data/gm4_gemini_shamir/function/breed/check_chicken.mcfunction @@ -1,6 +1,6 @@ # run from breed_chicken.json (advancement) # @s = player who has bred a mob -execute if predicate gm4_gemini_shamir:holding_gemini as @e[type=chicken,distance=..10,limit=1,sort=nearest,nbt=!{InLove:0}] at @s run summon chicken ~ ~ ~ {Age:-23999} - +execute if predicate gm4_gemini_shamir:holding_gemini as @e[type=chicken,distance=..10,limit=1,sort=nearest,nbt=!{InLove:0}] at @s run summon marker ~ ~ ~ {Tags:["gm4_gemini_bred","gm4_gemini_chicken"]} advancement revoke @s only gm4_gemini_shamir:breed_chicken +schedule function gm4_gemini_shamir:baby/find_baby 1t diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/function/breed/check_cow.mcfunction b/gm4_metallurgy/data/gm4_gemini_shamir/function/breed/check_cow.mcfunction index dfbe094332..ba91138d08 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/function/breed/check_cow.mcfunction +++ b/gm4_metallurgy/data/gm4_gemini_shamir/function/breed/check_cow.mcfunction @@ -1,6 +1,6 @@ # run from breed_cow.json (advancement) # @s = player who has bred a mob -execute if predicate gm4_gemini_shamir:holding_gemini as @e[type=cow,distance=..10,limit=1,sort=nearest,nbt=!{InLove:0}] at @s run summon cow ~ ~ ~ {Age:-23999} - +execute if predicate gm4_gemini_shamir:holding_gemini as @e[type=cow,distance=..10,limit=1,sort=nearest,nbt=!{InLove:0}] at @s run summon marker ~ ~ ~ {Tags:["gm4_gemini_bred","gm4_gemini_cow"]} advancement revoke @s only gm4_gemini_shamir:breed_cow +schedule function gm4_gemini_shamir:baby/find_baby 1t diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/function/breed/check_pig.mcfunction b/gm4_metallurgy/data/gm4_gemini_shamir/function/breed/check_pig.mcfunction index f361622f91..e19e37e5a9 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/function/breed/check_pig.mcfunction +++ b/gm4_metallurgy/data/gm4_gemini_shamir/function/breed/check_pig.mcfunction @@ -1,6 +1,6 @@ # run from breed_pig.json (advancement) # @s = player who has bred a mob -execute if predicate gm4_gemini_shamir:holding_gemini as @e[type=pig,distance=..10,limit=1,sort=nearest,nbt=!{InLove:0}] at @s run summon pig ~ ~ ~ {Age:-23999} - +execute if predicate gm4_gemini_shamir:holding_gemini as @e[type=pig,distance=..10,limit=1,sort=nearest,nbt=!{InLove:0}] at @s run summon marker ~ ~ ~ {Tags:["gm4_gemini_bred","gm4_gemini_pig"]} advancement revoke @s only gm4_gemini_shamir:breed_pig +schedule function gm4_gemini_shamir:baby/find_baby 1t From a1653552592b89738c0a322c2cb5662a936427b5 Mon Sep 17 00:00:00 2001 From: runcows Date: Wed, 23 Apr 2025 21:15:29 +0900 Subject: [PATCH 5/7] Fix Gemini Shamir extra wolf baby not having same variant as other baby / parents --- .../data/gm4_gemini_shamir/function/baby/spawn_wolf.mcfunction | 1 + 1 file changed, 1 insertion(+) diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_wolf.mcfunction b/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_wolf.mcfunction index 0602a470b0..9c4131f1fb 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_wolf.mcfunction +++ b/gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_wolf.mcfunction @@ -3,4 +3,5 @@ summon wolf ~ ~ ~ {Tags:["gm4_gemini_baby"],Age:-23999} data modify entity @e[type=wolf,tag=gm4_gemini_baby,distance=..2,sort=nearest,limit=1] Owner set from entity @s Owner +data modify entity @e[type=wolf,tag=gm4_gemini_baby,distance=..2,sort=nearest,limit=1] variant set from entity @s variant tag @e[type=wolf,tag=gm4_gemini_baby,sort=nearest,limit=1] remove gm4_gemini_baby From db119b10157b917b50900228b9d387ec68eb394e Mon Sep 17 00:00:00 2001 From: runcows Date: Wed, 23 Apr 2025 22:00:43 +0900 Subject: [PATCH 6/7] Add pale oak log & wood to Arborenda Shamir --- gm4_metallurgy/data/gm4_arborenda_shamir/tags/block/trunks.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gm4_metallurgy/data/gm4_arborenda_shamir/tags/block/trunks.json b/gm4_metallurgy/data/gm4_arborenda_shamir/tags/block/trunks.json index 3069f176fa..9ea4b8c750 100644 --- a/gm4_metallurgy/data/gm4_arborenda_shamir/tags/block/trunks.json +++ b/gm4_metallurgy/data/gm4_arborenda_shamir/tags/block/trunks.json @@ -17,6 +17,8 @@ "minecraft:mangrove_wood", "minecraft:oak_log", "minecraft:oak_wood", + "minecraft:pale_oak_log", + "minecraft:pale_oak_wood", "minecraft:spruce_log", "minecraft:spruce_wood", "minecraft:warped_stem", From 72b127b41782e8fc68b3f939ca6de1bca7a9cf4e Mon Sep 17 00:00:00 2001 From: Misode Date: Fri, 25 Apr 2025 00:01:46 +0200 Subject: [PATCH 7/7] Empty commit to trigger CI checks