From 7e022ab63da7296c96c387ccb2409e0c4b1ccc91 Mon Sep 17 00:00:00 2001
From: yhrwd <3314518364@qq.com>
Date: Mon, 8 Aug 2022 14:48:45 +0800
Subject: [PATCH] v2.0.5

---
 animations/trident.animation.json | 625 +++++++++++++++---------------
 models/entity/trident.geo.json    |  79 ++--
 particles/critical_hit.json       |  26 +-
 textures/blocks/brick.png         | Bin 147 -> 116 bytes
 textures/entity/trident.png       | Bin 1380 -> 1504 bytes
 5 files changed, 347 insertions(+), 383 deletions(-)

diff --git a/animations/trident.animation.json b/animations/trident.animation.json
index eb974a6..a94d571 100644
--- a/animations/trident.animation.json
+++ b/animations/trident.animation.json
@@ -1,320 +1,307 @@
 {
-  "format_version": "1.10.0",
-  "animations": {
-    "animation.trident.wield_first_person": {
-      "loop": true,
-      "animation_length": 2,
-      "bones": {
-        "pole": {
-          "rotation": [155, -15, 15],
-          "position": [-4, -10, -2]
-        },
-        "body": {
-          "rotation": {
-            "0.0": [0, 0, 0],
-            "2.0": [0, 0, 720]
-          }
-        },
-        "zx": {
-          "rotation": {
-            "0.0": [0, 0, 0],
-            "1.0": [0, 180, 0],
-            "2.0": [0, 360, 0]
-          },
-          "position": {
-            "0.0": {
-              "post": [0, 0, 0],
-              "lerp_mode": "catmullrom"
-            },
-            "1.0": {
-              "post": [0, 0.75, 0],
-              "lerp_mode": "catmullrom"
-            },
-            "2.0": {
-              "post": [0, 0, 0],
-              "lerp_mode": "catmullrom"
-            }
-          },
-          "scale": {
-            "0.0": [1, 1, 1],
-            "1.0": [1, 1, 1],
-            "2.0": [1, 1, 1]
-          }
-        },
-        "zhengfa": {
-          "rotation": {
-            "0.0": [0, 0, 0],
-            "2.0": [0, 360, 0]
-          },
-          "scale": {
-            "0.0": {
-              "post": [0.5, 0.5, 0.5],
-              "lerp_mode": "catmullrom"
-            },
-            "1.0": {
-              "post": [1, 1, 1],
-              "lerp_mode": "catmullrom"
-            },
-            "2.0": {
-              "post": [0.5, 0.5, 0.5],
-              "lerp_mode": "catmullrom"
-            }
-          }
-        }
-      }
-    },
-    "animation.trident.wield_first_person_raise": {
-      "loop": true,
-      "animation_length": 2,
-      "bones": {
-        "pole": {
-          "rotation": [40, -12, -60],
-          "position": [
-            "math.lerp(4.0, -7.0, variable.charge_amount)",
-            0,
-            "math.lerp(-2.0, -6.0, variable.charge_amount)"
-          ]
-        },
-        "body": {
-          "rotation": {
-            "0.0": [0, 0, 0],
-            "2.0": [0, 0, 720]
-          }
-        },
-        "zx": {
-          "rotation": {
-            "0.0": [0, 0, 0],
-            "1.0": [0, 180, 0],
-            "2.0": [0, 360, 0]
-          },
-          "position": {
-            "0.0": {
-              "post": [0, 0, 0],
-              "lerp_mode": "catmullrom"
-            },
-            "1.0": {
-              "post": [0, 0.75, 0],
-              "lerp_mode": "catmullrom"
-            },
-            "2.0": {
-              "post": [0, 0, 0],
-              "lerp_mode": "catmullrom"
-            }
-          },
-          "scale": {
-            "0.0": [1, 1, 1],
-            "1.0": [1, 1, 1],
-            "2.0": [1, 1, 1]
-          }
-        },
-        "zhengfa": {
-          "rotation": {
-            "0.0": [0, 0, 0],
-            "2.0": [0, 360, 0]
-          },
-          "scale": {
-            "0.0": {
-              "post": [0.5, 0.5, 0.5],
-              "lerp_mode": "catmullrom"
-            },
-            "1.0": {
-              "post": [1, 1, 1],
-              "lerp_mode": "catmullrom"
-            },
-            "2.0": {
-              "post": [0.5, 0.5, 0.5],
-              "lerp_mode": "catmullrom"
-            }
-          }
-        }
-      }
-    },
-    "animation.trident.wield_first_person_riptide": {
-      "loop": true,
-      "animation_length": 2,
-      "override_previous_animation": true,
-      "bones": {
-        "pole": {
-          "rotation": [180, 60, -36],
-          "position": [-2, -7, -10]
-        },
-        "zx": {
-          "rotation": {
-            "0.0": [0, 0, 0],
-            "1.0": [0, 180, 0],
-            "2.0": [0, 360, 0]
-          },
-          "position": {
-            "0.0": {
-              "post": [0, 0, 0],
-              "lerp_mode": "catmullrom"
-            },
-            "1.0": {
-              "post": [0, 0.75, 0],
-              "lerp_mode": "catmullrom"
-            },
-            "2.0": {
-              "post": [0, 0, 0],
-              "lerp_mode": "catmullrom"
-            }
-          },
-          "scale": {
-            "0.0": [1, 1, 1],
-            "1.0": [1, 1, 1],
-            "2.0": [1, 1, 1]
-          }
-        },
-        "zhengfa": {
-          "rotation": {
-            "0.0": [0, 0, 0],
-            "2.0": [0, 360, 0]
-          },
-          "scale": {
-            "0.0": {
-              "post": [0.5, 0.5, 0.5],
-              "lerp_mode": "catmullrom"
-            },
-            "1.0": {
-              "post": [1, 1, 1],
-              "lerp_mode": "catmullrom"
-            },
-            "2.0": {
-              "post": [0.5, 0.5, 0.5],
-              "lerp_mode": "catmullrom"
-            }
-          }
-        },
-        "body": {
-          "rotation": {
-            "0.0": [0, 0, 0],
-            "2.0": [0, 0, 720]
-          }
-        }
-      }
-    },
-    "animation.trident.wield_third_person": {
-      "loop": true,
-      "animation_length": 2,
-      "bones": {
-        "pole": {
-          "rotation": [90, 0, 0],
-          "position": [0, 0, -12]
-        },
-        "body": {
-          "rotation": {
-            "0.0": [0, 0, 0],
-            "2.0": [0, 0, 720]
-          }
-        },
-        "zx": {
-          "rotation": {
-            "0.0": [0, 0, 0],
-            "1.0": [0, 180, 0],
-            "2.0": [0, 360, 0]
-          },
-          "position": {
-            "0.0": {
-              "post": [0, 0, 0],
-              "lerp_mode": "catmullrom"
-            },
-            "1.0": {
-              "post": [0, 0.75, 0],
-              "lerp_mode": "catmullrom"
-            },
-            "2.0": {
-              "post": [0, 0, 0],
-              "lerp_mode": "catmullrom"
-            }
-          },
-          "scale": {
-            "0.0": [1, 1, 1],
-            "1.0": [1, 1, 1],
-            "2.0": [1, 1, 1]
-          }
-        },
-        "zhengfa": {
-          "rotation": {
-            "0.0": [0, 0, 0],
-            "2.0": [0, 360, 0]
-          },
-          "scale": {
-            "0.0": {
-              "post": [0.5, 0.5, 0.5],
-              "lerp_mode": "catmullrom"
-            },
-            "1.0": {
-              "post": [1, 1, 1],
-              "lerp_mode": "catmullrom"
-            },
-            "2.0": {
-              "post": [0.5, 0.5, 0.5],
-              "lerp_mode": "catmullrom"
-            }
-          }
-        }
-      }
-    },
-    "animation.trident.wield_third_person_raise": {
-      "loop": true,
-      "animation_length": 2,
-      "bones": {
-        "pole": {
-          "rotation": [0, 180, 0],
-          "position": [0, 0, 23]
-        },
-        "body": {
-          "rotation": {
-            "0.0": [0, 0, 0],
-            "2.0": [0, 0, 720]
-          }
-        },
-        "zx": {
-          "rotation": {
-            "0.0": [0, 0, 0],
-            "1.0": [0, 180, 0],
-            "2.0": [0, 360, 0]
-          },
-          "position": {
-            "0.0": {
-              "post": [0, 0, 0],
-              "lerp_mode": "catmullrom"
-            },
-            "1.0": {
-              "post": [0, 0.75, 0],
-              "lerp_mode": "catmullrom"
-            },
-            "2.0": {
-              "post": [0, 0, 0],
-              "lerp_mode": "catmullrom"
-            }
-          },
-          "scale": {
-            "0.0": [1, 1, 1],
-            "1.0": [1, 1, 1],
-            "2.0": [1, 1, 1]
-          }
-        },
-        "zhengfa": {
-          "rotation": {
-            "0.0": [0, 0, 0],
-            "2.0": [0, 360, 0]
-          },
-          "scale": {
-            "0.0": {
-              "post": [0.5, 0.5, 0.5],
-              "lerp_mode": "catmullrom"
-            },
-            "1.0": {
-              "post": [1, 1, 1],
-              "lerp_mode": "catmullrom"
-            },
-            "2.0": {
-              "post": [0.5, 0.5, 0.5],
-              "lerp_mode": "catmullrom"
-            }
-          }
-        }
-      }
-    }
-  }
-}
+	"format_version": "1.10.0",
+	"animations": {
+		"animation.trident.wield_first_person": {
+			"loop": true,
+			"animation_length": 2,
+			"bones": {
+				"pole": {
+					"rotation": [155, -15, 15],
+					"position": [-4, -10, -2]
+				},
+				"body": {
+					"scale": 0
+				},
+				"zx": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"1.0": [0, 180, 0],
+						"2.0": [0, 360, 0]
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [0, 0.75, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"0.0": [1, 1, 1],
+						"1.0": [1, 1, 1],
+						"2.0": [1, 1, 1]
+					}
+				},
+				"zhengfa": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"2.0": [0, 360, 0]
+					},
+					"scale": {
+						"0.0": {
+							"post": [0.5, 0.5, 0.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [1, 1, 1],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0": {
+							"post": [0.5, 0.5, 0.5],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				}
+			}
+		},
+		"animation.trident.wield_first_person_raise": {
+			"loop": true,
+			"animation_length": 2,
+			"bones": {
+				"pole": {
+					"rotation": [40, -12, -60],
+					"position": ["math.lerp(4.0, -7.0, variable.charge_amount)", 0, "math.lerp(-2.0, -6.0, variable.charge_amount)"]
+				},
+				"body": {
+					"scale": 0
+				},
+				"zx": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"1.0": [0, 180, 0],
+						"2.0": [0, 360, 0]
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [0, 0.75, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"0.0": [1, 1, 1],
+						"1.0": [1, 1, 1],
+						"2.0": [1, 1, 1]
+					}
+				},
+				"zhengfa": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"2.0": [0, 360, 0]
+					},
+					"scale": {
+						"0.0": {
+							"post": [0.5, 0.5, 0.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [1, 1, 1],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0": {
+							"post": [0.5, 0.5, 0.5],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				}
+			}
+		},
+		"animation.trident.wield_first_person_riptide": {
+			"loop": true,
+			"animation_length": 2,
+			"override_previous_animation": true,
+			"bones": {
+				"pole": {
+					"rotation": [180, 60, -36],
+					"position": [-2, -7, -10]
+				},
+				"zx": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"1.0": [0, 180, 0],
+						"2.0": [0, 360, 0]
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [0, 0.75, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"0.0": [1, 1, 1],
+						"1.0": [1, 1, 1],
+						"2.0": [1, 1, 1]
+					}
+				},
+				"zhengfa": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"2.0": [0, 360, 0]
+					},
+					"scale": {
+						"0.0": {
+							"post": [0.5, 0.5, 0.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [1, 1, 1],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0": {
+							"post": [0.5, 0.5, 0.5],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"body": {
+					"scale": 0
+				}
+			}
+		},
+		"animation.trident.wield_third_person": {
+			"loop": true,
+			"animation_length": 2,
+			"bones": {
+				"pole": {
+					"rotation": [90, 0, 0],
+					"position": [0, 0, -12]
+				},
+				"body": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"2.0": [0, 0, 360]
+					}
+				},
+				"zx": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"1.0": [0, 180, 0],
+						"2.0": [0, 360, 0]
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [0, 0.75, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"0.0": [1, 1, 1],
+						"1.0": [1, 1, 1],
+						"2.0": [1, 1, 1]
+					}
+				},
+				"zhengfa": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"2.0": [0, 360, 0]
+					},
+					"scale": {
+						"0.0": {
+							"post": [0.5, 0.5, 0.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [1, 1, 1],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0": {
+							"post": [0.5, 0.5, 0.5],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				}
+			}
+		},
+		"animation.trident.wield_third_person_raise": {
+			"loop": true,
+			"animation_length": 2,
+			"bones": {
+				"pole": {
+					"rotation": [0, 180, 0],
+					"position": [0, 0, 23]
+				},
+				"body": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"2.0": [0, 0, 360]
+					}
+				},
+				"zx": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"1.0": [0, 180, 0],
+						"2.0": [0, 360, 0]
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [0, 0.75, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"0.0": [1, 1, 1],
+						"1.0": [1, 1, 1],
+						"2.0": [1, 1, 1]
+					}
+				},
+				"zhengfa": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"2.0": [0, 360, 0]
+					},
+					"scale": {
+						"0.0": {
+							"post": [0.5, 0.5, 0.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [1, 1, 1],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0": {
+							"post": [0.5, 0.5, 0.5],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/models/entity/trident.geo.json b/models/entity/trident.geo.json
index 20a9081..e2766c2 100644
--- a/models/entity/trident.geo.json
+++ b/models/entity/trident.geo.json
@@ -7,8 +7,8 @@
 				"texture_width": 128,
 				"texture_height": 128,
 				"visible_bounds_width": 8,
-				"visible_bounds_height": 16,
-				"visible_bounds_offset": [0, -2, 0]
+				"visible_bounds_height": 19,
+				"visible_bounds_offset": [0, -0.5, 0]
 			},
 			"bones": [
 				{
@@ -16,81 +16,62 @@
 					"pivot": [0, 24, 0],
 					"binding": "q.item_slot_to_bone_name(c.item_slot)",
 					"cubes": [
-						{"origin": [-0.5, -35, -0.5], "size": [1, 93, 1], "inflate": 0.01, "uv": [0, 0]}
-					]
-				},
-				{
-					"name": "xiamian",
-					"parent": "pole",
-					"pivot": [0, -24, 0],
-					"cubes": [
+						{"origin": [-0.5, -35, -0.5], "size": [1, 93, 1], "inflate": 0.01, "uv": [0, 0]},
 						{"origin": [-0.75, -36.5, -0.75], "size": [1.5, 19.5, 1.5], "inflate": -0.05, "uv": [5, 31]},
 						{"origin": [-0.875, -17.5, -0.875], "size": [1.75, 5, 1.75], "inflate": -0.25, "uv": [28, 0]},
-						{"origin": [-0.875, -37.5, -0.875], "size": [1.75, 5, 1.75], "uv": [28, 0]}
+						{"origin": [-0.875, -37.5, -0.875], "size": [1.75, 5, 1.75], "uv": [28, 0]},
+						{"origin": [-0.75, 13.5, -0.75], "size": [1.5, 18.5, 1.5], "uv": [10, 31]},
+						{"origin": [-0.875, 31.5, -0.875], "size": [1.75, 1, 1.75], "uv": [24, 31]},
+						{"origin": [-0.875, 12.5, -0.875], "size": [1.75, 1, 1.75], "uv": [28, 12]},
+						{"origin": [-0.75, 58, -0.75], "size": [1.5, 1.5, 1.5], "uv": [13, 8]},
+						{"origin": [-0.5, 59.10896, 3.13618], "size": [1, 11, 1], "pivot": [0, 59, 0], "rotation": [12.5, 0, 0], "uv": [5, 0]},
+						{"origin": [-0.5, 58.10896, 0.13619], "size": [1, 1, 4], "pivot": [0, 59, 0], "rotation": [12.5, 0, 0], "uv": [6, 9]},
+						{"origin": [-0.5, 58.10896, -4.13619], "size": [1, 1, 4], "pivot": [0, 59, 0], "rotation": [-12.5, 0, 0], "uv": [6, 9]},
+						{"origin": [-0.5, 59.10896, -4.13618], "size": [1, 11, 1], "pivot": [0, 59, 0], "rotation": [-12.5, 0, 0], "uv": [5, 0]},
+						{"origin": [-4.13619, 58.10896, -0.5], "size": [4, 1, 1], "pivot": [0, 59, 0], "rotation": [0, 0, 12.5], "uv": [10, 5]},
+						{"origin": [-4.13618, 59.10896, -0.5], "size": [1, 11, 1], "pivot": [0, 59, 0], "rotation": [0, 0, 12.5], "uv": [5, 0]},
+						{"origin": [0.13619, 58.10896, -0.5], "size": [4, 1, 1], "pivot": [0, 59, 0], "rotation": [0, 0, -12.5], "uv": [10, 5]},
+						{"origin": [3.13619, 59.10896, -0.5], "size": [1, 11, 1], "pivot": [0, 59, 0], "rotation": [0, 0, -12.5], "uv": [5, 0]}
 					]
 				},
 				{
-					"name": "zhongjian",
+					"name": "_______",
 					"parent": "pole",
-					"pivot": [0, 167, 0],
-					"cubes": [
-						{"origin": [-0.75, 13.5, -0.75], "size": [1.5, 18.5, 1.5], "uv": [10, 31]},
-						{"origin": [-0.875, 31.5, -0.875], "size": [1.75, 1, 1.75], "uv": [24, 31]},
-						{"origin": [-0.875, 12.5, -0.875], "size": [1.75, 1, 1.75], "uv": [28, 12]}
-					]
+					"pivot": [0, -24, 0]
 				},
 				{
 					"name": "tou",
 					"parent": "pole",
-					"pivot": [0, 17, 0],
-					"cubes": [
-						{"origin": [-0.75, 58, -0.75], "size": [1.5, 1.5, 1.5], "uv": [13, 8]}
-					]
+					"pivot": [0, 17, 0]
 				},
 				{
 					"name": "sz",
 					"parent": "tou",
-					"pivot": [0, 17, 0]
+					"pivot": [0, 59, 0]
 				},
 				{
 					"name": "1",
 					"parent": "sz",
 					"pivot": [-0.5, 58.25, 0.5],
-					"rotation": [-10, 0, 0],
-					"cubes": [
-						{"origin": [-0.5, 52.58112, 25.07067], "size": [1, 1, 4], "pivot": [0, 0, 0], "rotation": [25, 0, 0], "uv": [6, 9]},
-						{"origin": [-0.5, 53.58112, 28.07066], "size": [1, 11, 1], "pivot": [0, 0, 0], "rotation": [25, 0, 0], "uv": [5, 0]}
-					]
+					"rotation": [-17.5, 0, 0]
 				},
 				{
 					"name": "2",
 					"parent": "sz",
 					"pivot": [-0.5, 58.25, -0.5],
-					"rotation": [10, 0, 0],
-					"cubes": [
-						{"origin": [-0.5, 52.58112, -29.07067], "size": [1, 1, 4], "pivot": [0, 0, 0], "rotation": [-25, 0, 0], "uv": [6, 9]},
-						{"origin": [-0.5, 53.58112, -29.07066], "size": [1, 11, 1], "pivot": [0, 0, 0], "rotation": [-25, 0, 0], "uv": [5, 0]}
-					]
+					"rotation": [17.5, 0, 0]
 				},
 				{
 					"name": "3",
 					"parent": "sz",
 					"pivot": [-0.5, 58.25, 0.5],
-					"rotation": [0, 0, -10],
-					"cubes": [
-						{"origin": [-29.07067, 52.58112, -0.5], "size": [4, 1, 1], "pivot": [0, 0, 0], "rotation": [0, 0, 25], "uv": [10, 5]},
-						{"origin": [-29.07066, 53.58112, -0.5], "size": [1, 11, 1], "pivot": [0, 0, 0], "rotation": [0, 0, 25], "uv": [5, 0]}
-					]
+					"rotation": [0, 0, -17.5]
 				},
 				{
 					"name": "4",
 					"parent": "sz",
 					"pivot": [0.5, 58.25, 0.5],
-					"rotation": [0, 0, 10],
-					"cubes": [
-						{"origin": [25.07067, 52.58112, -0.5], "size": [4, 1, 1], "pivot": [0, 0, 0], "rotation": [0, 0, -25], "uv": [10, 5]},
-						{"origin": [28.07067, 53.58112, -0.5], "size": [1, 11, 1], "pivot": [0, 0, 0], "rotation": [0, 0, -25], "uv": [5, 0]}
-					]
+					"rotation": [0, 0, 10]
 				},
 				{
 					"name": "zx",
@@ -106,7 +87,7 @@
 					"parent": "pole",
 					"pivot": [0, 18, 0],
 					"cubes": [
-						{"origin": [-5.5, 23.5, -5.5], "size": [11, 9, 11], "inflate": -3, "pivot": [0, 0, 0], "rotation": [0, 180, 0], "uv": [80, 101]}
+						{"origin": [-5.5, 23.9, -5.5], "size": [11, 9, 11], "inflate": -2.5, "pivot": [0, 0, 0], "rotation": [0, 180, 0], "uv": [80, 101]}
 					]
 				},
 				{
@@ -127,12 +108,12 @@
 				{
 					"name": "body",
 					"parent": "pole",
-					"pivot": [0, 27, 0],
+					"pivot": [0, 27, 0.5],
 					"cubes": [
-						{"origin": [-6.62742, 11, 6.5], "size": [13.25483, 32, 1], "pivot": [0, 27, 7], "rotation": [0, 0, 45], "uv": [62, 50]},
-						{"origin": [-6.62742, 11, 6.5], "size": [13.25483, 32, 1], "uv": [62, 50]},
-						{"origin": [-16, 20.37258, 6.5], "size": [32, 13.25483, 1], "pivot": [0, 27, 7], "rotation": [0, 0, 45], "uv": [62, 50]},
-						{"origin": [-16, 20.37258, 6.5], "size": [32, 13.25483, 1], "uv": [62, 50]}
+						{"origin": [-6.62742, 11, 7.5], "size": [13.25483, 32, 0], "pivot": [0, 27, 8], "rotation": [0, 0, 45], "uv": [102, 0]},
+						{"origin": [-6.62742, 11, 7.5], "size": [13.25483, 32, 0], "uv": [37, 63]},
+						{"origin": [-16, 20.37258, 7.5], "size": [32, 13.25483, 0], "pivot": [0, 27, 8], "rotation": [0, 0, 45], "uv": [47, 40]},
+						{"origin": [-16, 20.37258, 7.5], "size": [32, 13.25483, 0], "uv": [64, 63]}
 					]
 				}
 			]
diff --git a/particles/critical_hit.json b/particles/critical_hit.json
index 2872319..064e091 100644
--- a/particles/critical_hit.json
+++ b/particles/critical_hit.json
@@ -10,26 +10,22 @@
     },
     "components": {
       "minecraft:emitter_rate_steady": {
-        "spawn_rate": 255,
+        "spawn_rate": 999,
         "max_particles": 255
       },
       "minecraft:emitter_lifetime_once": {
-        "active_time": 0.08
+        "active_time": 0.5
       },
       "minecraft:emitter_shape_point": {
-        "offset": [0.0, "Math.random(-0.9, -0.5)", 0.0],
-        "direction": [
-          "Math.random(-0.75, 0.75)",
-          "Math.random(-1.0, 1.0)",
-          "Math.random(-0.75, 0.75)"
-        ]
+        "offset": [ 0.0, "Math.random(-0.9, -0.5)", 0.0 ],
+        "direction": [ "Math.random(-0.75, 0.75)", "Math.random(-1.0, 1.0)", "Math.random(-0.75, 0.75)" ]
       },
       "minecraft:particle_initial_speed": "Math.random(10.0, 20.0)",
       "minecraft:particle_lifetime_expression": {
         "max_lifetime": "6.0 / (Math.random(0.0, 16.0) + 12.0)"
       },
       "minecraft:particle_motion_dynamic": {
-        "linear_acceleration": [0, -12.0, 0],
+        "linear_acceleration": [ 0, -12.0, 0 ],
         "linear_drag_coefficient": 10
       },
       "minecraft:particle_appearance_billboard": {
@@ -42,11 +38,11 @@
           "texture_width": 128,
           "texture_height": 128,
           "flipbook": {
-            "base_UV": [0, 72],
-            "size_UV": [8, 8],
-            "step_UV": [8, 0],
-            "frames_per_second": 10,
-            "max_frame": 10,
+            "base_UV": [ 0, 72 ],
+            "size_UV": [ 8, 8 ],
+            "step_UV": [ 8, 0 ],
+            "frames_per_second": 8,
+            "max_frame": 8,
             "stretch_to_lifetime": true,
             "loop": false
           }
@@ -61,7 +57,7 @@
               "variable.particle_random_2*0.3+ 0.6",
               1.0
             ],
-            ["variable.particle_random_1*0.3 + 0.6", 0.5, 0.3, 1.0]
+            [ "variable.particle_random_1*0.3 + 0.6", 0.5, 0.3, 1.0 ]
           ],
           "interpolant": "variable.particle_age/variable.particle_lifetime"
         }
diff --git a/textures/blocks/brick.png b/textures/blocks/brick.png
index 2843bf66170726a8059cad4961c4ac022f617ace..b3840bbefa28571ba3b7f345c23aba48780ec549 100644
GIT binary patch
delta 97
zcmbQtSTaE}nu&pdVZy`=GazN{>Eak-(VIL+_Su;OAdqm~=50W(7&DuLaQdN;M)?VA
z8b3ZeJ9|lH!*52(2OrNb_;xtM<^kK5@5~Gx;>w5Hr++R58pGh}>gTe~DWM4faw91A

delta 128
zcmXS!%s4@^ij9GRLH_gqL?Fdj9OUlAu<o49OCX1(*vT`50|;t3QaXTqTTd6q5R2aA
zIkM0G%xC0^*qbC-mmhtmfjePx`k|GxJRCMM_Hc{o{P2&E%sb$;YW~Hi?a>lF%b0x(
coGvjkRD94-{c>rF0MH-?Pgg&ebxsLQ06DuWzW@LL

diff --git a/textures/entity/trident.png b/textures/entity/trident.png
index f389c8a4684850d199f3a305ca2c295af231150b..dcfa269c6f4653a2b51f3411daab60765612619a 100644
GIT binary patch
delta 1486
zcmaKqX)qgj0LA|i_fbcki#o<l9bN0FR7hijwu&a!RnlV1R>=g7qnZ$+Mk`tjQ3i2e
zbyram6s=WdS!YQUttlEug^IFvrk{3a_V@A4n|W{My=76hScVp{!U<`Qj?UkhhleU-
zfZ!%)-bUA@L?)mZNzc|hMoPI0$qTMhkd{)2Ana8wMa2&F+&>1GOdxhs3&G4yNYz3Z
z$swu(i|FNA7#UX)1E=-QoeP3I8Q!*Wdoza`&*3>uMVM@LWwHpI1sk{x0HNk`7I~ua
z-QS$5Ocsb9&^Z7kvwrfV;9_Dh*ZurdKetEflzC~k`9S4Zaj?Db<p+xd_CbwLG^b|K
zz}lJE|1&>LDo-2VSvS`gkb*&bGn;vs%L2+JBU~&mMxzB@p_#Pij0`20#c`K-;|;28
zT0sbUR!QYd&{-ETpiUQv#@CC^LF5V5tNg?(;N7NE#O%uMS1^3Wa~~C386%(Hx3rPw
zA6_$nSld6g!N3^S<fjUfW1hhf6Th2|1E|`LQ9*Y2T+d`JxvE{?*Q)ZaWtcezdUhCI
zS#)3h#8=!n+B=^|?%xQ>zwKi+9bDav*xaf3Rq2TtU4rR<&G;z)PKn3q%|u%}V*O1*
z+$A<(z73^5K36Ki4Ew8}Yc08Jtw1R4R@gs6%`Y6MOwCy42F|)MM{3i$s#EH$6&NEn
zpks;{xABZG-4K45t3!P*@Pe>lU-KcL<|CHzXB`X0)mAqMCf$ms1^bYM#%<Bz8$R=(
z7T!obF8>arKEfB>fzV^OpAsX&43hm^{SCmhOn8&Fey%V>L>ArM#Z8HgtWQiYYrw2|
z9QG3{u=>eyl2L50BPM514t<}bq300@UW?D#0@_8Ekm6V;OI1<=em|x~`eGiBo*6A-
z>ib&`X@1UmW5MN<j@yZ5PxIvi*rTeid28l-4&-SeQxzVd5SL6xapI&!MbH;wld%4Z
zMlP`Hb2tShE1QHo>=}Qr&~I_rf+Jbtow55Ni|f$KFRj|%I_#-&ArIwaM4}Ip39{gj
zyQGUs$ZfxS5yD&?5`t>D6~9V#-RaZEwmWZ^(?%DBgbf(STf?o&pLbJO0K9BHytIxu
zs30X*kcn<Ok!nz?_XmcO){P$NGg?M1$wKU9nws!)F}uxLweUs`zjrUC0_NFEaW62U
zrs8Eg1uE@&Q>da^zL8L=?#c1x)Oo(weq!p$60EDAb|C1N(~yQ_3C2>dyalWuWI52~
zizF1>r*T<1D`sx#GLd|Be!2~v<#@+P5nMJA>NCA+3d*G6AY-)%sw`tXEwrk?J>X#w
zr2B&3(W=10NMnp!U_NA=2_t9x?zLr;kb%pBiiosDL~~CMX9Y=}n;|5+k&>3$)RU1u
zjRJaUfe=^Y(hOXTT9LWTE@T$h84oFBsVQqB)?h=9Wwpq7FcnVV@u>(TRgIn}QqOIx
z3OL><S!qk3M4#F+fdJWwvAiJ-?p)7WAwv^jFLVazlVJxypOck|Koz^b&wqd(`gjY9
zy0-l02}h4KlnOCbfnu!$nLl<k1C#(DJ_r=kAtxtb$@yj=3m?5(*VA#F;WJIm_Fh$X
z4iW<y?5h=28jMKBp*@tKMRC%DjlCs-N=c`A#sPqo%X*AjkpPC)I;Ws%IfGf-ubUJ}
zA6CrDU`<9pf=FALYZG`u?7d}c{0&{)L)r7K`Tx`8-xUqlYS~BMqKJ!<6x;x=ut`we
z_f73r;UIClb$Efxia0Q|Ola!z>}dAiTO7sONdK2HPak)~n0tGsk4m&#=@V!5C`|S5
z*>z#|0%>19Wzjdqt|Mo9lvs=nmo8hW#7g;uh$U2M&Alz(yY;v88-A&u*qXhxhuYeR
zRn3|FQWzU5&U`?*z>CswYSs?%v-bMdfmb3)U&j<)nP`o|7&VThKKO^>UAXTlxkGss
QN*Fl7$-xEr41rDj8){Xqi2wiq

delta 1361
zcmaKmc{JMx0LOnnq0UOwF)VeYl&Lzxx+*Hk3!ct7+R$p6RjtfXrPWyR`zcx_QEYuQ
zCBo=IRaA>MNS@C1T4~avju6-Cs3SrgQ!#IUZ~MH@d*A;)?>nYGrIu#~9r7aLgQ&#|
zBitNxxW2MvX@y@+RLoJ2=<>3|`>Pxw-z5<1{QcQ=Y`aVhdLTq8umU?~j5@0NK+s00
z!9-l92M2Gc6HHVJw7b1%Q#kvg`z7ls)}tjYBQ5thBlG;lQ5P{X;~JLJ_?>90WI84B
zrvxp4x?Jz43$&&#Kv(e}GwGLBw`Gu|bGUYO4dgj<AFb_dw`pS~8<v{f^#TRn!pb@N
z_6x_ei}NoJy^5EaoqEdrV=#fF12A`f^x-z8>;)vEb>lf^t=)ro>8-}d<H>z|U#6^K
zWnuNVaR+YDBDe4aZiQq3mk+4ogxyt4!r_4Zut?VMMh)UQG?!Er!hHTBf6Z4vm)zVu
z&2Sajy`QMoz|G7*1-5)rH;cCkJU&#{8w9r+v4&C7`PheZMl4$(i9DisT>d9Rfmdr=
zi`7>ysvZiN3R!x4$CU1AOYV<1u(W`v_cfUea~Ae1SC`MjzheQzbxq)fXE?x!-5|(m
z3J@-Fr}2qd!YKoQC65tH<d<Ln;G6og2lbW|12C!-iY4uB?W0XYYIe6hkGRd<-E=Dy
zGiGR|pQ41ZbVUk7yWQ*3sj%;P<|kV!`btfUrlW)`4=Vs@{^kQG#ii$CIes3bg&`?u
z@gBoYKz~=#AcB3ne)mcA#QdYPkOI}T^X5=vT610);yN%nfY2v#6w$woM=HUb&u+4V
zlC%#NI)Hp@<1b!?ytUbd-D*56LQ{*4!84(EeJD<w+rzhfO9flZWL>qfvX!M=kzg;R
z7=0tGat|%p7S|3A&E`76BNtO2i=gO)Kx)5jLw>Dd_8U0(O6S0oJtWkihk`_xpaVpg
zay=liR(3@~OSR>N3xWZg^bEn6snD9P1(Y5fO)}BjYqYQDeHR#KgE&9B-`U4VyGJmi
zi$kBcPW1RWQz+hZ44L73O_hQa=p7&dx=3N3hYeU`?|~dMao3zihYrL_iz04z%z)U4
zF0dQr`~--xhx)I=!BdeJlp^SLR={pH1ROd~yAEn*B^l;4cZZc5#9PgF_&W6$Xt?KF
z;j|3k21y*Q7tq4@x{iuD8kUQTv|hE=JQb}p3|$twUKL<CsPsJDukswrACQ3?>*?<}
zNOEa+S`VRatz_2Ea<eaRB0VS0Dyuw>@u_JCN`Pa+Q>1CD4wATRI0!+_6dRF_W)cE&
zFXY_W2PhN4of<a&_=${T%6*Onhvi-44`Ec=+sb_JWg&>sw2Cx4^M%fZZUS4ON~{K{
zy?UOBz}qxUi{0T#Z1P5x#Tg(dbmTpZf`3JR^m2d#F`t1WD`Pv`y~{K$J)gBh%Bop>
zyg5cn@DKYk_c$|}o!o^94I(~_%a4M;C6^G~Sp^=?+Kt_$)^OGpi>xKYlVyf`)&nEl
zfD&V}cKb!Hw-R3GUc4&1qdHKh3O1o%$i79Hwn3@GPNA#xFo5<yMomEw(oIEAcHne<
zhZ+Tq_%Ct9f8qI~)lUZUiHp^{(^3zHt7y!Y&O3iCkoxsaI=a7hn@LJulG2vMjdjl*
zQ8!*?^UnQ>EvxE=B-8}Aj{$9oQQ@k0Vot=2H&&Xve3|TLc6I>XGvs&jsyy%d0@3L~
u*UgjSLa-=rlsbv4sgcfD6enQ*fg@KY89JzO_I>68yLh?#5}y(%H~t2kyoMG4