Skip to content

Commit

Permalink
v1.21.50.26-preview
Browse files Browse the repository at this point in the history
  • Loading branch information
@mammerla
mammerla committed Oct 30, 2024
1 parent fcb3b03 commit 26fec7f
Show file tree
Hide file tree
Showing 171 changed files with 2,476 additions and 1,124 deletions.
132 changes: 84 additions & 48 deletions behavior_pack/entities/creaking.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,15 @@
"values": [ "neutral", "hostile_observed", "hostile_unobserved", "twitching", "crumbling" ],
"default": "neutral",
"client_sync": true
},
"minecraft:creaking_swaying_ticks": {
"type": "int",
"default": 0,
"range": [ 0, 6 ],
"client_sync": true
}
}
},

"components": {
"minecraft:type_family": {
"family": [ "creaking", "monster", "mob" ]
Expand Down Expand Up @@ -51,7 +56,46 @@
"minecraft:is_hidden_when_invisible": {
},
"minecraft:conditional_bandwidth_optimization": {
}
},
"minecraft:environment_sensor": {
"triggers": [
{
"filters": {
"all_of": [
{
"any_of": [
{ "test": "enum_property", "domain": "minecraft:creaking_state", "value": "hostile_observed" },
{ "test": "enum_property", "domain": "minecraft:creaking_state", "value": "hostile_unobserved" }
]
},
{
"any_of": [
{ "test": "has_target", "value": false },
{ "test": "actor_health", "subject": "target", "value": 0 },
{ "test": "target_distance", "operator": ">", "value": 24 }
]
}
]
},
"event": "minecraft:become_neutral"
},
{
"filters": {
"all_of": [
{ "test": "int_property", "domain": "minecraft:creaking_swaying_ticks", "operator": ">", "value": 0 },
{ "test": "int_property", "domain": "minecraft:creaking_swaying_ticks", "operator": "<=", "value": 5 }
]
},
"event": "minecraft:increment_swaying_ticks"
},
{
"filters": {
"test": "int_property", "domain": "minecraft:creaking_swaying_ticks", "operator": ">", "value": 5
},
"event": "minecraft:reset_swaying_ticks"
}
]
}
},

