Update v1.20.30

ZtechNetwork · Oct 2, 2023 · b893d13 · b893d13
1 parent 97d2641
commit b893d13
Show file tree

Hide file tree

Showing 158 changed files with 23,681 additions and 5,714 deletions.
diff --git a/animation_controllers/agent.animation_controllers.json b/animation_controllers/agent.animation_controllers.json
@@ -7,19 +7,30 @@
 				"moving" : {
 					"animations" : [ "move" ],
 					"transitions" : [
-						{
-							"swinging_arms" : "variable.agent.swinganimationtick > 0"
-						}
+            {
+              "swinging_arms": "variable.agent.anim_state == 2"
+            },
+            {
+              "shrug": "variable.agent.anim_state == 3"
+            }
 					]
 				},
-				"swinging_arms" : {
-					"animations" : [ "swing_arms" ],
-					"transitions" : [
-						{
-							"moving" : "variable.agent.swinganimationtick <= 0"
-						}
-					]
-				}
+        "swinging_arms": {
+          "animations": [ "swing_arms" ],
+          "transitions": [
+            {
+              "moving": "variable.agent.anim_state == 1"
+            }
+          ]
+        },
+        "shrug": {
+          "animations": [ "shrug" ],
+          "transitions": [
+            {
+              "moving": "variable.agent.anim_state == 1"
+            }
+          ]
+        }
 			}
 		}
 	}

diff --git a/animation_controllers/camel.animation_controllers.json b/animation_controllers/camel.animation_controllers.json
@@ -54,7 +54,7 @@
           "blend_transition": 0.5
         },
         "dashing": {
-          "animations": [ "dashing" ],
+          "animations": [ "dashing", "dashing_sound" ],
           "transitions": [
             { "idling": "(query.is_on_ground || query.is_in_water || query.is_riding) && !variable.moving" },
             { "moving": "(query.is_on_ground || query.is_in_water || query.is_riding) && variable.moving" }

diff --git a/animation_controllers/humanoid.animation_controllers.json b/animation_controllers/humanoid.animation_controllers.json
@@ -155,15 +155,15 @@
 							"gliding" : "query.is_gliding"
 						},
 						{
-							"swimming" : "query.is_swimming"
+							"swimming" : "query.is_swimming || query.is_crawling"
 						}
 					]
 				},
 				"gliding" : {
 					"animations" : [ "look_at_target_gliding" ],
 					"transitions" : [
 						{
-							"swimming" : "query.is_swimming"
+							"swimming" : "query.is_swimming || query.is_crawling"
 						},
 						{
 							"default" : "!query.is_gliding"
@@ -177,7 +177,7 @@
 							"gliding" : "query.is_gliding"
 						},
 						{
-							"default" : "!query.is_swimming"
+							"default" : "!query.is_swimming && !query.is_crawling"
 						}
 					]
 				}

diff --git a/animation_controllers/player.animation_controllers.json b/animation_controllers/player.animation_controllers.json
@@ -213,6 +213,12 @@
 						{
 							"swimming.legs" : "variable.swim_amount > 0.0"
 						},
+						{
+							"crawling" : "query.is_crawling"
+						},
+						{
+							"crawling.legs" : "query.is_crawling"
+						},
 						{
 							"use_item_progress": "( variable.use_item_interval_progress > 0.0 ) || ( variable.use_item_startup_progress > 0.0 ) && !variable.is_brandishing_spear && !variable.is_holding_spyglass && !variable.is_tooting_goat_horn && !variable.is_using_brush && !query.is_item_name_any('slot.weapon.mainhand', 'minecraft:bow')"
 						},

