diff --git a/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_crab.json b/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_crab.json index d5018c922..f241f39ea 100644 --- a/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_crab.json +++ b/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_crab.json @@ -1,7 +1,19 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_crab_claw": { + "has_coconut_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:coconut_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dungeness_crab_claw": { "conditions": { "items": [ { @@ -13,16 +25,121 @@ }, "trigger": "minecraft:inventory_changed" }, + "has_fiddler_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:fiddler_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_flower_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:flower_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_ghost_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:ghost_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lightfoot_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:lightfoot_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lobster_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:lobster_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_spider_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:spider_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_the_recipe": { "conditions": { "recipe": "hybrid-aquatic:raw_crab" }, "trigger": "minecraft:recipe_unlocked" + }, + "has_vampire_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:vampire_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_yeti_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:yeti_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ [ - "has_crab_claw", + "has_dungeness_crab_claw", + "has_coconut_crab_claw", + "has_spider_crab_claw", + "has_vampire_crab_claw", + "has_yeti_crab_claw", + "has_ghost_crab_claw", + "has_lightfoot_crab_claw", + "has_flower_crab_claw", + "has_fiddler_crab_claw", + "has_lobster_claw", "has_the_recipe" ] ], diff --git a/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_fish_meat.json b/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_fish_meat.json index 0a64e3bdd..669274e68 100644 --- a/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_fish_meat.json +++ b/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_fish_meat.json @@ -1,12 +1,132 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_fish_meat": { + "has_anglerfish": { "conditions": { "items": [ { "items": [ - "hybrid-aquatic:raw_fish_meat" + "hybrid-aquatic:anglerfish" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_barreleye": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:barreleye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_blue_spotted_stingray": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:blue_spotted_stingray" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_blue_tang": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:blue_tang" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_clownfish": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:clownfish" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_cowfish": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:cowfish" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lionfish": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:lionfish" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_needlefish": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:needlefish" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oscar": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:oscar" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_piranha": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:piranha" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_rockfish": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:rockfish" ] } ] @@ -18,11 +138,47 @@ "recipe": "hybrid-aquatic:raw_fish_meat" }, "trigger": "minecraft:recipe_unlocked" + }, + "has_tiger_barb": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:tiger_barb" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_unicorn_fish": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:unicorn_fish" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ [ - "has_fish_meat", + "has_lionfish", + "has_rockfish", + "has_blue_spotted_stingray", + "has_needlefish", + "has_clownfish", + "has_blue_tang", + "has_barreleye", + "has_anglerfish", + "has_piranha", + "has_unicorn_fish", + "has_cowfish", + "has_tiger_barb", + "has_oscar", "has_the_recipe" ] ], diff --git a/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_fish_steak.json b/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_fish_steak.json index c3d3f45bc..aa1e990c9 100644 --- a/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_fish_steak.json +++ b/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_fish_steak.json @@ -1,12 +1,36 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_fish_meat": { + "has_mahi_mahi": { "conditions": { "items": [ { "items": [ - "hybrid-aquatic:raw_fish_steak" + "hybrid-aquatic:mahi_mahi" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_moray_eel": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:moray_eel" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_opah": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:opah" ] } ] @@ -18,11 +42,39 @@ "recipe": "hybrid-aquatic:raw_fish_steak" }, "trigger": "minecraft:recipe_unlocked" + }, + "has_triggerfish": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:triggerfish" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_yellowfin_tuna": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:yellowfin_tuna" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ [ - "has_fish_meat", + "has_yellowfin_tuna", + "has_mahi_mahi", + "has_opah", + "has_moray_eel", + "has_triggerfish", "has_the_recipe" ] ], diff --git a/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_lobster.json b/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_lobster.json index c75ddf54b..31eabed66 100644 --- a/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_lobster.json +++ b/src/generated/resources/data/hybrid-aquatic/advancements/recipes/food/raw_lobster.json @@ -1,6 +1,78 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_coconut_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:coconut_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dungeness_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:dungeness_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_fiddler_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:fiddler_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_flower_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:flower_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_ghost_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:ghost_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lightfoot_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:lightfoot_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_lobster_claw": { "conditions": { "items": [ @@ -13,16 +85,61 @@ }, "trigger": "minecraft:inventory_changed" }, + "has_spider_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:spider_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_the_recipe": { "conditions": { "recipe": "hybrid-aquatic:raw_lobster" }, "trigger": "minecraft:recipe_unlocked" + }, + "has_vampire_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:vampire_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_yeti_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:yeti_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ [ "has_lobster_claw", + "has_dungeness_crab_claw", + "has_coconut_crab_claw", + "has_spider_crab_claw", + "has_vampire_crab_claw", + "has_yeti_crab_claw", + "has_ghost_crab_claw", + "has_lightfoot_crab_claw", + "has_flower_crab_claw", + "has_fiddler_crab_claw", "has_the_recipe" ] ], diff --git a/src/generated/resources/data/hybrid-aquatic/advancements/recipes/tools/ominous_hook.json b/src/generated/resources/data/hybrid-aquatic/advancements/recipes/tools/ominous_hook.json new file mode 100644 index 000000000..6bbf98406 --- /dev/null +++ b/src/generated/resources/data/hybrid-aquatic/advancements/recipes/tools/ominous_hook.json @@ -0,0 +1,152 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_barbed_hook": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:barbed_hook" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_coconut_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:coconut_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dungeness_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:dungeness_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_fiddler_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:fiddler_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_flower_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:flower_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_ghost_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:ghost_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lightfoot_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:lightfoot_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_spider_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:spider_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hybrid-aquatic:ominous_hook" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vampire_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:vampire_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_yeti_crab_claw": { + "conditions": { + "items": [ + { + "items": [ + "hybrid-aquatic:yeti_crab_claw" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_barbed_hook", + "has_dungeness_crab_claw", + "has_coconut_crab_claw", + "has_spider_crab_claw", + "has_vampire_crab_claw", + "has_yeti_crab_claw", + "has_ghost_crab_claw", + "has_lightfoot_crab_claw", + "has_flower_crab_claw", + "has_fiddler_crab_claw", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hybrid-aquatic:ominous_hook" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/recipes/ominous_hook.json b/src/generated/resources/data/hybrid-aquatic/recipes/ominous_hook.json new file mode 100644 index 000000000..791add5c1 --- /dev/null +++ b/src/generated/resources/data/hybrid-aquatic/recipes/ominous_hook.json @@ -0,0 +1,36 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "hybrid-aquatic:coconut_crab_claw" + }, + { + "item": "hybrid-aquatic:yeti_crab_claw" + }, + { + "item": "hybrid-aquatic:ghost_crab_claw" + }, + { + "item": "hybrid-aquatic:flower_crab_claw" + }, + { + "item": "hybrid-aquatic:spider_crab_claw" + }, + { + "item": "hybrid-aquatic:fiddler_crab_claw" + }, + { + "item": "hybrid-aquatic:vampire_crab_claw" + }, + { + "item": "hybrid-aquatic:dungeness_crab_claw" + }, + { + "item": "hybrid-aquatic:lightfoot_crab_claw" + } + ], + "result": { + "item": "hybrid-aquatic:ominous_hook" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/ghost_crab_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/ghost_crab_spawn_biomes.json index 4c5d4f8c3..acc8a3d34 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/ghost_crab_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/ghost_crab_spawn_biomes.json @@ -1,8 +1,10 @@ { "replace": false, "values": [ + "minecraft:ocean", "minecraft:warm_ocean", "minecraft:lukewarm_ocean", - "minecraft:beach" + "minecraft:beach", + "minecraft:stony_shore" ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/oarfish_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/oarfish_spawn_biomes.json index 64752756c..31cddfa14 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/oarfish_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/oarfish_spawn_biomes.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "minecraft:deep_ocean", - "minecraft:deep_lukewarm_ocean" + "minecraft:deep_lukewarm_ocean", + "minecraft:deep_cold_ocean" ] } \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/vampire_crab_spawn_biomes.json b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/vampire_crab_spawn_biomes.json index 6484e9170..b53b7f195 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/vampire_crab_spawn_biomes.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/vampire_crab_spawn_biomes.json @@ -3,6 +3,8 @@ "values": [ "minecraft:jungle", "minecraft:bamboo_jungle", + "minecraft:sparse_jungle", + "minecraft:swamp", "minecraft:mangrove_swamp" ] } \ No newline at end of file diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/RecipeProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/RecipeProvider.kt index 1a9876a22..4828b5289 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/RecipeProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/RecipeProvider.kt @@ -71,25 +71,81 @@ class RecipeProvider(output: FabricDataOutput) : FabricRecipeProvider(output) { .criterion("has_glow_slime", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.GLOW_SLIME)) .offerTo(exporter) + ShapelessRecipeJsonBuilder.create(RecipeCategory.TOOLS, HybridAquaticItems.OMINOUS_HOOK) + .input(HybridAquaticItems.COCONUT_CRAB_CLAW) + .input(HybridAquaticItems.YETI_CRAB_CLAW) + .input(HybridAquaticItems.GHOST_CRAB_CLAW) + .input(HybridAquaticItems.FLOWER_CRAB_CLAW) + .input(HybridAquaticItems.SPIDER_CRAB_CLAW) + .input(HybridAquaticItems.FIDDLER_CRAB_CLAW) + .input(HybridAquaticItems.VAMPIRE_CRAB_CLAW) + .input(HybridAquaticItems.DUNGENESS_CRAB_CLAW) + .input(HybridAquaticItems.LIGHTFOOT_CRAB_CLAW) + .criterion("has_barbed_hook", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.BARBED_HOOK)) + .criterion("has_dungeness_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.DUNGENESS_CRAB_CLAW)) + .criterion("has_coconut_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.COCONUT_CRAB_CLAW)) + .criterion("has_spider_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.SPIDER_CRAB_CLAW)) + .criterion("has_vampire_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.VAMPIRE_CRAB_CLAW)) + .criterion("has_yeti_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.YETI_CRAB_CLAW)) + .criterion("has_ghost_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.GHOST_CRAB_CLAW)) + .criterion("has_lightfoot_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.LIGHTFOOT_CRAB_CLAW)) + .criterion("has_flower_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.FLOWER_CRAB_CLAW)) + .criterion("has_fiddler_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.FIDDLER_CRAB_CLAW)) + .offerTo(exporter) + // food items ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, HybridAquaticItems.RAW_CRAB) .input(HybridAquaticItemTags.CRAB_CLAW) - .criterion("has_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.DUNGENESS_CRAB_CLAW)) + .criterion("has_dungeness_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.DUNGENESS_CRAB_CLAW)) + .criterion("has_coconut_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.COCONUT_CRAB_CLAW)) + .criterion("has_spider_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.SPIDER_CRAB_CLAW)) + .criterion("has_vampire_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.VAMPIRE_CRAB_CLAW)) + .criterion("has_yeti_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.YETI_CRAB_CLAW)) + .criterion("has_ghost_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.GHOST_CRAB_CLAW)) + .criterion("has_lightfoot_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.LIGHTFOOT_CRAB_CLAW)) + .criterion("has_flower_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.FLOWER_CRAB_CLAW)) + .criterion("has_fiddler_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.FIDDLER_CRAB_CLAW)) + .criterion("has_lobster_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.LOBSTER_CLAW)) .offerTo(exporter) ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, HybridAquaticItems.RAW_LOBSTER) .input(HybridAquaticItems.LOBSTER_CLAW) .criterion("has_lobster_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.LOBSTER_CLAW)) + .criterion("has_dungeness_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.DUNGENESS_CRAB_CLAW)) + .criterion("has_coconut_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.COCONUT_CRAB_CLAW)) + .criterion("has_spider_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.SPIDER_CRAB_CLAW)) + .criterion("has_vampire_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.VAMPIRE_CRAB_CLAW)) + .criterion("has_yeti_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.YETI_CRAB_CLAW)) + .criterion("has_ghost_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.GHOST_CRAB_CLAW)) + .criterion("has_lightfoot_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.LIGHTFOOT_CRAB_CLAW)) + .criterion("has_flower_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.FLOWER_CRAB_CLAW)) + .criterion("has_fiddler_crab_claw", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.FIDDLER_CRAB_CLAW)) .offerTo(exporter) ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, HybridAquaticItems.RAW_FISH_MEAT, 1) .input(HybridAquaticItemTags.SMALL_FISH) - .criterion("has_fish_meat", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.RAW_FISH_MEAT)) + .criterion("has_lionfish", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.LIONFISH)) + .criterion("has_rockfish", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.ROCKFISH)) + .criterion("has_blue_spotted_stingray", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.BLUE_SPOTTED_STINGRAY)) + .criterion("has_needlefish", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.NEEDLEFISH)) + .criterion("has_clownfish", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.CLOWNFISH)) + .criterion("has_blue_tang", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.BLUE_TANG)) + .criterion("has_barreleye", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.BARRELEYE)) + .criterion("has_anglerfish", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.ANGLERFISH)) + .criterion("has_piranha", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.PIRANHA)) + .criterion("has_unicorn_fish", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.UNICORN_FISH)) + .criterion("has_cowfish", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.COWFISH)) + .criterion("has_tiger_barb", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.TIGER_BARB)) + .criterion("has_oscar", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.OSCAR)) .offerTo(exporter) ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, HybridAquaticItems.RAW_FISH_STEAK, 1) .input(HybridAquaticItemTags.MEDIUM_FISH) - .criterion("has_fish_meat", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.RAW_FISH_STEAK)) + .criterion("has_yellowfin_tuna", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.YELLOWFIN_TUNA)) + .criterion("has_mahi_mahi", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.MAHI_MAHI)) + .criterion("has_opah", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.OPAH)) + .criterion("has_moray_eel", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.MORAY_EEL)) + .criterion("has_triggerfish", InventoryChangedCriterion.Conditions.items(HybridAquaticItems.TRIGGERFISH)) .offerTo(exporter) // cooking recipes diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/BiomeTagProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/BiomeTagProvider.kt index ca14be5f9..9e393779b 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/BiomeTagProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/BiomeTagProvider.kt @@ -86,9 +86,11 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu ) getOrCreateTagBuilder(HybridAquaticBiomeTags.GHOST_CRAB_SPAWN_BIOMES).add( + BiomeKeys.OCEAN, BiomeKeys.WARM_OCEAN, BiomeKeys.LUKEWARM_OCEAN, - BiomeKeys.BEACH + BiomeKeys.BEACH, + BiomeKeys.STONY_SHORE, ) getOrCreateTagBuilder(HybridAquaticBiomeTags.LIGHTFOOT_CRAB_SPAWN_BIOMES).add( @@ -109,6 +111,8 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu getOrCreateTagBuilder(HybridAquaticBiomeTags.VAMPIRE_CRAB_SPAWN_BIOMES).add( BiomeKeys.JUNGLE, BiomeKeys.BAMBOO_JUNGLE, + BiomeKeys.SPARSE_JUNGLE, + BiomeKeys.SWAMP, BiomeKeys.MANGROVE_SWAMP ) @@ -348,6 +352,7 @@ class BiomeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu getOrCreateTagBuilder(HybridAquaticBiomeTags.OARFISH_SPAWN_BIOMES).add( BiomeKeys.DEEP_OCEAN, BiomeKeys.DEEP_LUKEWARM_OCEAN, + BiomeKeys.DEEP_COLD_OCEAN, ) getOrCreateTagBuilder(HybridAquaticBiomeTags.OPAH_SPAWN_BIOMES).add( diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt index 37635e216..bc239c017 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt @@ -197,7 +197,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(1) .saturationModifier(0.4F) .meat() .build() @@ -209,7 +209,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(3) .saturationModifier(0.4F) .meat() .build() @@ -221,7 +221,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(3) .saturationModifier(0.4F) .meat() .build() @@ -233,7 +233,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(3) .saturationModifier(0.4F) .meat() .build() @@ -245,7 +245,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(1) .saturationModifier(0.4F) .meat() .build() @@ -257,7 +257,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(1) .saturationModifier(0.4F) .meat() .build() @@ -269,7 +269,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(3) .saturationModifier(0.4F) .meat() .build() @@ -281,7 +281,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(1) .saturationModifier(0.4F) .meat() .build() @@ -293,7 +293,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(1) .saturationModifier(0.4F) .meat() .build() @@ -305,7 +305,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(1) .saturationModifier(0.4F) .meat() .build() @@ -317,7 +317,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(1) .saturationModifier(0.4F) .meat() .build() @@ -329,7 +329,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(1) .saturationModifier(0.4F) .meat() .build() @@ -341,7 +341,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(1) .saturationModifier(0.4F) .meat() .build() @@ -353,7 +353,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(1) .saturationModifier(0.4F) .meat() .build() @@ -365,7 +365,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(1) .saturationModifier(0.4F) .meat() .build() @@ -377,7 +377,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(3) .saturationModifier(0.4F) .meat() .build() @@ -389,7 +389,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(1) .saturationModifier(0.4F) .meat() .build() @@ -401,7 +401,7 @@ object HybridAquaticItems { FabricItemSettings() .food( FoodComponent.Builder() - .hunger(2) + .hunger(1) .saturationModifier(0.4F) .meat() .build()