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 2843bf6..b3840bb 100644 Binary files a/textures/blocks/brick.png and b/textures/blocks/brick.png differ diff --git a/textures/entity/trident.png b/textures/entity/trident.png index f389c8a..dcfa269 100644 Binary files a/textures/entity/trident.png and b/textures/entity/trident.png differ