From cda99357d49a39e2e8a2290c30a4274a5e72158b Mon Sep 17 00:00:00 2001 From: MysticKoko <132279944+MysticKoko@users.noreply.github.com> Date: Sat, 13 Jul 2024 07:13:24 +0300 Subject: [PATCH] Started massive reorganization of resource folder --- .../FishingBobberEntityRendererMixin.java | 10 +++--- .../HybridAquaticCephalopodEntityModel.kt | 4 +-- .../HybridAquaticCritterEntityModel.kt | 4 +-- .../HybridAquaticCrustaceanEntityModel.kt | 4 +-- .../fish/HybridAquaticFishEntityModel.kt | 4 +-- .../fish/HybridAquaticRayEntityModel.kt | 4 +-- .../HybridAquaticJellyfishEntityModel.kt | 4 +-- .../shark/HybridAquaticSharkEntityModel.kt | 2 +- .../utils/HybridAquaticSpawnGroup.java | 20 +++++------ .../HybridAquaticCephalopodEntity.kt | 2 +- .../aquatic/entity/fish/CarpEntity.kt | 4 +-- .../aquatic/entity/fish/ClownfishEntity.kt | 4 +++ .../aquatic/entity/fish/MahiMahiEntity.kt | 4 +++ .../aquatic/entity/fish/MorayEelEntity.kt | 2 +- .../aquatic/entity/fish/OpahEntity.kt | 4 +-- .../aquatic/entity/fish/RockfishEntity.kt | 4 +++ .../aquatic/entity/fish/StonefishEntity.kt | 2 +- .../aquatic/entity/fish/SunfishEntity.kt | 2 +- .../aquatic/entity/fish/TriggerfishEntity.kt | 2 +- .../aquatic/entity/fish/TunaEntity.kt | 4 +++ .../entity/fish/deepsea/AnglerfishEntity.kt | 2 +- .../entity/fish/deepsea/BarreleyeEntity.kt | 2 +- .../entity/fish/deepsea/DragonfishEntity.kt | 2 +- .../entity/fish/deepsea/OarfishEntity.kt | 2 +- .../entity/fish/ray/HybridAquaticRayEntity.kt | 32 +----------------- .../entity/jellyfish/AtollaJellyfishEntity.kt | 4 +++ .../entity/jellyfish/BlueJellyfishEntity.kt | 4 +++ .../jellyfish/CauliflowerJellyfishEntity.kt | 4 +++ .../jellyfish/CompassJellyfishEntity.kt | 4 +++ .../jellyfish/FriedEggJellyfishEntity.kt | 4 +++ .../jellyfish/LionsManeJellyfishEntity.kt | 4 +++ .../entity/jellyfish/NomuraJellyfishEntity.kt | 4 +++ .../entity/jellyfish/SeaNettleEntity.kt | 4 +++ .../entity/{ => bobber}/barbed_bobber.png | Bin .../{ => bobber}/creepermagnet_bobber.png | Bin .../entity/{ => bobber}/glowing_bobber.png | Bin .../entity/{ => bobber}/magnetic_bobber.png | Bin .../entity/{ => bobber}/ominous_bobber.png | Bin .../cuttlefish}/cuttlefish.png | Bin .../firefly_squid}/firefly_squid.png | Bin .../firefly_squid}/firefly_squid_glowmask.png | Bin .../glowing_sucker_octopus.png | Bin .../glowing_sucker_octopus_glowmask.png | Bin .../umbrella_octopus}/umbrella_octopus.png | Bin .../umbrella_octopus_brown.png | Bin .../umbrella_octopus_orange.png | Bin .../umbrella_octopus_pink.png | Bin .../umbrella_octopus_purple.png | Bin .../umbrella_octopus_white.png | Bin .../vampire_squid}/nautilus.png | Bin .../vampire_squid}/vampire_squid.png | Bin .../vampire_squid}/vampire_squid_glowmask.png | Bin .../nudibranch}/nudibranch_baba.png | Bin .../nudibranch}/nudibranch_bullock.png | Bin .../nudibranch}/nudibranch_festiva.png | Bin .../nudibranch}/nudibranch_kubaryana.png | Bin .../nudibranch}/nudibranch_kuniei.png | Bin .../nudibranch}/nudibranch_magnificent.png | Bin .../nudibranch}/nudibranch_pyjama.png | Bin .../nudibranch}/nudibranch_sagami.png | Bin .../nudibranch}/nudibranch_yonowae.png | Bin .../sea_cucumber}/sea_cucumber.png | Bin .../sea_cucumber}/sea_cucumber_black.png | Bin .../sea_cucumber}/sea_cucumber_red.png | Bin .../sea_cucumber}/sea_cucumber_sea_pig.png | Bin .../sea_urchin}/sea_urchin_black.png | Bin .../sea_urchin}/sea_urchin_blue.png | Bin .../sea_urchin}/sea_urchin_long_black.png | Bin .../sea_urchin}/sea_urchin_long_blue.png | Bin .../sea_urchin}/sea_urchin_long_purple.png | Bin .../sea_urchin}/sea_urchin_long_red.png | Bin .../sea_urchin}/sea_urchin_purple.png | Bin .../sea_urchin}/sea_urchin_red.png | Bin .../{ => critter/starfish}/starfish.png | Bin .../{ => critter/starfish}/starfish_blue.png | Bin .../starfish}/starfish_brittlestar_black.png | Bin .../starfish}/starfish_brittlestar_white.png | Bin .../starfish}/starfish_brittlestar_yellow.png | Bin .../starfish}/starfish_crown_of_thorns.png | Bin .../{ => critter/starfish}/starfish_green.png | Bin .../starfish}/starfish_medium_blue.png | Bin .../starfish}/starfish_medium_green.png | Bin .../starfish_medium_knobbed_blue.png | Bin .../starfish_medium_knobbed_green.png | Bin .../starfish_medium_knobbed_orange.png | Bin .../starfish_medium_knobbed_purple.png | Bin .../starfish}/starfish_medium_knobbed_red.png | Bin .../starfish_medium_knobbed_yellow.png | Bin .../starfish}/starfish_medium_orange.png | Bin .../starfish}/starfish_medium_purple.png | Bin .../starfish}/starfish_medium_red.png | Bin .../starfish}/starfish_medium_yellow.png | Bin .../starfish}/starfish_purple.png | Bin .../{ => critter/starfish}/starfish_red.png | Bin .../starfish}/starfish_yellow.png | Bin .../coconut_crab}/coconut_crab.png | Bin .../{ => crustacean/crayfish}/crayfish.png | Bin .../dungeness_crab}/dungeness_crab.png | Bin .../fiddler_crab}/fiddler_crab_blue.png | Bin .../fiddler_crab}/fiddler_crab_palestine.png | Bin .../fiddler_crab}/fiddler_crab_purple.png | Bin .../fiddler_crab}/fiddler_crab_red.png | Bin .../flower_crab}/flower_crab.png | Bin .../ghost_crab}/ghost_crab_brown.png | Bin .../ghost_crab}/ghost_crab_palestine.png | Bin .../ghost_crab}/ghost_crab_red.png | Bin .../ghost_crab}/ghost_crab_white.png | Bin .../ghost_crab}/ghost_crab_yellow.png | Bin .../giant_isopod}/giant_isopod.png | Bin .../hermit_crab}/hermit_crab.png | Bin .../horseshoe_crab}/horseshoe_crab.png | Bin .../{ => crustacean/karkinos}/karkinos.png | Bin .../lightfoot_crab}/lightfoot_crab.png | Bin .../lobster}/lobster_black.png | Bin .../{ => crustacean/lobster}/lobster_blue.png | Bin .../lobster}/lobster_green.png | Bin .../lobster}/lobster_palestine.png | Bin .../{ => crustacean/lobster}/lobster_red.png | Bin .../lobster}/lobster_white.png | Bin .../lobster}/lobster_yellow.png | Bin .../{ => crustacean/shrimp}/shrimp_black.png | Bin .../shrimp}/shrimp_black_white.png | Bin .../{ => crustacean/shrimp}/shrimp_blue.png | Bin .../shrimp}/shrimp_blue_white.png | Bin .../{ => crustacean/shrimp}/shrimp_brown.png | Bin .../shrimp}/shrimp_brown_white.png | Bin .../{ => crustacean/shrimp}/shrimp_green.png | Bin .../shrimp}/shrimp_green_white.png | Bin .../{ => crustacean/shrimp}/shrimp_lime.png | Bin .../shrimp}/shrimp_lime_white.png | Bin .../{ => crustacean/shrimp}/shrimp_orange.png | Bin .../shrimp}/shrimp_orange_white.png | Bin .../shrimp}/shrimp_palestine.png | Bin .../{ => crustacean/shrimp}/shrimp_pink.png | Bin .../shrimp}/shrimp_pink_white.png | Bin .../{ => crustacean/shrimp}/shrimp_red.png | Bin .../shrimp}/shrimp_red_white.png | Bin .../{ => crustacean/shrimp}/shrimp_white.png | Bin .../{ => crustacean/shrimp}/shrimp_yellow.png | Bin .../shrimp}/shrimp_yellow_white.png | Bin .../spider_crab}/spider_crab.png | Bin .../vampire_crab}/vampire_crab.png | Bin .../{ => crustacean/yeti_crab}/yeti_crab.png | Bin .../{ => fish/anglerfish}/anglerfish.png | Bin .../anglerfish}/anglerfish_glowmask.png | Bin .../entity/{ => fish/barreleye}/barreleye.png | Bin .../barreleye}/barreleye_glowmask.png | Bin .../barreleye}/barreleye_translucent.png | Bin .../entity/{ => fish/betta}/betta.png | Bin .../entity/{ => fish/betta}/betta_black.png | Bin .../entity/{ => fish/betta}/betta_blue.png | Bin .../{ => fish/betta}/betta_blue_yellow.png | Bin .../entity/{ => fish/betta}/betta_green.png | Bin .../entity/{ => fish/betta}/betta_pink.png | Bin .../entity/{ => fish/betta}/betta_red.png | Bin .../entity/{ => fish/betta}/betta_white.png | Bin .../{ => fish/carp}/carp_koi_ai_goromo.png | Bin .../{ => fish/carp}/carp_koi_hajiro.png | Bin .../{ => fish/carp}/carp_koi_platinum.png | Bin .../{ => fish/carp}/carp_koi_tancho.png | Bin .../entity/{ => fish/clownfish}/clownfish.png | Bin .../clownfish}/clownfish_cinnamon.png | Bin .../clownfish}/clownfish_clarkii.png | Bin .../clownfish}/clownfish_ocellaris.png | Bin .../clownfish}/clownfish_orange_skunk.png | Bin .../clownfish}/clownfish_percula.png | Bin .../clownfish}/clownfish_pink_skunk.png | Bin .../{ => fish/clownfish}/clownfish_tomato.png | Bin .../clownfish}/clownfish_whiteband.png | Bin .../entity/{ => fish/cowfish}/cowfish.png | Bin .../entity/{ => fish/danio}/danio.png | Bin .../entity/{ => fish/discus}/discus.png | Bin .../entity/{ => fish/discus}/discus_blue.png | Bin .../entity/{ => fish/discus}/discus_green.png | Bin .../{ => fish/discus}/discus_purple.png | Bin .../{ => fish/dragonfish}/dragonfish.png | Bin .../dragonfish}/dragonfish_glowmask.png | Bin .../flashlightfish}/flashlightfish.png | Bin .../flashlightfish_glowmask.png | Bin .../entity/{ => fish/goldfish}/goldfish.png | Bin .../goldfish}/goldfish_shubunkin.png | Bin .../entity/{ => fish/gourami}/gourami.png | Bin .../{ => fish/gourami}/gourami_pink.png | Bin .../{ => fish/gourami}/gourami_purple.png | Bin .../{ => fish/gourami}/gourami_yellow.png | Bin .../entity/{ => fish/lionfish}/lionfish.png | Bin .../entity/{ => fish/mahimahi}/mahimahi.png | Bin .../entity/{ => fish/manta_ray}/manta_ray.png | Bin .../entity/{ => fish/moray_eel}/moray_eel.png | Bin .../{ => fish/needlefish}/needlefish.png | Bin .../{ => fish/neon_tetra}/neon_tetra.png | Bin .../entity/{ => fish/neon_tetra}/tetra.png | Bin .../entity/{ => fish/oarfish}/oarfish.png | Bin .../{ => fish/oarfish}/oarfish_glowmask.png | Bin .../textures/entity/{ => fish/opah}/opah.png | Bin .../entity/{ => fish/oscar}/oscar.png | Bin .../entity/{ => fish/piranha}/piranha.png | Bin .../entity/{ => fish/ratfish}/ratfish.png | Bin .../{ => fish/ratfish}/ratfish_gray.png | Bin .../entity/{ => fish/rockfish}/rockfish.png | Bin .../entity/{ => fish/sea_angel}/sea_angel.png | Bin .../sea_angel}/sea_angel_glowmask.png | Bin .../seahorse}/seahorse_big_belly.png | Bin .../{ => fish/seahorse}/seahorse_blue.png | Bin .../{ => fish/seahorse}/seahorse_common.png | Bin .../{ => fish/seahorse}/seahorse_green.png | Bin .../{ => fish/seahorse}/seahorse_orange.png | Bin .../{ => fish/seahorse}/seahorse_pink.png | Bin .../{ => fish/seahorse}/seahorse_purple.png | Bin .../{ => fish/seahorse}/seahorse_pygmy.png | Bin .../{ => fish/seahorse}/seahorse_thorny.png | Bin .../{ => fish/seahorse}/seahorse_yellow.png | Bin .../entity/{ => fish/stingray}/stingray.png | Bin .../stingray}/stingray_blue_spotted.png | Bin .../stingray}/stingray_spotted_eagle.png | Bin .../entity/{ => fish/stonefish}/stonefish.png | Bin .../entity/{ => fish/sunfish}/sunfish.png | Bin .../{ => fish/sunfish}/sunfish_giant.png | Bin .../{ => fish/sunfish}/sunfish_hoodwinker.png | Bin .../{ => fish/sunfish}/sunfish_ocean.png | Bin .../{ => fish/sunfish}/sunfish_sharptail.png | Bin .../{ => fish/surgeonfish}/surgeonfish.png | Bin .../surgeonfish}/surgeonfish_blue_tang.png | Bin .../surgeonfish}/surgeonfish_lined.png | Bin .../surgeonfish_orangeshoulder.png | Bin .../surgeonfish_powder_blue_tang.png | Bin .../surgeonfish}/surgeonfish_sohal.png | Bin .../surgeonfish}/surgeonfish_unicornfish.png | Bin .../surgeonfish}/surgeonfish_yellow_tang.png | Bin .../{ => fish/tiger_barb}/tiger_barb.png | Bin .../entity/{ => fish/toadfish}/toadfish.png | Bin .../{ => fish/triggerfish}/triggerfish.png | Bin .../textures/entity/{ => fish/tuna}/tuna.png | Bin .../entity/{ => fish/tuna}/tuna_blackfin.png | Bin .../entity/{ => fish/tuna}/tuna_bluefin.png | Bin .../entity/{ => fish/tuna}/tuna_yellowfin.png | Bin .../{ => jellyfish}/atolla_jellyfish.png | Bin .../atolla_jellyfish_glowmask.png | Bin .../{ => jellyfish}/barrel_jellyfish.png | Bin .../entity/{ => jellyfish}/blue_jellyfish.png | Bin .../{ => jellyfish}/cauliflower_jellyfish.png | Bin .../{ => jellyfish}/compass_jellyfish.png | Bin .../{ => jellyfish}/fried_egg_jellyfish.png | Bin .../{ => jellyfish}/lions_mane_jellyfish.png | Bin .../entity/{ => jellyfish}/mauve_stinger.png | Bin .../mauve_stinger_glowmask.png | Bin .../entity/{ => jellyfish}/moon_jellyfish.png | Bin .../moon_jellyfish_glowmask.png | Bin .../{ => jellyfish}/nomura_jellyfish.png | Bin .../entity/{ => jellyfish}/sea_nettle.png | Bin .../textures/entity/mantis_shrimp.png | Bin 588 -> 0 bytes .../entity/{ => shark}/basking_shark.png | Bin .../entity/{ => shark}/bull_shark.png | Bin .../entity/{ => shark}/frilled_shark.png | Bin .../entity/{ => shark}/great_white_shark.png | Bin .../entity/{ => shark}/hammerhead_shark.png | Bin .../entity/{ => shark}/thresher_shark.png | Bin .../entity/{ => shark}/tiger_shark.png | Bin .../entity/{ => shark}/whale_shark.png | Bin 259 files changed, 90 insertions(+), 72 deletions(-) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => bobber}/barbed_bobber.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => bobber}/creepermagnet_bobber.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => bobber}/glowing_bobber.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => bobber}/magnetic_bobber.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => bobber}/ominous_bobber.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => cephalopod/cuttlefish}/cuttlefish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => cephalopod/firefly_squid}/firefly_squid.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => cephalopod/firefly_squid}/firefly_squid_glowmask.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => cephalopod/glowing_sucker_octopus}/glowing_sucker_octopus.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => cephalopod/glowing_sucker_octopus}/glowing_sucker_octopus_glowmask.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => cephalopod/umbrella_octopus}/umbrella_octopus.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => cephalopod/umbrella_octopus}/umbrella_octopus_brown.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => cephalopod/umbrella_octopus}/umbrella_octopus_orange.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => cephalopod/umbrella_octopus}/umbrella_octopus_pink.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => cephalopod/umbrella_octopus}/umbrella_octopus_purple.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => cephalopod/umbrella_octopus}/umbrella_octopus_white.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => cephalopod/vampire_squid}/nautilus.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => cephalopod/vampire_squid}/vampire_squid.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => cephalopod/vampire_squid}/vampire_squid_glowmask.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/nudibranch}/nudibranch_baba.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/nudibranch}/nudibranch_bullock.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/nudibranch}/nudibranch_festiva.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/nudibranch}/nudibranch_kubaryana.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/nudibranch}/nudibranch_kuniei.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/nudibranch}/nudibranch_magnificent.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/nudibranch}/nudibranch_pyjama.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/nudibranch}/nudibranch_sagami.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/nudibranch}/nudibranch_yonowae.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/sea_cucumber}/sea_cucumber.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/sea_cucumber}/sea_cucumber_black.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/sea_cucumber}/sea_cucumber_red.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/sea_cucumber}/sea_cucumber_sea_pig.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/sea_urchin}/sea_urchin_black.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/sea_urchin}/sea_urchin_blue.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/sea_urchin}/sea_urchin_long_black.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/sea_urchin}/sea_urchin_long_blue.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/sea_urchin}/sea_urchin_long_purple.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/sea_urchin}/sea_urchin_long_red.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/sea_urchin}/sea_urchin_purple.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/sea_urchin}/sea_urchin_red.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_blue.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_brittlestar_black.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_brittlestar_white.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_brittlestar_yellow.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_crown_of_thorns.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_green.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_medium_blue.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_medium_green.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_medium_knobbed_blue.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_medium_knobbed_green.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_medium_knobbed_orange.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_medium_knobbed_purple.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_medium_knobbed_red.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_medium_knobbed_yellow.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_medium_orange.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_medium_purple.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_medium_red.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_medium_yellow.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_purple.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_red.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => critter/starfish}/starfish_yellow.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/coconut_crab}/coconut_crab.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/crayfish}/crayfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/dungeness_crab}/dungeness_crab.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/fiddler_crab}/fiddler_crab_blue.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/fiddler_crab}/fiddler_crab_palestine.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/fiddler_crab}/fiddler_crab_purple.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/fiddler_crab}/fiddler_crab_red.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/flower_crab}/flower_crab.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/ghost_crab}/ghost_crab_brown.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/ghost_crab}/ghost_crab_palestine.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/ghost_crab}/ghost_crab_red.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/ghost_crab}/ghost_crab_white.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/ghost_crab}/ghost_crab_yellow.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/giant_isopod}/giant_isopod.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/hermit_crab}/hermit_crab.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/horseshoe_crab}/horseshoe_crab.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/karkinos}/karkinos.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/lightfoot_crab}/lightfoot_crab.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/lobster}/lobster_black.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/lobster}/lobster_blue.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/lobster}/lobster_green.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/lobster}/lobster_palestine.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/lobster}/lobster_red.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/lobster}/lobster_white.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/lobster}/lobster_yellow.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_black.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_black_white.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_blue.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_blue_white.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_brown.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_brown_white.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_green.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_green_white.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_lime.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_lime_white.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_orange.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_orange_white.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_palestine.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_pink.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_pink_white.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_red.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_red_white.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_white.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_yellow.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/shrimp}/shrimp_yellow_white.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/spider_crab}/spider_crab.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/vampire_crab}/vampire_crab.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => crustacean/yeti_crab}/yeti_crab.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/anglerfish}/anglerfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/anglerfish}/anglerfish_glowmask.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/barreleye}/barreleye.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/barreleye}/barreleye_glowmask.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/barreleye}/barreleye_translucent.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/betta}/betta.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/betta}/betta_black.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/betta}/betta_blue.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/betta}/betta_blue_yellow.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/betta}/betta_green.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/betta}/betta_pink.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/betta}/betta_red.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/betta}/betta_white.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/carp}/carp_koi_ai_goromo.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/carp}/carp_koi_hajiro.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/carp}/carp_koi_platinum.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/carp}/carp_koi_tancho.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/clownfish}/clownfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/clownfish}/clownfish_cinnamon.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/clownfish}/clownfish_clarkii.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/clownfish}/clownfish_ocellaris.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/clownfish}/clownfish_orange_skunk.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/clownfish}/clownfish_percula.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/clownfish}/clownfish_pink_skunk.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/clownfish}/clownfish_tomato.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/clownfish}/clownfish_whiteband.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/cowfish}/cowfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/danio}/danio.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/discus}/discus.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/discus}/discus_blue.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/discus}/discus_green.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/discus}/discus_purple.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/dragonfish}/dragonfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/dragonfish}/dragonfish_glowmask.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/flashlightfish}/flashlightfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/flashlightfish}/flashlightfish_glowmask.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/goldfish}/goldfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/goldfish}/goldfish_shubunkin.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/gourami}/gourami.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/gourami}/gourami_pink.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/gourami}/gourami_purple.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/gourami}/gourami_yellow.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/lionfish}/lionfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/mahimahi}/mahimahi.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/manta_ray}/manta_ray.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/moray_eel}/moray_eel.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/needlefish}/needlefish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/neon_tetra}/neon_tetra.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/neon_tetra}/tetra.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/oarfish}/oarfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/oarfish}/oarfish_glowmask.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/opah}/opah.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/oscar}/oscar.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/piranha}/piranha.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/ratfish}/ratfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/ratfish}/ratfish_gray.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/rockfish}/rockfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/sea_angel}/sea_angel.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/sea_angel}/sea_angel_glowmask.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/seahorse}/seahorse_big_belly.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/seahorse}/seahorse_blue.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/seahorse}/seahorse_common.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/seahorse}/seahorse_green.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/seahorse}/seahorse_orange.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/seahorse}/seahorse_pink.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/seahorse}/seahorse_purple.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/seahorse}/seahorse_pygmy.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/seahorse}/seahorse_thorny.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/seahorse}/seahorse_yellow.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/stingray}/stingray.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/stingray}/stingray_blue_spotted.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/stingray}/stingray_spotted_eagle.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/stonefish}/stonefish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/sunfish}/sunfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/sunfish}/sunfish_giant.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/sunfish}/sunfish_hoodwinker.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/sunfish}/sunfish_ocean.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/sunfish}/sunfish_sharptail.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/surgeonfish}/surgeonfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/surgeonfish}/surgeonfish_blue_tang.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/surgeonfish}/surgeonfish_lined.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/surgeonfish}/surgeonfish_orangeshoulder.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/surgeonfish}/surgeonfish_powder_blue_tang.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/surgeonfish}/surgeonfish_sohal.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/surgeonfish}/surgeonfish_unicornfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/surgeonfish}/surgeonfish_yellow_tang.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/tiger_barb}/tiger_barb.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/toadfish}/toadfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/triggerfish}/triggerfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/tuna}/tuna.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/tuna}/tuna_blackfin.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/tuna}/tuna_bluefin.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => fish/tuna}/tuna_yellowfin.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => jellyfish}/atolla_jellyfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => jellyfish}/atolla_jellyfish_glowmask.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => jellyfish}/barrel_jellyfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => jellyfish}/blue_jellyfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => jellyfish}/cauliflower_jellyfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => jellyfish}/compass_jellyfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => jellyfish}/fried_egg_jellyfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => jellyfish}/lions_mane_jellyfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => jellyfish}/mauve_stinger.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => jellyfish}/mauve_stinger_glowmask.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => jellyfish}/moon_jellyfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => jellyfish}/moon_jellyfish_glowmask.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => jellyfish}/nomura_jellyfish.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => jellyfish}/sea_nettle.png (100%) delete mode 100644 src/main/resources/assets/hybrid-aquatic/textures/entity/mantis_shrimp.png rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => shark}/basking_shark.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => shark}/bull_shark.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => shark}/frilled_shark.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => shark}/great_white_shark.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => shark}/hammerhead_shark.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => shark}/thresher_shark.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => shark}/tiger_shark.png (100%) rename src/main/resources/assets/hybrid-aquatic/textures/entity/{ => shark}/whale_shark.png (100%) diff --git a/src/client/java/dev/hybridlabs/aquatic/mixin/client/FishingBobberEntityRendererMixin.java b/src/client/java/dev/hybridlabs/aquatic/mixin/client/FishingBobberEntityRendererMixin.java index 1ee5ecb9b..18992e807 100644 --- a/src/client/java/dev/hybridlabs/aquatic/mixin/client/FishingBobberEntityRendererMixin.java +++ b/src/client/java/dev/hybridlabs/aquatic/mixin/client/FishingBobberEntityRendererMixin.java @@ -21,15 +21,15 @@ @Mixin(FishingBobberEntityRenderer.class) public abstract class FishingBobberEntityRendererMixin { @Unique - private static final RenderLayer BARBED_HOOK_LAYER = getRenderLayer(new Identifier(HybridAquatic.MOD_ID, "textures/entity/barbed_bobber.png")); + private static final RenderLayer BARBED_HOOK_LAYER = getRenderLayer(new Identifier(HybridAquatic.MOD_ID, "textures/entity/bobber/barbed_bobber.png")); @Unique - private static final RenderLayer GLOWING_HOOK_LAYER = getRenderLayer(new Identifier(HybridAquatic.MOD_ID, "textures/entity/glowing_bobber.png")); + private static final RenderLayer GLOWING_HOOK_LAYER = getRenderLayer(new Identifier(HybridAquatic.MOD_ID, "textures/entity/bobber/glowing_bobber.png")); @Unique - private static final RenderLayer MAGNETIC_HOOK_LAYER = getRenderLayer(new Identifier(HybridAquatic.MOD_ID, "textures/entity/magnetic_bobber.png")); + private static final RenderLayer MAGNETIC_HOOK_LAYER = getRenderLayer(new Identifier(HybridAquatic.MOD_ID, "textures/entity/bobber/magnetic_bobber.png")); @Unique - private static final RenderLayer CREEPERMAGNET_HOOK_LAYER = getRenderLayer(new Identifier(HybridAquatic.MOD_ID, "textures/entity/creepermagnet_bobber.png")); + private static final RenderLayer CREEPERMAGNET_HOOK_LAYER = getRenderLayer(new Identifier(HybridAquatic.MOD_ID, "textures/entity/bobber/creepermagnet_bobber.png")); @Unique - private static final RenderLayer OMINOUS_HOOK_LAYER = getRenderLayer(new Identifier(HybridAquatic.MOD_ID, "textures/entity/ominous_bobber.png")); + private static final RenderLayer OMINOUS_HOOK_LAYER = getRenderLayer(new Identifier(HybridAquatic.MOD_ID, "textures/entity/bobber/ominous_bobber.png")); @Unique FishingBobberEntity entity; diff --git a/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/cephalopod/HybridAquaticCephalopodEntityModel.kt b/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/cephalopod/HybridAquaticCephalopodEntityModel.kt index 74c43292c..86ec60c9d 100644 --- a/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/cephalopod/HybridAquaticCephalopodEntityModel.kt +++ b/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/cephalopod/HybridAquaticCephalopodEntityModel.kt @@ -16,8 +16,8 @@ abstract class HybridAquaticCephalopodEntityModel (p override fun getTextureResource(animatable: T?): Identifier { val variant = animatable?.variant if (variant != null && !variant.ignore.contains(HybridAquaticCritterEntity.CritterVariant.Ignore.TEXTURE)) - return Identifier(HybridAquatic.MOD_ID, "textures/entity/${id}_${variant.getProvidedVariant(animatable)}.png") - return Identifier(HybridAquatic.MOD_ID, "textures/entity/$id.png") + return Identifier(HybridAquatic.MOD_ID, "textures/entity/critter/${id}/${id}_${variant.getProvidedVariant(animatable)}.png") + return Identifier(HybridAquatic.MOD_ID, "textures/entity/critter/$id/${id}.png") } override fun getAnimationResource(animatable: T?): Identifier { diff --git a/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/crustacean/HybridAquaticCrustaceanEntityModel.kt b/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/crustacean/HybridAquaticCrustaceanEntityModel.kt index e71ffdb85..937bba1f0 100644 --- a/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/crustacean/HybridAquaticCrustaceanEntityModel.kt +++ b/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/crustacean/HybridAquaticCrustaceanEntityModel.kt @@ -11,11 +11,11 @@ abstract class HybridAquaticCrustaceanEntityModel (private override fun getTextureResource(animatable: T?): Identifier { val variant = animatable?.variant if (variant != null && !variant.ignore.contains(TEXTURE)) - return Identifier(HybridAquatic.MOD_ID, "textures/entity/${id}_${variant.getProvidedVariant(animatable)}.png") - return Identifier(HybridAquatic.MOD_ID, "textures/entity/$id.png") + return Identifier(HybridAquatic.MOD_ID, "textures/entity/fish/${id}/${id}_${variant.getProvidedVariant(animatable)}.png") + return Identifier(HybridAquatic.MOD_ID, "textures/entity/fish/${id}/$id.png") } override fun getAnimationResource(animatable: T?): Identifier { diff --git a/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/fish/HybridAquaticRayEntityModel.kt b/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/fish/HybridAquaticRayEntityModel.kt index b33df858a..f2cee7bd0 100644 --- a/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/fish/HybridAquaticRayEntityModel.kt +++ b/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/fish/HybridAquaticRayEntityModel.kt @@ -21,8 +21,8 @@ abstract class HybridAquaticRayEntityModel (private v override fun getTextureResource(animatable: T?): Identifier { val variant = animatable?.variant if (variant != null && !variant.ignore.contains(TEXTURE)) - return Identifier(HybridAquatic.MOD_ID, "textures/entity/${id}_${variant.getProvidedVariant(animatable)}.png") - return Identifier(HybridAquatic.MOD_ID, "textures/entity/$id.png") + return Identifier(HybridAquatic.MOD_ID, "textures/entity/fish/${id}_${variant.getProvidedVariant(animatable)}.png") + return Identifier(HybridAquatic.MOD_ID, "textures/entity/fish.$id.png") } override fun getAnimationResource(animatable: T?): Identifier { diff --git a/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/jellyfish/HybridAquaticJellyfishEntityModel.kt b/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/jellyfish/HybridAquaticJellyfishEntityModel.kt index 14c5a10ea..f4935d58f 100644 --- a/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/jellyfish/HybridAquaticJellyfishEntityModel.kt +++ b/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/jellyfish/HybridAquaticJellyfishEntityModel.kt @@ -11,11 +11,11 @@ abstract class HybridAquaticJellyfishEntityModel ( } override fun getTextureResource(animatable: T?): Identifier { - return Identifier(HybridAquatic.MOD_ID, "textures/entity/$id.png") + return Identifier(HybridAquatic.MOD_ID, "textures/entity/shark/$id.png") } override fun getAnimationResource(animatable: T?): Identifier { diff --git a/src/main/java/dev/hybridlabs/aquatic/utils/HybridAquaticSpawnGroup.java b/src/main/java/dev/hybridlabs/aquatic/utils/HybridAquaticSpawnGroup.java index 312f8b2b9..fa331fee9 100644 --- a/src/main/java/dev/hybridlabs/aquatic/utils/HybridAquaticSpawnGroup.java +++ b/src/main/java/dev/hybridlabs/aquatic/utils/HybridAquaticSpawnGroup.java @@ -3,16 +3,16 @@ import net.minecraft.entity.SpawnGroup; public enum HybridAquaticSpawnGroup { - FISH("ha_fish", 5, true, false, 64), - FISH_UNDERGROUND("ha_fish_underground", 3, true, false, 64), - CEPHALOPOD("ha_cephalopod", 5, true, true, 64), - CEPHALOPOD_UNDERGROUND("ha_cephalopod_underground", 3, true, false, 64), - JELLY("ha_jelly", 5, true, false, 64), - JELLY_UNDERGROUND("ha_jelly_underground", 3, true, false, 64), - SHARK("ha_shark", 3, true, true, 64), - CRUSTACEAN("crustacean", 5, true, false, 64), - CRUSTACEAN_UNDERGROUND("crustacean_underground", 3, true, false, 64), - CRITTER("ha_critter", 5, true, false, 64); + FISH("ha_fish", 8, true, false, 64), + FISH_UNDERGROUND("ha_fish_underground", 8, true, false, 64), + CEPHALOPOD("ha_cephalopod", 4, true, true, 64), + CEPHALOPOD_UNDERGROUND("ha_cephalopod_underground", 4, true, false, 64), + JELLY("ha_jelly", 6, true, false, 64), + JELLY_UNDERGROUND("ha_jelly_underground", 2, true, false, 64), + SHARK("ha_shark", 6, true, true, 64), + CRUSTACEAN("crustacean", 6, true, false, 64), + CRUSTACEAN_UNDERGROUND("crustacean_underground", 6, true, false, 64), + CRITTER("ha_critter", 6, true, false, 64); public SpawnGroup spawnGroup; public final String name; diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/HybridAquaticCephalopodEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/HybridAquaticCephalopodEntity.kt index 80a6becf0..e5cc16bfc 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/HybridAquaticCephalopodEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/HybridAquaticCephalopodEntity.kt @@ -222,7 +222,7 @@ open class HybridAquaticCephalopodEntity( } override fun getLimitPerChunk(): Int { - return 4 + return 2 } override fun getAmbientSound(): SoundEvent { diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/CarpEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/CarpEntity.kt index 0e5ca894e..a2b372036 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/CarpEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/CarpEntity.kt @@ -18,8 +18,8 @@ class CarpEntity(entityType: EntityType, world: World) : companion object { fun createMobAttributes(): DefaultAttributeContainer.Builder { return WaterCreatureEntity.createMobAttributes() - .add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0) - .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.7) + .add(EntityAttributes.GENERIC_MAX_HEALTH, 4.0) + .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.6) .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 1.0) .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 12.0) } diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/ClownfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/ClownfishEntity.kt index eca0b7d9b..18e823705 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/ClownfishEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/ClownfishEntity.kt @@ -23,6 +23,10 @@ class ClownfishEntity(entityType: EntityType, world: World) "orange_skunk" to FishVariant.biomeVariant("orange_skunk", HybridAquaticBiomeTags.CLOWNFISH_SPAWN_BIOMES),), HybridAquaticEntityTags.NONE, HybridAquaticEntityTags.CLOWNFISH_PREDATOR) { + override fun getLimitPerChunk(): Int { + return 2 + } + public override fun getLootTableId(): Identifier { return when (this.variant?.variantName) { "ocellaris" -> Identifier("hybrid-aquatic", "entities/clownfish") diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/MahiMahiEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/MahiMahiEntity.kt index 9e2b30f78..7ac745941 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/MahiMahiEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/MahiMahiEntity.kt @@ -10,6 +10,10 @@ import net.minecraft.world.World class MahiMahiEntity(entityType: EntityType, world: World) : HybridAquaticFishEntity(entityType, world, emptyMap(), HybridAquaticEntityTags.MAHI_PREY, HybridAquaticEntityTags.MAHI_PREDATOR) { + + override fun getLimitPerChunk(): Int { + return 2 + } override fun initGoals() { super.initGoals() goalSelector.add(5, FishJumpGoal(this, 10)) diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/MorayEelEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/MorayEelEntity.kt index 709d0606b..f5066cb4b 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/MorayEelEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/MorayEelEntity.kt @@ -11,7 +11,7 @@ class MorayEelEntity(entityType: EntityType, world: World) : HybridAquaticFishEntity(entityType, world, emptyMap(), HybridAquaticEntityTags.MORAY_EEL_PREY, HybridAquaticEntityTags.MORAY_EEL_PREDATOR) { override fun getLimitPerChunk(): Int { - return 1 + return 2 } companion object { diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/OpahEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/OpahEntity.kt index 3c5358020..836fb4237 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/OpahEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/OpahEntity.kt @@ -11,9 +11,9 @@ class OpahEntity(entityType: EntityType, world: World) : HybridAquaticFishEntity(entityType, world, emptyMap(), HybridAquaticEntityTags.OPAH_PREY, HybridAquaticEntityTags.OPAH_PREDATOR) { override fun getLimitPerChunk(): Int { - return 1 + return 2 } - + companion object { fun createMobAttributes(): DefaultAttributeContainer.Builder { return WaterCreatureEntity.createMobAttributes() diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/RockfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/RockfishEntity.kt index f464cadca..a69adf470 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/RockfishEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/RockfishEntity.kt @@ -10,6 +10,10 @@ import net.minecraft.world.World class RockfishEntity(entityType: EntityType, world: World) : HybridAquaticSchoolingFishEntity(entityType, world, HybridAquaticEntityTags.NONE, HybridAquaticEntityTags.ROCKFISH_PREDATOR) { + override fun getLimitPerChunk(): Int { + return 4 + } + companion object { fun createMobAttributes(): DefaultAttributeContainer.Builder { return WaterCreatureEntity.createMobAttributes() diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/StonefishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/StonefishEntity.kt index 364e09013..bbe54bb25 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/StonefishEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/StonefishEntity.kt @@ -17,7 +17,7 @@ class StonefishEntity(entityType: EntityType, world: World) HybridAquaticFishEntity(entityType, world, emptyMap(), HybridAquaticEntityTags.NONE, HybridAquaticEntityTags.NONE) { override fun getLimitPerChunk(): Int { - return 1 + return 2 } companion object { diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/SunfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/SunfishEntity.kt index 4af1ed981..717ca1f67 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/SunfishEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/SunfishEntity.kt @@ -16,7 +16,7 @@ class SunfishEntity(entityType: EntityType, world: World) : HybridAquaticEntityTags.SUNFISH_PREY, HybridAquaticEntityTags.SUNFISH_PREDATOR) { override fun getLimitPerChunk(): Int { - return 1 + return 2 } companion object { diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/TriggerfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/TriggerfishEntity.kt index 33d04de08..86f4a49db 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/TriggerfishEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/TriggerfishEntity.kt @@ -11,7 +11,7 @@ class TriggerfishEntity(entityType: EntityType, world: Wo HybridAquaticFishEntity(entityType, world, emptyMap(), HybridAquaticEntityTags.TRIGGERFISH_PREY, HybridAquaticEntityTags.TRIGGERFISH_PREDATOR) { override fun getLimitPerChunk(): Int { - return 1 + return 2 } companion object { diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/TunaEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/TunaEntity.kt index 6336b6ac8..bc50c90b6 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/TunaEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/TunaEntity.kt @@ -11,6 +11,10 @@ import net.minecraft.world.World class TunaEntity(entityType: EntityType, world: World) : HybridAquaticSchoolingFishEntity(entityType, world, HybridAquaticEntityTags.TUNA_PREY, HybridAquaticEntityTags.TUNA_PREDATOR) { + override fun getLimitPerChunk(): Int { + return 4 + } + override fun initGoals() { super.initGoals() goalSelector.add(5, FishJumpGoal(this, 10)) diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/AnglerfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/AnglerfishEntity.kt index 12e6b288c..cea8319ce 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/AnglerfishEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/AnglerfishEntity.kt @@ -11,7 +11,7 @@ class AnglerfishEntity(entityType: EntityType, world: Worl HybridAquaticDeepSeaFishEntity(entityType, world, emptyMap(), HybridAquaticEntityTags.ANGLERFISH_PREY, HybridAquaticEntityTags.ANGLERFISH_PREDATOR) { override fun getLimitPerChunk(): Int { - return 1 + return 3 } companion object { diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/BarreleyeEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/BarreleyeEntity.kt index 1f48b631c..25064e3fb 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/BarreleyeEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/BarreleyeEntity.kt @@ -11,7 +11,7 @@ class BarreleyeEntity(entityType: EntityType, world: World) HybridAquaticDeepSeaFishEntity(entityType, world, emptyMap(), HybridAquaticEntityTags.NONE, HybridAquaticEntityTags.NONE) { override fun getLimitPerChunk(): Int { - return 1 + return 2 } companion object { diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/DragonfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/DragonfishEntity.kt index 8e85b96a2..e8bb6c40b 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/DragonfishEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/DragonfishEntity.kt @@ -11,7 +11,7 @@ class DragonfishEntity(entityType: EntityType, world: Worl HybridAquaticDeepSeaFishEntity(entityType, world, emptyMap(), HybridAquaticEntityTags.DRAGONFISH_PREY, HybridAquaticEntityTags.DRAGONFISH_PREDATOR) { override fun getLimitPerChunk(): Int { - return 2 + return 4 } companion object { diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/OarfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/OarfishEntity.kt index 6a09400bc..47b81b8c5 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/OarfishEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/deepsea/OarfishEntity.kt @@ -11,7 +11,7 @@ class OarfishEntity(entityType: EntityType, world: World) : HybridAquaticDeepSeaFishEntity(entityType, world, emptyMap(), HybridAquaticEntityTags.OARFISH_PREY, HybridAquaticEntityTags.OARFISH_PREDATOR) { override fun getLimitPerChunk(): Int { - return 1 + return 2 } companion object { diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/ray/HybridAquaticRayEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/ray/HybridAquaticRayEntity.kt index 6bf34a933..111bc4360 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/ray/HybridAquaticRayEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/ray/HybridAquaticRayEntity.kt @@ -88,7 +88,6 @@ open class HybridAquaticRayEntity( if (spawnReason == SpawnReason.SPAWN_EGG) { variantKey = variants.keys.elementAt(random.nextBetween(0, variants.size - 1)) } else { - // Handle collisions val validKeys = variants.filter { it.value.spawnCondition(world, spawnReason, blockPos, random) }.map { it.key } if (validKeys.isEmpty()) { @@ -103,7 +102,6 @@ open class HybridAquaticRayEntity( } } } else { - // Default to a priority based system val validityFilter = variants.filter { validKeys.contains(it.key) } variantKey = if (validityFilter.isNotEmpty()) { val maxPriority = validityFilter.values.maxOf { it.priority } @@ -224,7 +222,7 @@ open class HybridAquaticRayEntity( } override fun getLimitPerChunk(): Int { - return 2 + return 4 } // region Properties @@ -379,9 +377,6 @@ open class HybridAquaticRayEntity( } companion object { - /** - * Creates a biome variant of a fish - */ fun biomeVariant(variantName: String, biomes : TagKey, ignore : List = emptyList()): RayVariant { return RayVariant(variantName, { world, _, pos, _ -> world.getBiome(pos).isIn(biomes) @@ -399,41 +394,16 @@ open class HybridAquaticRayEntity( @Suppress("UNUSED") data class VariantCollisionRules(val variants : Set, val collisionHandler: (Set, Random, ServerWorldAccess) -> String, val exclusionStatus: ExclusionStatus = INCLUSIVE) { - /** - * INCLUSIVE - all other variants can exist within this selection swath - *
- * EXCLUSIVE - all other variants are excluded from this selection swath - */ enum class ExclusionStatus { INCLUSIVE, EXCLUSIVE } - - /** - * 

-         * Example:
-         * ```kotlin
-         * // returns a bluefin or a yellowfin tuna variant
-         * equalDistribution(setOf("bluefin", "yellowfin"))
-         * ```
-         * @return a random variant within the set
-         */
         fun equalDistribution(variants: Set, status : ExclusionStatus = INCLUSIVE) : VariantCollisionRules {
             return VariantCollisionRules(variants, { possibleVariants, _, _ ->
                 possibleVariants.random()
             }, status)
         }
 
-        /**
-         * Example
-         * ```
-         * weightedDistribution(setOf(
-         *  Pair("bluefin", 0.80),
-         *  Pair("yellowfin", 0.20)
-         * ))
-         * ```
-         * @return a premade variant collision rule which allows weighted distribution of variants.
-         */
         fun weightedDistribution(weights: Set>, status: ExclusionStatus = EXCLUSIVE) : VariantCollisionRules {
             return VariantCollisionRules(weights.map { pair -> pair.first }.toSet(), { _, random, _ ->
                 // sum up weights
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/AtollaJellyfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/AtollaJellyfishEntity.kt
index d5c3c1316..3e11b52cf 100644
--- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/AtollaJellyfishEntity.kt
+++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/AtollaJellyfishEntity.kt
@@ -9,6 +9,10 @@ import net.minecraft.world.World
 
 class AtollaJellyfishEntity(entityType: EntityType, world: World) : HybridAquaticJellyfishEntity(entityType, world, true) {
 
+    override fun getLimitPerChunk(): Int {
+        return 2
+    }
+
     override fun initGoals() {
         super.initGoals()
         goalSelector.add(0, StayDeepGoal(this))
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/BlueJellyfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/BlueJellyfishEntity.kt
index 989442073..7635666dd 100644
--- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/BlueJellyfishEntity.kt
+++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/BlueJellyfishEntity.kt
@@ -8,6 +8,10 @@ import net.minecraft.world.World
 
 class BlueJellyfishEntity(entityType: EntityType, world: World) : HybridAquaticJellyfishEntity(entityType, world, true) {
 
+    override fun getLimitPerChunk(): Int {
+        return 2
+    }
+
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/CauliflowerJellyfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/CauliflowerJellyfishEntity.kt
index 1ee4faa3e..ebf16e024 100644
--- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/CauliflowerJellyfishEntity.kt
+++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/CauliflowerJellyfishEntity.kt
@@ -8,6 +8,10 @@ import net.minecraft.world.World
 
 class CauliflowerJellyfishEntity(entityType: EntityType, world: World) : HybridAquaticJellyfishEntity(entityType, world, false) {
 
+    override fun getLimitPerChunk(): Int {
+        return 2
+    }
+
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/CompassJellyfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/CompassJellyfishEntity.kt
index 81b93ed14..003360ecc 100644
--- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/CompassJellyfishEntity.kt
+++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/CompassJellyfishEntity.kt
@@ -8,6 +8,10 @@ import net.minecraft.world.World
 
 class CompassJellyfishEntity(entityType: EntityType, world: World) : HybridAquaticJellyfishEntity(entityType, world, true) {
 
+    override fun getLimitPerChunk(): Int {
+        return 2
+    }
+
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/FriedEggJellyfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/FriedEggJellyfishEntity.kt
index e2b9a43e4..1aa93ef00 100644
--- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/FriedEggJellyfishEntity.kt
+++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/FriedEggJellyfishEntity.kt
@@ -8,6 +8,10 @@ import net.minecraft.world.World
 
 class FriedEggJellyfishEntity(entityType: EntityType, world: World) : HybridAquaticJellyfishEntity(entityType, world, false) {
 
+    override fun getLimitPerChunk(): Int {
+        return 2
+    }
+
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/LionsManeJellyfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/LionsManeJellyfishEntity.kt
index 6b8a11579..180d5d688 100644
--- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/LionsManeJellyfishEntity.kt
+++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/LionsManeJellyfishEntity.kt
@@ -8,6 +8,10 @@ import net.minecraft.world.World
 
 class LionsManeJellyfishEntity(entityType: EntityType, world: World) : HybridAquaticJellyfishEntity(entityType, world, true) {
 
+    override fun getLimitPerChunk(): Int {
+        return 1
+    }
+
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/NomuraJellyfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/NomuraJellyfishEntity.kt
index bde37ce79..efe0ae661 100644
--- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/NomuraJellyfishEntity.kt
+++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/NomuraJellyfishEntity.kt
@@ -8,6 +8,10 @@ import net.minecraft.world.World
 
 class NomuraJellyfishEntity(entityType: EntityType, world: World) : HybridAquaticJellyfishEntity(entityType, world, true) {
 
+    override fun getLimitPerChunk(): Int {
+        return 1
+    }
+
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/SeaNettleEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/SeaNettleEntity.kt
index 55891bc3d..ba40f14a2 100644
--- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/SeaNettleEntity.kt
+++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/jellyfish/SeaNettleEntity.kt
@@ -8,6 +8,10 @@ import net.minecraft.world.World
 
 class SeaNettleEntity(entityType: EntityType, world: World) : HybridAquaticJellyfishEntity(entityType, world, true) {
 
+    override fun getLimitPerChunk(): Int {
+        return 2
+    }
+
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/barbed_bobber.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/bobber/barbed_bobber.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/barbed_bobber.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/bobber/barbed_bobber.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/creepermagnet_bobber.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/bobber/creepermagnet_bobber.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/creepermagnet_bobber.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/bobber/creepermagnet_bobber.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/glowing_bobber.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/bobber/glowing_bobber.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/glowing_bobber.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/bobber/glowing_bobber.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/magnetic_bobber.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/bobber/magnetic_bobber.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/magnetic_bobber.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/bobber/magnetic_bobber.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/ominous_bobber.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/bobber/ominous_bobber.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/ominous_bobber.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/bobber/ominous_bobber.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/cuttlefish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/cuttlefish/cuttlefish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/cuttlefish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/cuttlefish/cuttlefish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/firefly_squid.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/firefly_squid/firefly_squid.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/firefly_squid.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/firefly_squid/firefly_squid.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/firefly_squid_glowmask.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/firefly_squid/firefly_squid_glowmask.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/firefly_squid_glowmask.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/firefly_squid/firefly_squid_glowmask.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/glowing_sucker_octopus.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/glowing_sucker_octopus/glowing_sucker_octopus.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/glowing_sucker_octopus.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/glowing_sucker_octopus/glowing_sucker_octopus.png
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/cephalopod/glowing_sucker_octopus/glowing_sucker_octopus_glowmask.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/glowing_sucker_octopus_glowmask.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/glowing_sucker_octopus/glowing_sucker_octopus_glowmask.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/umbrella_octopus.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/umbrella_octopus/umbrella_octopus.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/umbrella_octopus.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/umbrella_octopus/umbrella_octopus.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/umbrella_octopus_brown.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/umbrella_octopus/umbrella_octopus_brown.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/umbrella_octopus_brown.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/umbrella_octopus/umbrella_octopus_brown.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/umbrella_octopus_orange.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/umbrella_octopus/umbrella_octopus_orange.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/umbrella_octopus_orange.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/umbrella_octopus/umbrella_octopus_orange.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/umbrella_octopus_pink.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/umbrella_octopus/umbrella_octopus_pink.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/umbrella_octopus_pink.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/umbrella_octopus/umbrella_octopus_pink.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/umbrella_octopus_purple.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/umbrella_octopus/umbrella_octopus_purple.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/umbrella_octopus_purple.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/umbrella_octopus/umbrella_octopus_purple.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/umbrella_octopus_white.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/umbrella_octopus/umbrella_octopus_white.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/umbrella_octopus_white.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/umbrella_octopus/umbrella_octopus_white.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/nautilus.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/vampire_squid/nautilus.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/nautilus.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/vampire_squid/nautilus.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/vampire_squid.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/vampire_squid/vampire_squid.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/vampire_squid.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/vampire_squid/vampire_squid.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/vampire_squid_glowmask.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/vampire_squid/vampire_squid_glowmask.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/vampire_squid_glowmask.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/cephalopod/vampire_squid/vampire_squid_glowmask.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_baba.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_baba.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_baba.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_baba.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_bullock.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_bullock.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_bullock.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_bullock.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_festiva.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_festiva.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_festiva.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_festiva.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_kubaryana.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_kubaryana.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_kubaryana.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_kubaryana.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_kuniei.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_kuniei.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_kuniei.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_kuniei.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_magnificent.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_magnificent.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_magnificent.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_magnificent.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_pyjama.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_pyjama.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_pyjama.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_pyjama.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_sagami.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_sagami.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_sagami.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_sagami.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_yonowae.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_yonowae.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/nudibranch_yonowae.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/nudibranch/nudibranch_yonowae.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sea_cucumber.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_cucumber/sea_cucumber.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sea_cucumber.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_cucumber/sea_cucumber.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sea_cucumber_black.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_cucumber/sea_cucumber_black.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sea_cucumber_black.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_cucumber/sea_cucumber_black.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sea_cucumber_red.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_cucumber/sea_cucumber_red.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sea_cucumber_red.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_cucumber/sea_cucumber_red.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sea_cucumber_sea_pig.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_cucumber/sea_cucumber_sea_pig.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sea_cucumber_sea_pig.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_cucumber/sea_cucumber_sea_pig.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_black.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_black.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_black.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_black.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_blue.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_blue.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_blue.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_blue.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_long_black.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_long_black.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_long_black.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_long_black.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_long_blue.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_long_blue.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_long_blue.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_long_blue.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_long_purple.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_long_purple.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_long_purple.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_long_purple.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_long_red.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_long_red.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_long_red.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_long_red.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_purple.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_purple.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_purple.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_purple.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_red.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_red.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sea_urchin_red.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/sea_urchin/sea_urchin_red.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_blue.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_blue.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_blue.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_blue.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_brittlestar_black.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_brittlestar_black.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_brittlestar_black.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_brittlestar_black.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_brittlestar_white.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_brittlestar_white.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_brittlestar_white.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_brittlestar_white.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_brittlestar_yellow.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_brittlestar_yellow.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_brittlestar_yellow.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_brittlestar_yellow.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_crown_of_thorns.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_crown_of_thorns.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_crown_of_thorns.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_crown_of_thorns.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_green.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_green.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_green.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_green.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_blue.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_blue.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_blue.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_blue.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_green.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_green.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_green.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_green.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_knobbed_blue.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_knobbed_blue.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_knobbed_blue.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_knobbed_blue.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_knobbed_green.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_knobbed_green.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_knobbed_green.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_knobbed_green.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_knobbed_orange.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_knobbed_orange.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_knobbed_orange.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_knobbed_orange.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_knobbed_purple.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_knobbed_purple.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_knobbed_purple.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_knobbed_purple.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_knobbed_red.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_knobbed_red.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_knobbed_red.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_knobbed_red.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_knobbed_yellow.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_knobbed_yellow.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_knobbed_yellow.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_knobbed_yellow.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_orange.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_orange.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_orange.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_orange.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_purple.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_purple.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_purple.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_purple.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_red.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_red.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_red.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_red.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_yellow.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_yellow.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_medium_yellow.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_medium_yellow.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_purple.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_purple.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_purple.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_purple.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_red.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_red.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_red.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_red.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_yellow.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_yellow.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/starfish_yellow.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/critter/starfish/starfish_yellow.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/coconut_crab.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/coconut_crab/coconut_crab.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/coconut_crab.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/coconut_crab/coconut_crab.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/crayfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/crayfish/crayfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/crayfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/crayfish/crayfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/dungeness_crab.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/dungeness_crab/dungeness_crab.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/dungeness_crab.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/dungeness_crab/dungeness_crab.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/fiddler_crab_blue.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/fiddler_crab/fiddler_crab_blue.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/fiddler_crab_blue.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/fiddler_crab/fiddler_crab_blue.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/fiddler_crab_palestine.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/fiddler_crab/fiddler_crab_palestine.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/fiddler_crab_palestine.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/fiddler_crab/fiddler_crab_palestine.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/fiddler_crab_purple.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/fiddler_crab/fiddler_crab_purple.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/fiddler_crab_purple.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/fiddler_crab/fiddler_crab_purple.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/fiddler_crab_red.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/fiddler_crab/fiddler_crab_red.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/fiddler_crab_red.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/fiddler_crab/fiddler_crab_red.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/flower_crab.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/flower_crab/flower_crab.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/flower_crab.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/flower_crab/flower_crab.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/ghost_crab_brown.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/ghost_crab/ghost_crab_brown.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/ghost_crab_brown.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/ghost_crab/ghost_crab_brown.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/ghost_crab_palestine.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/ghost_crab/ghost_crab_palestine.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/ghost_crab_palestine.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/ghost_crab/ghost_crab_palestine.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/ghost_crab_red.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/ghost_crab/ghost_crab_red.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/ghost_crab_red.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/ghost_crab/ghost_crab_red.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/ghost_crab_white.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/ghost_crab/ghost_crab_white.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/ghost_crab_white.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/ghost_crab/ghost_crab_white.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/ghost_crab_yellow.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/ghost_crab/ghost_crab_yellow.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/ghost_crab_yellow.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/ghost_crab/ghost_crab_yellow.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/giant_isopod.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/giant_isopod/giant_isopod.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/giant_isopod.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/giant_isopod/giant_isopod.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/hermit_crab.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/hermit_crab/hermit_crab.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/hermit_crab.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/hermit_crab/hermit_crab.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/horseshoe_crab.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/horseshoe_crab/horseshoe_crab.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/horseshoe_crab.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/horseshoe_crab/horseshoe_crab.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/karkinos.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/karkinos/karkinos.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/karkinos.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/karkinos/karkinos.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/lightfoot_crab.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lightfoot_crab/lightfoot_crab.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/lightfoot_crab.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lightfoot_crab/lightfoot_crab.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/lobster_black.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lobster/lobster_black.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/lobster_black.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lobster/lobster_black.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/lobster_blue.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lobster/lobster_blue.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/lobster_blue.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lobster/lobster_blue.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/lobster_green.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lobster/lobster_green.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/lobster_green.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lobster/lobster_green.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/lobster_palestine.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lobster/lobster_palestine.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/lobster_palestine.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lobster/lobster_palestine.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/lobster_red.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lobster/lobster_red.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/lobster_red.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lobster/lobster_red.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/lobster_white.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lobster/lobster_white.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/lobster_white.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lobster/lobster_white.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/lobster_yellow.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lobster/lobster_yellow.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/lobster_yellow.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/lobster/lobster_yellow.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_black.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_black.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_black.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_black.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_black_white.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_black_white.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_black_white.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_black_white.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_blue.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_blue.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_blue.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_blue.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_blue_white.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_blue_white.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_blue_white.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_blue_white.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_brown.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_brown.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_brown.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_brown.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_brown_white.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_brown_white.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_brown_white.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_brown_white.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_green.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_green.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_green.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_green.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_green_white.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_green_white.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_green_white.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_green_white.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_lime.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_lime.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_lime.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_lime.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_lime_white.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_lime_white.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_lime_white.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_lime_white.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_orange.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_orange.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_orange.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_orange.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_orange_white.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_orange_white.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_orange_white.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_orange_white.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_palestine.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_palestine.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_palestine.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_palestine.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_pink.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_pink.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_pink.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_pink.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_pink_white.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_pink_white.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_pink_white.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_pink_white.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_red.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_red.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_red.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_red.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_red_white.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_red_white.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_red_white.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_red_white.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_white.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_white.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_white.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_white.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_yellow.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_yellow.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_yellow.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_yellow.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_yellow_white.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_yellow_white.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/shrimp_yellow_white.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/shrimp/shrimp_yellow_white.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/spider_crab.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/spider_crab/spider_crab.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/spider_crab.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/spider_crab/spider_crab.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/vampire_crab.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/vampire_crab/vampire_crab.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/vampire_crab.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/vampire_crab/vampire_crab.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/yeti_crab.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/yeti_crab/yeti_crab.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/yeti_crab.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/yeti_crab/yeti_crab.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/anglerfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/anglerfish/anglerfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/anglerfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/anglerfish/anglerfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/anglerfish_glowmask.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/anglerfish/anglerfish_glowmask.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/anglerfish_glowmask.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/anglerfish/anglerfish_glowmask.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/barreleye.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/barreleye/barreleye.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/barreleye.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/barreleye/barreleye.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/barreleye_glowmask.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/barreleye/barreleye_glowmask.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/barreleye_glowmask.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/barreleye/barreleye_glowmask.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/barreleye_translucent.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/barreleye/barreleye_translucent.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/barreleye_translucent.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/barreleye/barreleye_translucent.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/betta.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/betta.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/betta_black.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta_black.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/betta_black.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta_black.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/betta_blue.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta_blue.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/betta_blue.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta_blue.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/betta_blue_yellow.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta_blue_yellow.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/betta_blue_yellow.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta_blue_yellow.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/betta_green.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta_green.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/betta_green.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta_green.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/betta_pink.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta_pink.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/betta_pink.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta_pink.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/betta_red.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta_red.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/betta_red.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta_red.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/betta_white.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta_white.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/betta_white.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/betta/betta_white.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/carp_koi_ai_goromo.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/carp/carp_koi_ai_goromo.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/carp_koi_ai_goromo.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/carp/carp_koi_ai_goromo.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/carp_koi_hajiro.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/carp/carp_koi_hajiro.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/carp_koi_hajiro.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/carp/carp_koi_hajiro.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/carp_koi_platinum.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/carp/carp_koi_platinum.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/carp_koi_platinum.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/carp/carp_koi_platinum.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/carp_koi_tancho.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/carp/carp_koi_tancho.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/carp_koi_tancho.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/carp/carp_koi_tancho.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_cinnamon.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_cinnamon.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_cinnamon.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_cinnamon.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_clarkii.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_clarkii.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_clarkii.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_clarkii.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_ocellaris.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_ocellaris.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_ocellaris.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_ocellaris.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_orange_skunk.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_orange_skunk.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_orange_skunk.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_orange_skunk.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_percula.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_percula.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_percula.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_percula.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_pink_skunk.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_pink_skunk.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_pink_skunk.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_pink_skunk.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_tomato.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_tomato.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_tomato.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_tomato.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_whiteband.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_whiteband.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/clownfish_whiteband.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/clownfish/clownfish_whiteband.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/cowfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/cowfish/cowfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/cowfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/cowfish/cowfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/danio.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/danio/danio.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/danio.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/danio/danio.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/discus.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/discus/discus.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/discus.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/discus/discus.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/discus_blue.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/discus/discus_blue.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/discus_blue.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/discus/discus_blue.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/discus_green.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/discus/discus_green.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/discus_green.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/discus/discus_green.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/discus_purple.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/discus/discus_purple.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/discus_purple.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/discus/discus_purple.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/dragonfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/dragonfish/dragonfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/dragonfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/dragonfish/dragonfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/dragonfish_glowmask.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/dragonfish/dragonfish_glowmask.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/dragonfish_glowmask.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/dragonfish/dragonfish_glowmask.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/flashlightfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/flashlightfish/flashlightfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/flashlightfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/flashlightfish/flashlightfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/flashlightfish_glowmask.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/flashlightfish/flashlightfish_glowmask.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/flashlightfish_glowmask.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/flashlightfish/flashlightfish_glowmask.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/goldfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/goldfish/goldfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/goldfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/goldfish/goldfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/goldfish_shubunkin.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/goldfish/goldfish_shubunkin.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/goldfish_shubunkin.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/goldfish/goldfish_shubunkin.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/gourami.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/gourami/gourami.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/gourami.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/gourami/gourami.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/gourami_pink.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/gourami/gourami_pink.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/gourami_pink.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/gourami/gourami_pink.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/gourami_purple.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/gourami/gourami_purple.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/gourami_purple.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/gourami/gourami_purple.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/gourami_yellow.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/gourami/gourami_yellow.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/gourami_yellow.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/gourami/gourami_yellow.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/lionfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/lionfish/lionfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/lionfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/lionfish/lionfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/mahimahi.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/mahimahi/mahimahi.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/mahimahi.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/mahimahi/mahimahi.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/manta_ray.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/manta_ray/manta_ray.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/manta_ray.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/manta_ray/manta_ray.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/moray_eel.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/moray_eel/moray_eel.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/moray_eel.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/moray_eel/moray_eel.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/needlefish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/needlefish/needlefish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/needlefish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/needlefish/needlefish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/neon_tetra.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/neon_tetra/neon_tetra.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/neon_tetra.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/neon_tetra/neon_tetra.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/tetra.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/neon_tetra/tetra.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/tetra.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/neon_tetra/tetra.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/oarfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/oarfish/oarfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/oarfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/oarfish/oarfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/oarfish_glowmask.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/oarfish/oarfish_glowmask.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/oarfish_glowmask.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/oarfish/oarfish_glowmask.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/opah.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/opah/opah.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/opah.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/opah/opah.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/oscar.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/oscar/oscar.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/oscar.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/oscar/oscar.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/piranha.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/piranha/piranha.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/piranha.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/piranha/piranha.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/ratfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/ratfish/ratfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/ratfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/ratfish/ratfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/ratfish_gray.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/ratfish/ratfish_gray.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/ratfish_gray.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/ratfish/ratfish_gray.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/rockfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/rockfish/rockfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/rockfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/rockfish/rockfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sea_angel.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/sea_angel/sea_angel.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sea_angel.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/sea_angel/sea_angel.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sea_angel_glowmask.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/sea_angel/sea_angel_glowmask.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sea_angel_glowmask.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/sea_angel/sea_angel_glowmask.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_big_belly.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_big_belly.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_big_belly.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_big_belly.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_blue.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_blue.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_blue.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_blue.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_common.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_common.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_common.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_common.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_green.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_green.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_green.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_green.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_orange.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_orange.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_orange.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_orange.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_pink.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_pink.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_pink.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_pink.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_purple.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_purple.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_purple.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_purple.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_pygmy.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_pygmy.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_pygmy.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_pygmy.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_thorny.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_thorny.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_thorny.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_thorny.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_yellow.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_yellow.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/seahorse_yellow.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/seahorse/seahorse_yellow.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/stingray.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/stingray/stingray.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/stingray.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/stingray/stingray.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/stingray_blue_spotted.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/stingray/stingray_blue_spotted.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/stingray_blue_spotted.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/stingray/stingray_blue_spotted.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/stingray_spotted_eagle.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/stingray/stingray_spotted_eagle.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/stingray_spotted_eagle.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/stingray/stingray_spotted_eagle.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/stonefish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/stonefish/stonefish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/stonefish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/stonefish/stonefish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sunfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/sunfish/sunfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sunfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/sunfish/sunfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sunfish_giant.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/sunfish/sunfish_giant.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sunfish_giant.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/sunfish/sunfish_giant.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sunfish_hoodwinker.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/sunfish/sunfish_hoodwinker.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sunfish_hoodwinker.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/sunfish/sunfish_hoodwinker.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sunfish_ocean.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/sunfish/sunfish_ocean.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sunfish_ocean.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/sunfish/sunfish_ocean.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sunfish_sharptail.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/sunfish/sunfish_sharptail.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sunfish_sharptail.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/sunfish/sunfish_sharptail.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish_blue_tang.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish_blue_tang.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish_blue_tang.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish_blue_tang.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish_lined.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish_lined.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish_lined.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish_lined.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish_orangeshoulder.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish_orangeshoulder.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish_orangeshoulder.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish_orangeshoulder.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish_powder_blue_tang.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish_powder_blue_tang.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish_powder_blue_tang.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish_powder_blue_tang.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish_sohal.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish_sohal.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish_sohal.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish_sohal.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish_unicornfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish_unicornfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish_unicornfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish_unicornfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish_yellow_tang.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish_yellow_tang.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/surgeonfish_yellow_tang.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/surgeonfish/surgeonfish_yellow_tang.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/tiger_barb.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/tiger_barb/tiger_barb.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/tiger_barb.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/tiger_barb/tiger_barb.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/toadfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/toadfish/toadfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/toadfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/toadfish/toadfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/triggerfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/triggerfish/triggerfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/triggerfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/triggerfish/triggerfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/tuna.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/tuna/tuna.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/tuna.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/tuna/tuna.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/tuna_blackfin.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/tuna/tuna_blackfin.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/tuna_blackfin.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/tuna/tuna_blackfin.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/tuna_bluefin.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/tuna/tuna_bluefin.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/tuna_bluefin.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/tuna/tuna_bluefin.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/tuna_yellowfin.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/fish/tuna/tuna_yellowfin.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/tuna_yellowfin.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/fish/tuna/tuna_yellowfin.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/atolla_jellyfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/atolla_jellyfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/atolla_jellyfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/atolla_jellyfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/atolla_jellyfish_glowmask.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/atolla_jellyfish_glowmask.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/atolla_jellyfish_glowmask.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/atolla_jellyfish_glowmask.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/barrel_jellyfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/barrel_jellyfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/barrel_jellyfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/barrel_jellyfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/blue_jellyfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/blue_jellyfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/blue_jellyfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/blue_jellyfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/cauliflower_jellyfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/cauliflower_jellyfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/cauliflower_jellyfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/cauliflower_jellyfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/compass_jellyfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/compass_jellyfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/compass_jellyfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/compass_jellyfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/fried_egg_jellyfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/fried_egg_jellyfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/fried_egg_jellyfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/fried_egg_jellyfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/lions_mane_jellyfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/lions_mane_jellyfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/lions_mane_jellyfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/lions_mane_jellyfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/mauve_stinger.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/mauve_stinger.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/mauve_stinger.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/mauve_stinger.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/mauve_stinger_glowmask.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/mauve_stinger_glowmask.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/mauve_stinger_glowmask.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/mauve_stinger_glowmask.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/moon_jellyfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/moon_jellyfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/moon_jellyfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/moon_jellyfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/moon_jellyfish_glowmask.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/moon_jellyfish_glowmask.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/moon_jellyfish_glowmask.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/moon_jellyfish_glowmask.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/nomura_jellyfish.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/nomura_jellyfish.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/nomura_jellyfish.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/nomura_jellyfish.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/sea_nettle.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/sea_nettle.png
similarity index 100%
rename from src/main/resources/assets/hybrid-aquatic/textures/entity/sea_nettle.png
rename to src/main/resources/assets/hybrid-aquatic/textures/entity/jellyfish/sea_nettle.png
diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/mantis_shrimp.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/mantis_shrimp.png
deleted file mode 100644
index 4191d6b15a67b5698bd2145acb8f0912ac53db94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 588
zcmV-S0<-;zP)o+z}zA?-oX)3K2eqn4TVYS})_NZ2(t2GfT`)5A;|B@)|q`?|pR@g}gHl2ZsFR!w2
z2CmOewGsh9YB=)b+rp)WBTU+5y7`h1kMp$s_B#UrKF8r+4AHc`$pGDtZlY`YLx@$vX?
zu&o1Hcn*NoI%e292sICoG?ipsAxTpg1`0cL^CV^!L9AnJCLxIRKw^`2nW$DG*62n$
z3%+2ouF(Al9Qr*MX}*Q8pAS*oc!AE-yziV)sSp6zr>CKlVUnhjAl8w%djtTuNdN$*
zKbx>e&jL=CkpTcmn?FLo4$d+%Slv59nr{IB-oHLXapPLPga)gV^$nw}EA;4z1pw&x
zTv%al2d;-|(k{~?y?VY&vaWc#tSeMK-;Hb#1OI|~z29>&?KC}o+G%<%iiwGdiHV7c
aiGn|6>I8Q*Md;K30000