v1.21.60.21-preview

Mojang · Nov 20, 2024 · 706bce4 · 706bce4
1 parent 71e3969
commit 706bce4
Show file tree

Hide file tree

Showing 146 changed files with 53,438 additions and 14,690 deletions.
diff --git a/behavior_pack/entities/cat.json b/behavior_pack/entities/cat.json
@@ -39,6 +39,7 @@
           "require_tame": true,
           "require_full_health": true,
           "allow_sitting": true,
+          "combine_parent_colors": true,
           "breeds_with": {
             "mate_type": "minecraft:cat",
             "baby_type": "minecraft:cat",

diff --git a/behavior_pack/entities/creaking.json b/behavior_pack/entities/creaking.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "1.21.50",
+  "format_version": "1.21.60",
   "use_beta_features": true,
   "minecraft:entity": {
     "description": {
@@ -55,8 +55,32 @@
       },
       "minecraft:is_hidden_when_invisible": {
       },
-      "minecraft:environment_sensor": {
+      "minecraft:despawn": {
+        "despawn_from_distance": {}
+      }
+    },
+
+    "component_groups": {
+      "minecraft:spawned_by_player": {
+        "minecraft:nameable": {
+        },
+        "minecraft:navigation.walk": {
+          "can_path_over_water": true,
+          "can_path_over_lava": false,
+          "avoid_damage_blocks": true
+        },
+        "minecraft:hurt_on_condition": {
+          "damage_conditions": [
+            {
+              "filters": { "test": "in_lava" },
+              "cause": "lava",
+              "damage_per_tick": 4
+            }
+          ]
+        },
+        "minecraft:environment_sensor": {
           "triggers": [
+            // This trigger needs to be aligned with the analogous one defined in "minecraft:spawned_by_creaking_heart".
             {
               "filters": {
                 "all_of": [
@@ -76,48 +100,11 @@
                 ]
               },
               "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": {
-      "minecraft:spawned_by_player": {
-        "minecraft:nameable": {
-        },
-        "minecraft:navigation.walk": {
-          "can_path_over_water": true,
-          "can_path_over_lava": false,
-          "avoid_damage_blocks": true
-        },
-        "minecraft:hurt_on_condition": {
-          "damage_conditions": [
-            {
-              "filters": { "test": "in_lava" },
-              "cause": "lava",
-              "damage_per_tick": 4
             }
           ]
         }
       },
       "minecraft:spawned_by_creaking_heart": {
-        "minecraft:transient": {
-        },
         "minecraft:dimension_bound": {
         },
         "minecraft:fire_immune": {
@@ -165,6 +152,71 @@
               "deals_damage": "no_but_side_effects_apply"
             }
           ]
+        },
+        "minecraft:environment_sensor": {
+          "triggers": [
+            // This trigger needs to be aligned with the analogous one defined in "minecraft:spawned_by_player".
+            {
+              "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"
+            },
+            // Force the Creaking to despawn if the conditions for it being spawned are no longer met.
+            {
+              "filters": {
+                "all_of": [
+                  { "test": "enum_property", "domain": "minecraft:creaking_state", "operator": "not", "value": "twitching" },
+                  {
+                    "any_of": [
+                      { "test": "home_distance", "operator": ">", "value": 34 },
+                      { "test": "is_daytime" }
+                    ]
+                  }
+                ]
+              },
+              "event": "minecraft:crumble_and_notify_creaking_heart"
+            },
+            {
+              "filters": {
+                "all_of": [
+                  { "test": "enum_property", "domain": "minecraft:creaking_state", "operator": "not", "value": "twitching" },
+                  { "test": "is_bound_to_creaking_heart", "value": false }
+                ]
+              },
+              "event": "minecraft:crumble"
+            },
+            // Make sure that the Creaking sways for exactly 5 ticks.
+            {
+              "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"
+            }
+          ]
         }
       },
       "minecraft:mobile": {
@@ -259,6 +311,10 @@
               { "test": "has_equipment", "subject": "other", "domain": "head", "value": "carved_pumpkin" }
             ]
           }
+        },
+        "minecraft:ambient_sound_interval": {
+          // We need to override the ambient sound to be something else or it will play even after the component is removed.
+          "event_name": "undefined"
         }
       },
       "minecraft:hostile_unobserved": {
@@ -467,6 +523,12 @@
           "sound": "death"
         }
       },
+      "minecraft:crumble_and_notify_creaking_heart": {
+        "execute_event_on_home_block": {
+          "event": "minecraft:on_spawned_creaking_crumbling"
+        },
+        "trigger": "minecraft:crumble"
+      },
       "minecraft:damaged_by_player": {
         "execute_event_on_home_block": {
           "event": "minecraft:on_spawned_creaking_damaged_by_player"

diff --git a/behavior_pack/entities/donkey.json b/behavior_pack/entities/donkey.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "1.21.10",
+  "format_version": "1.21.60",
   "minecraft:entity": {
     "description": {
       "identifier": "minecraft:donkey",
@@ -313,6 +313,8 @@
     "components": {
       "minecraft:is_hidden_when_invisible": {
       },
+      "minecraft:ambient_sound_interval": {
+      },
       "minecraft:type_family": {
         "family": [ "donkey", "mob" ]
       },

diff --git a/behavior_pack/entities/drowned.json b/behavior_pack/entities/drowned.json
@@ -18,7 +18,7 @@
           "value": 0.5
         },
         "minecraft:movement": {
-          "value": 0.25
+          "value": 0.35
         },
         "minecraft:underwater_movement": {
           "value": 0.08

diff --git a/behavior_pack/entities/fox.json b/behavior_pack/entities/fox.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "1.21.40",
+  "format_version": "1.21.60",
   "minecraft:entity": {
     "description": {
       "identifier": "minecraft:fox",
@@ -366,7 +366,7 @@
       "minecraft:fox_night": {
         "minecraft:environment_sensor": {
           "triggers": [
-	    {
+	          {
               "filters": { "test" : "weather_at_position", "value" : "thunderstorm" },
               "event": "minecraft:fox_configure_thunderstorm"
             },
@@ -375,7 +375,7 @@
               "event": "minecraft:fox_configure_day"
             }
           ]
-	},
+	      },
         "minecraft:behavior.stroll_towards_village": {
           "priority": 11,
           "speed_multiplier": 1.0,
@@ -404,6 +404,12 @@
           "value": 80,
           "range": 160
         }
+      },
+
+      "minecraft:fox_ambient_defending_target": {
+        "minecraft:ambient_sound_interval": {
+          "event_name": "mad"
+        }
       }
     },
 
@@ -812,7 +818,8 @@
         },
         "add": {
           "component_groups": [
-            "minecraft:defending_fox"
+            "minecraft:defending_fox",
+            "minecraft:fox_ambient_defending_target"
           ]
         }
       },

diff --git a/behavior_pack/entities/horse.json b/behavior_pack/entities/horse.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "1.21.10",
+  "format_version": "1.21.60",
   "minecraft:entity": {
     "description": {
       "identifier": "minecraft:horse",
@@ -348,6 +348,8 @@
     "components": {
       "minecraft:is_hidden_when_invisible": {
       },
+      "minecraft:ambient_sound_interval": {
+      },
       "minecraft:equippable": {
         "slots": [
           {

diff --git a/behavior_pack/entities/mule.json b/behavior_pack/entities/mule.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "1.21.10",
+  "format_version": "1.21.60",
   "minecraft:entity": {
     "description": {
       "identifier": "minecraft:mule",
@@ -258,6 +258,8 @@
     "components": {
       "minecraft:is_hidden_when_invisible": {
       },
+      "minecraft:ambient_sound_interval": {
+      },
       "minecraft:type_family": {
         "family": [ "mule", "mob" ]
       },

diff --git a/behavior_pack/entities/sheep.json b/behavior_pack/entities/sheep.json
@@ -71,6 +71,7 @@
         },
         "minecraft:breedable": {
           "require_tame": false,
+          "combine_parent_colors": true,
           "breeds_with": {
             "mate_type": "minecraft:sheep",
             "baby_type": "minecraft:sheep"

diff --git a/behavior_pack/entities/skeleton_horse.json b/behavior_pack/entities/skeleton_horse.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "1.21.0",
+  "format_version": "1.21.60",
   "minecraft:entity": {
     "description": {
       "identifier": "minecraft:skeleton_horse",
@@ -72,7 +72,7 @@
                 "test": "is_family", "subject": "other", "value": "lightning"
               }
             },
-            "deals_damage": false
+            "deals_damage": "no"
           }
         }
       }
@@ -81,6 +81,8 @@
     "components": {
       "minecraft:is_hidden_when_invisible": {
       },
+      "minecraft:ambient_sound_interval": {
+      },
       "minecraft:type_family": {
         "family": [ "skeletonhorse", "undead", "mob" ]
       },

diff --git a/behavior_pack/entities/strider.json b/behavior_pack/entities/strider.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "1.21.0",
+  "format_version": "1.21.60",
   "minecraft:entity": {
     "description": {
       "identifier": "minecraft:strider",
@@ -225,6 +225,9 @@
     },
 
     "components": {
+      "minecraft:movement_sound_distance_offset": {
+        "value": 0.6
+      },
       "minecraft:is_hidden_when_invisible": {
       },
       "minecraft:type_family": {
@@ -242,7 +245,9 @@
         "damage_conditions": [
           {
             "filters": {
-              "test": "in_contact_with_water", "operator": "==", "value": true
+              "test": "in_contact_with_water",
+              "operator": "==",
+              "value": true
             },
             "cause": "drowning",
             "damage_per_tick": 1

diff --git a/behavior_pack/entities/wolf.json b/behavior_pack/entities/wolf.json
@@ -64,6 +64,7 @@
         "minecraft:breedable": {
           "require_tame": true,
           "require_full_health": true,
+          "combine_parent_colors": true,
           "breeds_with": {
             "mate_type": "minecraft:wolf",
             "baby_type": "minecraft:wolf",
@@ -229,11 +230,14 @@
         }
       },
 
-      "minecraft:wolf_tame": {
-        "minecraft:is_tamed": {
-        },
+      "minecraft:on_tame_collar_color": {
         "minecraft:color": {
           "value": 14
+        }
+      },
+
+      "minecraft:wolf_tame": {
+        "minecraft:is_tamed": {
         },
         "minecraft:attack": {
           "damage": 4
@@ -1127,7 +1131,8 @@
         },
         "add": {
           "component_groups": [
-            "minecraft:wolf_tame"
+            "minecraft:wolf_tame",
+            "minecraft:on_tame_collar_color"
           ]
         }
       },