Temporarily removed thalassophobia, karkinos, crab pots, and mantis s…

…hrimp

Added colors to all new spawn eggs
Edited entity loot tables
Edited some item tags

src/client/kotlin/dev/hybridlabs/aquatic/HybridAquaticClient.kt

@@ -59,7 +59,6 @@ object HybridAquaticClient : ClientModInitializer {
         BlockEntityRendererFactories.register(HybridAquaticBlockEntityTypes.MESSAGE_IN_A_BOTTLE, ::MessageInABottleBlockEntityRenderer)
         BlockEntityRendererFactories.register(HybridAquaticBlockEntityTypes.BUOY, ::BuoyBlockEntityRenderer)
         BlockEntityRendererFactories.register(HybridAquaticBlockEntityTypes.HYDROTHERMAL_VENT, ::HydrothermalVentBlockEntityRenderer)
-        BlockEntityRendererFactories.register(HybridAquaticBlockEntityTypes.CRAB_POT, ::CrabPotBlockEntityRenderer)
         BlockEntityRendererFactories.register(HybridAquaticBlockEntityTypes.TUBE_SPONGE, ::TubeSpongeBlockEntityRenderer)
     }
 
@@ -72,7 +71,6 @@ object HybridAquaticClient : ClientModInitializer {
         registry.register(HybridAquaticItems.GIANT_CLAM, GiantClamBlockItemRenderer())
         registry.register(HybridAquaticItems.TUBE_SPONGE, TubeSpongeBlockItemRenderer())
         registry.register(HybridAquaticItems.BUOY, BuoyBlockItemRenderer())
-        registry.register(HybridAquaticItems.CRAB_POT, CrabPotBlockItemRenderer())
         registry.register(HybridAquaticItems.MESSAGE_IN_A_BOTTLE, MessageInABottleBlockItemRenderer())
         registry.register(HybridAquaticItems.HYDROTHERMAL_VENT, HydrothermalVentBlockItemRenderer())
     }

src/client/kotlin/dev/hybridlabs/aquatic/client/render/entity/HybridAquaticEntityRenderers.kt

