Skip to content

Commit 36125ba

Browse files
runcowsruncows
authored
Run's misc 1.21.5 commits part 3 (#1115)
* Fix pig tractors unresponsive (#1109) * Fix NBI area affect cloud showing particles * Fix DripleafLaunchers broken from "stepping_on" change * Fix Gemini Shamir extra farm animal baby not having same variant as other baby / parents * Fix Gemini Shamir extra wolf baby not having same variant as other baby / parents * Add pale oak log & wood to Arborenda Shamir
1 parent fd8ac15 commit 36125ba

13 files changed

Lines changed: 59 additions & 35 deletions

File tree

‎gm4_dripleaf_launchers/data/gm4_dripleaf_launchers/predicate/dripleaf_no_tilt.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"condition": "minecraft:entity_properties",
33
"entity": "this",
44
"predicate": {
5-
"stepping_on": {
5+
"location": {
66
"block": {
77
"blocks": [
88
"minecraft:big_dripleaf"

‎gm4_dripleaf_launchers/data/gm4_dripleaf_launchers/predicate/dripleaf_tilted.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"condition": "minecraft:entity_properties",
33
"entity": "this",
44
"predicate": {
5-
"stepping_on": {
5+
"location": {
66
"block": {
77
"blocks": [
88
"minecraft:big_dripleaf"

‎gm4_dripleaf_launchers/data/gm4_dripleaf_launchers/predicate/dripleaf_triggered.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"condition": "minecraft:entity_properties",
66
"entity": "this",
77
"predicate": {
8-
"stepping_on": {
8+
"location": {
99
"block": {
1010
"blocks": [
1111
"minecraft:big_dripleaf"
@@ -21,7 +21,7 @@
2121
"condition": "minecraft:entity_properties",
2222
"entity": "this",
2323
"predicate": {
24-
"stepping_on": {
24+
"location": {
2525
"block": {
2626
"blocks": [
2727
"minecraft:big_dripleaf"

‎gm4_metallurgy/data/gm4_arborenda_shamir/tags/block/trunks.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
"minecraft:mangrove_wood",
1818
"minecraft:oak_log",
1919
"minecraft:oak_wood",
20+
"minecraft:pale_oak_log",
21+
"minecraft:pale_oak_wood",
2022
"minecraft:spruce_log",
2123
"minecraft:spruce_wood",
2224
"minecraft:warped_stem",

‎gm4_metallurgy/data/gm4_gemini_shamir/function/baby/pick_type.mcfunction‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
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
55
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
6+
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
7+
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
68
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
79
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
810
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
1113
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
1214
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
1315
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
16+
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
1417
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
1518
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
1619
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

‎gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_chicken.mcfunction‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# run from gm4_gemini_shamir:baby/pick_type
2+
# @s = recently bred chicken
3+
4+
summon chicken ~ ~ ~ {Tags:["gm4_gemini_baby"],Age:-23999}
5+
data modify entity @e[type=chicken,tag=gm4_gemini_baby,distance=..2,sort=nearest,limit=1] variant set from entity @s variant
6+
tag @e[type=chicken,tag=gm4_gemini_baby,sort=nearest,limit=1] remove gm4_gemini_baby

‎gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_cow.mcfunction‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# run from gm4_gemini_shamir:baby/pick_type
2+
# @s = recently bred cow
3+
4+
summon cow ~ ~ ~ {Tags:["gm4_gemini_baby"],Age:-23999}
5+
data modify entity @e[type=cow,tag=gm4_gemini_baby,distance=..2,sort=nearest,limit=1] variant set from entity @s variant
6+
tag @e[type=cow,tag=gm4_gemini_baby,sort=nearest,limit=1] remove gm4_gemini_baby

‎gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_pig.mcfunction‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# run from gm4_gemini_shamir:baby/pick_type
2+
# @s = recently bred pig
3+
4+
summon pig ~ ~ ~ {Tags:["gm4_gemini_baby"],Age:-23999}
5+
data modify entity @e[type=pig,tag=gm4_gemini_baby,distance=..2,sort=nearest,limit=1] variant set from entity @s variant
6+
tag @e[type=pig,tag=gm4_gemini_baby,sort=nearest,limit=1] remove gm4_gemini_baby

‎gm4_metallurgy/data/gm4_gemini_shamir/function/baby/spawn_wolf.mcfunction‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33

44
summon wolf ~ ~ ~ {Tags:["gm4_gemini_baby"],Age:-23999}
55
data modify entity @e[type=wolf,tag=gm4_gemini_baby,distance=..2,sort=nearest,limit=1] Owner set from entity @s Owner
6+
data modify entity @e[type=wolf,tag=gm4_gemini_baby,distance=..2,sort=nearest,limit=1] variant set from entity @s variant
67
tag @e[type=wolf,tag=gm4_gemini_baby,sort=nearest,limit=1] remove gm4_gemini_baby

‎gm4_metallurgy/data/gm4_gemini_shamir/function/breed/check_chicken.mcfunction‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# run from breed_chicken.json (advancement)
22
# @s = player who has bred a mob
33

4-
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}
5-
4+
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"]}
65
advancement revoke @s only gm4_gemini_shamir:breed_chicken
6+
schedule function gm4_gemini_shamir:baby/find_baby 1t

0 commit comments

Comments
 (0)