"component_groups": {
Expand Down Expand Up @@ -98,19 +142,26 @@
{
"on_damage": {
"filters": { "test": "is_family", "subject": "other", "value": "player" },
"event": "minecraft:attacked_by_player"
"event": "minecraft:damaged_by_player"
},
"cause": "all",
"deals_damage": "no_but_side_effects_apply"
},
{
"on_damage": {
"filters": { "test": "is_family", "subject": "other", "value": "mob" },
"event": "minecraft:attacked_by_mob"
"event": "minecraft:damaged_by_entity"
},
"cause": "all",
"deals_damage": "no_but_side_effects_apply"
},
{
"on_damage": {
"event": "minecraft:damaged_by_entity"
},
"cause": "projectile",
"deals_damage": "no_but_side_effects_apply"
},
{
"cause": "all",
"deals_damage": "no_but_side_effects_apply"
Expand Down Expand Up @@ -150,7 +201,14 @@
"minecraft:neutral": {
"minecraft:looked_at": {
"search_radius": 12.0,
"look_at_locations": [ "head", "body", "feet" ],
"look_at_locations": [
{ "location": "head" },
{ "location": "body" },
{
"location": "feet",
"vertical_offset": 0.5
}
],
"set_target": "once_and_keep_scanning",
"find_players_only": true,
"looked_at_cooldown": 0.1,
Expand All @@ -169,13 +227,20 @@
},
"minecraft:behavior.random_stroll": {
"priority": 7,
"speed_multiplier": 0.5
"speed_multiplier": 0.3
}
},
"minecraft:hostile": {
"minecraft:looked_at": {
"search_radius": 24.0,
"look_at_locations": [ "head", "body", "feet" ],
"look_at_locations": [
{ "location": "head" },
{ "location": "body" },
{
"location": "feet",
"vertical_offset": 0.5
}
],
"set_target": "never",
"find_players_only": true,
"looked_at_cooldown": 0.1,
Expand All @@ -196,20 +261,6 @@
{ "test": "has_equipment", "subject": "other", "domain": "head", "value": "carved_pumpkin" }
]
}
},
"minecraft:environment_sensor": {
"triggers": [
{
"filters": {
"any_of": [
{ "test": "has_target", "value": false },
{ "test": "actor_health", "subject": "target", "value": 0 },
{ "test": "target_distance", "operator": ">", "value": 24 }
]
},
"event": "minecraft:become_neutral"
}
]
}
},
"minecraft:hostile_unobserved": {
Expand All @@ -218,19 +269,8 @@
"cooldown_time": 2.0
}
},
"minecraft:swaying": {
"minecraft:behavior.timer_flag_1": {
"priority": 0,
"cooldown_range": 0.0,
"duration_range": [ 0.3, 0.3 ],
"on_end": {
"event": "minecraft:stop_swaying",
"target": "self"
}
}
},
"minecraft:twitching": {
"minecraft:behavior.timer_flag_2": {
"minecraft:behavior.timer_flag_1": {
"priority": 0,
"cooldown_range": 0.0,
"duration_range": [ 2.25, 2.25 ],
Expand Down Expand Up @@ -429,27 +469,23 @@
"sound": "death"
}
},
"minecraft:attacked_by_player": {
"trigger": "minecraft:start_swaying",
"minecraft:damaged_by_player": {
"execute_event_on_home_block": {
"event": "minecraft:on_spawned_creaking_damaged_by_player"
}
},
"trigger": "minecraft:increment_swaying_ticks"
},
"minecraft:attacked_by_mob": {
"trigger": "minecraft:start_swaying"
"minecraft:damaged_by_entity": {
"trigger": "minecraft:increment_swaying_ticks"
},
"minecraft:start_swaying": {
"add": {
"component_groups": [
"minecraft:swaying"
]
"minecraft:increment_swaying_ticks": {
"set_property": {
"minecraft:creaking_swaying_ticks": "math.clamp(query.property('minecraft:creaking_swaying_ticks') + 1, 0, 6)"
}
},
"minecraft:stop_swaying": {
"remove": {
"component_groups": [
"minecraft:swaying"
]
"minecraft:reset_swaying_ticks": {
"set_property": {
"minecraft:creaking_swaying_ticks": "0"
}
}
}
Expand Down
70 changes: 67 additions & 3 deletions behavior_pack/entities/mooshroom.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "1.21.0",
"format_version": "1.21.50",
"minecraft:entity": {
"description": {
"identifier": "minecraft:mooshroom",
Expand Down Expand Up @@ -288,6 +288,42 @@
"particle_on_start": { "particle_type": "smoke", "particle_y_offset": 0.25, "particle_offset_towards_interactor": true },
"interact_text": "action.interact.feed"
},
{
"on_interact": {
"filters": { // open eyeblossom
"all_of": [
{ "test": "has_equipment", "subject": "other", "domain": "hand", "value": "open_eyeblossom"},
{ "test" : "is_family", "subject" : "other", "value" : "player"},
{ "test": "is_variant", "subject": "self", "operator": "==", "value": 1},
{ "test": "is_mark_variant", "subject": "self", "operator": "!=", "value": 11}
]
},
"event": "minecraft:ate_open_eyeblossom",
"target": "self"
},
"use_item": true,
"play_sounds": "eat",
"particle_on_start": { "particle_type": "smoke", "particle_y_offset": 0.25, "particle_offset_towards_interactor": true },
"interact_text": "action.interact.feed"
},
{
"on_interact": {
"filters": { // closed eyeblossom
"all_of": [
{ "test": "has_equipment", "subject": "other", "domain": "hand", "value": "closed_eyeblossom"},
{ "test" : "is_family", "subject" : "other", "value" : "player"},
{ "test": "is_variant", "subject": "self", "operator": "==", "value": 1},
{ "test": "is_mark_variant", "subject": "self", "operator": "!=", "value": 12}
]
},
"event": "minecraft:ate_closed_eyeblossom",
"target": "self"
},
"use_item": true,
"play_sounds": "eat",
"particle_on_start": { "particle_type": "smoke", "particle_y_offset": 0.25, "particle_offset_towards_interactor": true },
"interact_text": "action.interact.feed"
},
{
"on_interact": {
"filters": {
Expand Down Expand Up @@ -418,6 +454,18 @@
}
},

"minecraft:mooshroom_brown_fed_open_eyeblossom": {
"minecraft:mark_variant": {
"value": 11
}
},

"minecraft:mooshroom_brown_fed_closed_eyeblossom": {
"minecraft:mark_variant": {
"value": 12
}
},

"minecraft:mooshroom_red": {
"minecraft:variant": {
"value": 0
Expand Down Expand Up @@ -556,7 +604,7 @@
},
"event": "minecraft:become_brown"
},
"deals_damage": false,
"deals_damage": "no",
"on_damage_sound_event": "convert_mooshroom"
},
{
Expand All @@ -569,7 +617,7 @@
},
"event": "minecraft:become_red"
},
"deals_damage": false,
"deals_damage": "no",
"on_damage_sound_event": "convert_mooshroom"
}
]
Expand Down Expand Up @@ -684,6 +732,22 @@
}
},

"minecraft:ate_open_eyeblossom": {
"add": {
"component_groups": [
"minecraft:mooshroom_brown_fed_open_eyeblossom"
]
}
},

"minecraft:ate_closed_eyeblossom": {
"add": {
"component_groups": [
"minecraft:mooshroom_brown_fed_closed_eyeblossom"
]
}
},

"minecraft:ate_orchid": {
"add": {
"component_groups": [
Expand Down
44 changes: 44 additions & 0 deletions behavior_pack/loot_tables/gameplay/entities/mooshroom_milking.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,50 @@
]
}
]
},
{
"conditions": [
{
"condition": "has_mark_variant",
"value": 11
}
],
"rolls": 1,
"entries": [
{
"type": "item",
"name": "minecraft:suspicious_stew",
"weight": 1,
"functions": [
{
"function": "set_data",
"data": 11
}
]
}
]
},
{
"conditions": [
{
"condition": "has_mark_variant",
"value": 12
}
],
"rolls": 1,
"entries": [
{
"type": "item",
"name": "minecraft:suspicious_stew",
"weight": 1,
"functions": [
{
"function": "set_data",
"data": 12
}
]
}
]
}
]
}
3 changes: 2 additions & 1 deletion behavior_pack/recipes/resin_brick_slab.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
}
],
"result": {
"item": "minecraft:resin_brick_slab"
"item": "minecraft:resin_brick_slab",
"count": 6
}
}
}
3 changes: 2 additions & 1 deletion behavior_pack/recipes/resin_brick_stairs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
}
],
"result": {
"item": "minecraft:resin_brick_stairs"
"item": "minecraft:resin_brick_stairs",
"count": 4
}
}
}
Loading

0 comments on commit 26fec7f

Please sign in to comment.