@@ -68,12 +68,10 @@ object HybridAquaticEntityRenderers {
     val YETI_CRAB = EntityRendererRegistry.register(HybridAquaticEntityTypes.YETI_CRAB, ::YetiCrabEntityRenderer)
     val GIANT_ISOPOD = EntityRendererRegistry.register(HybridAquaticEntityTypes.GIANT_ISOPOD, ::GiantIsopodEntityRenderer)
     val SHRIMP = EntityRendererRegistry.register(HybridAquaticEntityTypes.SHRIMP, ::ShrimpEntityRenderer)
-    val MANTIS_SHRIMP = EntityRendererRegistry.register(HybridAquaticEntityTypes.MANTIS_SHRIMP, ::MantisShrimpEntityRenderer)
     val CRAYFISH = EntityRendererRegistry.register(HybridAquaticEntityTypes.CRAYFISH, ::CrayfishEntityRenderer)
     val LOBSTER = EntityRendererRegistry.register(HybridAquaticEntityTypes.LOBSTER, ::LobsterEntityRenderer)
     val COCONUT_CRAB = EntityRendererRegistry.register(HybridAquaticEntityTypes.COCONUT_CRAB, ::CoconutCrabEntityRenderer)
     val HERMIT_CRAB = EntityRendererRegistry.register(HybridAquaticEntityTypes.HERMIT_CRAB, ::HermitCrabEntityRenderer)
-    val KARKINOS = EntityRendererRegistry.register(HybridAquaticEntityTypes.KARKINOS, ::KarkinosEntityRenderer)
     val STARFISH = EntityRendererRegistry.register(HybridAquaticEntityTypes.STARFISH, ::StarfishEntityRenderer)
     val NUDIBRANCH = EntityRendererRegistry.register(HybridAquaticEntityTypes.NUDIBRANCH, ::NudibranchEntityRenderer)
     val SEA_CUCUMBER = EntityRendererRegistry.register(HybridAquaticEntityTypes.SEA_CUCUMBER, ::SeaCucumberEntityRenderer)

src/client/kotlin/dev/hybridlabs/aquatic/client/render/item/HydrothermalVentBlockItemRenderer.kt

@@ -2,10 +2,7 @@ package dev.hybridlabs.aquatic.client.render.item
 
 import dev.hybridlabs.aquatic.HybridAquaticClient
 import dev.hybridlabs.aquatic.block.HybridAquaticBlocks
-import dev.hybridlabs.aquatic.block.entity.BuoyBlockEntity
-import dev.hybridlabs.aquatic.block.entity.CrabPotBlockEntity
 import dev.hybridlabs.aquatic.block.entity.HydrothermalVentBlockEntity
-import dev.hybridlabs.aquatic.client.render.block.entity.BuoyBlockEntityRenderer
 import dev.hybridlabs.aquatic.client.render.block.entity.HydrothermalVentBlockEntityRenderer
 import net.fabricmc.fabric.api.client.rendering.v1.BuiltinItemRendererRegistry.DynamicItemRenderer
 import net.minecraft.client.render.VertexConsumerProvider

src/generated/resources/assets/hybrid-aquatic/lang/en_us.json

@@ -3,7 +3,6 @@
   "block.hybrid-aquatic.basking_shark_plushie": "Basking Shark Plushie",
   "block.hybrid-aquatic.bull_shark_plushie": "Bull Shark Plushie",
   "block.hybrid-aquatic.buoy": "Buoy",
-  "block.hybrid-aquatic.crab_pot": "Crab Pot",
   "block.hybrid-aquatic.crate": "Crate",
   "block.hybrid-aquatic.crate.description": "Break with an axe to open",
   "block.hybrid-aquatic.frilled_shark_plushie": "Frilled Shark Plushie",
@@ -54,13 +53,11 @@
   "entity.hybrid-aquatic.hammerhead_shark": "Hammerhead Shark",
   "entity.hybrid-aquatic.hermit_crab": "Hermit Crab",
   "entity.hybrid-aquatic.horseshoe_crab": "Horseshoe Crab",
-  "entity.hybrid-aquatic.karkinos": "Karkinos",
   "entity.hybrid-aquatic.lightfoot_crab": "Lightfoot Crab",
   "entity.hybrid-aquatic.lionfish": "Lionfish",
   "entity.hybrid-aquatic.lions_mane_jellyfish": "Lion's Mane Jellyfish",
   "entity.hybrid-aquatic.lobster": "Lobster",
   "entity.hybrid-aquatic.mahimahi": "Mahimahi",
-  "entity.hybrid-aquatic.mantis_shrimp": "Mantis Shrimp",
   "entity.hybrid-aquatic.mauve_stinger": "Mauve Stinger",
   "entity.hybrid-aquatic.moon_jellyfish": "Moon Jellyfish",
   "entity.hybrid-aquatic.moray_eel": "Moray Eel",
@@ -171,7 +168,6 @@
   "item.hybrid-aquatic.hermit_crab_spawn_egg": "Hermit Crab Spawn Egg",
   "item.hybrid-aquatic.hook.description": "Needs to be put in the offhand",
   "item.hybrid-aquatic.horseshoe_crab_spawn_egg": "Horseshoe Crab Spawn Egg",
-  "item.hybrid-aquatic.karkinos_spawn_egg": "Karkinos Spawn Egg",
   "item.hybrid-aquatic.lightfoot_crab_spawn_egg": "Lightfoot Crab Spawn Egg",
   "item.hybrid-aquatic.lionfish": "Lionfish",
   "item.hybrid-aquatic.lionfish_spawn_egg": "Lionfish Spawn Egg",
@@ -181,7 +177,6 @@
   "item.hybrid-aquatic.magnetic_hook.description": "Increases treasure chance",
   "item.hybrid-aquatic.mahi_mahi": "Mahi Mahi",
   "item.hybrid-aquatic.mahimahi_spawn_egg": "Mahimahi Spawn Egg",
-  "item.hybrid-aquatic.mantis_shrimp_spawn_egg": "Mantis Shrimp Spawn Egg",
   "item.hybrid-aquatic.mauve_stinger_spawn_egg": "Mauve Stinger Spawn Egg",
   "item.hybrid-aquatic.moon_jellyfish_spawn_egg": "Moon Jellyfish Spawn Egg",
   "item.hybrid-aquatic.moray_eel": "Moray Eel",

src/generated/resources/data/hybrid-aquatic/loot_tables/entities/coconut_crab.json

@@ -0,0 +1,48 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "conditions": [
+                {
+                  "condition": "minecraft:entity_properties",
+                  "entity": "this",
+                  "predicate": {
+                    "flags": {
+                      "is_on_fire": true
+                    }
+                  }
+                }
+              ],
+              "function": "minecraft:furnace_smelt"
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1.0,
+                "min": 0.0
+              },
+              "function": "minecraft:looting_enchant"
+            },
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 2.0,
+                "min": 1.0
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
+          "name": "hybrid-aquatic:crab_claw"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/generated/resources/data/hybrid-aquatic/loot_tables/entities/flower_crab.json

@@ -0,0 +1,48 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "conditions": [
+                {
+                  "condition": "minecraft:entity_properties",
+                  "entity": "this",
+                  "predicate": {
+                    "flags": {
+                      "is_on_fire": true
+                    }
+                  }
+                }
+              ],
+              "function": "minecraft:furnace_smelt"
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1.0,
+                "min": 0.0
+              },
+              "function": "minecraft:looting_enchant"
+            },
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 2.0,
+                "min": 1.0
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
+          "name": "hybrid-aquatic:crab_claw"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}