From 92cefaf5066074e7ca915a1c88472fad82edc0bb Mon Sep 17 00:00:00 2001 From: MysticKoko <132279944+MysticKoko@users.noreply.github.com> Date: Sun, 4 Feb 2024 20:32:13 +0200 Subject: [PATCH] Edited Karkinos Claw Edited Ominous Hook Adjusted entity tags Adjusted item tags Adjusted language file --- .../FishingBobberEntityRendererMixin.java | 3 ++ .../assets/hybrid-aquatic/lang/en_us.json | 3 ++ .../models/item/ominous_hook.json | 6 +++ .../loot_tables/entities/karkinos.json | 40 ++++++++++++++++++ .../tags/entity_types/small_prey.json | 11 +++++ .../hybrid-aquatic/tags/items/lure_items.json | 3 +- .../aquatic/data/client/LanguageProvider.kt | 3 ++ .../aquatic/data/client/ModelProvider.kt | 1 + .../loot/EntityTypeLootTableProvider.kt | 12 ++++++ .../data/server/tag/ItemTagProvider.kt | 3 +- .../aquatic/item/HybridAquaticItemGroups.kt | 1 + ...inos_crab_claw.json => karkinos_claw.json} | 2 +- ...rkinos_crab_claw.png => karkinos_claw.png} | Bin 13 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 src/generated/resources/assets/hybrid-aquatic/models/item/ominous_hook.json create mode 100644 src/generated/resources/data/hybrid-aquatic/loot_tables/entities/karkinos.json rename src/main/resources/assets/hybrid-aquatic/models/item/{karkinos_crab_claw.json => karkinos_claw.json} (98%) rename src/main/resources/assets/hybrid-aquatic/textures/item/{karkinos_crab_claw.png => karkinos_claw.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 ca14334d6..1954eaa28 100644 --- 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 index c87eee779..372150e99 100644 --- 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 new file mode 100644 index 000000000..b61003101 --- /dev/null +++ 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" + } +} \ No newline at end of file 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 new file mode 100644 index 000000000..f40cf8971 --- /dev/null +++ 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 + } + ] +} \ No newline at end of file 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 index 2d040d2f3..f4a7a6226 100644 --- 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 index ce4aced6c..cbe3656eb 100644 --- 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" ] } \ No newline at end of file diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt index ead59a7ee..81e721f5f 100644 --- 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 index d5fbbc920..a248c867c 100644 --- 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 index a1b799b6f..614c5980e 100644 --- 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 index 7c8eda7f8..f51af6d6a 100644 --- 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 index 4d4d8292c..c806eeab5 100644 --- 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/src/main/resources/assets/hybrid-aquatic/models/item/karkinos_crab_claw.json b/src/main/resources/assets/hybrid-aquatic/models/item/karkinos_claw.json similarity index 98% rename from src/main/resources/assets/hybrid-aquatic/models/item/karkinos_crab_claw.json rename to src/main/resources/assets/hybrid-aquatic/models/item/karkinos_claw.json index c8ae008e5..fa97a6d48 100644 --- a/src/main/resources/assets/hybrid-aquatic/models/item/karkinos_crab_claw.json +++ b/src/main/resources/assets/hybrid-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/src/main/resources/assets/hybrid-aquatic/textures/item/karkinos_crab_claw.png b/src/main/resources/assets/hybrid-aquatic/textures/item/karkinos_claw.png similarity index 100% rename from src/main/resources/assets/hybrid-aquatic/textures/item/karkinos_crab_claw.png rename to src/main/resources/assets/hybrid-aquatic/textures/item/karkinos_claw.png