diff --git a/animations/agent.animation.json b/animations/agent.animation.json
@@ -1,33 +1,103 @@
 {
-	"format_version" : "1.8.0",
-	"animations" : {
-		"animation.agent.move" : {
-			"loop" : true,
-			"bones" : {
-				"body" : {
-					"position" : [ 0.0, "variable.agent.easein * (math.sin(query.life_time * 114.6 * variable.agent.movespeedscalar) + 1.0) * 1.12", 0.0 ]
-				},
-				"leftarm" : {
-					"rotation" : [ "((-0.2 + 1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 - variable.agent.armxrotationfactor", 0.0, "-variable.agent.armzrotation" ]
-				},
-				"leftleg" : {
-					"rotation" : [ "((-1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 + (variable.agent.ishovering * variable.agent.legxrotationfactor)", 0.0, 0.0 ]
-				},
-				"rightarm" : {
-					"rotation" : [ "((-0.2 - 1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 + variable.agent.armxrotationfactor", 0.0, "variable.agent.armzrotation" ]
-				},
-				"rightleg" : {
-					"rotation" : [ "((1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 - (variable.agent.ishovering * variable.agent.legxrotationfactor)", 0.0, 0.0 ]
-				}
-			}
-		},
-		"animation.agent.swing_arms" : {
-			"loop" : true,
-			"bones" : {
-				"rightarm" : {
-					"rotation" : [ "(-2.0 + 1.5 * (math.abs(math.mod(variable.agent.swinganimationtick - query.frame_alpha, variable.agent.swinganimationduration) - variable.agent.swinganimationduration * 0.5) - variable.agent.swinganimationduration * 0.25) / (variable.agent.swinganimationduration * 0.25)) * 57.3", 0.0, 0.0 ]
-				}
-			}
-		}
-	}
+  "format_version": "1.8.0",
+  "animations": {
+    "animation.agent.move": {
+      "loop": true,
+      "bones": {
+        "body": {
+          "position": [ 0, "variable.agent.easein * (math.sin(query.life_time * 114.6 * variable.agent.movespeedscalar) + 1.0) * 1.12", 0 ]
+        },
+        "leftArm": {
+          "rotation": [
+            "((-0.2 + 1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 - variable.agent.armxrotationfactor",
+            0,
+            "-variable.agent.armzrotation"
+          ]
+        },
+        "leftLeg": {
+          "rotation": [
+            "((-1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 + (variable.agent.ishovering * variable.agent.legxrotationfactor)",
+            0,
+            0
+          ]
+        },
+        "rightArm": {
+          "rotation": [
+            "((-0.2 - 1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 + variable.agent.armxrotationfactor",
+            0,
+            "variable.agent.armzrotation"
+          ]
+        },
+        "rightLeg": {
+          "rotation": [
+            "((1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 - (variable.agent.ishovering * variable.agent.legxrotationfactor)",
+            0,
+            0
+          ]
+        }
+      }
+    },
+    "animation.agent.swing_arms": {
+      "loop": true,
+      "animation_length": 1.5,
+      "bones": {
+        "rightArm": {
+          "rotation": [
+            "(-2.0 + 1.5 * (math.abs(math.mod(variable.agent.swinganimationtick - query.frame_alpha, variable.agent.swinganimationduration) - variable.agent.swinganimationduration * 0.5) - variable.agent.swinganimationduration * 0.25) / (variable.agent.swinganimationduration * 0.25)) * 57.3",
+            0,
+            0
+          ]
+        }
+      }
+    },
+    "animation.agent.shrug": {
+      "animation_length": 1.5,
+      "bones": {
+        "head": {
+          "rotation": {
+            "0.3333": [ 0, 0, 0 ],
+            "0.5833": [ 0, 0, 0 ],
+            "0.8333": [ 0, 72.5, 0 ],
+            "1.0417": [ 0, 0, 0 ],
+            "1.2917": [ 0, -62.5, 0 ],
+            "1.5": [ 0, 0, 0 ]
+          },
+          "position": {
+            "0.0": [ 0, 0, 0 ],
+            "0.125": [ 0, 0, 0 ]
+          }
+        },
+        "leftArm": {
+          "rotation": {
+            "0.0": [ 0, 0, 0 ],
+            "0.25": [ -64.03195, -33.38529, 26.32435 ],
+            "0.625": [ 0, 0, 0 ],
+            "0.75": [ 0, 0, 0 ],
+            "0.9583": [ 0, 0, -10 ],
+            "1.1667": [ 0, 0, 0 ]
+          },
+          "position": {
+            "0.75": [ 0, 0, 0 ],
+            "0.9583": [ 0, 1, 0 ],
+            "1.1667": [ 0, 0, 0 ]
+          }
+        },
+        "rightArm": {
+          "rotation": {
+            "0.0": [ 0, 0, 0 ],
+            "0.25": [ -58.25703, 25.73828, -15.06695 ],
+            "0.625": [ 0, 0, 0 ],
+            "0.75": [ 0, 0, 0 ],
+            "0.9583": [ 0, 0, 10 ],
+            "1.1667": [ 0, 0, 0 ]
+          },
+          "position": {
+            "0.75": [ 0, 0, 0 ],
+            "0.9583": [ 0, 1, 0 ],
+            "1.1667": [ 0, 0, 0 ]
+          }
+        }
+      }
+    }
+  }
 }
