Edited Karkinos Claw

Edited Ominous Hook Adjusted entity tags Adjusted item tags Adjusted language file
hybridlabs · Feb 4, 2024 · 92cefaf · 92cefaf
1 parent 9f65405
commit 92cefaf
Show file tree

Hide file tree

Showing 13 changed files with 85 additions and 3 deletions.
diff --git a/src/client/java/dev/hybridlabs/aquatic/mixin/client/FishingBobberEntityRendererMixin.java b/src/client/java/dev/hybridlabs/aquatic/mixin/client/FishingBobberEntityRendererMixin.java
@@ -26,6 +26,8 @@ public abstract class FishingBobberEntityRendererMixin {
   private static final RenderLayer GLOWING_HOOK_LAYER = getRenderLayer(new Identifier(HybridAquatic.MOD_ID, "textures/entity/glowing_bobber.png"));
   @Unique
   private static final RenderLayer MAGNETIC_HOOK_LAYER = getRenderLayer(new Identifier(HybridAquatic.MOD_ID, "textures/entity/magnetic_bobber.png"));
+  @Unique
+  private static final RenderLayer OMINOUS_HOOK_LAYER = getRenderLayer(new Identifier(HybridAquatic.MOD_ID, "textures/entity/ominous_bobber.png"));
 
   @Unique
   FishingBobberEntity entity;
@@ -47,6 +49,7 @@ private VertexConsumer changeRenderLayer(VertexConsumerProvider instance, Render
     if (currentStack.getItem().equals(HybridAquaticItems.INSTANCE.getBARBED_HOOK())) currentRenderLayer = BARBED_HOOK_LAYER;
     else if (currentStack.getItem().equals(HybridAquaticItems.INSTANCE.getGLOWING_HOOK())) currentRenderLayer = GLOWING_HOOK_LAYER;
     else if (currentStack.getItem().equals(HybridAquaticItems.INSTANCE.getMAGNETIC_HOOK())) currentRenderLayer = MAGNETIC_HOOK_LAYER;
+    else if (currentStack.getItem().equals(HybridAquaticItems.INSTANCE.getOMINOUS_HOOK())) currentRenderLayer = OMINOUS_HOOK_LAYER;
 
     return instance.getBuffer(currentRenderLayer);
   }

diff --git a/src/generated/resources/assets/hybrid-aquatic/lang/en_us.json b/src/generated/resources/assets/hybrid-aquatic/lang/en_us.json
@@ -174,6 +174,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_claw": "Karkinos Claw",
   "item.hybrid-aquatic.karkinos_spawn_egg": "Karkinos Spawn Egg",
   "item.hybrid-aquatic.lightfoot_crab_claw": "Lightfoot Crab Claw",
   "item.hybrid-aquatic.lightfoot_crab_spawn_egg": "Lightfoot Crab Spawn Egg",
@@ -196,6 +197,8 @@
   "item.hybrid-aquatic.nomura_jellyfish_spawn_egg": "Nomura Jellyfish Spawn Egg",
   "item.hybrid-aquatic.nudibranch_spawn_egg": "Nudibranch Spawn Egg",
   "item.hybrid-aquatic.oarfish_spawn_egg": "Oarfish Spawn Egg",
+  "item.hybrid-aquatic.ominous_hook": "Ominous Hook",
+  "item.hybrid-aquatic.ominous_hook.description": "Summons Karkinos",
   "item.hybrid-aquatic.opah": "Opah",
   "item.hybrid-aquatic.opah_spawn_egg": "Opah Spawn Egg",
   "item.hybrid-aquatic.oscar": "Oscar",

diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/ominous_hook.json b/src/generated/resources/assets/hybrid-aquatic/models/item/ominous_hook.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hybrid-aquatic:item/ominous_hook"
+  }
+}
diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/karkinos.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/karkinos.json
@@ -0,0 +1,40 @@
+{
+  "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"
+            },
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1.0,
+                "min": 1.0
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
+          "name": "hybrid-aquatic:karkinos_claw"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/hybrid-aquatic/tags/entity_types/small_prey.json b/src/generated/resources/data/hybrid-aquatic/tags/entity_types/small_prey.json
@@ -24,6 +24,17 @@
     "hybrid-aquatic:dungeness_crab",
     "hybrid-aquatic:fiddler_crab",
     "hybrid-aquatic:hermit_crab",
+    "hybrid-aquatic:ghost_crab",
+    "hybrid-aquatic:vampire_crab",
+    "hybrid-aquatic:lightfoot_crab",
+    "hybrid-aquatic:spider_crab",
+    "hybrid-aquatic:yeti_crab",
+    "hybrid-aquatic:horseshoe_crab",
+    "hybrid-aquatic:flower_crab",
+    "hybrid-aquatic:giant_isopod",
+    "hybrid-aquatic:shrimp",
+    "hybrid-aquatic:crayfish",
+    "hybrid-aquatic:lobster",
     "hybrid-aquatic:blue_spotted_stingray",
     "hybrid-aquatic:vampire_squid",
     "hybrid-aquatic:glowing_sucker_octopus",

