Added some new types of crab claw, with more to come

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

@@ -53,6 +53,7 @@
   "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",
@@ -147,15 +148,18 @@
   "item.hybrid-aquatic.cuttlefish_spawn_egg": "Cuttlefish Spawn Egg",
   "item.hybrid-aquatic.discus_spawn_egg": "Discus Spawn Egg",
   "item.hybrid-aquatic.dragonfish_spawn_egg": "Dragonfish Spawn Egg",
+  "item.hybrid-aquatic.fiddler_crab_claw": "Fiddler Crab Claw",
   "item.hybrid-aquatic.fiddler_crab_spawn_egg": "Fiddler Crab Spawn Egg",
   "item.hybrid-aquatic.firefly_squid_spawn_egg": "Firefly Squid Spawn Egg",
   "item.hybrid-aquatic.fish_meat": "Fish Meat",
   "item.hybrid-aquatic.fishing_net": "Fishing Net",
   "item.hybrid-aquatic.fishing_net.description": "Stored Entity: %s",
   "item.hybrid-aquatic.flashlight_fish_spawn_egg": "Flashlight Fish Spawn Egg",
+  "item.hybrid-aquatic.flower_crab_claw": "Flower Crab Claw",
   "item.hybrid-aquatic.flower_crab_spawn_egg": "Flower Crab Spawn Egg",
   "item.hybrid-aquatic.fried_egg_jellyfish_spawn_egg": "Fried Egg Jellyfish Spawn Egg",
   "item.hybrid-aquatic.frilled_shark_spawn_egg": "Frilled Shark Spawn Egg",
+  "item.hybrid-aquatic.ghost_crab_claw": "Ghost Crab Claw",
   "item.hybrid-aquatic.ghost_crab_spawn_egg": "Ghost Crab Spawn Egg",
   "item.hybrid-aquatic.giant_isopod_spawn_egg": "Giant Isopod Spawn Egg",
   "item.hybrid-aquatic.glow_slime": "Glow Slime",
@@ -168,6 +172,7 @@
   "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",
@@ -221,6 +226,7 @@
   "item.hybrid-aquatic.triggerfish_spawn_egg": "Triggerfish Spawn Egg",
   "item.hybrid-aquatic.unicorn_fish": "Unicorn Fish",
   "item.hybrid-aquatic.unicorn_fish_spawn_egg": "Unicorn Fish Spawn Egg",
+  "item.hybrid-aquatic.vampire_crab_claw": "Vampire Crab Claw",
   "item.hybrid-aquatic.vampire_crab_spawn_egg": "Vampire Crab Spawn Egg",
   "item.hybrid-aquatic.vampire_squid_spawn_egg": "Vampire Squid Spawn Egg",
   "item.hybrid-aquatic.whale_shark_spawn_egg": "Whale Shark Spawn Egg",

src/generated/resources/assets/hybrid-aquatic/models/item/fiddler_crab_claw.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hybrid-aquatic:item/fiddler_crab_claw"
+  }
+}

src/generated/resources/assets/hybrid-aquatic/models/item/flower_crab_claw.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hybrid-aquatic:item/flower_crab_claw"
+  }
+}

src/generated/resources/assets/hybrid-aquatic/models/item/ghost_crab_claw.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hybrid-aquatic:item/ghost_crab_claw"
+  }
+}

src/generated/resources/assets/hybrid-aquatic/models/item/vampire_crab_claw.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hybrid-aquatic:item/vampire_crab_claw"
+  }
+}

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

@@ -39,7 +39,7 @@
               "function": "minecraft:set_count"
             }
           ],
-          "name": "hybrid-aquatic:crab_claw"
+          "name": "hybrid-aquatic:fiddler_crab_claw"
         }
       ],
       "rolls": 1.0

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

@@ -39,7 +39,7 @@
               "function": "minecraft:set_count"
             }
           ],
-          "name": "hybrid-aquatic:crab_claw"
+          "name": "hybrid-aquatic:flower_crab_claw"
         }
       ],
       "rolls": 1.0

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

@@ -39,7 +39,7 @@
               "function": "minecraft:set_count"
             }
           ],
-          "name": "hybrid-aquatic:crab_claw"
+          "name": "hybrid-aquatic:ghost_crab_claw"
         }
       ],
       "rolls": 1.0

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

@@ -39,7 +39,7 @@
               "function": "minecraft:set_count"
             }
           ],
-          "name": "hybrid-aquatic:crab_claw"
+          "name": "hybrid-aquatic:vampire_crab_claw"
         }
       ],
       "rolls": 1.0

src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt

@@ -101,6 +101,10 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output
             HybridAquaticItems.TRIGGERFISH to "Triggerfish",
             HybridAquaticItems.COWFISH to "Cowfish",
             HybridAquaticItems.CRAB_CLAW to "Crab Claw",
+            HybridAquaticItems.FIDDLER_CRAB_CLAW to "Fiddler Crab Claw",
+            HybridAquaticItems.GHOST_CRAB_CLAW to "Ghost Crab Claw",
+            HybridAquaticItems.FLOWER_CRAB_CLAW to "Flower Crab Claw",
+            HybridAquaticItems.VAMPIRE_CRAB_CLAW to "Vampire Crab Claw",
             HybridAquaticItems.GLOW_SLIME to "Glow Slime",
             HybridAquaticItems.SHARK_TOOTH to "Shark Tooth",
             HybridAquaticItems.SPONGE_CHUNK to "Sponge Chunk",
