From f388d633d4502fc64fbc2a44b124ae2da0a0e34f Mon Sep 17 00:00:00 2001 From: MysticKoko <132279944+MysticKoko@users.noreply.github.com> Date: Tue, 13 Feb 2024 13:05:51 +0200 Subject: [PATCH] Animation work Texture work Model work Giant clams give black pearls 25% of the time --- .../aquatic/block/GiantClamBlock.kt | 6 +- .../atolla_jellyfish.animation.json | 119 ++++---- .../animations/blue_jellyfish.animation.json | 147 ++++++---- .../cauliflower_jellyfish.animation.json | 116 ++++---- .../compass_jellyfish.animation.json | 109 +++---- .../fried_egg_jellyfish.animation.json | 149 ++++++---- .../glowing_sucker_octopus.animation.json | 178 +++--------- .../animations/seahorse.animation.json | 193 ++++++------- .../umbrella_octopus.animation.json | 271 ++---------------- .../geo/atolla_jellyfish.geo.json | 151 +++++++++- .../geo/blue_jellyfish.geo.json | 149 +++++++++- .../geo/cauliflower_jellyfish.geo.json | 155 +++++++++- .../geo/compass_jellyfish.geo.json | 159 +++++++++- .../geo/fried_egg_jellyfish.geo.json | 151 +++++++++- .../geo/glowing_sucker_octopus.geo.json | 116 ++++++-- .../hybrid-aquatic/geo/seahorse.geo.json | 111 ++++--- .../textures/entity/atolla_jellyfish.png | Bin 1413 -> 1382 bytes .../entity/atolla_jellyfish_glowmask.png | Bin 390 -> 398 bytes .../textures/entity/blue_jellyfish.png | Bin 818 -> 825 bytes .../textures/entity/cauliflower_jellyfish.png | Bin 1260 -> 1373 bytes .../textures/entity/compass_jellyfish.png | Bin 1036 -> 1023 bytes .../textures/entity/fried_egg_jellyfish.png | Bin 1039 -> 978 bytes .../entity/glowing_sucker_octopus.png | Bin 646 -> 596 bytes .../glowing_sucker_octopus_glowmask.png | Bin 171 -> 118 bytes 24 files changed, 1407 insertions(+), 873 deletions(-) diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/block/GiantClamBlock.kt b/src/main/kotlin/dev/hybridlabs/aquatic/block/GiantClamBlock.kt index 3b9eb8eeb..4db4dd916 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/block/GiantClamBlock.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/block/GiantClamBlock.kt @@ -106,7 +106,11 @@ class GiantClamBlock(settings: Settings) : PlantBlock(settings), BlockEntityProv if (blockEntity is GiantClamBlockEntity && blockEntity.pearlCooldown == 0) { blockEntity.pearlCooldown = world.random.nextBetween(1200, 6000) - dropStack(world, pos, ItemStack(HybridAquaticItems.PEARL, 1)) + if (world.random.nextInt(4) == 0) { + dropStack(world, pos, ItemStack(HybridAquaticItems.BLACK_PEARL, 1)) + } else { + dropStack(world, pos, ItemStack(HybridAquaticItems.PEARL, 1)) + } world.playSound( null, pos, diff --git a/src/main/resources/assets/hybrid-aquatic/animations/atolla_jellyfish.animation.json b/src/main/resources/assets/hybrid-aquatic/animations/atolla_jellyfish.animation.json index ff5bfcf2d..ab8ad5968 100644 --- a/src/main/resources/assets/hybrid-aquatic/animations/atolla_jellyfish.animation.json +++ b/src/main/resources/assets/hybrid-aquatic/animations/atolla_jellyfish.animation.json @@ -3,71 +3,70 @@ "animations": { "bob": { "loop": true, - "animation_length": 3, + "animation_length": 4, "bones": { - "bottom_tentacles": { - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.875": { - "vector": [0, 2, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } - }, - "scale": { - "0.0": { - "vector": [1, 1, 1] - }, - "2.3333": { - "vector": [1.2, 1, 1.2] - }, - "3.0": { - "vector": [1, 1, 1] - } - } - }, "head": { + "position": [0, "-0.5+Math.SIN(query.anim_time * 90)*0.25", 0], "scale": { - "0.0": { - "vector": [1, 1.1, 1] - }, - "1.875": { - "vector": [1.3, 1, 1.3] - }, - "3.0": { - "vector": [1, 1.1, 1] - } + "0.0": [0.9, 0.9, 0.9], + "2.5": [1, 1, 1], + "4.0": [0.9, 0.9, 0.9] } }, - "tentacles": { - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.375": { - "vector": [0, 0, 0] - }, - "1.875": { - "vector": [0, 2, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } - }, - "scale": { - "0.0": { - "vector": [1, 1, 1] - }, - "1.875": { - "vector": [1.2, 1, 1.2] - }, - "3.0": { - "vector": [1, 1, 1] - } - } + "core_tentacles": { + "rotation": [0, 0, 0.01], + "position": [0, "Math.SIN(query.anim_time * 90)*0.25", 0] + }, + "tentacle_a1": { + "rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0] + }, + "tentacle_a2": { + "rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + }, + "tentacle_b1": { + "rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0] + }, + "tentacle_b2": { + "rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + }, + "tentacle_c1": { + "rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0] + }, + "tentacle_c2": { + "rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + }, + "tentacle_d1": { + "rotation": ["Math.cos(query.anim_time * 90)*-10", 0, 0] + }, + "tentacle_d2": { + "rotation": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0] + }, + "tentacle_e1": { + "rotation": ["Math.cos(query.anim_time * 90)*-10", 0, 0] + }, + "tentacle_e2": { + "rotation": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0] + }, + "tentacle_h1": { + "rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0] + }, + "tentacle_h2": { + "rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + }, + "tentacle_g1": { + "rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0] + }, + "tentacle_g2": { + "rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + }, + "tentacle_f1": { + "rotation": ["Math.cos(query.anim_time * 90)*-10", 0, 0] + }, + "tentacle_f2": { + "rotation": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0] + }, + "atolla_jellyfish": { + "position": [0, "Math.sin(query.anim_time * 90)*1", 0] } } } diff --git a/src/main/resources/assets/hybrid-aquatic/animations/blue_jellyfish.animation.json b/src/main/resources/assets/hybrid-aquatic/animations/blue_jellyfish.animation.json index f3cb24b15..cc3ecb780 100644 --- a/src/main/resources/assets/hybrid-aquatic/animations/blue_jellyfish.animation.json +++ b/src/main/resources/assets/hybrid-aquatic/animations/blue_jellyfish.animation.json @@ -3,70 +3,115 @@ "animations": { "bob": { "loop": true, - "animation_length": 3, + "animation_length": 4, "bones": { - "inner_tentacles": { + "head": { "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.875": { - "vector": [0, 2, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } + "vector": [0, "-0.5+Math.SIN(query.anim_time * 90)*0.25", 0] }, "scale": { "0.0": { - "vector": [1, 1, 1] + "vector": [0.9, 0.9, 0.9] }, - "2.3333": { - "vector": [1.2, 1, 1.2] - }, - "3.0": { + "2.5": { "vector": [1, 1, 1] + }, + "4.0": { + "vector": [0.9, 0.9, 0.9] } } }, - "head": { - "scale": { - "0.0": { - "vector": [1, 1.1, 1] - }, - "1.875": { - "vector": [1.3, 1, 1.3] - }, - "3.0": { - "vector": [1, 1.1, 1] - } + "core_tentacles": { + "rotation": { + "vector": [0, 0, 0.01] + }, + "position": { + "vector": [0, "Math.SIN(query.anim_time * 90)*0.25", 0] } }, - "outer_tentacles": { + "tentacle_a1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*10", 0, 0] + } + }, + "tentacle_a2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + } + }, + "tentacle_b1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*10", 0, 0] + } + }, + "tentacle_b2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + } + }, + "tentacle_c1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*10", 0, 0] + } + }, + "tentacle_c2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + } + }, + "tentacle_d1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*-10", 0, 0] + } + }, + "tentacle_d2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0] + } + }, + "tentacle_e1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*-10", 0, 0] + } + }, + "tentacle_e2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0] + } + }, + "tentacle_h1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*10", 0, 0] + } + }, + "tentacle_h2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + } + }, + "tentacle_g1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*10", 0, 0] + } + }, + "tentacle_g2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + } + }, + "tentacle_f1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*-10", 0, 0] + } + }, + "tentacle_f2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0] + } + }, + "blue_jellyfish": { "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.375": { - "vector": [0, 0, 0] - }, - "1.875": { - "vector": [0, 2, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } - }, - "scale": { - "0.0": { - "vector": [1, 1, 1] - }, - "1.875": { - "vector": [1.2, 1, 1.2] - }, - "3.0": { - "vector": [1, 1, 1] - } + "vector": [0, "Math.sin(query.anim_time * 90)*1", 0] } } } diff --git a/src/main/resources/assets/hybrid-aquatic/animations/cauliflower_jellyfish.animation.json b/src/main/resources/assets/hybrid-aquatic/animations/cauliflower_jellyfish.animation.json index 5c54c15ca..79204ce5c 100644 --- a/src/main/resources/assets/hybrid-aquatic/animations/cauliflower_jellyfish.animation.json +++ b/src/main/resources/assets/hybrid-aquatic/animations/cauliflower_jellyfish.animation.json @@ -3,71 +3,69 @@ "animations": { "bob": { "loop": true, - "animation_length": 3, + "animation_length": 4, "bones": { "head": { + "position": [0, "-0.5+Math.SIN(query.anim_time * 90)*0.25", 0], "scale": { - "0.0": { - "vector": [1, 1.1, 1] - }, - "1.875": { - "vector": [1.3, 1, 1.3] - }, - "3.0": { - "vector": [1, 1.1, 1] - } + "0.0": [0.9, 0.9, 0.9], + "2.5": [1, 1, 1], + "4.0": [0.9, 0.9, 0.9] } }, - "outer_tentacles": { - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.375": { - "vector": [0, 0, 0] - }, - "1.875": { - "vector": [0, 2, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } - }, - "scale": { - "0.0": { - "vector": [1, 1, 1] - }, - "1.875": { - "vector": [1.2, 1, 1.2] - }, - "3.0": { - "vector": [1, 1, 1] - } - } + "core_tentacles": { + "position": [0, "Math.SIN(query.anim_time * 90)*0.5", 0] }, - "inner_tentacles": { - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.875": { - "vector": [0, 2, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } - }, - "scale": { - "0.0": { - "vector": [1, 1, 1] - }, - "2.3333": { - "vector": [1.2, 1, 1.2] - }, - "3.0": { - "vector": [1, 1, 1] - } - } + "tentacle_a1": { + "rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0] + }, + "tentacle_a2": { + "rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + }, + "tentacle_b1": { + "rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0] + }, + "tentacle_b2": { + "rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + }, + "tentacle_c1": { + "rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0] + }, + "tentacle_c2": { + "rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + }, + "tentacle_d1": { + "rotation": ["Math.cos(query.anim_time * 90)*-10", 0, 0] + }, + "tentacle_d2": { + "rotation": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0] + }, + "tentacle_e1": { + "rotation": ["Math.cos(query.anim_time * 90)*-10", 0, 0] + }, + "tentacle_e2": { + "rotation": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0] + }, + "tentacle_h1": { + "rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0] + }, + "tentacle_h2": { + "rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + }, + "tentacle_g1": { + "rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0] + }, + "tentacle_g2": { + "rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + }, + "tentacle_f1": { + "rotation": ["Math.cos(query.anim_time * 90)*-10", 0, 0] + }, + "tentacle_f2": { + "rotation": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0] + }, + "cauliflower_jelly": { + "position": [0, "Math.sin(query.anim_time * 90)*1", 0] } } } diff --git a/src/main/resources/assets/hybrid-aquatic/animations/compass_jellyfish.animation.json b/src/main/resources/assets/hybrid-aquatic/animations/compass_jellyfish.animation.json index 47eb4c3dc..27a889ef6 100644 --- a/src/main/resources/assets/hybrid-aquatic/animations/compass_jellyfish.animation.json +++ b/src/main/resources/assets/hybrid-aquatic/animations/compass_jellyfish.animation.json @@ -3,65 +3,70 @@ "animations": { "bob": { "loop": true, - "animation_length": 3, + "animation_length": 4, "bones": { "head": { + "position": [0, "-0.5+Math.SIN(query.anim_time * 90)*0.25", 0], "scale": { - "0.0": { - "vector": [1, 1, 1] - }, - "1.875": { - "vector": [1.1, 1, 1.1] - }, - "3.0": { - "vector": [1, 1, 1] - } + "0.0": [0.9, 0.9, 0.9], + "2.5": [1, 1, 1], + "4.0": [0.9, 0.9, 0.9] } }, - "outer_tentacles": { - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.875": { - "vector": [0, 0.5, 0] - }, - "2.375": { - "vector": [0, 0.5, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } - } + "core_tentacles": { + "rotation": [0, 0, 0.01], + "position": [0, "Math.SIN(query.anim_time * 90)*0.25", 0] }, - "inner_tentacles": { - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.875": { - "vector": [0, 0.5, 0] - }, - "2.375": { - "vector": [0, 0.5, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } - } + "tentacle_a1": { + "rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0] }, - "core_tentacles": { - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.875": { - "vector": [0, 0.5, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } - } + "tentacle_a2": { + "rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + }, + "tentacle_b1": { + "rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0] + }, + "tentacle_b2": { + "rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + }, + "tentacle_c1": { + "rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0] + }, + "tentacle_c2": { + "rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + }, + "tentacle_d1": { + "rotation": ["Math.cos(query.anim_time * 90)*-10", 0, 0] + }, + "tentacle_d2": { + "rotation": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0] + }, + "tentacle_e1": { + "rotation": ["Math.cos(query.anim_time * 90)*-10", 0, 0] + }, + "tentacle_e2": { + "rotation": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0] + }, + "tentacle_h1": { + "rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0] + }, + "tentacle_h2": { + "rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + }, + "tentacle_g1": { + "rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0] + }, + "tentacle_g2": { + "rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + }, + "tentacle_f1": { + "rotation": ["Math.cos(query.anim_time * 90)*-10", 0, 0] + }, + "tentacle_f2": { + "rotation": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0] + }, + "compass_jellyfish": { + "position": [0, "Math.sin(query.anim_time * 90)*1", 0] } } } diff --git a/src/main/resources/assets/hybrid-aquatic/animations/fried_egg_jellyfish.animation.json b/src/main/resources/assets/hybrid-aquatic/animations/fried_egg_jellyfish.animation.json index c0e6eadf0..a3748cd06 100644 --- a/src/main/resources/assets/hybrid-aquatic/animations/fried_egg_jellyfish.animation.json +++ b/src/main/resources/assets/hybrid-aquatic/animations/fried_egg_jellyfish.animation.json @@ -3,70 +3,117 @@ "animations": { "bob": { "loop": true, - "animation_length": 3, + "animation_length": 4, "bones": { "head": { + "position": { + "vector": [0, "-0.5+Math.SIN(query.anim_time * 90)*0.25", 0] + }, "scale": { "0.0": { - "vector": [1, 1.1, 1] + "vector": [0.9, 0.9, 0.9] }, - "1.875": { - "vector": [1.3, 1, 1.3] + "2.5": { + "vector": [1, 1, 1] }, - "3.0": { - "vector": [1, 1.1, 1] + "4.0": { + "vector": [0.9, 0.9, 0.9] } } }, - "outer_tentacles": { + "core_tentacles": { "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.375": { - "vector": [0, 0, 0] - }, - "1.875": { - "vector": [0, 1, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } - }, - "scale": { - "0.0": { - "vector": [1, 1, 1] - }, - "1.875": { - "vector": [1.2, 1, 1.2] - }, - "3.0": { - "vector": [1, 1, 1] - } + "vector": [0, "Math.SIN(query.anim_time * 90)*0.5", 0] } }, - "inner_tentacles": { + "cauliflower_jelly": { "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.875": { - "vector": [0, 1, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } - }, - "scale": { - "0.0": { - "vector": [1, 1, 1] - }, - "2.3333": { - "vector": [1.2, 1, 1.2] - }, - "3.0": { - "vector": [1, 1, 1] - } + "vector": [0, "Math.sin(query.anim_time * 90)*1", 0] + } + }, + "fried_egg_jelly": { + "position": { + "vector": [0, "Math.sin(query.anim_time * 90)*1", 0] + } + }, + "tentacle_a1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*10", 0, 0] + } + }, + "tentacle_a2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + } + }, + "tentacle_b1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*10", 0, 0] + } + }, + "tentacle_b2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + } + }, + "tentacle_c1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*10", 0, 0] + } + }, + "tentacle_c2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + } + }, + "tentacle_d1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*-10", 0, 0] + } + }, + "tentacle_d2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0] + } + }, + "tentacle_e1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*-10", 0, 0] + } + }, + "tentacle_e2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0] + } + }, + "tentacle_f1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*-10", 0, 0] + } + }, + "tentacle_f2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0] + } + }, + "tentacle_g1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*10", 0, 0] + } + }, + "tentacle_g2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] + } + }, + "tentacle_h1": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 90)*10", 0, 0] + } + }, + "tentacle_h2": { + "rotation": { + "vector": ["Math.sin(query.anim_time * 90)*12.5", 0, 0] } } } diff --git a/src/main/resources/assets/hybrid-aquatic/animations/glowing_sucker_octopus.animation.json b/src/main/resources/assets/hybrid-aquatic/animations/glowing_sucker_octopus.animation.json index ef423a073..61f307982 100644 --- a/src/main/resources/assets/hybrid-aquatic/animations/glowing_sucker_octopus.animation.json +++ b/src/main/resources/assets/hybrid-aquatic/animations/glowing_sucker_octopus.animation.json @@ -48,151 +48,63 @@ }, "swim": { "loop": true, - "animation_length": 2.25, + "animation_length": 4, "bones": { "head": { - "rotation": { - "0.0": { - "vector": [25, 0, 0] - }, - "1.5": { - "vector": [15, 0, 0] - }, - "2.25": { - "vector": [25, 0, 0] - } - }, - "position": { - "vector": [0, 5, -2] - } + "rotation": ["20+Math.cos(query.anim_time * 90)*10", 0, 0], + "position": [0, "Math.cos(query.anim_time * 90)*0.5", 0] }, "mantle": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [22.5, 0, 0] - }, - "2.25": { - "vector": [0, 0, 0] - } - }, - "scale": { - "0.0": { - "vector": [0.9, 0.9, 0.9] - }, - "1.5": { - "vector": [1.1, 1.1, 1.1] - }, - "2.25": { - "vector": [0.9, 0.9, 0.9] - } - } + "rotation": ["-Math.cos(query.anim_time * 90)*15", 0, 0], + "scale": 1 }, - "right_tentacle_1": { - "rotation": { - "0.0": { - "vector": [38.18093, 4.34772, -75.84312] - }, - "1.5": { - "vector": [0, 0, -22.5] - }, - "2.25": { - "vector": [38.18093, 4.34772, -75.84312] - } - } + "left_tentacle_1_1": { + "rotation": ["-Math.cos(query.anim_time * 90)*20", 0, "35-Math.cos(query.anim_time * 90)*-20"] }, - "left_tentacle_1": { - "rotation": { - "0.0": { - "vector": [38.18093, -4.34772, 75.84312] - }, - "1.5": { - "vector": [0, 0, 22.5] - }, - "2.25": { - "vector": [38.18093, -4.34772, 75.84312] - } - } + "left_tentacle_1_2": { + "rotation": [0, 0, "Math.sin(query.anim_time * 90)*25"] }, - "right_tentacle_2": { - "rotation": { - "0.0": { - "vector": [-18.544, -11.1216, -74.47225] - }, - "1.5": { - "vector": [-27.5, 0, -35] - }, - "2.25": { - "vector": [-18.544, -11.1216, -74.47225] - } - } + "left_tentacle_2_1": { + "rotation": [0, 0, "25+Math.cos(query.anim_time * 90)*30"] }, - "left_tentacle_2": { - "rotation": { - "0.0": { - "vector": [-18.544, 11.1216, 74.47225] - }, - "1.5": { - "vector": [-27.5, 0, 35] - }, - "2.25": { - "vector": [-18.544, 11.1216, 74.47225] - } - } + "left_tentacle_2_2": { + "rotation": [0, 0, "Math.sin(query.anim_time * 90)*25"] }, - "right_tentacle_3": { - "rotation": { - "0.0": { - "vector": [-51.37715, -32.97417, -85.27752] - }, - "1.5": { - "vector": [-28.07746, -9.72513, -43.55817] - }, - "2.25": { - "vector": [-51.37715, -32.97417, -85.27752] - } - } + "left_tentacle_3_1": { + "rotation": [0, 0, "25+Math.cos(query.anim_time * 90)*30"] }, - "left_tentacle_3": { - "rotation": { - "0.0": { - "vector": [-51.37715, 32.97417, 85.27752] - }, - "1.5": { - "vector": [-28.07746, 9.72513, 43.55817] - }, - "2.25": { - "vector": [-51.37715, 32.97417, 85.27752] - } - } + "left_tentacle_3_2": { + "rotation": [0, 0, "Math.sin(query.anim_time * 90)*25"] }, - "right_tentacle_4": { - "rotation": { - "0.0": { - "vector": [-70.81145, -67.63602, -93.71168] - }, - "1.5": { - "vector": [-63.40043, -29.64983, -71.27114] - }, - "2.25": { - "vector": [-70.81145, -67.63602, -93.71168] - } - } + "left_tentacle_4_1": { + "rotation": ["-35-Math.cos(query.anim_time * 90)*30", 0, "35+Math.cos(query.anim_time * 90)*35"] }, - "left_tentacle_4": { - "rotation": { - "0.0": { - "vector": [-70.81145, 67.63602, 93.71168] - }, - "1.5": { - "vector": [-63.40043, 29.64983, 71.27114] - }, - "2.25": { - "vector": [-70.81145, 67.63602, 93.71168] - } - } + "left_tentacle_4_2": { + "rotation": [0, 0, "Math.sin(query.anim_time * 90)*25"] + }, + "right_tentacle_1_1": { + "rotation": ["-Math.cos(query.anim_time * 90)*20", 0, "-35-Math.cos(query.anim_time * 90)*20"] + }, + "right_tentacle_1_2": { + "rotation": [0, 0, "-(Math.sin(query.anim_time * 90)*25)"] + }, + "right_tentacle_4_1": { + "rotation": ["-35-Math.cos(query.anim_time * 90)*20", 0, "-35-Math.cos(query.anim_time * 90)*20"] + }, + "right_tentacle_4_2": { + "rotation": [0, 0, "-(Math.sin(query.anim_time * 90)*25)"] + }, + "right_tentacle_2_1": { + "rotation": [0, 0, "-25-Math.cos(query.anim_time * 90)*30"] + }, + "right_tentacle_2_2": { + "rotation": [0, 0, "-(Math.sin(query.anim_time * 90)*25)"] + }, + "right_tentacle_3_1": { + "rotation": [0, 0, "-25-Math.cos(query.anim_time * 90)*20"] + }, + "right_tentacle_3_2": { + "rotation": [0, 0, "-(Math.sin(query.anim_time * 90)*25)"] } } }, diff --git a/src/main/resources/assets/hybrid-aquatic/animations/seahorse.animation.json b/src/main/resources/assets/hybrid-aquatic/animations/seahorse.animation.json index 5f260484f..9ee740533 100644 --- a/src/main/resources/assets/hybrid-aquatic/animations/seahorse.animation.json +++ b/src/main/resources/assets/hybrid-aquatic/animations/seahorse.animation.json @@ -1,103 +1,94 @@ { - "format_version": "1.8.0", - "animations": { - "swim": { - "loop": true, - "animation_length": 1, - "bones": { - "head": { - "rotation": { - "0.0": { - "vector": [-2.5, 0, 0] - }, - "0.5": { - "vector": [-7.5, 0, 0] - }, - "1.0": { - "vector": [-2.5, 0, 0] - } - } - }, - "body": { - "rotation": { - "0.0": { - "vector": [2.5, 0, 0] - }, - "0.5": { - "vector": [7.5, 0, 0] - }, - "1.0": { - "vector": [2.5, 0, 0] - } - } - }, - "tail": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [15, 0, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } - } - } - } - }, - "flop": { - "loop": true, - "animation_length": 0.625, - "bones": { - "body": { - "rotation": { - "0.0": { - "vector": [0, 0, -90] - }, - "0.1667": { - "vector": [0, 0, -67.5] - }, - "0.3333": { - "vector": [0, 0, -112.5] - }, - "0.5": { - "vector": [0, 0, -90] - } - }, - "position": { - "0.0": { - "vector": [0, -3.5, 0] - }, - "0.1667": { - "vector": [0, -0.5, 0] - }, - "0.3333": { - "vector": [0, -1, 0] - }, - "0.5": { - "vector": [0, -3.5, 0] - } - } - }, - "tail": { - "rotation": { - "0.0": { - "vector": [0, 0, 22.5] - }, - "0.1667": { - "vector": [0, 0, -22.5] - }, - "0.3333": { - "vector": [0, 0, -45] - }, - "0.5": { - "vector": [0, 0, 22.5] - } - } - } - } - } - }, - "geckolib_format_version": 2 + "format_version": "1.8.0", + "animations": { + "swim": { + "loop": true, + "animation_length": 2, + "bones": { + "head": { + "rotation": { + "vector": ["-5+Math.cos(query.anim_time * 180)*-5", 0, 0] + } + }, + "body": { + "rotation": { + "vector": ["5+Math.sin(query.anim_time * 180)*5", 0, 0] + } + }, + "tail": { + "rotation": { + "vector": ["Math.cos(query.anim_time * 180)*10", 0, 0] + } + }, + "left_ear": { + "rotation": { + "vector": [0, "Math.cos(query.anim_time * 180)*-10", 0] + } + }, + "right_ear": { + "rotation": { + "vector": [0, "Math.cos(query.anim_time * 180)*10", 0] + } + }, + "back_fin": { + "rotation": { + "vector": [0, "Math.cos(query.anim_time * 360)*5", 0] + } + } + } + }, + "flop": { + "loop": true, + "animation_length": 0.625, + "bones": { + "body": { + "rotation": { + "0.0": { + "vector": [0, 0, -90] + }, + "0.1667": { + "vector": [0, 0, -67.5] + }, + "0.3333": { + "vector": [0, 0, -112.5] + }, + "0.5": { + "vector": [0, 0, -90] + } + }, + "position": { + "0.0": { + "vector": [0, -3.5, 0] + }, + "0.1667": { + "vector": [0, -0.5, 0] + }, + "0.3333": { + "vector": [0, -1, 0] + }, + "0.5": { + "vector": [0, -3.5, 0] + } + } + }, + "tail": { + "rotation": { + "0.0": { + "vector": [0, 0, 22.5] + }, + "0.1667": { + "vector": [0, 0, -22.5] + }, + "0.3333": { + "vector": [0, 0, -45] + }, + "0.5": { + "vector": [0, 0, 22.5] + } + } + } + } + } + }, + "geckolib_format_version": 2 } \ No newline at end of file diff --git a/src/main/resources/assets/hybrid-aquatic/animations/umbrella_octopus.animation.json b/src/main/resources/assets/hybrid-aquatic/animations/umbrella_octopus.animation.json index 4d29616c5..faa508b5a 100644 --- a/src/main/resources/assets/hybrid-aquatic/animations/umbrella_octopus.animation.json +++ b/src/main/resources/assets/hybrid-aquatic/animations/umbrella_octopus.animation.json @@ -7,300 +7,121 @@ "bones": { "dumbo_octopus": { "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3333": { - "vector": [0, 0, 0] - }, - "2.0": { - "vector": [0, 1, 0] - }, - "2.3333": { - "vector": [0, 1, 0] - }, - "4.0": { - "vector": [0, 0, 0] - } + "vector": [0, "Math.cos(query.anim_time * 90)*0.5", 0] } }, "left_side_tentacle_1": { "rotation": { - "0.0": { - "vector": [0, 0, -22.5] - }, - "2.0": { - "vector": [0, 0, 15] - }, - "4.0": { - "vector": [0, 0, -22.5] - } + "vector": [0, 0, "Math.cos(query.anim_time * 90)*10"] } }, "left_side_tentacle_2": { "rotation": { - "0.0": { - "vector": [0, 0, -22.5] - }, - "2.0": { - "vector": [0, 0, 15] - }, - "4.0": { - "vector": [0, 0, -22.5] - } + "vector": [0, 0, "Math.cos(query.anim_time * 90)*10"] } }, "right_side_tentacle_2": { "rotation": { - "0.0": { - "vector": [0, 0, 22.5] - }, - "2.0": { - "vector": [0, 0, -15] - }, - "4.0": { - "vector": [0, 0, 22.5] - } + "vector": [0, 0, "Math.cos(query.anim_time * 90)*-10"] } }, "right_side_tentacle_1": { "rotation": { - "0.0": { - "vector": [0, 0, 22.5] - }, - "2.0": { - "vector": [0, 0, -15] - }, - "4.0": { - "vector": [0, 0, 22.5] - } + "vector": [0, 0, "Math.cos(query.anim_time * 90)*-10"] } }, "left_front_tentacle": { "rotation": { - "0.0": { - "vector": [-22.5, 0, 0] - }, - "2.0": { - "vector": [15, 0, 0] - }, - "4.0": { - "vector": [-22.5, 0, 0] - } + "vector": ["Math.cos(query.anim_time * 90)*10", 0, 0] } }, "left_back_tentacle": { "rotation": { - "0.0": { - "vector": [22.5, 0, 0] - }, - "2.0": { - "vector": [-15, 0, 0] - }, - "4.0": { - "vector": [22.5, 0, 0] - } + "vector": ["Math.cos(query.anim_time * 90)*-10", 0, 0] } }, "right_back_tentacle": { "rotation": { - "0.0": { - "vector": [22.5, 0, 0] - }, - "2.0": { - "vector": [-15, 0, 0] - }, - "4.0": { - "vector": [22.5, 0, 0] - } + "vector": ["Math.cos(query.anim_time * 90)*-10", 0, 0] } }, "right_front_tentacle": { "rotation": { - "0.0": { - "vector": [-22.5, 0, 0] - }, - "2.0": { - "vector": [15, 0, 0] - }, - "4.0": { - "vector": [-22.5, 0, 0] - } + "vector": ["Math.cos(query.anim_time * 90)*10", 0, 0] } }, "left_ear": { "rotation": { - "0.0": { - "vector": [0, 0, -22.5] - }, - "2.0": { - "vector": [0, 0, 45] - }, - "4.0": { - "vector": [0, 0, -22.5] - } + "vector": [0, 0, "Math.cos(query.anim_time * 90)*20"] } }, "right_ear": { "rotation": { - "0.0": { - "vector": [0, 0, 22.5] - }, - "2.0": { - "vector": [0, 0, -45] - }, - "4.0": { - "vector": [0, 0, 22.5] - } + "vector": [0, 0, "Math.cos(query.anim_time * 90)*-20"] } } } }, "swim": { "loop": true, - "animation_length": 3, + "animation_length": 4, "bones": { "dumbo_octopus": { "rotation": { - "0.0": { - "vector": [10, 0, 0] - }, - "1.5": { - "vector": [20, 0, 0] - }, - "3.0": { - "vector": [10, 0, 0] - } + "vector": ["15+Math.cos(query.anim_time * 90)*5", 0, 0] + }, + "position": { + "vector": [0, "Math.cos(query.anim_time * 90)*0.5", 0] } }, "left_side_tentacle_1": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [0, 0, 20] - }, - "3.0": { - "vector": [0, 0, 0] - } + "vector": [0, 0, "Math.cos(query.anim_time * 90)*10"] } }, "left_side_tentacle_2": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [0, 0, 20] - }, - "3.0": { - "vector": [0, 0, 0] - } + "vector": [0, 0, "Math.cos(query.anim_time * 90)*10"] } }, "right_side_tentacle_2": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [0, 0, -20] - }, - "3.0": { - "vector": [0, 0, 0] - } + "vector": [0, 0, "Math.cos(query.anim_time * 90)*-10"] } }, "right_side_tentacle_1": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [0, 0, -20] - }, - "3.0": { - "vector": [0, 0, 0] - } + "vector": [0, 0, "Math.cos(query.anim_time * 90)*-10"] } }, "left_front_tentacle": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [20, 0, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } + "vector": ["Math.cos(query.anim_time * 90)*10", 0, 0] } }, "left_back_tentacle": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [-20, 0, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } + "vector": ["Math.cos(query.anim_time * 90)*-10", 0, 0] } }, "right_back_tentacle": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [-20, 0, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } + "vector": ["Math.cos(query.anim_time * 90)*-10", 0, 0] } }, "right_front_tentacle": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [20, 0, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } + "vector": ["Math.cos(query.anim_time * 90)*10", 0, 0] } }, "left_ear": { "rotation": { - "0.0": { - "vector": [0, 0, -22.5] - }, - "1.5": { - "vector": [0, 0, 45] - }, - "3.0": { - "vector": [0, 0, -22.5] - } + "vector": [0, 0, "Math.cos(query.anim_time * 90)*20"] } }, "right_ear": { "rotation": { - "0.0": { - "vector": [0, 0, 22.5] - }, - "1.5": { - "vector": [0, 0, -45] - }, - "3.0": { - "vector": [0, 0, 22.5] - } + "vector": [0, 0, "Math.cos(query.anim_time * 90)*-20"] } } } @@ -380,28 +201,12 @@ }, "left_ear": { "rotation": { - "0.0": { - "vector": [0, 0, 45] - }, - "2.0": { - "vector": [0, 0, 22.5] - }, - "4.0": { - "vector": [0, 0, 45] - } + "vector": [0, 0, "50+Math.cos(query.anim_time * 90)*10"] } }, "right_ear": { "rotation": { - "0.0": { - "vector": [0, 0, -45] - }, - "2.0": { - "vector": [0, 0, -22.5] - }, - "4.0": { - "vector": [0, 0, -45] - } + "vector": [0, 0, "-50+Math.cos(query.anim_time * 90)*-10"] } } } @@ -484,28 +289,12 @@ }, "left_ear": { "rotation": { - "0.0": { - "vector": [0, 0, 67.5] - }, - "2.0": { - "vector": [0, 0, 77.5] - }, - "4.0": { - "vector": [0, 0, 67.5] - } + "vector": [0, 0, "70+Math.cos(query.anim_time * 90)*5"] } }, "right_ear": { "rotation": { - "0.0": { - "vector": [0, 0, -67.5] - }, - "2.0": { - "vector": [0, 0, -77.5] - }, - "4.0": { - "vector": [0, 0, -67.5] - } + "vector": [0, 0, "-70+Math.cos(query.anim_time * 90)*-5"] } } } diff --git a/src/main/resources/assets/hybrid-aquatic/geo/atolla_jellyfish.geo.json b/src/main/resources/assets/hybrid-aquatic/geo/atolla_jellyfish.geo.json index b845d5130..ab0caf042 100644 --- a/src/main/resources/assets/hybrid-aquatic/geo/atolla_jellyfish.geo.json +++ b/src/main/resources/assets/hybrid-aquatic/geo/atolla_jellyfish.geo.json @@ -20,10 +20,10 @@ "parent": "atolla_jellyfish", "pivot": [0, 8.5, 0], "cubes": [ - {"origin": [-6, 7.5, -6], "size": [12, 3, 12], "uv": [0, 37]}, - {"origin": [-6.5, 8, -6.5], "size": [13, 3, 13], "uv": [0, 21]}, - {"origin": [-5, 10.5, -5], "size": [10, 2, 10], "uv": [39, 0]}, - {"origin": [-3, 10, -3], "size": [6, 2, 6], "uv": [42, 49]} + {"origin": [-6, 7.5, -6], "size": [12, 3, 12], "uv": [0, 16]}, + {"origin": [-6.5, 8, -6.5], "size": [13, 3, 13], "uv": [0, 0]}, + {"origin": [-5, 10.5, -5], "size": [10, 2, 10], "uv": [30, 33]}, + {"origin": [-3, 10, -3], "size": [6, 2, 6], "uv": [39, 0]} ] }, { @@ -31,16 +31,147 @@ "parent": "head", "pivot": [0, 10.5, 0], "cubes": [ - {"origin": [-5, 5.5, -5], "size": [10, 2, 10], "uv": [36, 37]}, - {"origin": [-3.5, 2.5, -3.5], "size": [7, 3, 7], "uv": [39, 21]} + {"origin": [-5, 5.5, -5], "size": [10, 2, 10], "uv": [0, 31]}, + {"origin": [-3.5, 2.5, -3.5], "size": [7, 3, 7], "uv": [36, 16]} ] }, { - "name": "tentacles", - "parent": "atolla_jellyfish", - "pivot": [-0.5, 8.5, 0.5], + "name": "top_tentacles", + "parent": "head", + "pivot": [0, 32.5, 0] + }, + { + "name": "tentacle_a1", + "parent": "top_tentacles", + "pivot": [0, 8, -6.25], + "cubes": [ + {"origin": [-2.5, 4, -6.25], "size": [5, 4, 0], "uv": [0, 4]} + ] + }, + { + "name": "tentacle_a2", + "parent": "tentacle_a1", + "pivot": [0, 4, -6.25], + "cubes": [ + {"origin": [-2.5, 0, -6.25], "size": [5, 4, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_b1", + "parent": "top_tentacles", + "pivot": [5.75, 8, -4.25], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [3.25, 4, -4.25], "size": [3, 4, 0], "uv": [6, 8]} + ] + }, + { + "name": "tentacle_b2", + "parent": "tentacle_b1", + "pivot": [5.75, 4, -4.25], + "cubes": [ + {"origin": [3.25, 0, -4.25], "size": [3, 4, 0], "uv": [0, 8]} + ] + }, + { + "name": "tentacle_c1", + "parent": "top_tentacles", + "pivot": [6.25, 8, 0], + "rotation": [0, -90, 0], + "cubes": [ + {"origin": [3.75, 4, 0], "size": [5, 4, 0], "uv": [0, 4]} + ] + }, + { + "name": "tentacle_c2", + "parent": "tentacle_c1", + "pivot": [6.25, 4, 0], + "cubes": [ + {"origin": [3.75, 0, 0], "size": [5, 4, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_d1", + "parent": "top_tentacles", + "pivot": [5.75, 8, 4.25], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [3.25, 4, 4.25], "size": [3, 4, 0], "uv": [6, 8]} + ] + }, + { + "name": "tentacle_d2", + "parent": "tentacle_d1", + "pivot": [5.75, 4, 4.25], + "cubes": [ + {"origin": [3.25, 0, 4.25], "size": [3, 4, 0], "uv": [0, 8]} + ] + }, + { + "name": "tentacle_e1", + "parent": "top_tentacles", + "pivot": [0, 8, 6.25], + "cubes": [ + {"origin": [-2.5, 4, 6.25], "size": [5, 4, 0], "uv": [0, 4]} + ] + }, + { + "name": "tentacle_e2", + "parent": "tentacle_e1", + "pivot": [0, 4, 6.25], + "cubes": [ + {"origin": [-2.5, 0, 6.25], "size": [5, 4, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_f1", + "parent": "top_tentacles", + "pivot": [-5.75, 8, 4.25], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [-6.25, 4, 4.25], "size": [3, 4, 0], "uv": [6, 8], "mirror": true} + ] + }, + { + "name": "tentacle_f2", + "parent": "tentacle_f1", + "pivot": [-5.75, 4, 4.25], + "cubes": [ + {"origin": [-6.25, 0, 4.25], "size": [3, 4, 0], "uv": [0, 8], "mirror": true} + ] + }, + { + "name": "tentacle_g1", + "parent": "top_tentacles", + "pivot": [-6.25, 8, 0], + "rotation": [0, 90, 0], + "cubes": [ + {"origin": [-8.75, 4, 0], "size": [5, 4, 0], "uv": [0, 4], "mirror": true} + ] + }, + { + "name": "tentacle_g2", + "parent": "tentacle_g1", + "pivot": [-6.25, 4, 0], + "cubes": [ + {"origin": [-8.75, 0, 0], "size": [5, 4, 0], "uv": [0, 0], "mirror": true} + ] + }, + { + "name": "tentacle_h1", + "parent": "top_tentacles", + "pivot": [-5.75, 8, -4.25], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [-6.25, 4, -4.25], "size": [3, 4, 0], "uv": [6, 8], "mirror": true} + ] + }, + { + "name": "tentacle_h2", + "parent": "tentacle_h1", + "pivot": [-5.75, 4, -4.25], "cubes": [ - {"origin": [-6.5, 0, -6.5], "size": [13, 8, 13], "uv": [0, 0]} + {"origin": [-6.25, 0, -4.25], "size": [3, 4, 0], "uv": [0, 8], "mirror": true} ] } ] diff --git a/src/main/resources/assets/hybrid-aquatic/geo/blue_jellyfish.geo.json b/src/main/resources/assets/hybrid-aquatic/geo/blue_jellyfish.geo.json index 13d775e68..2da24dbdf 100644 --- a/src/main/resources/assets/hybrid-aquatic/geo/blue_jellyfish.geo.json +++ b/src/main/resources/assets/hybrid-aquatic/geo/blue_jellyfish.geo.json @@ -12,16 +12,16 @@ }, "bones": [ { - "name": "compass_jellyfish", + "name": "blue_jellyfish", "pivot": [0, 0, 0] }, { "name": "head", - "parent": "compass_jellyfish", + "parent": "blue_jellyfish", "pivot": [0, 14.75, 0], "cubes": [ - {"origin": [-4.5, 12, -4.5], "size": [9, 6, 9], "uv": [0, 21]}, - {"origin": [-3, 13, -3], "size": [6, 4, 6], "uv": [27, 15]} + {"origin": [-4.5, 12, -4.5], "size": [9, 6, 9], "uv": [0, 0]}, + {"origin": [-3, 13, -3], "size": [6, 4, 6], "uv": [20, 15]} ] }, { @@ -29,15 +29,146 @@ "parent": "head", "pivot": [0, 6, 0], "cubes": [ - {"origin": [-2.5, 1, -2.5], "size": [5, 12, 5], "uv": [31, 31]} + {"origin": [-2.5, 1, -2.5], "size": [5, 12, 5], "uv": [0, 15]} ] }, { - "name": "outer_tentacles", - "parent": "compass_jellyfish", - "pivot": [0, 7.5, 0], + "name": "top_tentacles", + "parent": "blue_jellyfish", + "pivot": [0, 32.5, 0] + }, + { + "name": "tentacle_a1", + "parent": "top_tentacles", + "pivot": [0, 12, -4], + "cubes": [ + {"origin": [-1.5, 6, -4], "size": [3, 6, 0], "uv": [20, 15]} + ] + }, + { + "name": "tentacle_a2", + "parent": "tentacle_a1", + "pivot": [0, 6, -4], + "cubes": [ + {"origin": [-1.5, 0, -4], "size": [3, 6, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_b1", + "parent": "top_tentacles", + "pivot": [3, 12, -3], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [1.5, 6, -3], "size": [3, 6, 0], "uv": [20, 15]} + ] + }, + { + "name": "tentacle_b2", + "parent": "tentacle_b1", + "pivot": [3, 6, -3], + "cubes": [ + {"origin": [1.5, 0, -3], "size": [3, 6, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_c1", + "parent": "top_tentacles", + "pivot": [4, 12, 0], + "rotation": [0, -90, 0], + "cubes": [ + {"origin": [2.5, 6, 0], "size": [3, 6, 0], "uv": [20, 15]} + ] + }, + { + "name": "tentacle_c2", + "parent": "tentacle_c1", + "pivot": [4, 6, 0], + "cubes": [ + {"origin": [2.5, 0, 0], "size": [3, 6, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_d1", + "parent": "top_tentacles", + "pivot": [3, 12, 3], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [1.5, 6, 3], "size": [3, 6, 0], "uv": [20, 15]} + ] + }, + { + "name": "tentacle_d2", + "parent": "tentacle_d1", + "pivot": [3, 6, 3], + "cubes": [ + {"origin": [1.5, 0, 3], "size": [3, 6, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_e1", + "parent": "top_tentacles", + "pivot": [0, 12, 4], + "cubes": [ + {"origin": [-1.5, 6, 4], "size": [3, 6, 0], "uv": [20, 15]} + ] + }, + { + "name": "tentacle_e2", + "parent": "tentacle_e1", + "pivot": [0, 6, 4], + "cubes": [ + {"origin": [-1.5, 0, 4], "size": [3, 6, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_f1", + "parent": "top_tentacles", + "pivot": [-3, 12, 3], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [-4.5, 6, 3], "size": [3, 6, 0], "uv": [20, 15], "mirror": true} + ] + }, + { + "name": "tentacle_f2", + "parent": "tentacle_f1", + "pivot": [-3, 6, 3], + "cubes": [ + {"origin": [-4.5, 0, 3], "size": [3, 6, 0], "uv": [0, 0], "mirror": true} + ] + }, + { + "name": "tentacle_g1", + "parent": "top_tentacles", + "pivot": [-4, 12, 0], + "rotation": [0, 90, 0], + "cubes": [ + {"origin": [-5.5, 6, 0], "size": [3, 6, 0], "uv": [20, 15], "mirror": true} + ] + }, + { + "name": "tentacle_g2", + "parent": "tentacle_g1", + "pivot": [-4, 6, 0], + "cubes": [ + {"origin": [-5.5, 0, 0], "size": [3, 6, 0], "uv": [0, 0], "mirror": true} + ] + }, + { + "name": "tentacle_h1", + "parent": "top_tentacles", + "pivot": [-3, 12, -3], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [-4.5, 6, -3], "size": [3, 6, 0], "uv": [20, 15], "mirror": true} + ] + }, + { + "name": "tentacle_h2", + "parent": "tentacle_h1", + "pivot": [-3, 6, -3], "cubes": [ - {"origin": [-4, 0, -4], "size": [8, 13, 8], "uv": [0, 0]} + {"origin": [-4.5, 0, -3], "size": [3, 6, 0], "uv": [0, 0], "mirror": true} ] } ] diff --git a/src/main/resources/assets/hybrid-aquatic/geo/cauliflower_jellyfish.geo.json b/src/main/resources/assets/hybrid-aquatic/geo/cauliflower_jellyfish.geo.json index 86417775d..20d51dae3 100644 --- a/src/main/resources/assets/hybrid-aquatic/geo/cauliflower_jellyfish.geo.json +++ b/src/main/resources/assets/hybrid-aquatic/geo/cauliflower_jellyfish.geo.json @@ -21,12 +21,12 @@ "pivot": [0, 5, 0], "cubes": [ {"origin": [-6, 5.5, -6], "size": [12, 3, 12], "uv": [0, 0]}, - {"origin": [-3.5, 8.5, 0], "size": [7, 4, 0], "uv": [27, 34]}, + {"origin": [-3.5, 8.5, 0], "size": [7, 4, 0], "uv": [33, 15]}, {"origin": [-1.5, 8.51, -1.5], "size": [3, 2, 3], "uv": [0, 0]}, - {"origin": [0, 8.5, -3.5], "size": [0, 4, 7], "uv": [27, 23]}, - {"origin": [0, 8.5, -3.5], "size": [0, 4, 7], "pivot": [0, 10.5, 0], "rotation": [0, 45, 0], "uv": [27, 23]}, - {"origin": [-3.5, 8.5, 0], "size": [7, 4, 0], "pivot": [0, 10.5, 0], "rotation": [0, 45, 0], "uv": [27, 34]}, - {"origin": [-3.5, 3.5, -3.5], "size": [7, 5, 7], "inflate": -0.001, "uv": [36, 0]} + {"origin": [0, 8.5, -3.5], "size": [0, 4, 7], "uv": [21, 23]}, + {"origin": [0, 8.5, -3.5], "size": [0, 4, 7], "pivot": [0, 10.5, 0], "rotation": [0, 45, 0], "uv": [21, 23]}, + {"origin": [-3.5, 8.5, 0], "size": [7, 4, 0], "pivot": [0, 10.5, 0], "rotation": [0, 45, 0], "uv": [33, 15]}, + {"origin": [-3.5, 3.5, -3.5], "size": [7, 5, 7], "inflate": -0.001, "uv": [0, 30]} ] }, { @@ -38,19 +38,148 @@ ] }, { - "name": "outer_tentacles", - "parent": "cauliflower_jelly", - "pivot": [0, 0, 0], + "name": "top_tentacles", + "parent": "core_tentacles", + "pivot": [0, 0, 0] + }, + { + "name": "tentacle_a1", + "parent": "top_tentacles", + "pivot": [0, 0, -4.5], "cubes": [ - {"origin": [-4.5, -4, -4.5], "size": [9, 4, 9], "uv": [0, 30]} + {"origin": [-1.5, -4, -4.5], "size": [3, 4, 0], "uv": [0, 5]} ] }, { - "name": "inner_tentacles", - "parent": "cauliflower_jelly", - "pivot": [0, 0, 0], + "name": "tentacle_a2", + "parent": "top_tentacles", + "pivot": [0, 0, -3.5], + "cubes": [ + {"origin": [-1.5, -3, -3.5], "size": [3, 3, 0], "uv": [6, 5]} + ] + }, + { + "name": "tentacle_b1", + "parent": "top_tentacles", + "pivot": [3.5, 0, -3.5], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [2, -4, -3.5], "size": [3, 4, 0], "uv": [0, 5]} + ] + }, + { + "name": "tentacle_b2", + "parent": "top_tentacles", + "pivot": [3, 0, -3], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [1.5, -3, -3], "size": [3, 3, 0], "uv": [6, 5]} + ] + }, + { + "name": "tentacle_c1", + "parent": "top_tentacles", + "pivot": [4.5, 0, 0], + "rotation": [0, -90, 0], + "cubes": [ + {"origin": [3, -4, 0], "size": [3, 4, 0], "uv": [0, 5]} + ] + }, + { + "name": "tentacle_c2", + "parent": "top_tentacles", + "pivot": [3.5, 0, 0], + "rotation": [0, -90, 0], + "cubes": [ + {"origin": [2, -3, 0], "size": [3, 3, 0], "uv": [6, 5]} + ] + }, + { + "name": "tentacle_d1", + "parent": "top_tentacles", + "pivot": [3.5, 0, 3.5], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [2, -4, 3.5], "size": [3, 4, 0], "uv": [0, 5]} + ] + }, + { + "name": "tentacle_d2", + "parent": "top_tentacles", + "pivot": [3, 0, 3], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [1.5, -3, 3], "size": [3, 3, 0], "uv": [6, 5]} + ] + }, + { + "name": "tentacle_e1", + "parent": "top_tentacles", + "pivot": [0, 0, 4.5], + "cubes": [ + {"origin": [-1.5, -4, 4.5], "size": [3, 4, 0], "uv": [0, 5]} + ] + }, + { + "name": "tentacle_e2", + "parent": "top_tentacles", + "pivot": [0, 0, 3.5], + "cubes": [ + {"origin": [-1.5, -3, 3.5], "size": [3, 3, 0], "uv": [6, 5]} + ] + }, + { + "name": "tentacle_f1", + "parent": "top_tentacles", + "pivot": [-3.5, 0, 3.5], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [-5, -4, 3.5], "size": [3, 4, 0], "uv": [0, 5], "mirror": true} + ] + }, + { + "name": "tentacle_f2", + "parent": "top_tentacles", + "pivot": [-3, 0, 3], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [-4.5, -3, 3], "size": [3, 3, 0], "uv": [6, 5], "mirror": true} + ] + }, + { + "name": "tentacle_g1", + "parent": "top_tentacles", + "pivot": [-4.5, 0, 0], + "rotation": [0, 90, 0], + "cubes": [ + {"origin": [-6, -4, 0], "size": [3, 4, 0], "uv": [0, 5], "mirror": true} + ] + }, + { + "name": "tentacle_g2", + "parent": "top_tentacles", + "pivot": [-3.5, 0, 0], + "rotation": [0, 90, 0], + "cubes": [ + {"origin": [-5, -3, 0], "size": [3, 3, 0], "uv": [6, 5], "mirror": true} + ] + }, + { + "name": "tentacle_h1", + "parent": "top_tentacles", + "pivot": [-3.5, 0, -3.5], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [-5, -4, -3.5], "size": [3, 4, 0], "uv": [0, 5], "mirror": true} + ] + }, + { + "name": "tentacle_h2", + "parent": "top_tentacles", + "pivot": [-3, 0, -3], + "rotation": [0, 45, 0], "cubes": [ - {"origin": [-3.5, -3, -3.5], "size": [7, 3, 7], "uv": [33, 15]} + {"origin": [-4.5, -3, -3], "size": [3, 3, 0], "uv": [6, 5], "mirror": true} ] } ] diff --git a/src/main/resources/assets/hybrid-aquatic/geo/compass_jellyfish.geo.json b/src/main/resources/assets/hybrid-aquatic/geo/compass_jellyfish.geo.json index 5ca4d005b..2ded79cf6 100644 --- a/src/main/resources/assets/hybrid-aquatic/geo/compass_jellyfish.geo.json +++ b/src/main/resources/assets/hybrid-aquatic/geo/compass_jellyfish.geo.json @@ -21,7 +21,7 @@ "pivot": [0, 14.75, 0], "cubes": [ {"origin": [-4.5, 12, -4.5], "size": [9, 6, 9], "uv": [0, 0]}, - {"origin": [-3, 13, -3], "size": [6, 4, 6], "uv": [30, 9]} + {"origin": [-3, 13, -3], "size": [6, 4, 6], "uv": [20, 15]} ] }, { @@ -29,23 +29,162 @@ "parent": "head", "pivot": [0, 6, 0], "cubes": [ - {"origin": [-2.5, 1, -2.5], "size": [5, 12, 5], "uv": [0, 33]} + {"origin": [-2.5, 1, -2.5], "size": [5, 12, 5], "uv": [0, 15]} ] }, { - "name": "outer_tentacles", - "parent": "compass_jellyfish", - "pivot": [0, 7.5, 0], + "name": "top_tentacles", + "parent": "head", + "pivot": [0, 32.5, 0] + }, + { + "name": "tentacle_a1", + "parent": "top_tentacles", + "pivot": [0, 12, -4], "cubes": [ - {"origin": [-4, 3, -4], "size": [8, 10, 8], "uv": [0, 15]} + {"origin": [-1.5, 7, -4], "size": [3, 5, 0], "uv": [26, 25]}, + {"origin": [-1.5, 6, -3.5], "size": [3, 6, 0], "uv": [20, 15]} ] }, { - "name": "inner_tentacles", - "parent": "compass_jellyfish", - "pivot": [0, 7.5, 0], + "name": "tentacle_a2", + "parent": "tentacle_a1", + "pivot": [0, 7, -4], + "cubes": [ + {"origin": [-1.5, 2, -4], "size": [3, 5, 0], "uv": [20, 30]}, + {"origin": [-1.5, 0, -3.5], "size": [3, 6, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_b1", + "parent": "top_tentacles", + "pivot": [3, 12, -3], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [1.5, 7, -3], "size": [3, 5, 0], "uv": [26, 25]}, + {"origin": [1.5, 6, -2.29289], "size": [3, 6, 0], "uv": [20, 15]} + ] + }, + { + "name": "tentacle_b2", + "parent": "tentacle_b1", + "pivot": [3, 7, -3], + "cubes": [ + {"origin": [1.5, 2, -3], "size": [3, 5, 0], "uv": [20, 30]}, + {"origin": [1.5, 0, -2.29289], "size": [3, 6, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_c1", + "parent": "top_tentacles", + "pivot": [4, 12, 0], + "rotation": [0, -90, 0], + "cubes": [ + {"origin": [2.5, 7, 0], "size": [3, 5, 0], "uv": [26, 25]}, + {"origin": [2.5, 6, 0.5], "size": [3, 6, 0], "uv": [20, 15]} + ] + }, + { + "name": "tentacle_c2", + "parent": "tentacle_c1", + "pivot": [4, 7, 0], + "cubes": [ + {"origin": [2.5, 2, 0], "size": [3, 5, 0], "uv": [20, 30]}, + {"origin": [2.5, 0, 0.5], "size": [3, 6, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_d1", + "parent": "top_tentacles", + "pivot": [3, 12, 3], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [1.5, 7, 3], "size": [3, 5, 0], "uv": [26, 25]}, + {"origin": [1.5, 6, 2.29289], "size": [3, 6, 0], "uv": [20, 15]} + ] + }, + { + "name": "tentacle_d2", + "parent": "tentacle_d1", + "pivot": [3, 7, 3], + "cubes": [ + {"origin": [1.5, 2, 3], "size": [3, 5, 0], "uv": [20, 30]}, + {"origin": [1.5, 0, 2.29289], "size": [3, 6, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_e1", + "parent": "top_tentacles", + "pivot": [0, 12, 4], + "cubes": [ + {"origin": [-1.5, 7, 4], "size": [3, 5, 0], "uv": [26, 25]}, + {"origin": [-1.5, 6, 3.5], "size": [3, 6, 0], "uv": [20, 15]} + ] + }, + { + "name": "tentacle_e2", + "parent": "tentacle_e1", + "pivot": [0, 7, 4], + "cubes": [ + {"origin": [-1.5, 2, 4], "size": [3, 5, 0], "uv": [20, 30]}, + {"origin": [-1.5, 0, 3.5], "size": [3, 6, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_f1", + "parent": "top_tentacles", + "pivot": [-3, 12, 3], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [-4.5, 7, 3], "size": [3, 5, 0], "uv": [26, 25], "mirror": true}, + {"origin": [-4.5, 6, 2.29289], "size": [3, 6, 0], "uv": [20, 15], "mirror": true} + ] + }, + { + "name": "tentacle_f2", + "parent": "tentacle_f1", + "pivot": [-3, 7, 3], + "cubes": [ + {"origin": [-4.5, 2, 3], "size": [3, 5, 0], "uv": [20, 30], "mirror": true}, + {"origin": [-4.5, 0, 2.29289], "size": [3, 6, 0], "uv": [0, 0], "mirror": true} + ] + }, + { + "name": "tentacle_g1", + "parent": "top_tentacles", + "pivot": [-4, 12, 0], + "rotation": [0, 90, 0], + "cubes": [ + {"origin": [-5.5, 7, 0], "size": [3, 5, 0], "uv": [26, 25], "mirror": true}, + {"origin": [-5.5, 6, 0.5], "size": [3, 6, 0], "uv": [20, 15], "mirror": true} + ] + }, + { + "name": "tentacle_g2", + "parent": "tentacle_g1", + "pivot": [-4, 7, 0], + "cubes": [ + {"origin": [-5.5, 2, 0], "size": [3, 5, 0], "uv": [27, 0]}, + {"origin": [-5.5, 0, 0.5], "size": [3, 6, 0], "uv": [0, 0], "mirror": true} + ] + }, + { + "name": "tentacle_h1", + "parent": "top_tentacles", + "pivot": [-3, 12, -3], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [-4.5, 7, -3], "size": [3, 5, 0], "uv": [26, 25], "mirror": true}, + {"origin": [-4.5, 6, -2.29289], "size": [3, 6, 0], "uv": [20, 15], "mirror": true} + ] + }, + { + "name": "tentacle_h2", + "parent": "tentacle_h1", + "pivot": [-3, 7, -3], "cubes": [ - {"origin": [-3.5, 2, -3.5], "size": [7, 11, 7], "uv": [25, 26]} + {"origin": [-4.5, 2, -3], "size": [3, 5, 0], "uv": [20, 25]}, + {"origin": [-4.5, 0, -2.29289], "size": [3, 6, 0], "uv": [0, 0], "mirror": true} ] } ] diff --git a/src/main/resources/assets/hybrid-aquatic/geo/fried_egg_jellyfish.geo.json b/src/main/resources/assets/hybrid-aquatic/geo/fried_egg_jellyfish.geo.json index b4e451ab3..8d1862a0c 100644 --- a/src/main/resources/assets/hybrid-aquatic/geo/fried_egg_jellyfish.geo.json +++ b/src/main/resources/assets/hybrid-aquatic/geo/fried_egg_jellyfish.geo.json @@ -21,8 +21,8 @@ "pivot": [0, 6, 0], "cubes": [ {"origin": [-6, 7.5, -6], "size": [12, 1, 12], "uv": [0, 0]}, - {"origin": [-3.5, 5.5, -3.5], "size": [7, 4, 7], "uv": [33, 23]}, - {"origin": [-3, 5.5, -3], "size": [6, 3, 6], "uv": [30, 34]} + {"origin": [-3.5, 5.5, -3.5], "size": [7, 4, 7], "uv": [25, 30]}, + {"origin": [-3, 5.5, -3], "size": [6, 3, 6], "uv": [30, 13]} ] }, { @@ -31,23 +31,152 @@ "pivot": [0, 6, 0], "cubes": [ {"origin": [-5, 2, -5], "size": [10, 4, 10], "uv": [0, 13]}, - {"origin": [-4, 0, -4], "size": [8, 2, 8], "uv": [30, 13]} + {"origin": [-4, 0, -4], "size": [8, 2, 8], "uv": [0, 27]} ] }, { - "name": "outer_tentacles", - "parent": "fried_egg_jelly", - "pivot": [0, 2, 0], + "name": "top_tentacles", + "parent": "core_tentacles", + "pivot": [0, 0, 0] + }, + { + "name": "tentacle_a1", + "parent": "top_tentacles", + "pivot": [0, 2, -4.5], "cubes": [ - {"origin": [-4.5, -2, -4.5], "size": [9, 4, 9], "uv": [0, 27]} + {"origin": [-1.5, -2, -4.5], "size": [3, 4, 0], "uv": [0, 0]} ] }, { - "name": "inner_tentacles", - "parent": "fried_egg_jelly", - "pivot": [0, 0, 0], + "name": "tentacle_a2", + "parent": "top_tentacles", + "pivot": [0, 0, -3.5], + "cubes": [ + {"origin": [-1.5, -3, -3.5], "size": [3, 3, 0], "uv": [0, 4]} + ] + }, + { + "name": "tentacle_b1", + "parent": "top_tentacles", + "pivot": [3.5, 2, -3.5], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [2, -2, -3.5], "size": [3, 4, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_b2", + "parent": "top_tentacles", + "pivot": [3, 0, -3], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [1.5, -3, -3], "size": [3, 3, 0], "uv": [0, 4]} + ] + }, + { + "name": "tentacle_c1", + "parent": "top_tentacles", + "pivot": [4.5, 2, 0], + "rotation": [0, -90, 0], + "cubes": [ + {"origin": [3, -2, 0], "size": [3, 4, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_c2", + "parent": "top_tentacles", + "pivot": [3.5, 0, 0], + "rotation": [0, -90, 0], + "cubes": [ + {"origin": [2, -3, 0], "size": [3, 3, 0], "uv": [0, 4]} + ] + }, + { + "name": "tentacle_d1", + "parent": "top_tentacles", + "pivot": [3.5, 2, 3.5], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [2, -2, 3.5], "size": [3, 4, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_d2", + "parent": "top_tentacles", + "pivot": [3, 0, 3], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [1.5, -3, 3], "size": [3, 3, 0], "uv": [0, 4]} + ] + }, + { + "name": "tentacle_e1", + "parent": "top_tentacles", + "pivot": [0, 2, 4.5], + "cubes": [ + {"origin": [-1.5, -2, 4.5], "size": [3, 4, 0], "uv": [0, 0]} + ] + }, + { + "name": "tentacle_e2", + "parent": "top_tentacles", + "pivot": [0, 0, 3.5], + "cubes": [ + {"origin": [-1.5, -3, 3.5], "size": [3, 3, 0], "uv": [0, 4]} + ] + }, + { + "name": "tentacle_f1", + "parent": "top_tentacles", + "pivot": [-3.5, 2, 3.5], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [-5, -2, 3.5], "size": [3, 4, 0], "uv": [0, 0], "mirror": true} + ] + }, + { + "name": "tentacle_f2", + "parent": "top_tentacles", + "pivot": [-3, 0, 3], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [-4.5, -3, 3], "size": [3, 3, 0], "uv": [0, 4], "mirror": true} + ] + }, + { + "name": "tentacle_g1", + "parent": "top_tentacles", + "pivot": [-4.5, 2, 0], + "rotation": [0, 90, 0], + "cubes": [ + {"origin": [-6, -2, 0], "size": [3, 4, 0], "uv": [0, 0], "mirror": true} + ] + }, + { + "name": "tentacle_g2", + "parent": "top_tentacles", + "pivot": [-3.5, 0, 0], + "rotation": [0, 90, 0], + "cubes": [ + {"origin": [-5, -3, 0], "size": [3, 3, 0], "uv": [0, 4], "mirror": true} + ] + }, + { + "name": "tentacle_h1", + "parent": "top_tentacles", + "pivot": [-3.5, 2, -3.5], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [-5, -2, -3.5], "size": [3, 4, 0], "uv": [0, 0], "mirror": true} + ] + }, + { + "name": "tentacle_h2", + "parent": "top_tentacles", + "pivot": [-3, 0, -3], + "rotation": [0, 45, 0], "cubes": [ - {"origin": [-2.5, -3, -2.5], "size": [5, 3, 5], "uv": [36, 0]} + {"origin": [-4.5, -3, -3], "size": [3, 3, 0], "uv": [0, 4], "mirror": true} ] } ] diff --git a/src/main/resources/assets/hybrid-aquatic/geo/glowing_sucker_octopus.geo.json b/src/main/resources/assets/hybrid-aquatic/geo/glowing_sucker_octopus.geo.json index a1982f208..a057aa3a8 100644 --- a/src/main/resources/assets/hybrid-aquatic/geo/glowing_sucker_octopus.geo.json +++ b/src/main/resources/assets/hybrid-aquatic/geo/glowing_sucker_octopus.geo.json @@ -23,39 +23,71 @@ ] }, { - "name": "left_tentacle_1", + "name": "left_tentacle_1_1", "parent": "head", - "pivot": [0.5, 1, -1.12935], + "pivot": [0.5, 1, -0.87935], "rotation": [0, 45, 0], "cubes": [ - {"origin": [0.5, 0, -2.12935], "size": [7, 1, 2], "uv": [14, 14]} + {"origin": [0.5, 0, -1.87935], "size": [4, 1, 2], "inflate": -0.014, "uv": [14, 14]} ] }, { - "name": "left_tentacle_2", + "name": "left_tentacle_1_2", + "parent": "left_tentacle_1_1", + "pivot": [4.5, 1, -0.87935], + "cubes": [ + {"origin": [4.5, 0, -1.87935], "size": [4, 1, 2], "inflate": 0.01, "uv": [12, 9]} + ] + }, + { + "name": "left_tentacle_2_1", "parent": "head", - "pivot": [1, 1, -0.62935], + "pivot": [0.5, 1, -0.52935], "rotation": [0, 10, 0], "cubes": [ - {"origin": [1, 0, -1.62935], "size": [7, 1, 2], "inflate": -0.01, "uv": [14, 14]} + {"origin": [0.5, 0, -1.52935], "size": [4, 1, 2], "uv": [14, 14]} + ] + }, + { + "name": "left_tentacle_2_2", + "parent": "left_tentacle_2_1", + "pivot": [4.5, 1, -0.52935], + "cubes": [ + {"origin": [4.5, 0, -1.52935], "size": [4, 1, 2], "inflate": 0.01, "uv": [12, 9]} ] }, { - "name": "left_tentacle_3", + "name": "left_tentacle_3_1", "parent": "head", - "pivot": [1, 1, 0.37065], + "pivot": [0.5, 1, 0.52935], "rotation": [0, -20, 0], "cubes": [ - {"origin": [1, 0, -0.62935], "size": [7, 1, 2], "uv": [14, 14]} + {"origin": [0.5, 0, -0.47065], "size": [4, 1, 2], "inflate": -0.01, "uv": [14, 14]} ] }, { - "name": "left_tentacle_4", + "name": "left_tentacle_3_2", + "parent": "left_tentacle_3_1", + "pivot": [4.5, 1, 0.52935], + "cubes": [ + {"origin": [4.5, 0, -0.47065], "size": [4, 1, 2], "inflate": 0.01, "uv": [12, 9]} + ] + }, + { + "name": "left_tentacle_4_1", "parent": "head", - "pivot": [0.75, 1, 0.37065], - "rotation": [0, -67.5, 0], + "pivot": [0.5, 1, 0.87935], + "rotation": [0, -60, 0], + "cubes": [ + {"origin": [0.5, 0, -0.12065], "size": [4, 1, 2], "uv": [14, 14]} + ] + }, + { + "name": "left_tentacle_4_2", + "parent": "left_tentacle_4_1", + "pivot": [4.5, 1, 0.87935], "cubes": [ - {"origin": [0.75, 0, -0.62935], "size": [7, 1, 2], "inflate": -0.01, "uv": [14, 14]} + {"origin": [4.5, 0, -0.12065], "size": [4, 1, 2], "inflate": 0.01, "uv": [12, 9]} ] }, { @@ -68,39 +100,71 @@ ] }, { - "name": "right_tentacle_1", + "name": "right_tentacle_1_1", "parent": "head", - "pivot": [-0.5, 1, -1.12935], + "pivot": [-0.5, 1, -0.87935], "rotation": [0, -45, 0], "cubes": [ - {"origin": [-7.5, 0, -2.12935], "size": [7, 1, 2], "uv": [12, 9]} + {"origin": [-4.5, 0, -1.87935], "size": [4, 1, 2], "inflate": -0.014, "uv": [14, 14], "mirror": true} ] }, { - "name": "right_tentacle_2", + "name": "right_tentacle_1_2", + "parent": "right_tentacle_1_1", + "pivot": [-4.5, 1, -0.87935], + "cubes": [ + {"origin": [-8.5, 0, -1.87935], "size": [4, 1, 2], "inflate": 0.01, "uv": [12, 9], "mirror": true} + ] + }, + { + "name": "right_tentacle_2_1", "parent": "head", - "pivot": [-1, 1, -0.62935], + "pivot": [-0.5, 1, -0.52935], "rotation": [0, -10, 0], "cubes": [ - {"origin": [-8, 0, -1.62935], "size": [7, 1, 2], "inflate": -0.01, "uv": [12, 9]} + {"origin": [-4.5, 0, -1.52935], "size": [4, 1, 2], "uv": [14, 14], "mirror": true} + ] + }, + { + "name": "right_tentacle_2_2", + "parent": "right_tentacle_2_1", + "pivot": [-4.5, 1, -0.52935], + "cubes": [ + {"origin": [-8.5, 0, -1.52935], "size": [4, 1, 2], "inflate": 0.01, "uv": [12, 9], "mirror": true} ] }, { - "name": "right_tentacle_3", + "name": "right_tentacle_3_1", "parent": "head", - "pivot": [-1, 1, 0.37065], + "pivot": [-0.5, 1, 0.52935], "rotation": [0, 20, 0], "cubes": [ - {"origin": [-8, 0, -0.62935], "size": [7, 1, 2], "uv": [12, 9]} + {"origin": [-4.5, 0, -0.47065], "size": [4, 1, 2], "inflate": -0.01, "uv": [14, 14], "mirror": true} ] }, { - "name": "right_tentacle_4", + "name": "right_tentacle_3_2", + "parent": "right_tentacle_3_1", + "pivot": [-4.5, 1, 0.52935], + "cubes": [ + {"origin": [-8.5, 0, -0.47065], "size": [4, 1, 2], "inflate": 0.01, "uv": [12, 9], "mirror": true} + ] + }, + { + "name": "right_tentacle_4_1", "parent": "head", - "pivot": [-0.75, 1, 0.37065], - "rotation": [0, 67.5, 0], + "pivot": [-0.5, 1, 0.87935], + "rotation": [0, 60, 0], + "cubes": [ + {"origin": [-4.5, 0, -0.12065], "size": [4, 1, 2], "uv": [14, 14], "mirror": true} + ] + }, + { + "name": "right_tentacle_4_2", + "parent": "right_tentacle_4_1", + "pivot": [-4.5, 1, 0.87935], "cubes": [ - {"origin": [-7.75, 0, -0.62935], "size": [7, 1, 2], "inflate": -0.01, "uv": [12, 9]} + {"origin": [-8.5, 0, -0.12065], "size": [4, 1, 2], "inflate": 0.01, "uv": [12, 9], "mirror": true} ] } ] diff --git a/src/main/resources/assets/hybrid-aquatic/geo/seahorse.geo.json b/src/main/resources/assets/hybrid-aquatic/geo/seahorse.geo.json index ecbb89a4e..19fe72cd8 100644 --- a/src/main/resources/assets/hybrid-aquatic/geo/seahorse.geo.json +++ b/src/main/resources/assets/hybrid-aquatic/geo/seahorse.geo.json @@ -1,46 +1,67 @@ { - "format_version": "1.12.0", - "minecraft:geometry": [ - { - "description": { - "identifier": "geometry.unknown", - "texture_width": 32, - "texture_height": 32, - "visible_bounds_width": 2, - "visible_bounds_height": 2.5, - "visible_bounds_offset": [0, 0.75, 0] - }, - "bones": [ - { - "name": "body", - "pivot": [0, 4.5, 1.5], - "cubes": [ - {"origin": [-1, 3, -1], "size": [2, 3, 3], "uv": [5, 7]}, - {"origin": [0, 3, 2], "size": [0, 3, 1], "uv": [0, 9]} - ] - }, - { - "name": "head", - "parent": "body", - "pivot": [0.5, 6, 2], - "cubes": [ - {"origin": [0, 6, -0.99], "size": [0, 4, 4], "uv": [0, 2]}, - {"origin": [-1.5, 6, -1], "size": [3, 3, 3], "uv": [0, 0]}, - {"origin": [1.5, 6, 1], "size": [0, 3, 2], "pivot": [1.5, 7.5, 1], "rotation": [0, 22.5, 0], "uv": [12, 0]}, - {"origin": [-1.5, 6, 1], "size": [0, 3, 2], "pivot": [-1.5, 7.5, 1], "rotation": [0, -22.5, 0], "uv": [8, 11]}, - {"origin": [-0.5, 6, -3], "size": [1, 1, 2], "uv": [12, 5]} - ] - }, - { - "name": "tail", - "parent": "body", - "pivot": [-0.5, 3.25, 1.75], - "rotation": [22.5, 0, 0], - "cubes": [ - {"origin": [-0.5, 0.6147, -1.07664], "size": [1, 3, 3], "uv": [0, 10]} - ] - } - ] - } - ] -} + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.unknown", + "texture_width": 32, + "texture_height": 32, + "visible_bounds_width": 2, + "visible_bounds_height": 2.5, + "visible_bounds_offset": [0, 0.75, 0] + }, + "bones": [ + { + "name": "body", + "pivot": [0, 4.5, 1.5], + "cubes": [ + {"origin": [-1, 3, -1], "size": [2, 3, 3], "uv": [5, 7]} + ] + }, + { + "name": "back_fin", + "parent": "body", + "pivot": [0, 4.5, 2], + "cubes": [ + {"origin": [0, 3, 2], "size": [0, 3, 1], "uv": [0, 9]} + ] + }, + { + "name": "head", + "parent": "body", + "pivot": [0, 6, 1], + "cubes": [ + {"origin": [0, 6, -0.99], "size": [0, 4, 4], "uv": [0, 2]}, + {"origin": [-1.5, 6, -1], "size": [3, 3, 3], "uv": [0, 0]}, + {"origin": [-0.5, 6, -3], "size": [1, 1, 2], "uv": [12, 5]} + ] + }, + { + "name": "left_ear", + "parent": "head", + "pivot": [1.5, 7.5, 1], + "cubes": [ + {"origin": [1.5, 6, 1], "size": [0, 3, 2], "pivot": [1.5, 7.5, 1], "rotation": [0, 22.5, 0], "uv": [12, 0]} + ] + }, + { + "name": "right_ear", + "parent": "head", + "pivot": [-1.5, 7.5, 1], + "cubes": [ + {"origin": [-1.5, 6, 1], "size": [0, 3, 2], "pivot": [-1.5, 7.5, 1], "rotation": [0, -22.5, 0], "uv": [8, 11]} + ] + }, + { + "name": "tail", + "parent": "body", + "pivot": [-0.5, 3.25, 1.75], + "rotation": [22.5, 0, 0], + "cubes": [ + {"origin": [-0.5, 0.6147, -1.07664], "size": [1, 3, 3], "uv": [0, 10]} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/atolla_jellyfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/atolla_jellyfish.png index 9de829d99b0fc79589c798a2865e856a20e8bd99..a9772d520ae691234bd423dfda45bfddd596caa1 100644 GIT binary patch delta 1318 zcmV+>1=;$A3+4)tB!4YQL_t(|obBAdPa9_($MKIXt4I!sDyXce1~XZBC?XLDc}iWo*R4&vwy7!o3+~I-IbM$OS-;s zq;hdoyN747(;v56+qUz56^Fkojk42U-)!08-wv`_t6jQW zWV2TDDnG8M@_)OBXWHLusx*~XX)3S%y`~od%+oKaZ5!>fCKIRP4fABXlrI-YT~3i} zc_fql{oMyil0S_y=m=n50sDJRFA|iCqpFOJdnt66RmDIM+q(SrjlG^rl8l797T?!5H_L_jl3zK?MZ+O=x zDui>M3$Q0w>_(fvA!o|k4LUmwT?3Gi{q&pHhkt)R+T}VIX=SgrDNW^7IXv?gWSD#< zWMZb1ZYs;ZUTG>XZ67n-8-w!=V4mvIR91O?WCJFfW7#`v;kNU(pjPfA;ZYNdF(}^3@JxT)D4u>@yW6qi!SD?1#g9q z-9^VNda>X-iO0d(64G^y#%1&s>!@>rTV zhd(nKw{vo?#hG!fZ69lKW?YiI{Mz=h7k~O)yMc__^_TN2z<#o$M)pkEuxVhXfQLiQ zb!^|2|GgWuFw;(5zYo9r>rPe*UXT&CSYsH=Be|S;y8LO-zNljZE6)nwuEY+XQB$#g zal$u0$`}qk9|?@pPM{w?JefA5A@`DP!I%bEY&(dkDUF8id; zWBf0Q@vgfj{g#`!rHg~pzzXN-?@rGC=SopCb%WY>r*KUuuP$mOA&-r!WD9nyJCZtdP0yp35mC`A+Ra*nSFM4 zcARH+cbuJhzd)XG<{4+4=b7(3&v!>hl#uPa5BIAMyKBM)_qd`P~XhI|5cxVt)Vw^(|TVImb;Pq#3Re$!jZ5@JTA_CZVxM_I*GEpE{rXm2` zWg-IDqy4eZ-hT~Tw(FoJGqV7D5NMm3x+Uqd127Bdl!*u+weIklsatJd_BM3NLz$=Q#bmIDdJN*en3)RJdI#N|H?3ja@Iz z`@l`%kMo8k$&~(!X-d0Zn)iX5jtJntm_Zjm&HKPj#~7g7T^1(I`ygE5_D7fLQd4$g z*Guz0aMKw9d>1pyMNRWQ2p208_+=tq z-L{$iYk%hreZ4fTM>{8~mWrxOj_dx@C#lYUCM~gxv2|~yd3bsex&C#H71jZa+Id6E za})ac#T!+x#tUJcDvx3%f}XFfU3>BU^<5fYl3eTCYUd5ru4V``vtu3W(2~gru((jx z@loAtd`aH-cQ!VN0G3!E2b*WROa0xwGpA$p5`O_6?VMaLym;e{0nGPk7wZw=dKcZ< z*choyjyoO0wZ5%dDtgcS2Sj{#<8$8>yD@0cQ*M(y{u zJdO{BA_ADvd(bF;5Zm%3)nfp2r%J6*et3GJdOw&hVznLwBNuCoA%q)if1Jq93c zJAZgRjR9OrGuV<8sqAGIfanTw8Z*v;78lC8|Mba-OPSQU<=M#Ay_Ke!ZbdC6MXsCl zK0G$ujG9pETBdy;MB{w7tWGaAtEHl9=MCAVq>go_4EnrZlJh$NwkRJ58&S?RuQLwk zL7<&aw+C(hft;yp59sVNXx$)EwNVm1d4Em@Ie!{xE>^Wv)XeOds;3uTLd7gsuinOS zHHZ*yci5n1Z{11X4?Pr|JAk>XXJ*G_k~?;iXLs*Riwk8{eEIe$DwE^Vf$JHCvpa0q z_PmM}0cz(BRYMwecke8f5g>GXP9s39F~IWNgccXdUF$3^l(jrJ;YEw6__#KCiGTfr zh?~MAARLbX9szEK?Ga$V4QzKxdtIKRKu-~1aiQ#u`lZ$kAZ-!gx^tqc8-#?JU8KW9(&n;JjwT#(TT5gS(gz7Dfoqq zZZB)3t-i@hnmT4VX!OtD1#}wq=fuPE<)OLs8>;Vr!PC6->A&-{8p3-u^aGmp`3KFQ zcmBII_~VnEq5qxxY3MV7_8*W)?SBa*1!Mv<_#E%W(071tGZFtlQQ|QWWFKfcfC=@c zp|8s?__L5^dA$_;bMpE|(9m>%uxVsJmy-|$H5Ul+Kk*}4Oj~~^{{R3007*qoM6N<$ Ef_?X_CjbBd diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/atolla_jellyfish_glowmask.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/atolla_jellyfish_glowmask.png index 42ed3b151ce89f99700ce5bd0e45d2e91c6b4569..370a452ba5ee7cdc6b53dfe90f5dd461ecff3265 100644 GIT binary patch delta 334 zcmV-U0kQsu1C9fbB!5*&L_t(|obA}pN&-<72jEjk3qxrUA~g5}LGIf29=$@3(<}HM zZQT|01TjHGi%@hCE?UUwj0pY-ozcE;b>}+Df#31o%Z&g4000000000000000005xU zPRcG|mB*Lw-t*_j?0J$7A|j%eG-q?&Ry!VUF7EeU+!3giU4OtTS@>D-nS3MU8-&eN zz5ycUVZWur!h9!b#3UUQRs%M3T6O{J%EBM_M=|b?3Uh3)@(qw*`m^8{$BWwo>#KYN zuv?XHfc*Ymzdc_%b_UqqK^y`jrU$;abXW+!lQc@K=r|li1JsgcOwz&9!2SFGrt(`r zx7Ch_Y0&ww^DNKVJ8Z7B6=2;PzFqvDo5i`(u7aQ5$GvR)`t?)z?E3O->38<|-rZIG gUo?|J0V)PQx%10ALpwI#dj(T~I1ECKje1f^%>SMsCq_ za0n(ArfyXu77#<#p$k7llr)Bb5GqY;zHfs$xH{Xv+;C`H@1X4f)}cy%nfOwz5TXL1l0*T75UOP7`F}F%&a!SXR$C2N*=sw1 zbt;oTpH9MjI*IydmPP^8mi{vFAKRa{2SNy`6ac@LMgi3J_rsIZ#J{LpH++Bbz5jBv z*l9a}@7z4RjT6iE-ScZSc7D{ncx`gt#c^ln3zJa+CzD_S6Bl;HJ4R_+In4^2eE4}06vzL&*}@{#o+5-z8n3(*ULYaGHrfP_ z`v57fi*UiO5P}51Lde0ES6E#YA~xD=l>ShMAp=C(|`2u zN#m@kGEnL~~YKN@Xx zsssFbavvIBA10&@RF~gADm^TDKZ`9a@iCT_n7reva}=UubA2+hpF{xIT!+#e#Ta|Z z6kz@J9^M%Qq6J_tnes9f2<|xGQ+&Kk`L{Nv~ z9Cc{2iH(CZCznYn6I8kM2`$Xs zX+jaTqgierhaUItVC3tk#m2#z0|4UI7F8QvU4I<~o>16A4l@ieie8UgYbXY-0Kn@w z6%<*k-A_9{E&aIk7}3hRC8zxR+~3mZy^gBcX8H)2KG+b8>T$mUv3o$+>2T?x!90aI&i|H6IoPkC1DTvpFMzK7=~dOhG7_nVHk#C7=~dO hh8$rShGCd@&p%^KL~mDUe$fB`002ovPDHLkV1jTRcwYbj delta 796 zcmV+%1LOR;2C@c_BYy(+~Qlmmb5*&$i&EJ?LgMh1b<}hK-MT_Eqo5P+0wA5 zfpRx}0N{0oT{Bx6_N-8XoC%tgr0rRuu#2D-;z`mzsI?c>k`A06xk7)8+tFlYuap3~UM+tYj4(|Z8xY>)-j zfU}pmMwoG%O@FGrKi=e3p&7EGC!YOAJHxZh2{r@iC~itwpPA0l=cwwFb4e zwAbl*93FU_^RxhPcz{&L1W+yM$XzuX0Fb+CHe@~*D3yW^82{WqcV?c}08l9`|1703 z*8xtl;KTZHaBqRb15^q+jN^jq<8i@tm|u}J$A9=>=^xgQ!}5iQ4%RZfI#M3v<#sf| zqSdu>SIx$v)wPm*MV2aG-nJ}%KaRGK51DSxrd9-B-A%0+OM8;AEsfvW;%HG3dlpED zL9K1EEv;J8SAp!So!nfedWeb*)c~piR0F66`1@1?s0L6Ccs@0NAP9mW2!bF8f*^=Y a_!SS{mWzjW>fG=E0000vwh6k3B5L37E$m(V~;!I1RigD(!q$-#d>duT5`T2Kr=$hjI+Y8^&YP|LQ~ zKjKuidRV>DthAE4j%2ONelBk`zqD`W&3kWF3P9rV^n*In6n}8DhNav}01iBQn$H5j ze(@C7QzJrls(bRSk#U;GD=6{@rYT6o+o~P8o*F?k8Nq(>6wzb^0Bq%}LQwv|%^J!T zOLk(vcxsch({j1BkC#zovzKYDr}96kk+o)!lQZY2=Db#Fd&`|jFOZY2=9 zeRr)>JtZ4&MQQSUP-1e&9~^|2J&zo;)~t zc)5=1_Z^M^SpoTmt8@euS<#2{A7om~Bmpa?KYE(a(tj9oc%-cC7-=EAj$^XZjr-sH zmL*Fdher!S<=xFaVJ)lAraYYp1$%d~L;j#O=F8>QK3=AG%GUu|@zzKnr@~%Gahuz_ z<)ZUn)?FhgdwJO*Iz<7w-Yfmzlpsw+&dMpbUwt-}Y5ig^^?wswMS+Ez3-t*W12=2Z z&C!A`QGZNRu*DBhFu7|(ZDvFZnns|Apix0M@;JAaj#u7c^Ru$Dv|qK?MTtuJRvW(}pr zI4aMrFAqG2c*{-aFF%_4p6OvApa?S#oyW2L*B^KrVK80Ahwnz9hk`ggy9NNzL)XAG z1?mV8JP!(KzCMR}_8Re!4&#RLo_Y2+wD2|YU8Tcg7&na1xBuM!xxXsgapePk`f9PB zFMrnB&M-k|-AF0O7u)?rE95siy?(n4Tqip06@LqqxT0_3sA10;l)(|3V5AhW^FnD|MZx4E1ah;6L|m~+ z!pWChCaxBMcAr;|BujwUc~YKYy&URT#mWuHI;g#1_DPcq;%Wi5_(3Ddu@on#XQV8% zC*`;J0RRXmIi@kmdaSVplMh{a08redw{95I7+U8wU|9jH#Ds6y;s+RW@eD6szJKUz z$W#g@2gET{0Vr*bidUtx>V>}jTmYw?0wDcF);QCR?;dvFT%Q*pF#Y~#b^6fj)+RHo zzPaCj?duWfI@#mt2X*;DWJ%CZX7bNyGoPqKyWYB`>upekD++53DJL)@rIlj)Ft4|6 z>AC<+SH<0)c71}yY_Yy=jHV3rdVlMdu18?u=0Y8i5}me8(3w*8cntuO(RZ44hsOYb z=P#doY7x37Lh?@2IcHj|?abT8XbP5c-cqs~J$(QrK(zB){J{3sr)^A^KUa8>o<0C* zcXX{$K$cex<-dfwPT2ok(Hz%p&SAd&aU$5dgR&e%o7YehaqFdplLQ9S=0qhF>$Oxn zo$3eGHY^l!Z1iv>Wp6%+HXk1!A0HndA0HndA0HndA0HndA0MB~=U*1Os*A9O-zWe8 N002ovPDHLkV1hXnjhX-e delta 1241 zcmV;~1Sb343hW7xBYy<5Nkl(qErafj3M z-g_sV&aZTL((rzk=e>L1JH5~QKELkO5+wFEwr`nbfI9>1AAcV#VGO&!v}^#lYTw{q zX+_Aedq4kFt&e-pH0*6`-|}7`Y|TVa5;T93077*EfMxlDSq2I@S4MHKw1P}=6#$Sa zuKL=feBAI}U(8dMbRU3Fnq(Bd1>nvA7oEuuU$t+1QdU;B1X;!fTQjlFvZ4(D>nsbl zW`=HB)Mgs8*?-Ff?^FA~(#r3&<7X$ADA)2hJGle^(Jt5WGbtJd@AbiZ5DIf=Anm?6 z{+S3%Fx(fIz86huf6=}XK2D0tR#2|xaee+d_T2~I+iCK1W@Sfw-uFzD1-$$CE;K-l zWB0osZ1VTBlS`lSq+{blua1N)V4Y>%;D2Xj(d6A>?{pThJh6AdAioa= zx?mQNWfXTCC2=*z1!$)!Hq7DzcS&_&_}$riZqhrIEr1lKAP9Ji0=RCGDXyYi%TJXK zgF7h8B>JYZ0Fo5&WJ{n-Kn0O1g&e>fbF2j7?^9j?+EqE{Q&6OKaEuBU9ku(j_9-s_ zA@8mn?SIMtr>zDlu+hXx%F#T|z9rS#o>-LevwmwVllcM&t?lLhMH@dW%k-kdH;?MT z_}c#P&7*qohZkx5EGSih&mTU&U1whDNf8!+_=sYbfhOK`HID`$?nIa#SAEA0aK|(gMg|Uu4FuwmCFsHnPL=b3sYzsbVo4$DzrTC@nxC=bF3h z!wvok0K_5yCaNU^%rQse1hoq}ppY}bI@vp)+$4o^Ayh3Hs3MD2+Z4(JuD@4H-s{8% ziGPF8fa#5!AIb|5v;d;PKY{mLH>j4pfF~tT@ zs~GR~(d1pU+Jli2^rGV~WRrKndwslm`Iik~tW2VB>ILAAH)&dgYRT~B`6lmzI|HAE z1P?G|zdv>O$k7_faxI@opNw)A5C;vzHh&-;Qc4GwbYC20cih^5tb_Vb9pK0Bzpeuq zDR=39Qhk7~1YxKsr9#DG2)?(9;hBCXE7D|>cTrK8gX$q}6vnB;0kIh-0CxiP!*miW zc5D&G#<>9Fb_$@P#r1P$8DfI-9vgSnxU})r<6F9j@>Q96jh$z_n3)f+ckQFC9e*1D z4!?2b(bkUr;q|UP`N`x+bv2K+c5Et!&Yb~@!*p550pGs=Ew;bWRY={O_BOXic6+~Z zFc;;4lo#N|!xuIH6f<9nd*|2x0s!8Ad^?v#NcF$LXHN=v`XGb-#zDPk8Q5%C=B!9+9L_t(|ob8#xPt$M|$G^XBBJ(h^C8o`g0|!DB59*?c2Tw-$ z6VQa|g&BJAz(Gg+1I&;E#~FH(?VvIK0kUv5AptMUgm54RAv7i|av2a~aPu65827tbk~1p+x$0Mu1P;}T{+We|-^fVv7fRX}Ee&_Fc9 z?RkgrR06XvHDF`{5R*9AFCg=D76Xl%0k!AWhS$jk2mr*3lD3{#Ob%LWzIIQp z-*Rq(e|{>>o_7jQB>({O=rsMKmi8>Ajq;{kD(5bg7G#qAUa!1bi(mkt?U473S)8iWAgbhoSsu?R?{H?36;m1?;HVD1A!AXL^?Oe;mbU)j!2)d!c&8CUiCCH$&g!@w87m2=ZL&uiI&YuO zgzr6oz1TV`cbnr3!ES$VN9Ov$F8gUr=wgwEOcP#@G=z3!jvsOY69De|yX3MR6Ib+)Co6hU) z3WOIMIm-K@M4}iKOG{>u-#;}aWh+>9VFfHX!h@`DfW}ry12%$t++zfak+D_Mtl0#d zvunE-?%elJz~4VwJAGV`DgfIRb8OCdGOghBxLFa+@^&O-fDkE0`E>zmwhZW-NTwC6 zea$18RsekyYJawj{JLN!q8**|F+r+;wYLT^w*<%;oF12vf4PR!<0C-MpjZN}0{XN< zXiLD>-L0}`0rhEMR7gtz0MvyQ^P*YytfcMowhZzTP_t$8Q^y(}V2#!%a#ePIEj;!C z{fOk=QFMki;i1I9iiD>|Uaj=VqUbWsM z%Ci7q$wr=hBz?;L5R+-enjN*EJ4S3*kW4FZ+a%LUN1N+D#~wTY2ouv*&@6C!LV_Y% zj>;J%(+XZay)Ye>GcD&Lw6O>8l>}q23S-YqfITtSPJrbEfJu1_kM7;Vq&x-ymXlH1 zM2%>7;(y(T$BvOX8KsSJuzSTxdmj*{W+6;D`#=x`$CF;KY%cD~kv73V ze;kDKpYIL7KzkvlCMLE7{5$_)g!z1F7vj_ zfz+tg0XUsu*Gw0MJ}x9LXS|XUwmvSb9^f@Y4#SZ3aS_{Ls9)d-h}(gI;qtJi8TB&_ z0F3&Xc6nGM@8Xu{7d5{z3|%*Ik$(>mQwa!((HsB>iP0QO1_ky@FjXFw&I|GqV8Q#{ zQ-5I2c{v$|jsiIW?iuf<0{R*95@^)wFzRO-EB|hGaqNEqRC!oBFGTl|)P97u%Px*~ z96jLTXy?jt*6(<`ub()aW8=Pl5{j-Hq+w;ob7q6c+_;@{J0F&gf;cpu$}z_qwK|5z zQ@J3rb}w_!R@gcU(&b@IV|#Nkl>qy`UvF3Dm4va|-o4gO9+u7v(Q9o7k+p+4=jCJ= zItn7|0f4!lhm{!wkqsoQobB7&AhJOsk{-~{MA`%T5rI{J`&)ip*`QSb0Nw*`bPwQg kI2;a#!{Kl^9L`PTKU`*%$}<<0#sB~S07*qoM6N<$f_k>&wEzGB diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/fried_egg_jellyfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fried_egg_jellyfish.png index 6a870e4c469c0604e8d2944f2911662ba9ec18e4..81a0823a275dbb3fa5163c04aaf2b9207586e5d2 100644 GIT binary patch delta 956 zcmV;t14I0e2+{|TB!8JnL_t(|ob8%BYuiv1$NzHNA%WCGu!10Sr?@2^y0;kH`3fzi zOF|kjAsE~Yo=qr*wj>=2>Q<7k;JT=I?ow#&rF+0cCW8~G39h*vk|RsD9@h^^c5{D= zj_y5roTGal7aPC7eOCd1j$SZbQ<<)*B=d~TG7@7}F5~bn~05D{lyZ5AS z`)sCb41hJP091M0pj@&f9qNUIri!%zyO94)%4!KmdmEW_eLbpwp~- zKhTs%{DeCPv@e=mI%K>Xt~z!lmZ$8F3AY1cD+-rRv6S@Gwne~>~-oT>(&w$ndZXM^V@#U<>mDf zl+<#0#VCO!cbfHycWZt#u>*j<6R5nIE5WQ}dnYDtg>!kuVz61x<-L1{unBzyutq_( z`;lcKzKN?}9{OQkrhg(j{Hmse>DE@zAMDhT0tp83QIV861b0;5gU8K3R?> z>txB2lHLb|-rYT&?mgYRJKX^WAyTP8q*8&(EO~CmWAuRmqkp6wKuC1&KwlOT{TB$a zCG*Xk9EKeL^qfGA2GFS&0RX{ZZEk6PVgFiz$3(# zlwDktOJF=Oh6891pxs`LPQ3_7I~ZpWB!mhtDj8?6JX)%IqE{a@s7XW0L zmQBr7M!vgUj*wC1w4PL2#K(6v0FdQYt%4g5*=%EWz<+9NfxLY$jMQ0sDPjHTCrpcx zk$Nl*)N=r>XIhM)RjUAiEVDS6!aN2v4r@$0dd34_($OQ876%Mg%Bi%-To1DYf;0M+ z24_TMb5UJA79BlkSEq(6Wf~GJFgt+8yq*q?`BAXw*u~h>pwrkM0{aIICY>uA0<43e zT_K?S+JCeMD0>AfmJfm~FK^WPdid;aR$mfG%DZB1Pn@6Z$uccFKiPv5dLCf6eJl+%eCoP@_OYZn zpKg4`8x{wQwIgIFXXS7~?TZJ*ur(oIqHVT8V_qw52G=`)?lT6&uzV@=&Ekp>Ak|Dk zYk#T(pn3>nrcAk;?TUkuPQ9o)vIlziNt97s;Q(J~9svw?>rTDc@BWsT^&R7y5U}%o z$`Ejc1C$V{)csLWo;3hymSU>B*EI*!c(TBE&;$$XCxv-W7rYUGU=1p^x;Ci7X3#vF5i72S6fX4eNC4u`|x na5x+ehr{7;I2;a#b0zr)R^u4>1=IwPB!3%8L_t(oh3%C+YZO5k$NzKgal;*V?pf@J79mv-JZ&Q>gkU@@ zZ7d}D6lZB`qo(u&2$pi7O*j=Hg)fzm3mAgMVG(h*kj;i1vjj61n;B+z_SW4*u-P9h z>^wX3yg#!98LZAN%bwfT>+RqG1Av;`aQ_c;Sxkp*7}@F=u;;50Q)LssXOC8Kq1&=&##EC)=PF9f(a z0sy3&^~Lx1rGK2#8BkFx#U@JTQL3FuJ9kb1faC8KdvTud#c>hc*Z^d%QZU^LFk^G`2Pb6YqL4pDPkAk9Xh zUa&4AMw?)?e)2T4&Hwqy&Dk>@}Dk}aPe*lfq{Mt^Ou2KL1002ov JPDHLkV1kDW4VeG{ delta 621 zcmV-z0+RjI1cn8WB!5jwL_t(oh3%EUYZGA@$G>k#xVH(3mnE;oAxH-uj2%P>I0(TI zaFMJb|3x!)QxGwZF3zE2))Gw%4i+b&5p<9e97_A%VADv?_bBvrxV&%g?oEOT0hjy0 z!9CBt_xyhD2&T|1R%FS}YWeHvHwNdYU{+4+xHraN^o;<3bbtC1P7mbXYckE=JQCBC zjHc$wt0Z~*)~3woZsN=Lo{qjiY3NXa(opsQz^t5~xjs~bbZQa+Na4vpS0Xt)J|x5A z!{x$vdds~R3}C8VAwpGfgaG%(#tbae^C+ZQtVl*v+My!^02l!Tb&e3=;t~K59oEjz z{e^t7k+P}DBWNb zmS>$?1fyS7R+fzVS#jYSM%Bkho#Vm7#SECCg z>>W<9ZO4{PN7kSz~)r#Y7D#qs(eJ-w!{A`mg4~J2^u7 z!9xN})@Bg!`^!Ym$WT3-MZSB0LZgmPtv7ho-oo9TK2nW3#;tcD=LtIl3)jP`NUF73 zl&w28neXlbFo#gd^}S#C(|W3t3a+gB1;oU}#KgqJ{CEBW(8D|eg+8L000000NkvXX Hu0mjf+=ws{ diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/glowing_sucker_octopus_glowmask.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/glowing_sucker_octopus_glowmask.png index c0d811c4c288bce4270be7136c3e4cc489b4ddcc..7e62a4a86c0702eea88c7a3197f69ce17a8ba5c0 100644 GIT binary patch delta 88 zcmV-e0H^<}0d|liQawpTK~z|U?b0z303Z+p!3+XXg%dQ5&+;( u8x0000