diff --git a/src/generated/resources/data/hybrid-aquatic/tags/items/lure_items.json b/src/generated/resources/data/hybrid-aquatic/tags/items/lure_items.json
@@ -3,6 +3,7 @@
   "values": [
     "hybrid-aquatic:barbed_hook",
     "hybrid-aquatic:glowing_hook",
-    "hybrid-aquatic:magnetic_hook"
+    "hybrid-aquatic:magnetic_hook",
+    "hybrid-aquatic:ominous_hook"
   ]
 }
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt
@@ -124,7 +124,9 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output
             HybridAquaticItems.BARBED_HOOK to "Barbed Hook",
             HybridAquaticItems.GLOWING_HOOK to "Glowing Hook",
             HybridAquaticItems.MAGNETIC_HOOK to "Magnetic Hook",
+            HybridAquaticItems.OMINOUS_HOOK to "Ominous Hook",
             HybridAquaticItems.FISHING_NET to "Fishing Net",
+            HybridAquaticItems.KARKINOS_CLAW to "Karkinos Claw",
         ).forEach { (item, translation) ->
             builder.add(item, translation)
         }
@@ -143,6 +145,7 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output
             HybridAquaticItems.BARBED_HOOK.translationKey to "Increases fishing speed during the day",
             HybridAquaticItems.GLOWING_HOOK.translationKey to "Increases fishing speed at night",
             HybridAquaticItems.MAGNETIC_HOOK.translationKey to "Increases treasure chance",
+            HybridAquaticItems.OMINOUS_HOOK.translationKey to "Summons Karkinos",
             HybridAquaticBlocks.CRATE.translationKey to "Break with an axe to open",
             HybridAquaticItems.FISHING_NET.translationKey to "Stored Entity: %s"
         ).forEach { (itemTranslationKey, translation) ->

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt
@@ -111,6 +111,7 @@ class ModelProvider(output: FabricDataOutput) : FabricModelProvider(output) {
             HybridAquaticItems.BARBED_HOOK,
             HybridAquaticItems.GLOWING_HOOK,
             HybridAquaticItems.MAGNETIC_HOOK,
+            HybridAquaticItems.OMINOUS_HOOK,
             HybridAquaticItems.FISHING_NET
         ).forEach { item ->
             generator.register(item, Models.GENERATED)

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/EntityTypeLootTableProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/EntityTypeLootTableProvider.kt
@@ -44,6 +44,18 @@ class EntityTypeLootTableProvider(output: FabricDataOutput) : SimpleFabricLootTa
             )
         }
         //crustaceans
+
+        export(exporter, HybridAquaticEntityTypes.KARKINOS) {
+            pool(
+                LootPool.builder()
+                    .with(
+                        ItemEntry.builder(HybridAquaticItems.KARKINOS_CLAW)
+                            .apply(FurnaceSmeltLootFunction.builder().conditionally(EntityPropertiesLootCondition.builder(LootContext.EntityTarget.THIS, NEEDS_ENTITY_ON_FIRE)))
+                            .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 1.0F)))
+                    )
+            )
+        }
+
         export(exporter, HybridAquaticEntityTypes.DUNGENESS_CRAB) {
             pool(
                 LootPool.builder()

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/ItemTagProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/ItemTagProvider.kt
@@ -16,7 +16,8 @@ class ItemTagProvider(output: FabricDataOutput, registriesFuture: CompletableFut
         setOf(
             HybridAquaticItems.BARBED_HOOK,
             HybridAquaticItems.GLOWING_HOOK,
-            HybridAquaticItems.MAGNETIC_HOOK
+            HybridAquaticItems.MAGNETIC_HOOK,
+            HybridAquaticItems.OMINOUS_HOOK
         ).forEach { item ->
             getOrCreateTagBuilder(HybridAquaticItemTags.LURE_ITEMS).add(item)
         }

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt
@@ -101,6 +101,7 @@ object HybridAquaticItemGroups {
             entries.add(HybridAquaticItems.BARBED_HOOK)
             entries.add(HybridAquaticItems.GLOWING_HOOK)
             entries.add(HybridAquaticItems.MAGNETIC_HOOK)
+            entries.add(HybridAquaticItems.OMINOUS_HOOK)
 
             // fishing net
             entries.add(HybridAquaticItems.FISHING_NET)

diff --git a/...uatic/models/item/karkinos_crab_claw.json → ...id-aquatic/models/item/karkinos_claw.json b/...uatic/models/item/karkinos_crab_claw.json → ...id-aquatic/models/item/karkinos_claw.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [64, 64],
 	"textures": {
-		"1": "hybrid-aquatic:item/karkinos_crab_claw"
+		"1": "hybrid-aquatic:item/karkinos_claw"
 	},
 	"elements": [
 		{

diff --git a/...atic/textures/item/karkinos_crab_claw.png → ...d-aquatic/textures/item/karkinos_claw.png b/...atic/textures/item/karkinos_crab_claw.png → ...d-aquatic/textures/item/karkinos_claw.png