@@ -200,6 +204,7 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output
             HybridAquaticEntityTypes.TIGER_SHARK to "Tiger Shark",
             HybridAquaticEntityTypes.HAMMERHEAD_SHARK to "Hammerhead Shark",
             HybridAquaticEntityTypes.WHALE_SHARK to "Whale Shark",
+            HybridAquaticEntityTypes.KARKINOS to "Karkinos",
             HybridAquaticEntityTypes.CRAB to "Crab",
             HybridAquaticEntityTypes.FIDDLER_CRAB to "Fiddler Crab",
             HybridAquaticEntityTypes.HERMIT_CRAB to "Hermit Crab",

src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt

@@ -61,6 +61,10 @@ class ModelProvider(output: FabricDataOutput) : FabricModelProvider(output) {
     override fun generateItemModels(generator: ItemModelGenerator) {
         setOf(
             HybridAquaticItems.CRAB_CLAW,
+            HybridAquaticItems.FIDDLER_CRAB_CLAW,
+            HybridAquaticItems.VAMPIRE_CRAB_CLAW,
+            HybridAquaticItems.FLOWER_CRAB_CLAW,
+            HybridAquaticItems.GHOST_CRAB_CLAW,
             HybridAquaticItems.CRAB_MEAT,
             HybridAquaticItems.COOKED_CRAB_MEAT,
             HybridAquaticItems.FISH_MEAT,

src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/EntityTypeLootTableProvider.kt

@@ -60,7 +60,7 @@ class EntityTypeLootTableProvider(output: FabricDataOutput) : SimpleFabricLootTa
             pool(
                 LootPool.builder()
                     .with(
-                        ItemEntry.builder(HybridAquaticItems.CRAB_CLAW)
+                        ItemEntry.builder(HybridAquaticItems.FIDDLER_CRAB_CLAW)
                             .apply(FurnaceSmeltLootFunction.builder().conditionally(EntityPropertiesLootCondition.builder(LootContext.EntityTarget.THIS, NEEDS_ENTITY_ON_FIRE)))
                             .apply(LootingEnchantLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
                             .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F)))
@@ -84,7 +84,7 @@ class EntityTypeLootTableProvider(output: FabricDataOutput) : SimpleFabricLootTa
             pool(
                 LootPool.builder()
                     .with(
-                        ItemEntry.builder(HybridAquaticItems.CRAB_CLAW)
+                        ItemEntry.builder(HybridAquaticItems.GHOST_CRAB_CLAW)
                             .apply(FurnaceSmeltLootFunction.builder().conditionally(EntityPropertiesLootCondition.builder(LootContext.EntityTarget.THIS, NEEDS_ENTITY_ON_FIRE)))
                             .apply(LootingEnchantLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
                             .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F)))
@@ -96,7 +96,7 @@ class EntityTypeLootTableProvider(output: FabricDataOutput) : SimpleFabricLootTa
             pool(
                 LootPool.builder()
                     .with(
-                        ItemEntry.builder(HybridAquaticItems.CRAB_CLAW)
+                        ItemEntry.builder(HybridAquaticItems.VAMPIRE_CRAB_CLAW)
                             .apply(FurnaceSmeltLootFunction.builder().conditionally(EntityPropertiesLootCondition.builder(LootContext.EntityTarget.THIS, NEEDS_ENTITY_ON_FIRE)))
                             .apply(LootingEnchantLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
                             .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F)))
@@ -108,7 +108,7 @@ class EntityTypeLootTableProvider(output: FabricDataOutput) : SimpleFabricLootTa
             pool(
                 LootPool.builder()
                     .with(
-                        ItemEntry.builder(HybridAquaticItems.CRAB_CLAW)
+                        ItemEntry.builder(HybridAquaticItems.FLOWER_CRAB_CLAW)
                             .apply(FurnaceSmeltLootFunction.builder().conditionally(EntityPropertiesLootCondition.builder(LootContext.EntityTarget.THIS, NEEDS_ENTITY_ON_FIRE)))
                             .apply(LootingEnchantLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
                             .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F)))

src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt

@@ -75,6 +75,10 @@ object HybridAquaticItemGroups {
 
             // miscellaneous items
             entries.add(HybridAquaticItems.CRAB_CLAW)
+            entries.add(HybridAquaticItems.FIDDLER_CRAB_CLAW)
+            entries.add(HybridAquaticItems.VAMPIRE_CRAB_CLAW)
+            entries.add(HybridAquaticItems.FLOWER_CRAB_CLAW)
+            entries.add(HybridAquaticItems.GHOST_CRAB_CLAW)
             entries.add(HybridAquaticItems.GLOW_SLIME)
             entries.add(HybridAquaticItems.SHARK_TOOTH)
             entries.add(HybridAquaticItems.PEARL)

src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt

@@ -34,6 +34,10 @@ object HybridAquaticItems {
     val BLACK_PEARL = register("black_pearl", Item(FabricItemSettings()))
 
     val CRAB_CLAW = register("crab_claw", Item(FabricItemSettings()))
+    val FIDDLER_CRAB_CLAW = register("fiddler_crab_claw", Item(FabricItemSettings()))
+    val VAMPIRE_CRAB_CLAW = register("vampire_crab_claw", Item(FabricItemSettings()))
+    val FLOWER_CRAB_CLAW = register("flower_crab_claw", Item(FabricItemSettings()))
+    val GHOST_CRAB_CLAW = register("ghost_crab_claw", Item(FabricItemSettings()))
 
     // food items
     val COOKED_CRAB_MEAT = register("cooked_crab_meat",