Update v1.18.0

README.md

@@ -2,91 +2,9 @@
 ## Repository Status
 ![GitHub All Releases](https://img.shields.io/github/downloads/ZtechNetwork/MCBVanillaResourcePack/total) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/ZtechNetwork/MCBVanillaResourcePack) ![GitHub last commit](https://img.shields.io/github/last-commit/ZtechNetwork/MCBVanillaResourcePack/master)
 
-## Game Music Warning
-Game music will no longer be included in our package for copyright reasons. If you need any reference to music, use the `sounds_definitions.json` file in the `sounds` directory.
+## Game Music
+Game music will not be included in our package for copyright reasons. If you need any reference to music, use the `sound_definitions.json` file in the `sounds` directory.
 
-## Resource Pack Changelogs
-As of v1.17 and up, specific changelogs for resource packs will be included for every release on the [releases](https://github.com/ZtechNetwork/MCBVanillaResourcePack/releases) page and on this README. Since all of the specific changes are not documented by Mojang, some listed will be based off of speculation. If any information is missing, please create an issue.
-
-## Changelogs
-### v1.17.10
-#### New Textures:
-- Candle (White, Orange, Magenta, Light Blue, Yellow, Lime, Pink, Gray, Light Gray, Cyan, Purple, Blue, Brown, Green, Red, Black)
-- Potted Azalea
-#### Changes:
-- The Ender Dragon rendering and animations are now fully data-driven.
-- The Ender Crystal rendering and animations are now fully data-driven.
-- The Horse rendering and animations are now fully data-driven.
-- This work supports all Horse variants (Horse, Mule, Donkey, Zombie Horse, Skeleton Horse) and all Horse versions including:
-    - v1 (engine version 1.2.5 and earlier)
-    - v2 (engine version 1.2.6 to 1.17.0)
-    - v3 (engine version 1.17.10 and onward). This will be a cleaner version of the v2 model, with less confusing bone naming.
-- Updated UI (New Realms Menu)
-- View the official changelog [here](https://feedback.minecraft.net/hc/en-us/articles/4404454406285-Minecraft-1-17-10-Bedrock-).
-
-### v1.17.0
-#### New Textures:
-- **Mobs:**
-    - Axolotl
-    - Goat
-    - Glow Squid
-- **Blocks/Items:**
-    - Powder Snow
-    - Glow Lichen
-    - Amethyst
-    - Amethyst Cluster/Bud
-    - Budding Amethyst
-    - Amethyst Shards
-    - Glow Inc Sac
-    - Glow Item Frame
-    - Glow Berries
-    - Tinted Glass
-    - Copper (Exposed, Weathered, Oxidized)
-    - Cut Copper (Stairs & Slabs included)
-    - Waxed Cut Copper (Stairs & Slabs included)
-    - Copper Ore
-    - Copper Ingot
-    - Lightning Rod
-    - Spyglass
-    - Raw Ore (Copper, Iron & Gold)
-    - Deepslate
-    - Infested Deepslate
-    - Cobbled Deepslate (Stairs, Fences and Slabs included)
-    - Polished Deepslate (Stairs, Fences and Slabs included)
-    - Chiseled Deepslate (Stairs, Fences and Slabs included)
-    - Deepslate Tiles (Stairs, Fences and Slabs included)
-    - Cracked Deepslate Tiles
-    - Deepslate Bricks
-    - Cracked Deepslate Bricks
-    - Deepslate Ore (Coal, Copper, Iron, Gold, Diamond, Lapis, Redstone, Emerald)
-    - Tuff
-    - Smooth Basalt
-    - Dripstone
-    - Pointed Dripstone
-    - Dripleaf (Big & Small)
-    - Moss Block
-    - Moss Carpet
-    - Azalea
-    - Flowering Azalea
-    - Azelea Leaves
-    - Flowering Azalea Leaves
-    - Rooted Dirt
-    - Hanging Roots
-    - Cave Vines
-    - Spore Blossom
-    - Bucket Axolotl
-    - Tinted Glass
-#### Changes
-- Added two new variables to the `biomes_client.json` file: `remove_all_prior_fog` and `inherit_from_prior_fog`, which control fog merging and/or inheritance.
-- `remove_all_prior_fog`, when true, will clear all previous fog definitions stored on the stack, making the current pack the new `starting point` for fogs.
-- `inherit_from_prior_fog`, when true, will merge a biome's fog definition with matching biomes on the stack then create a new merged definition for it.
-- `transparentattachable` tag should only affect rendering in first person camera perspective.
-- Fixed Enchanted Bow's textures being too dark.
-- Updated UI (Settings Menu, Marketplace)
-- Added animation controllers for Goats, Axolotls & Glow Squids.
-- Added new sound effects.
-- Modified some block & mob textures.
-- View the official changelog [here](https://feedback.minecraft.net/hc/en-us/articles/4402427632013-Minecraft-Caves-Cliffs-Part-I-1-17-0-Bedrock-).
 
 ```
     All assets belong to Mojang & Microsoft.

animation_controllers/axolotl.animation_controllers.json

@@ -25,7 +25,7 @@
               "idle_float": "query.is_in_water && !query.is_on_ground && !query.is_playing_dead"
             },
             {
-              "idle_floor": "!query.is_in_water && query.is_on_ground"
+              "idle_floor": "!query.is_in_water"
             },
             {
               "idle_floor_water": "query.is_in_water && query.is_on_ground"
@@ -44,7 +44,7 @@
               "swim": "query.is_in_water && !query.is_on_ground"
             },
             {
-              "walk_floor": "!query.is_in_water && query.is_on_ground"
+              "walk_floor": "!query.is_in_water"
             },
             {
               "walk_floor_water": "query.is_in_water && query.is_on_ground"

animation_controllers/persona.animation_controllers.json

@@ -6,7 +6,7 @@
       "states": {
         "default": {
           "transitions": [
-            { "open": "variable.is_blinking = 0; variable.last_blink_time = query.life_time; return variable.last_blink_time != 0;" }
+            { "open": "variable.is_blinking = 0; variable.return_from_blink = query.life_time + math.random(0, 0.2); variable.last_blink_time = query.life_time; return variable.last_blink_time != 0;" }
           ]
         },
         "open": {
@@ -16,7 +16,7 @@
         },
         "blink": {
           "transitions": [
-            { "open": "variable.is_blinking = 1; variable.last_blink_time = query.life_time; return query.all_animations_finished && (query.life_time > variable.return_from_blink);" }
+            { "open": "variable.is_blinking = 1; variable.last_blink_time = query.life_time; return query.all_animations_finished && (query.life_time > (variable.return_from_blink ?? 0.2));" }
           ]
         }
       }

animation_controllers/shield.animation_controllers.json

@@ -1,25 +1,40 @@
 {
-	"format_version" : "1.10.0",
-	"animation_controllers" : {
+	"format_version": "1.10.0",
+	"animation_controllers": {
 		"controller.animation.shield.wield": {
-			"initial_state": "first_person",
+			"initial_state": "default",
 			"states": {
-				"first_person": {
+				"default": {
 					"animations": [
 						{
 							"wield_main_hand_first_person": "c.item_slot == 'main_hand'"
 						},
 						{
 							"wield_off_hand_first_person": "c.item_slot != 'main_hand'"
+						}
+					],
+					"transitions": [
+						{
+							"blocking": "query.blocking"
 						},
 						{
-							"wield_main_hand_first_person_block": "query.blocking && query.get_equipped_item_name('off_hand') != 'shield' && query.get_equipped_item_name == 'shield' && c.item_slot == 'main_hand'"
+							"third_person": "!c.is_first_person"
+						}
+					]
+				},
+				"blocking": {
+					"animations": [
+						{
+							"wield_main_hand_first_person_block": "query.get_equipped_item_name('off_hand') != 'shield' && query.get_equipped_item_name == 'shield' && c.item_slot == 'main_hand'"
 						},
 						{
-							"wield_off_hand_first_person_block": "query.blocking && query.get_equipped_item_name('off_hand') == 'shield' && c.item_slot != 'main_hand'"
+							"wield_off_hand_first_person_block": "query.get_equipped_item_name('off_hand') == 'shield' && c.item_slot != 'main_hand'"
 						}
 					],
 					"transitions": [
+						{
+							"default": "!query.blocking"
+						},
 						{
 							"third_person": "!c.is_first_person"
 						}
@@ -29,7 +44,7 @@
 					"animations": [ "wield_third_person" ],
 					"transitions": [
 						{
-							"first_person": "c.is_first_person"
+							"default": "c.is_first_person"
 						}
 					]
 				}

animation_controllers/skeleton.animation_controllers.json

@@ -4,8 +4,20 @@
 		"controller.animation.skeleton.attack" : {
 			"initial_state" : "default",
 			"states" : {
-				"default" : {
-					"animations" : [ "skeleton_attack" ]
+				"default" :  {
+					"transitions" : [
+						{
+							"attack" : "query.has_target && !query.facing_target_to_range_attack"
+						}
+					]
+				},
+				"attack" : {
+					"animations": [ "skeleton_attack" ],
+					"transitions" : [
+						{
+							"default" : "!query.has_target || query.facing_target_to_range_attack"
+						}
+					]
 				}
 			}
 		}

animations/bow.animation.json

@@ -5,7 +5,7 @@
       "loop": true,
       "bones": {
         "rightitem": {
-          "position": [ "c.is_first_person ? -5.5 : 0.5", "c.is_first_person ? -3.0 : -2.5", "c.is_first_person ? -3.0 : 1.0" ],
+          "position": [ "c.is_first_person ? -5.5 : 0.5", "c.is_first_person ? (-3.0 + math.sin(q.life_time * 1000.0 * 1.3) * 0.1) : -2.5", "c.is_first_person ? -3.0 : 1.0" ],
           "rotation": [ "c.is_first_person ? 38.0 : 0.0", "c.is_first_person ? -120.0 : 0.0", "c.is_first_person ? -63.0 : 0.0" ]
         }
       }
@@ -14,8 +14,8 @@
       "loop": true,
       "bones": {
         "rightitem": {
-          "position": [ -1.5, "math.sin(q.life_time * 800.0) * 0.05 + 2.5", -6.0 ],
-          "rotation": [ -53.0, 5.0, 40.0 ]
+          "position": [ -1.5, "math.sin(q.life_time * 1000.0 * 1.3) * 0.1 - math.sin(q.life_time * 45.0) * 0.5 + 2.5", -4.8 ],
+          "rotation": [ -53.0, 8.0, 35.0 ]
         }
       }
     }

animations/humanoid.animation.json

@@ -57,7 +57,7 @@
 			"loop" : true,
 			"bones" : {
 				"rightarm" : {
-					"rotation" : [ "this * -0.5 - 157.5 - 22.5 * variable.charge_amount", "-this", 0.0 ]
+					"rotation": [ "this * -0.5 - 143.5 - 22.5 * variable.charge_amount", "-this", "-((math.cos(query.life_time * 103.2) * 2.865) + 2.865)" ]
 				}
 			}
 		},

animations/player_firstperson.animation.json

@@ -25,6 +25,9 @@
 			"bones": {
 				"body": {
 					"rotation": [ "query.target_x_rotation", "query.target_y_rotation", 0.0 ]
+				},
+				"head": {
+					"rotation": [ "query.target_x_rotation", "query.target_y_rotation + 180", 0.0 ]
 				}
 			}
 		},
@@ -38,9 +41,9 @@
 					"scale": [ 0.4, 0.4, 0.4 ]
 				},
 				"rightitem": {
-					"position": [ 0.0, 2.0, "1.0 + query.item_remaining_use_duration('main_hand', 1.0) * 1.5" ],
+					"position": [ 0.0, 2.0, "2.5 - query.item_remaining_use_duration('main_hand', 1.0) * 1.5" ],
 					"rotation": [ -20.0, -15.0, -30.0 ],
-					"scale": [ 1.0, "1.0 + query.item_remaining_use_duration('main_hand', 1.0) * 0.15", 1.0 ]
+					"scale": [ 1.0, "1.15 - query.item_remaining_use_duration('main_hand', 1.0) * 0.15", 1.0 ]
 				}
 			}
 		},

animations/shield.animation.json

@@ -5,44 +5,50 @@
       "loop": true,
       "bones": {
         "shield": {
-          "position": [ 5.3, 26.0, 0.4 ],
-          "rotation": [ 91.0, 65.0, -43.0 ]
+          "position": [ "variable.main_hand_first_person_pos_x", "variable.main_hand_first_person_pos_y", "variable.main_hand_first_person_pos_z" ],
+          "rotation": [ "variable.main_hand_first_person_rot_x", "variable.main_hand_first_person_rot_y", "variable.main_hand_first_person_rot_z" ]
         }
       }
     },
     "animation.shield.wield_off_hand_first_person": {
       "loop": true,
       "bones": {
         "shield": {
-          "position": [ -13.5, -5.8, "(query.get_equipped_item_name == 'bow') && (query.main_hand_item_use_duration > 0.0f) ? -25.0 : 5.1" ],
-          "rotation": [ 1.0, 176.0, -2.5 ],
+          "position": [ "variable.off_hand_first_person_pos_x", "variable.off_hand_first_person_pos_y", "variable.is_using_bow ? variable.off_hand_first_person_with_bow_pos_z : variable.off_hand_first_person_pos_z" ],
+          "rotation": [ "variable.off_hand_first_person_rot_x", "variable.off_hand_first_person_rot_y", "variable.off_hand_first_person_rot_z" ],
           "scale": [ -1.0, 1.0, 1.0 ]
         }
       }
     },
     "animation.shield.wield_main_hand_first_person_blocking": {
-      "loop": true,
+      "loop": "hold_on_last_frame",
       "bones": {
         "shield": {
-          "position": [ -2, -3.0, -2 ],
-          "rotation": [ 0.0, -12.0, 0.0 ]
+          "position": {
+            "0": [ "variable.main_hand_first_person_pos_x - 2", "variable.main_hand_first_person_pos_y", "variable.main_hand_first_person_pos_z" ],
+            "0.1": [ "variable.main_hand_first_person_pos_x - 2", "variable.main_hand_first_person_pos_y - 3", "variable.main_hand_first_person_pos_z - 2" ]
+          },
+          "rotation": [ "variable.main_hand_first_person_rot_x", "variable.main_hand_first_person_rot_y - 12.0", "variable.main_hand_first_person_rot_z" ]
         }
       }
     },
     "animation.shield.wield_off_hand_first_person_blocking": {
-      "loop": true,
+      "loop": "hold_on_last_frame",
       "bones": {
         "shield": {
-          "position": [ 0.5, 4.2, 1.5 ],
-          "rotation": [ 0.0, 0.0, 10.0 ]
+          "position": {
+            "0": [ "variable.off_hand_first_person_pos_x + 0.5", "variable.off_hand_first_person_pos_y", "variable.is_using_bow ? variable.off_hand_first_person_with_bow_pos_z : variable.off_hand_first_person_pos_z" ],
+            "0.1": [ "variable.off_hand_first_person_pos_x + 0.5", "variable.off_hand_first_person_pos_y + 4.2", "variable.is_using_bow ? variable.off_hand_first_person_with_bow_pos_z : variable.off_hand_first_person_pos_z + 1.5" ]
+          },
+          "rotation": [ "variable.off_hand_first_person_rot_x", "variable.off_hand_first_person_rot_y", "variable.off_hand_first_person_rot_z + 10.0" ]
         }
       }
     },
     "animation.shield.wield_third_person": {
       "loop": true,
       "bones": {
         "shield": {
-          "position": [ "c.item_slot == 'main_hand' ? -0.4 : -1.6", 9.0, "c.item_slot == 'main_hand' ? 9.3 : -15.3" ],
+          "position": [ "c.item_slot == 'main_hand' ? -0.4 : -1.6", 9.0, "c.item_slot == 'main_hand' ? 9.3 : -15.7" ],
           "rotation": [ -90.0, 0.0, 90.0 ],
           "scale": [ 1.0, "c.item_slot == 'main_hand' ? -1.0 : 1.0", "c.item_slot == 'main_hand' ? -1.0 : 1.0" ]
         }

animations/skeleton.animation.json

@@ -5,10 +5,10 @@
 			"loop" : true,
 			"bones" : {
 				"leftarm" : {
-					"rotation" : [ "-68.75 * math.sin(variable.attack_time * 180.0) + 22.92 * (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0))", "5.73 - math.sin(variable.attack_time * 180.0) * 34.38 - this", "-this" ]
+					"rotation" : [ "-68.75 * math.sin(variable.attack_time * 180.0) + 22.92 * (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0)) - 90.0 - this", "5.73 - math.sin(variable.attack_time * 180.0) * 34.38 - this", "-this" ]
 				},
 				"rightarm" : {
-					"rotation" : [ "-68.75 * math.sin(variable.attack_time * 180.0) + 22.92 * (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0))", "-5.73 + math.sin(variable.attack_time * 180.0) * 34.38 - this", "-this" ]
+					"rotation" : [ "-68.75 * math.sin(variable.attack_time * 180.0) + 22.92 * (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0)) - 90.0 - this", "-5.73 + math.sin(variable.attack_time * 180.0) * 34.38 - this", "-this" ]
 				}
 			}
 		}

animations/trident.animation.json

@@ -5,25 +5,29 @@
       "loop": true,
       "bones": {
         "pole": {
-          "position": [ -9.0, -1.0, -8.0 ],
-          "rotation": [ 159.0, -19.0, 32.0 ]
+          "position": [ -7.0, -3.0, -2.0 ],
+          "rotation": [ 152.0, -9.0, 25.0 ]
         }
       }
     },
     "animation.trident.wield_first_person_raise": {
       "loop": true,
       "bones": {
         "pole": {
-          "position": [ "math.lerp(8.0, -1.5, variable.charge_amount)", -9.5, "math.lerp(8.0, -1.0, variable.charge_amount)" ], 
-          "rotation": [ 35.0, -30.0, -65.0 ]
+          "position": [
+            "6.0 + (variable.charge_amount <= 0.25 ? math.lerp(0.0, -6.5, variable.charge_amount * 4.0) : -6.5) + (variable.charge_amount > 0.25 ? math.lerp(0.0, -4.0, (variable.charge_amount - 0.25) * 1.33) : 0.0)",
+            "-3.0 + (variable.charge_amount <= 0.25 ? math.lerp(0.0, -3.0, variable.charge_amount * 4.0) : -3.0) + (variable.charge_amount > 0.25 ? math.lerp(0.0, 3.0, (variable.charge_amount - 0.25) * 1.33) : 0.0)",
+            "8.0 + (variable.charge_amount <= 0.25 ? math.lerp(0.0, -16.5, variable.charge_amount * 4.0) : -16.5) + (variable.charge_amount > 0.25 ? math.lerp(0.0, 0.0, (variable.charge_amount - 0.25) * 1.33) : 0.0)"
+          ], 
+          "rotation": [ 30.0, -20.0, -65.0 ]
         }
       }
     },
     "animation.trident.wield_first_person_raise_shake": {
       "loop": true,
       "bones": {
         "pole": {
-          "position": [ 0.0, "variable.charge_amount >= 1.0 ? math.sin(q.life_time * 900.0) * 0.05 : 0.0", 0.0 ],
+          "position": [ 0.0, "variable.charge_amount >= 1.0 ? math.sin(q.life_time * 1000.0 * 1.3) * 0.1 - math.sin(q.life_time * 45.0) * 0.5 : 0.0", 0.0 ],
           "rotation": [ 0.0, 0.0, 0.0 ]
         }
       }
@@ -42,7 +46,7 @@
     "loop": true,
     "bones": {
       "pole": {
-        "position": [ 0.75, -2.5, -10.5 ],
+        "position": [ 1.5, -2.5, -10.5 ],
         "rotation": [ 97.0, -1.5, -49.0 ]
       }
     }
@@ -51,8 +55,8 @@
     "loop": true,
     "bones": {
       "pole": {
-        "position": [ 2.0, 1.25, 20.0 ],
-        "rotation": [ -1.0, 195.0, 10.0 ]
+        "position": [ -0.7, 0, 17.5 ],
+        "rotation": [ -7, 180.0, -40.0 ]
       }
     }
   }