diff --git a/animations/armor_stand.animation.json b/animations/armor_stand.animation.json
@@ -254,7 +254,7 @@
 					"rotation" : [ "-this + 246", "-this", "-this + 89" ]
 				},
 				"rightitem" : {
-					"rotation" : [ "-this", "-this + 180", "-this" ]
+					"rotation" : [ "-this", "query.get_equipped_item_name == 'shield' ? -this + 90 : -this + 180", "-this" ]
 				},
 				"rightleg" : {
 					"rotation" : [ "-this + 8", "-this + 20", "-this + 4" ]

diff --git a/animations/camel.animation.json b/animations/camel.animation.json
@@ -560,10 +560,14 @@
             "0.5": [ 0, 67.5, 0 ]
           }
         }
-      },
+      }
+    },
+    "animation.camel.dash_sound": {
+      "animation_length": 0.5,
+      "loop": false,
       "sound_effects": {
         "0.0": {
-          "effect": "dashing"
+          "effect": "dash"
         }
       }
     },

diff --git a/animations/player.animation.json b/animations/player.animation.json
@@ -403,7 +403,7 @@
 					}
 				},
 				"root" : {
-					"position" : [ 0.0, "(math.sin(query.target_x_rotation) * 24.0 + 3.0) * variable.swim_amount", "(math.cos(query.target_x_rotation) * 24.0 + 9.0) * variable.swim_amount" ],
+					"position" : [ 0.0, "(math.sin(query.target_x_rotation) * 17.0 + 5.0) * variable.swim_amount", "(math.cos(query.target_x_rotation) * 17.0) * variable.swim_amount" ],
 					"rotation" : [ "variable.swim_amount * (90 + query.target_x_rotation)", 0.0, 0.0 ]
 				}
 			}
@@ -442,6 +442,46 @@
 					"rotation" : [ 0.0, 0.1, 0.1 ]
 				}
 			}
+		},
+		"animation.player.crawl" : {
+			"anim_time_update": "query.modified_distance_moved / 15.0",
+			"animation_length" : 1.3,
+			"loop" : true,
+			"override_previous_animation" : true,
+			"bones" : {
+				"leftarm" : {
+					"rotation" : {
+						"0" : [ 0.0, 180.0, 180.0 ],
+						"0.7" : [ 0.0, 180.0, 287.2 ],
+						"1.1" : [ 90.0, 180.0, 180.0 ],
+						"1.3" : [ 0.0, 180.0, 180.0 ]
+					}
+				},
+				"rightarm" : {
+					"rotation" : {
+						"0" : [ 0.0, 180.0, -180.0 ],
+						"0.7" : [ 0.0, 180.0, -287.2 ],
+						"1.1" : [ 90.0, 180.0, -180.0 ],
+						"1.3" : [ 0.0, 180.0, -180.0 ]
+					}
+				},
+				"root" : {
+					"position" : [ 0.0, "5.0 * variable.swim_amount", "17.0 * variable.swim_amount" ],
+					"rotation" : [ "variable.swim_amount * 90", 0.0, 0.0 ]
+				}
+			}
+		},
+		"animation.player.crawl.legs" : {
+			"loop" : true,
+			"override_previous_animation" : true,
+			"bones" : {
+				"leftleg" : {
+					"rotation" : [ "math.lerp(0.0, math.cos(query.modified_distance_moved * 30.0 + 180.0) * 17.2, variable.swim_amount)", -0.1, -0.1 ]
+				},
+				"rightleg" : {
+					"rotation" : [ "math.lerp(0.0, math.cos(query.modified_distance_moved * 30.0) * 17.2, variable.swim_amount)", 0.1, 0.1 ]
+				}
+			}
 		}
 	}
 }