v1.19.70.2

Mojang · Mar 14, 2023 · 97eee80 · 97eee80
1 parent cb24cd7
commit 97eee80
Show file tree

Hide file tree

Showing 116 changed files with 6,836 additions and 3,139 deletions.
diff --git a/behavior_pack/entities/donkey.json b/behavior_pack/entities/donkey.json
@@ -206,6 +206,9 @@
           "container_type": "horse"
         },
         "minecraft:breedable": {
+          "parent_centric_attribute_blending": [
+            "minecraft:health"
+          ],
           "require_tame": true,
           "inherit_tamed": false,
           "breeds_with": [

diff --git a/behavior_pack/entities/ender_crystal.json b/behavior_pack/entities/ender_crystal.json
@@ -22,8 +22,8 @@
 
     "components": {
       "minecraft:collision_box": {
-        "width": 0.98,
-        "height": 0.98
+        "width": 2,
+        "height": 2
       },
       "minecraft:health": {
         "value": 1,

diff --git a/behavior_pack/entities/horse.json b/behavior_pack/entities/horse.json
@@ -221,6 +221,11 @@
           "container_type": "horse"
         },
         "minecraft:breedable": {
+          "parent_centric_attribute_blending": [
+            "minecraft:health",
+            "minecraft:movement",
+            "minecraft:horse.jump_strength"
+          ],
           "require_tame": true,
           "inherit_tamed": false,
           "breeds_with": [
@@ -245,7 +250,14 @@
             "golden_carrot",
             "golden_apple",
             "appleEnchanted"
-          ]
+          ],
+          "mutation_factor": {
+            "extra_variant": 0.2, // 1/5
+            "variant": 0.111 // ~1/9
+          },
+          "mutation_strategy": "random",
+          "random_variant_mutation_interval": [0, 7],
+          "random_extra_variant_mutation_interval": [0, 5]
         },
         "minecraft:behavior.tempt": {
           "priority": 5,

diff --git a/behavior_pack/entities/llama.json b/behavior_pack/entities/llama.json
@@ -52,6 +52,9 @@
           "speed_multiplier": 1.0
         },
         "minecraft:breedable": {
+          "parent_centric_attribute_blending": [
+            "minecraft:health"
+          ],
           "require_tame": true,
           "inherit_tamed": false,
           "breeds_with": {

diff --git a/behavior_pack/entities/witch.json b/behavior_pack/entities/witch.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "1.16.0",
+  "format_version": "1.19.60",
   "minecraft:entity": {
     "description": {
       "identifier": "minecraft:witch",
@@ -106,6 +106,58 @@
         "attack_interval_max": 3,
         "attack_radius": 10.0
       },
+      "minecraft:shooter": {
+        "power" : 0.75,
+        "def": "minecraft:splash_potion",
+        "aux_val" : 23,   // harming
+        "sound" : "throw",
+        "projectiles" : [
+          {
+            "def" : "minecraft:splash_potion",
+            "aux_val" : 17, // slowness
+            "filters" : {
+              "all_of" : [
+                { "test" : "target_distance", "subject" : "self", "value" : 8.0, "operator" : ">="},
+                {
+                  "none_of":[
+                    { "test": "has_mob_effect", "subject": "other", "value": "slowness" }
+                  ]
+                }
+              ]
+            }
+          },
+          {
+            "def" : "minecraft:splash_potion",
+            "aux_val" : 25, // poison
+            "filters" : {
+              "all_of" : [
+                { "test" : "actor_health", "subject" : "other", "value" : 8, "operator" : ">="},
+                {
+                  "none_of": [
+                    { "test": "has_mob_effect", "subject": "other", "value": "poison" }
+                  ]
+                }
+              ]
+            }
+          },
+          {
+            "def" : "minecraft:splash_potion",
+            "aux_val" : 34, // weakness
+            "filters" : {
+              "all_of" : [
+                { "test" : "target_distance", "subject" : "self", "value" : 3, "operator" : "<="},
+                {
+                  "none_of":[
+                    { "test": "has_mob_effect", "subject": "other", "value": "weakness" }
+                  ]
+                }
+              ]
+            },
+            "chance" : 0.25
+          }
+        ],
+        "magic" : true
+      },
       "minecraft:behavior.random_stroll": {
         "priority": 4,
         "speed_multiplier": 1.0
@@ -118,6 +170,69 @@
         "priority": 5,
         "look_distance": 8.0
       },
+      "minecraft:behavior.drink_potion": {
+        "priority": 1,
+        "speed_modifier": -0.25,
+        "potions": [
+          {
+            "id": 19, // Water breathing
+            "chance": 0.15,
+            "filters": {
+              "all_of": [
+                { "test": "is_underwater", "subject": "self", "value": true },
+                {
+                  "none_of": [
+                    { "test": "has_mob_effect", "subject": "self", "value": "water_breathing" }
+                  ]
+                }
+              ]
+            }
+          },
+          {
+            "id": 12, // Fire resistance
+            "chance": 0.15,
+            "filters": {
+              "all_of": [
+                {
+                  "any_of": [
+                    { "test": "on_fire", "subject": "self", "value": true },
+                    { "test": "on_hot_block", "subject": "self", "value": true }
+                  ]
+                },
+                {
+                  "none_of": [
+                    { "test": "has_mob_effect", "subject": "self", "value": "fire_resistance" }
+                  ]
+                }
+              ]
+            }
+          },
+          {
+            "id": 21, // Healing
+            "chance": 0.05,
+            "filters": {
+              "all_of": [
+                { "test": "is_missing_health", "subject": "self", "value": true }
+              ]
+            }
+          },
+          {
+            "id": 14, // Swiftness
+            "chance": 0.25,
+            "filters": {
+              "all_of": [
+                { "test": "has_target", "subject": "self", "value": true },
+                {
+                  "none_of": [
+                    { "test": "has_mob_effect", "subject": "self", "value": "speed" }
+                  ]
+                },
+                { "test": "target_distance", "subject": "self", "value": 11.0, "operator": ">=" }
+              ]
+            }
+          }
+        ]
+      },
       "minecraft:behavior.hurt_by_target": {
         "priority": 1
       },

diff --git a/behavior_pack/manifest.json b/behavior_pack/manifest.json
@@ -5,7 +5,7 @@
         "name": "Vanilla Behavior Pack",
         "uuid": "ee649bcf-256c-4013-9068-6a802b89d756",
         "version": [ 0, 0, 1 ],
-        "min_engine_version": [ 1, 19, 60 ]
+        "min_engine_version": [ 1, 19, 70 ]
     },
     "modules": [
         {

diff --git a/behavior_pack/spawn_rules/tropicalfish.json b/behavior_pack/spawn_rules/tropicalfish.json
@@ -215,7 +215,7 @@
           "default": 75
         },
         "minecraft:density_limit": {
-          "surface": 20
+          "underground": 20
         },
         "minecraft:herd": [
           {
@@ -347,7 +347,7 @@
           "default": 25
         },
         "minecraft:density_limit": {
-          "surface": 20
+          "underground": 20
         },
         "minecraft:herd": {
           "min_size": 1,

diff --git a/behavior_pack/spawn_rules/zombie_pigman.json b/behavior_pack/spawn_rules/zombie_pigman.json
@@ -33,6 +33,12 @@
           "test": "has_biome_tag",
           "operator": "==",
           "value": "spawn_zombified_piglin"
+        },
+
+        "minecraft:brightness_filter": {
+          "min": 0,
+          "max": 11,
+          "adjust_for_weather": true
         }
       },
       {
@@ -62,8 +68,14 @@
           "test": "has_biome_tag",
           "operator": "==",
           "value": "spawn_few_zombified_piglins"
+        },
+
+        "minecraft:brightness_filter": {
+          "min": 0,
+          "max": 11,
+          "adjust_for_weather": true
         }
       }
     ]
   }
-}
+}
diff --git a/behavior_pack/trading/economy_trades/wandering_trader_trades.json b/behavior_pack/trading/economy_trades/wandering_trader_trades.json
@@ -355,34 +355,6 @@
                 }
               ]
             },
-            {
-              "max_uses": 12,
-              "weight":4,
-              "wants": [
-                {
-                  "item": "minecraft:emerald",
-                  "quantity": 1
-                }
-              ],
-              "gives": [
-                {
-                  "choice": [
-                    {
-                      "item": "minecraft:wheat_seeds"
-                    },
-                    {
-                      "item": "minecraft:pumpkin_seeds"
-                    },
-                    {
-                      "item": "minecraft:melon_seeds"
-                    },
-                    {
-                      "item": "minecraft:beetroot_seeds"
-                    }
-                  ]
-                }
-              ]
-            },
             {
               "max_uses": 8,
               "weight":6,
@@ -702,4 +674,4 @@
       ]
     }
   ]
-}
+}