v1.21.60.10

Xterionix · Feb 12, 2025 · fa222fc · fa222fc
1 parent 19df7dd
commit fa222fc
Show file tree

Hide file tree

Showing 251 changed files with 8,539 additions and 2,787 deletions.
diff --git a/behavior_pack/aim_assist/categories/categories.json b/behavior_pack/aim_assist/categories/categories.json
@@ -1,10 +1,9 @@
 {
     "format_version": "1.21.50",
     "minecraft:aim_assist_categories": {
-        "identifier": "minecraft:aim_assist_categories_1",
         "categories": [
             {
-                "name": "bucket",
+                "name": "minecraft:bucket",
                 "entity_default": 30,
                 "block_default": 30,
                 "priorities": {
@@ -16,7 +15,7 @@
                 }
             },
             {
-                "name": "hand",
+                "name": "minecraft:empty_hand",
                 "entity_default": 30,
                 "block_default": 30,
                 "priorities": {
@@ -33,7 +32,7 @@
                 }
             },
             {
-                "name": "default",
+                "name": "minecraft:default",
                 "priorities": {
                     "blocks": {
                         "minecraft:lever": 60,

diff --git a/behavior_pack/aim_assist/presets/aim_assist_preset.json b/behavior_pack/aim_assist/presets/aim_assist_preset.json
@@ -2,12 +2,11 @@
     "format_version": "1.21.50",
     "minecraft:aim_assist_preset": {
         "identifier": "minecraft:aim_assist_default",
-        "categories": "minecraft:aim_assist_categories_1",
         "item_settings": {
-            "minecraft:bucket": "bucket"
+            "minecraft:bucket": "minecraft:bucket"
         },
-        "default_item_settings": "default",
-        "hand_settings": "hand",
+        "default_item_settings": "minecraft:default",
+        "hand_settings": "minecraft:empty_hand",
         "exclusion_list": [
           "minecraft:bedrock",
           "minecraft:arrow"

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/cave_spider.json b/behavior_pack/entities/cave_spider.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "1.21.0",
+  "format_version": "1.21.60",
   "minecraft:entity": {
     "description": {
       "identifier": "minecraft:cave_spider",
@@ -23,7 +23,6 @@
           }
         }
       },
-
       "minecraft:spider_stray_jockey": {
         "minecraft:addrider": {
           "entity_type": "minecraft:skeleton.stray"
@@ -38,7 +37,6 @@
           }
         }
       },
-
       "minecraft:spider_wither_jockey": {
         "minecraft:addrider": {
           "entity_type": "minecraft:skeleton.wither"
@@ -53,7 +51,6 @@
           }
         }
       },
-
       "minecraft:spider_neutral": {
         "minecraft:environment_sensor": {
           "triggers": {
@@ -69,7 +66,6 @@
           "event": "minecraft:become_angry"
         }
       },
-
       "minecraft:spider_hostile": {
         "minecraft:environment_sensor": {
           "triggers": {
@@ -81,7 +77,6 @@
             "event": "minecraft:become_neutral"
           }
         },
-
         "minecraft:behavior.nearest_attackable_target": {
           "priority": 2,
           "must_see": true,
@@ -90,9 +85,21 @@
             {
               "filters": {
                 "any_of": [
-                  { "test": "is_family", "subject": "other", "value": "player" },
-                  { "test": "is_family", "subject": "other", "value": "snowgolem" },
-                  { "test": "is_family", "subject": "other", "value": "irongolem" }
+                  {
+                    "test": "is_family",
+                    "subject": "other",
+                    "value": "player"
+                  },
+                  {
+                    "test": "is_family",
+                    "subject": "other",
+                    "value": "snowgolem"
+                  },
+                  {
+                    "test": "is_family",
+                    "subject": "other",
+                    "value": "irongolem"
+                  }
                 ]
               },
               "max_dist": 16
@@ -110,7 +117,6 @@
           "random_stop_interval": 100
         }
       },
-
       "minecraft:spider_angry": {
         "minecraft:angry": {
           "duration": 10,
@@ -128,9 +134,21 @@
             {
               "filters": {
                 "any_of": [
-                  { "test": "is_family", "subject": "other", "value": "player" },
-                  { "test": "is_family", "subject": "other", "value": "snowgolem" },
-                  { "test": "is_family", "subject": "other", "value": "irongolem" }
+                  {
+                    "test": "is_family",
+                    "subject": "other",
+                    "value": "player"
+                  },
+                  {
+                    "test": "is_family",
+                    "subject": "other",
+                    "value": "snowgolem"
+                  },
+                  {
+                    "test": "is_family",
+                    "subject": "other",
+                    "value": "irongolem"
+                  }
                 ]
               },
               "max_dist": 16
@@ -173,6 +191,8 @@
     "components": {
       "minecraft:is_hidden_when_invisible": {
       },
+      "minecraft:renders_when_invisible": {
+      },
       "minecraft:experience_reward": {
         "on_death": "query.last_hit_by_player ? 5 : 0"
       },
@@ -200,7 +220,7 @@
         "damage_conditions": [
           {
             "filters": {
-              "test": "in_lava", "subject": "self","operator": "==", "value": true
+              "test": "in_lava", "subject": "self"
             },
             "cause": "lava",
             "damage_per_tick": 4
@@ -305,7 +325,6 @@
                     { "test": "is_underground", "value": false }
                   ]
                 },
-                "remove": {},
                 "add": {
                   "component_groups": [
                     "minecraft:spider_stray_jockey",
@@ -316,10 +335,8 @@
               {
                 "weight": 80,
                 "filters": {
-                  "test": "is_biome",
-                  "value": "the_nether"
+                  "test": "is_biome", "value": "the_nether"
                 },
-                "remove": {},
                 "add": {
                   "component_groups": [
                     "minecraft:spider_wither_jockey",
@@ -335,7 +352,6 @@
                     { "test": "is_underground", "value": true }
                   ]
                 },
-                "remove": {},
                 "add": {
                   "component_groups": [
                     "minecraft:spider_jockey",
@@ -347,7 +363,6 @@
           },
           {
             "weight": 99,
-            "remove": {},
             "add": {
               "component_groups": [
                 "minecraft:spider_neutral"
@@ -356,7 +371,6 @@
           }
         ]
       },
-
       "minecraft:become_hostile": {
         "sequence": [
           {
@@ -373,8 +387,7 @@
           },
           {
             "filters": {
-              "test": "is_difficulty",
-              "value": "easy"
+              "test": "is_difficulty", "value": "easy"
             },
             "remove": {
               "component_groups": [ "minecraft:spider_poison_hard", "minecraft:spider_poison_normal" ]
@@ -385,8 +398,7 @@
           },
           {
             "filters": {
-              "test": "is_difficulty",
-              "value": "normal"
+              "test": "is_difficulty", "value": "normal"
             },
             "remove": {
               "component_groups": [ "minecraft:spider_poison_easy", "minecraft:spider_poison_hard" ]
@@ -397,8 +409,7 @@
           },
           {
             "filters": {
-              "test": "is_difficulty",
-              "value": "hard"
+              "test": "is_difficulty", "value": "hard"
             },
             "remove": {
               "component_groups": [ "minecraft:spider_poison_easy", "minecraft:spider_poison_normal" ]
@@ -409,7 +420,6 @@
           }
         ]
       },
-
       "minecraft:become_neutral": {
         "remove": {
           "component_groups": [
@@ -422,7 +432,6 @@
           ]
         }
       },
-
       "minecraft:become_angry": {
         "sequence": [
           {
@@ -439,8 +448,7 @@
           },
           {
             "filters": {
-              "test": "is_difficulty",
-              "value": "easy"
+              "test": "is_difficulty", "value": "easy"
             },
             "remove": {
               "component_groups": [ "minecraft:spider_poison_hard", "minecraft:spider_poison_normal" ]
@@ -473,7 +481,6 @@
           }
         ]
       },
-
       "minecraft:on_calm": {
         "remove": {
           "component_groups": [