From 3b4635c2a16c6727e4d124467beef89fca16cd55 Mon Sep 17 00:00:00 2001 From: Xiao-MoMi <70987828+Xiao-MoMi@users.noreply.github.com> Date: Sat, 22 Oct 2022 14:45:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=96=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../api/event/FishFinderEvent.java | 9 +- .../api/event/FishHookEvent.java | 9 +- .../api/event/FishResultEvent.java | 9 +- .../customfishing/api/event/RodCastEvent.java | 9 +- .../api/event/SellFishEvent.java | 9 +- .../api/event/TotemActivationEvent.java | 9 +- .../commands/SellFishCommand.java | 1 + .../commands/subcmd/OpenCommand.java | 2 + .../competition/Competition.java | 5 +- .../customfishing/manager/FishingManager.java | 26 +- .../customfishing/manager/LootManager.java | 2 +- src/main/resources/bars.yml | 2 +- src/main/resources/loots/default.yml | 969 ++++++++++++++++++ 14 files changed, 1033 insertions(+), 30 deletions(-) diff --git a/build.gradle b/build.gradle index 9db788e0..dd4a927b 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'net.momirealms' -version = '1.2.0-beta1' +version = '1.2.0-pre-1' repositories { mavenCentral() diff --git a/src/main/java/net/momirealms/customfishing/api/event/FishFinderEvent.java b/src/main/java/net/momirealms/customfishing/api/event/FishFinderEvent.java index 5b6191a1..8f2a6416 100644 --- a/src/main/java/net/momirealms/customfishing/api/event/FishFinderEvent.java +++ b/src/main/java/net/momirealms/customfishing/api/event/FishFinderEvent.java @@ -49,11 +49,16 @@ public class FishFinderEvent extends PlayerEvent implements Cancellable { cancelled = cancel; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlerList; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + public List getLoots() { return loots; } diff --git a/src/main/java/net/momirealms/customfishing/api/event/FishHookEvent.java b/src/main/java/net/momirealms/customfishing/api/event/FishHookEvent.java index ce23f2e7..72460710 100644 --- a/src/main/java/net/momirealms/customfishing/api/event/FishHookEvent.java +++ b/src/main/java/net/momirealms/customfishing/api/event/FishHookEvent.java @@ -46,11 +46,16 @@ public class FishHookEvent extends PlayerEvent implements Cancellable { cancelled = cancel; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlerList; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + public Difficulty getDifficulty() { return difficulty; } diff --git a/src/main/java/net/momirealms/customfishing/api/event/FishResultEvent.java b/src/main/java/net/momirealms/customfishing/api/event/FishResultEvent.java index 9d9c1c1e..29f1360e 100644 --- a/src/main/java/net/momirealms/customfishing/api/event/FishResultEvent.java +++ b/src/main/java/net/momirealms/customfishing/api/event/FishResultEvent.java @@ -52,11 +52,16 @@ public class FishResultEvent extends PlayerEvent implements Cancellable { cancelled = cancel; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlerList; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + public boolean isDouble() { return isDouble; } diff --git a/src/main/java/net/momirealms/customfishing/api/event/RodCastEvent.java b/src/main/java/net/momirealms/customfishing/api/event/RodCastEvent.java index d95cef43..e8e070a9 100644 --- a/src/main/java/net/momirealms/customfishing/api/event/RodCastEvent.java +++ b/src/main/java/net/momirealms/customfishing/api/event/RodCastEvent.java @@ -46,11 +46,16 @@ public class RodCastEvent extends PlayerEvent implements Cancellable { this.isCancelled = cancel; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlerList; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + public Bonus getBonus() { return bonus; } diff --git a/src/main/java/net/momirealms/customfishing/api/event/SellFishEvent.java b/src/main/java/net/momirealms/customfishing/api/event/SellFishEvent.java index 7d19b5e0..41424e23 100644 --- a/src/main/java/net/momirealms/customfishing/api/event/SellFishEvent.java +++ b/src/main/java/net/momirealms/customfishing/api/event/SellFishEvent.java @@ -27,11 +27,16 @@ public class SellFishEvent extends PlayerEvent implements Cancellable { cancelled = cancel; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlerList; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + public float getMoney() { return money; } diff --git a/src/main/java/net/momirealms/customfishing/api/event/TotemActivationEvent.java b/src/main/java/net/momirealms/customfishing/api/event/TotemActivationEvent.java index dae72217..ffc7f0c7 100644 --- a/src/main/java/net/momirealms/customfishing/api/event/TotemActivationEvent.java +++ b/src/main/java/net/momirealms/customfishing/api/event/TotemActivationEvent.java @@ -50,11 +50,16 @@ public class TotemActivationEvent extends PlayerEvent implements Cancellable { cancelled = cancel; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlerList; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + public Totem getTotem() { return totem; } diff --git a/src/main/java/net/momirealms/customfishing/commands/SellFishCommand.java b/src/main/java/net/momirealms/customfishing/commands/SellFishCommand.java index 6370fe59..ae3a141c 100644 --- a/src/main/java/net/momirealms/customfishing/commands/SellFishCommand.java +++ b/src/main/java/net/momirealms/customfishing/commands/SellFishCommand.java @@ -37,6 +37,7 @@ public class SellFishCommand implements TabExecutor { AdventureUtil.sendMessage(sender, MessageManager.prefix + MessageManager.noConsole); return true; } + player.closeInventory(); CustomFishing.plugin.getSellManager().openGuiForPlayer(player); return true; } diff --git a/src/main/java/net/momirealms/customfishing/commands/subcmd/OpenCommand.java b/src/main/java/net/momirealms/customfishing/commands/subcmd/OpenCommand.java index 0bee02e4..eea0e5b9 100644 --- a/src/main/java/net/momirealms/customfishing/commands/subcmd/OpenCommand.java +++ b/src/main/java/net/momirealms/customfishing/commands/subcmd/OpenCommand.java @@ -51,6 +51,7 @@ public class OpenCommand extends AbstractSubCommand { AdventureUtil.sendMessage(sender, MessageManager.prefix + MessageManager.noPerm); return true; } + player.closeInventory(); CustomFishing.plugin.getBagDataManager().openFishingBag(player, player); } if (args.size() == 1) { @@ -63,6 +64,7 @@ public class OpenCommand extends AbstractSubCommand { AdventureUtil.sendMessage(sender, MessageManager.prefix + MessageManager.playerNotExist); return true; } + player.closeInventory(); CustomFishing.plugin.getBagDataManager().openFishingBag(player, offlinePlayer); } return true; diff --git a/src/main/java/net/momirealms/customfishing/competition/Competition.java b/src/main/java/net/momirealms/customfishing/competition/Competition.java index d9fe9509..06008665 100644 --- a/src/main/java/net/momirealms/customfishing/competition/Competition.java +++ b/src/main/java/net/momirealms/customfishing/competition/Competition.java @@ -62,8 +62,6 @@ public class Competition { Collection playerCollections = Bukkit.getOnlinePlayers(); if (playerCollections.size() >= competitionConfig.getMinPlayers() || forceStart) { - currentCompetition = this; - if (ConfigManager.useRedis){ ranking = new RedisRankingImpl(); } else { @@ -85,8 +83,9 @@ public class Competition { } else { for (Player player : playerCollections) { - AdventureUtil.playerMessage(player, MessageManager.notEnoughPlayers); + AdventureUtil.playerMessage(player, MessageManager.prefix + MessageManager.notEnoughPlayers); } + currentCompetition = null; } } diff --git a/src/main/java/net/momirealms/customfishing/manager/FishingManager.java b/src/main/java/net/momirealms/customfishing/manager/FishingManager.java index 3dc3d093..b6d4d8b0 100644 --- a/src/main/java/net/momirealms/customfishing/manager/FishingManager.java +++ b/src/main/java/net/momirealms/customfishing/manager/FishingManager.java @@ -51,10 +51,7 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Entity; -import org.bukkit.entity.FishHook; -import org.bukkit.entity.Item; -import org.bukkit.entity.Player; +import org.bukkit.entity.*; import org.bukkit.event.HandlerList; import org.bukkit.event.player.PlayerFishEvent; import org.bukkit.event.player.PlayerInteractEvent; @@ -589,9 +586,6 @@ public class FishingManager extends Function { } private void sendSuccessTitle(Player player, String loot) { - - nextLoot.remove(player); - AdventureUtil.playerTitle( player, ConfigManager.successTitle[new Random().nextInt(ConfigManager.successTitle.length)] @@ -659,7 +653,6 @@ public class FishingManager extends Function { action.doOn(player, null); } - nextLoot.remove(player); nextBonus.remove(player); AdventureUtil.playerTitle( @@ -674,8 +667,18 @@ public class FishingManager extends Function { public void onCaughtEntity(PlayerFishEvent event) { final Player player = event.getPlayer(); - if (fishingPlayerCache.remove(player) != null && event.getCaught() != null){ - AdventureUtil.playerMessage(player, MessageManager.prefix + MessageManager.hookOther); + FishingPlayer fishingPlayer = fishingPlayerCache.remove(player); + if (fishingPlayer != null) { + Entity entity = event.getCaught(); + if (entity != null && entity.getType() == EntityType.ARMOR_STAND) { + proceedReelIn(event, player, fishingPlayer); + } + else { + fishingPlayer.cancel(); + nextBonus.remove(player); + nextLoot.remove(player); + AdventureUtil.playerMessage(player, MessageManager.prefix + MessageManager.hookOther); + } } } @@ -755,7 +758,7 @@ public class FishingManager extends Function { NBTItem nbtItem = new NBTItem(itemStack); NBTCompound cfCompound = nbtItem.getCompound("CustomFishing"); if (cfCompound != null && cfCompound.getString("type").equals("util") && cfCompound.getString("id").equals("fishfinder")) { - if (isCoolDown(player, 2000)) return; + if (isCoolDown(player, 1000)) return; useFinder(event.getPlayer()); return; } @@ -805,7 +808,6 @@ public class FishingManager extends Function { } private void useFinder(Player player) { - if (isCoolDown(player, 1000)) return; FishingCondition fishingCondition = new FishingCondition(player.getLocation(), player); List possibleLoots = getPossibleLootList(fishingCondition, true, LootManager.WATERLOOTS.values()); possibleLoots.addAll(getPossibleLootList(fishingCondition, true, LootManager.LAVALOOTS.values())); diff --git a/src/main/java/net/momirealms/customfishing/manager/LootManager.java b/src/main/java/net/momirealms/customfishing/manager/LootManager.java index 4f9e48e9..86b16eea 100644 --- a/src/main/java/net/momirealms/customfishing/manager/LootManager.java +++ b/src/main/java/net/momirealms/customfishing/manager/LootManager.java @@ -153,7 +153,7 @@ public class LootManager extends Function { loot.setSize(size); } if (config.contains(key + ".price")) { - loot.setBasicPrice((float) config.getDouble(key + ".price.basic", 0)); + loot.setBasicPrice((float) config.getDouble(key + ".price.base", 0)); loot.setSizeBonus((float) config.getDouble(key + ".price.bonus", 0)); } if (config.contains(key + ".random-enchantments")){ diff --git a/src/main/resources/bars.yml b/src/main/resources/bars.yml index 5bb591a0..9d5111f5 100644 --- a/src/main/resources/bars.yml +++ b/src/main/resources/bars.yml @@ -56,7 +56,7 @@ rainbow_3: 7: 0 rainbow_4: range: 16 - title: '<#3CB371>GREEN!' + title: 'GREEN!' subtitle: start: '' bar: '뀋' diff --git a/src/main/resources/loots/default.yml b/src/main/resources/loots/default.yml index e69de29b..450cf017 100644 --- a/src/main/resources/loots/default.yml +++ b/src/main/resources/loots/default.yml @@ -0,0 +1,969 @@ +rubbish: + material: paper + show-in-fishfinder: false + display: + name: 'Garbage' + lore: + - 'Maybe we need to protect the environment...' + weight: 130 + time: 20000 + difficulty: 1-1 + custom-model-data: 640 +obsidian: + nick: '<#4B0082>Obsidian' + material: obsidian + in-lava: true + weight: 80 + time: 20000 + difficulty: 1-2 +wither_skeleton_skull: + nick: 'Wither Skeleton Skull' + material: wither_skeleton_skull + in-lava: true + weight: 1 + time: 20000 + difficulty: 1-6 +pufferfish: + nick: '<#DAA520>Pufferfish' + material: PUFFERFISH + weight: 50 + difficulty: 1-1 +cod: + nick: '<#FFFACD>Cod' + material: COD + weight: 300 + difficulty: 1-1 +salmon: + nick: '<#D2691E>Salmon' + material: SALMON + weight: 250 + difficulty: 1-1 +tropical_fish: + nick: '&cT&fr&co&fp&ci&fc&ca&fl &cF&fi&cs&fh' + material: TROPICAL_FISH + weight: 50 + difficulty: 1-1 + requirements: + biome: + - minecraft:jungle + - minecraft:bamboo_jungle + - minecraft:sparse_jungle + - minecraft:warm_ocean + - minecraft:lukewarm_ocean + - minecraft:deep_lukewarm_ocean +tuna_fish: + material: paper + nick: Tuna Fish + display: + name: 'Tuna Fish' + lore: + - 'Tuna is a kind of healthy food.' + - 'size: {size}cm' + weight: 50 + time: 10000 + difficulty: 1-4 + custom-model-data: 641 + size: 15~50 + price: + base: 30 + bonus: 0.6 + requirements: + biome: + - minecraft:ocean + - minecraft:cold_ocean + - minecraft:deep_cold_ocean + - minecraft:deep_frozen_ocean + - minecraft:deep_lukewarm_ocean + - minecraft:frozen_ocean + - minecraft:lukewarm_ocean + - minecraft:warm_ocean +tuna_fish_silver_star: + show-in-fishfinder: false + material: paper + display: + name: 'Tuna Fish <#F5F5F5>(Silver Star)' + lore: + - 'Tuna is a kind of healthy food.' + - 'size: {size}cm' + weight: 20 + time: 8000 + difficulty: 1-5 + group: silver + custom-model-data: 666 + size: 30~100 + price: + base: 50 + bonus: 0.6 + requirements: + biome: + - minecraft:ocean + - minecraft:cold_ocean + - minecraft:deep_cold_ocean + - minecraft:deep_frozen_ocean + - minecraft:deep_lukewarm_ocean + - minecraft:frozen_ocean + - minecraft:lukewarm_ocean + - minecraft:warm_ocean +tuna_fish_golden_star: + show-in-fishfinder: false + material: paper + display: + name: 'Tuna Fish <#FFD700>(Golden Star)' + lore: + - 'Tuna is a kind of healthy food.' + - 'size: {size}cm' + weight: 10 + time: 5000 + difficulty: 1-6 + group: gold + custom-model-data: 667 + size: 80~190 + price: + base: 80 + bonus: 0.7 + requirements: + biome: + - minecraft:ocean + - minecraft:cold_ocean + - minecraft:deep_cold_ocean + - minecraft:deep_frozen_ocean + - minecraft:deep_lukewarm_ocean + - minecraft:frozen_ocean + - minecraft:lukewarm_ocean + - minecraft:warm_ocean +pike_fish: + material: paper + nick: Pike Fish + display: + name: 'Pike Fish' + lore: + - 'It likes to inhabit at the junction' + - 'of salt and fresh water. It can' + - 'survive in seawater, brackish fresh' + - 'water and inland freshwater lakes' + - 'size: {size}cm' + weight: 70 + time: 7000 + difficulty: 1-2 + custom-model-data: 642 + size: 5~15 + price: + base: 30 + bonus: 1.5 + requirements: + biome: + - minecraft:ocean + - minecraft:river + - minecraft:frozen_river + - minecraft:frozen_ocean + - minecraft:lukewarm_ocean + - minecraft:warm_ocean +pike_fish_silver_star: + show-in-fishfinder: false + material: paper + display: + name: 'Pike Fish <#F5F5F5>(Silver Star)' + lore: + - 'It likes to inhabit at the junction' + - 'of salt and fresh water. It can' + - 'survive in seawater, brackish fresh' + - 'water and inland freshwater lakes' + - 'size: {size}cm' + weight: 30 + time: 7000 + difficulty: 1-3 + group: silver + size: 10~25 + price: + base: 40 + bonus: 1.5 + custom-model-data: 664 + requirements: + biome: + - minecraft:ocean + - minecraft:river + - minecraft:frozen_river + - minecraft:frozen_ocean + - minecraft:lukewarm_ocean + - minecraft:warm_ocean +pike_fish_golden_star: + show-in-fishfinder: false + material: paper + display: + name: 'Pike Fish <#FFD700>(Golden Star)' + lore: + - 'It likes to inhabit at the junction' + - 'of salt and fresh water. It can' + - 'survive in seawater, brackish fresh' + - 'water and inland freshwater lakes' + - 'size: {size}cm' + weight: 10 + time: 7000 + difficulty: 1-4 + group: gold + size: 15~30 + price: + base: 50 + bonus: 1.5 + custom-model-data: 665 + requirements: + biome: + - minecraft:ocean + - minecraft:river + - minecraft:frozen_river + - minecraft:frozen_ocean + - minecraft:lukewarm_ocean + - minecraft:warm_ocean +gold_fish: + material: paper + display: + name: 'Gold Fish' + lore: + - 'Goldfish is one of most famous ornamental' + - 'fishes in the world. It originated in China' + - 'and has a history of more than 1700 years' + weight: 50 + price: + base: 70 + time: 12000 + difficulty: 1-1 + custom-model-data: 643 +gold_fish_silver_star: + show-in-fishfinder: false + material: paper + display: + name: 'Gold Fish <#F5F5F5>(Silver Star)' + lore: + - 'Goldfish is one of most famous ornamental' + - 'fishes in the world. It originated in China' + - 'and has a history of more than 1700 years' + weight: 20 + time: 11000 + price: + base: 80 + difficulty: 1-2 + group: silver + custom-model-data: 658 +gold_fish_golden_star: + show-in-fishfinder: false + material: paper + display: + name: 'Gold Fish <#FFD700>(Golden Star)' + lore: + - 'Goldfish is one of most famous ornamental' + - 'fishes in the world. It originated in China' + - 'and has a history of more than 1700 years' + weight: 10 + time: 10000 + price: + base: 100 + group: gold + difficulty: 1-3 + custom-model-data: 659 +perch_fish: + material: paper + display: + name: 'Perch Fish' + lore: + - 'Living in various habitats and' + - 'foraging at dusk and early morning' + - 'size: {size}cm' + weight: 100 + time: 10000 + difficulty: 1-2 + custom-model-data: 644 + size: 5~12 + price: + base: 10 + bonus: 3 + requirements: + time: + - 0~3000 + - 17000~19000 +perch_fish_silver_star: + show-in-fishfinder: false + material: paper + display: + name: 'Perch Fish <#F5F5F5>(Silver Star)' + lore: + - 'Living in various habitats and' + - 'foraging at dusk and early morning' + - 'size: {size}cm' + weight: 30 + time: 9000 + group: silver + difficulty: 1-2 + custom-model-data: 660 + size: 10~19 + price: + base: 10 + bonus: 3 + requirements: + time: + - 0~3000 + - 17000~19000 +perch_fish_golden_star: + show-in-fishfinder: false + material: paper + display: + name: 'Perch Fish <#FFD700>(Golden Star)' + lore: + - 'Living in various habitats and' + - 'foraging at dusk and early morning' + - 'size: {size}cm' + weight: 15 + group: gold + time: 8000 + difficulty: 1-1 + custom-model-data: 661 + size: 20~39 + price: + base: 10 + bonus: 3 + requirements: + time: + - 0~3000 + - 17000~19000 +mullet_fish: + material: paper + nick: Mullet Fish + display: + name: 'Mullet Fish' + lore: + - 'Used in traditional Chinese medicine' + - 'to treat spleen and stomach weakness' + - 'size: {size}cm' + weight: 50 + time: 10000 + difficulty: 1-2 + custom-model-data: 645 + size: 1~3 + price: + base: 20 + bonus: 1.5 +mullet_fish_silver_star: + show-in-fishfinder: false + material: paper + display: + name: 'Mullet Fish <#F5F5F5>(Silver Star)' + lore: + - 'Used in traditional Chinese medicine' + - 'to treat spleen and stomach weakness' + - 'size: {size}cm' + weight: 20 + group: silver + time: 8000 + difficulty: 1-3 + custom-model-data: 662 + size: 4~9 + price: + base: 30 + bonus: 1.5 +mullet_fish_golden_star: + show-in-fishfinder: false + material: paper + display: + name: 'Mullet Fish <#FFD700>(Golden Star)' + lore: + - 'Used in traditional Chinese medicine' + - 'to treat spleen and stomach weakness' + - 'size: {size}cm' + weight: 10 + time: 6000 + group: gold + difficulty: 1-4 + custom-model-data: 663 + size: 10~20 + price: + base: 50 + bonus: 1.5 +sardine_fish: + material: paper + nick: Sardine Fish + display: + name: 'Sardine Fish' + lore: + - 'Sardine fish is rich in DHA which improves memory' + - 'Therefore, sardine are also called "smart food"' + - 'size: {size}cm' + weight: 50 + time: 8000 + difficulty: 1-2 + custom-model-data: 668 + size: 1~5 + price: + base: 10 + bonus: 3.4 +sardine_fish_silver_star: + show-in-fishfinder: false + material: paper + display: + name: 'Sardine Fish <#F5F5F5>(Silver Star)' + lore: + - 'Sardine fish is rich in DHA which improves memory' + - 'Therefore, sardine are also called "smart food"' + - 'size: {size}cm' + weight: 20 + time: 8000 + group: silver + difficulty: 1-3 + custom-model-data: 669 + size: 4~8 + price: + base: 13 + bonus: 3.4 +sardine_fish_golden_star: + show-in-fishfinder: false + material: paper + display: + name: 'Sardine Fish <#FFD700>(Golden Star)' + lore: + - 'Sardine fish is rich in DHA which improves memory' + - 'Therefore, sardine are also called "smart food"' + - 'size: {size}cm' + weight: 10 + time: 8000 + group: gold + difficulty: 1-4 + custom-model-data: 670 + size: 7~14 + price: + base: 15 + bonus: 3.4 +carp_fish: + material: paper + nick: Carp Fish + display: + name: 'Carp Fish' + lore: + - 'One of the most common edible fish' + - 'size: {size}cm' + weight: 100 + time: 10000 + difficulty: 1-2 + custom-model-data: 671 + size: 7~19 + price: + base: 10 + bonus: 2 + requirements: + biome: + - minecraft:river + - minecraft:plains + - minecraft:forest + - minecraft:swamp + - minecraft:dark_forest + - minecraft:flower_forest + - minecraft:birch_forest + - minecraft:old_growth_birch_forest + - minecraft:sunflower_plains +carp_fish_silver_star: + show-in-fishfinder: false + material: paper + display: + name: 'Carp Fish <#F5F5F5>(Silver Star)' + lore: + - 'One of the most common edible fish' + - 'size: {size}cm' + weight: 20 + time: 10000 + group: silver + difficulty: 1-2 + custom-model-data: 672 + size: 15~28 + price: + base: 11 + bonus: 2.1 + requirements: + biome: + - minecraft:river + - minecraft:plains + - minecraft:forest + - minecraft:swamp + - minecraft:dark_forest + - minecraft:flower_forest + - minecraft:birch_forest + - minecraft:old_growth_birch_forest + - minecraft:sunflower_plains +carp_fish_golden_star: + show-in-fishfinder: false + material: paper + display: + name: 'Carp Fish <#FFD700>(Golden Star)' + lore: + - 'One of the most common edible fish' + - 'size: {size}cm' + weight: 10 + time: 10000 + group: gold + difficulty: 1-2 + custom-model-data: 673 + size: 27~48 + price: + base: 12 + bonus: 2.2 + requirements: + biome: + - minecraft:river + - minecraft:plains + - minecraft:forest + - minecraft:swamp + - minecraft:dark_forest + - minecraft:flower_forest + - minecraft:birch_forest + - minecraft:old_growth_birch_forest + - minecraft:sunflower_plains +cat_fish: + material: paper + display: + name: '<#BDB76B>Cat Fish' + lore: + - 'Catfish is a fierce carnivorous fish with' + - 'sharp jaw teeth, short intestine and stomach' + - 'size: {size}cm' + weight: 50 + time: 8000 + difficulty: 1-3 + custom-model-data: 674 + size: 3~12 + price: + base: 27 + bonus: 1.8 + requirements: + biome: + - minecraft:river + - minecraft:plains + - minecraft:forest + - minecraft:swamp + - minecraft:dark_forest + - minecraft:flower_forest + - minecraft:birch_forest + - minecraft:old_growth_birch_forest + - minecraft:sunflower_plains +cat_fish_silver_star: + show-in-fishfinder: false + material: paper + display: + name: '<#BDB76B>Cat Fish <#F5F5F5>(Silver Star)' + lore: + - 'Catfish is a fierce carnivorous fish with' + - 'sharp jaw teeth, short intestine and stomach' + - 'size: {size}cm' + weight: 20 + group: silver + time: 8000 + difficulty: 1-4 + custom-model-data: 675 + size: 10~28 + price: + base: 14 + bonus: 2.2 + requirements: + biome: + - minecraft:river + - minecraft:plains + - minecraft:forest + - minecraft:swamp + - minecraft:dark_forest + - minecraft:flower_forest + - minecraft:birch_forest + - minecraft:old_growth_birch_forest + - minecraft:sunflower_plains +cat_fish_golden_star: + show-in-fishfinder: false + material: paper + display: + name: '<#BDB76B>Cat Fish <#FFD700>(Golden Star)' + lore: + - 'Catfish is a fierce carnivorous fish with' + - 'sharp jaw teeth, short intestine and stomach' + - 'size: {size}cm' + weight: 10 + time: 8000 + group: gold + difficulty: 1-5 + custom-model-data: 676 + size: 40~70 + price: + base: 16 + bonus: 2.2 + requirements: + biome: + - minecraft:river + - minecraft:plains + - minecraft:forest + - minecraft:swamp + - minecraft:dark_forest + - minecraft:flower_forest + - minecraft:birch_forest + - minecraft:old_growth_birch_forest + - minecraft:sunflower_plains +octopus: + material: paper + nick: 'Octopus' + display: + name: 'Octopus' + lore: + - 'Octopus is crazy about all kinds of utensils' + - 'People often use pots to catch octopus' + - 'size: {size}cm' + weight: 50 + time: 15000 + difficulty: 1-1 + custom-model-data: 677 + size: 1~4 + price: + base: 50 + bonus: 2.2 + requirements: + biome: + - minecraft:ocean + - minecraft:deep_lukewarm_ocean + - minecraft:frozen_ocean + - minecraft:lukewarm_ocean + - minecraft:warm_ocean + - minecraft:jungle +octopus_silver_star: + show-in-fishfinder: false + material: paper + display: + name: 'Octopus <#F5F5F5>(Silver Star)' + lore: + - 'Octopus is crazy about all kinds of utensils' + - 'People often use pots to catch octopus' + - 'size: {size}cm' + weight: 20 + group: silver + time: 15000 + difficulty: 1-1 + custom-model-data: 678 + size: 4~12 + price: + base: 50 + bonus: 2.2 + requirements: + biome: + - minecraft:ocean + - minecraft:cold_ocean + - minecraft:deep_cold_ocean + - minecraft:deep_frozen_ocean + - minecraft:deep_lukewarm_ocean + - minecraft:frozen_ocean + - minecraft:lukewarm_ocean + - minecraft:warm_ocean +octopus_golden_star: + show-in-fishfinder: false + material: paper + display: + name: 'Octopus <#FFD700>(Golden Star)' + lore: + - 'Octopus is crazy about all kinds of utensils' + - 'People often use pots to catch octopus' + - 'size: {size}cm' + weight: 10 + time: 15000 + group: gold + difficulty: 1-1 + custom-model-data: 679 + size: 12~100 + price: + base: 10 + bonus: 1.5 + requirements: + biome: + - minecraft:ocean + - minecraft:cold_ocean + - minecraft:deep_cold_ocean + - minecraft:deep_frozen_ocean + - minecraft:deep_lukewarm_ocean + - minecraft:frozen_ocean + - minecraft:lukewarm_ocean + - minecraft:warm_ocean +sunfish: + material: paper + nick: <#F5DEB3>Sunfish + display: + name: '<#F5DEB3>Sunfish' + lore: + - 'It only has one huge head' + - 'size: {size}cm' + weight: 50 + time: 10000 + difficulty: 1-2 + custom-model-data: 680 + size: 5~18 + price: + base: 10 + bonus: 1.5 +sunfish_silver_star: + show-in-fishfinder: false + material: paper + display: + name: '<#F5DEB3>Sunfish <#F5F5F5>(Silver Star)' + lore: + - 'It only has one huge head' + - 'size: {size}cm' + weight: 20 + group: silver + time: 10000 + difficulty: 1-2 + custom-model-data: 681 + size: 17~28 + price: + base: 18 + bonus: 1.5 +sunfish_golden_star: + show-in-fishfinder: false + material: paper + display: + name: '<#F5DEB3>Sunfish <#FFD700>(Golden Star)' + lore: + - 'It only has one huge head' + - 'size: {size}cm' + weight: 10 + time: 10000 + group: gold + difficulty: 1-2 + custom-model-data: 682 + size: 26~50 + price: + base: 26 + bonus: 1.5 +red_snapper_fish: + material: paper + display: + name: 'Red Snapper Fish' + lore: + - 'They usually have a large family of ten or twenty' + - 'with a male as the "head of the family"' + - 'size: {size}cm' + weight: 100 + time: 10000 + difficulty: 1-1 + custom-model-data: 683 + size: 1~4 + price: + base: 10 + bonus: 2.3 +red_snapper_fish_silver_star: + show-in-fishfinder: false + material: paper + display: + name: 'Red Snapper Fish <#F5F5F5>(Silver Star)' + lore: + - 'They usually have a large family of ten or twenty' + - 'with a male as the "head of the family"' + - 'size: {size}cm' + weight: 40 + time: 10000 + group: silver + difficulty: 1-2 + custom-model-data: 684 + size: 3~12 + price: + base: 10 + bonus: 2.3 +red_snapper_fish_golden_star: + show-in-fishfinder: false + material: paper + display: + name: 'Red Snapper Fish <#FFD700>(Golden Star)' + lore: + - 'They usually have a large family of ten or twenty' + - 'with a male as the "head of the family"' + - 'size: {size}cm' + weight: 20 + time: 10000 + group: gold + difficulty: 1-3 + custom-model-data: 685 + size: 9~18 + price: + base: 10 + bonus: 2.3 +salmon_void_fish: + material: paper + in-lava: true + nick: Void Salmon + display: + name: 'Void Salmon' + lore: + - 'A fish from the hell' + weight: 50 + time: 10000 + difficulty: 1-2 + custom-model-data: 686 + price: + base: 20 + requirements: + world: + - world_nether +salmon_void_fish_silver_star: + show-in-fishfinder: false + in-lava: true + material: paper + display: + name: 'Void Salmon<#F5F5F5>(Silver Star)' + lore: + - 'A fish from the hell' + weight: 20 + time: 10000 + group: silver + difficulty: 1-2 + custom-model-data: 687 + price: + base: 50 + requirements: + world: + - world_nether +salmon_void_fish_golden_star: + show-in-fishfinder: false + in-lava: true + material: paper + display: + name: 'Void Salmon <#FFD700>(Golden Star)' + lore: + - 'A fish from the hell' + weight: 10 + time: 10000 + group: gold + difficulty: 1-2 + custom-model-data: 688 + price: + base: 100 + requirements: + world: + - world_nether +woodskip_fish: + material: paper + nick: <#CD5C5C>Woodskip Fish + display: + name: '<#CD5C5C>Woodskip Fish' + lore: + - 'A very sensitive fish that can only' + - 'live in pools deep in the forest' + - 'size: {size}cm' + weight: 50 + time: 8000 + difficulty: 1-2 + custom-model-data: 689 + size: 3~7 + price: + base: 10 + bonus: 2.3 + requirements: + biome: + - minecraft:dark_forest + - minecraft:forest + - minecraft:flower_forest + - minecraft:birch_forest +woodskip_fish_silver_star: + show-in-fishfinder: false + material: paper + display: + name: '<#CD5C5C>Woodskip Fish <#F5F5F5>(Silver Star)' + lore: + - 'A very sensitive fish that can only' + - 'live in pools deep in the forest' + - 'size: {size}cm' + weight: 20 + group: silver + time: 7000 + difficulty: 1-3 + custom-model-data: 690 + size: 7~18 + price: + base: 17 + bonus: 2.5 + requirements: + biome: + - minecraft:dark_forest + - minecraft:forest + - minecraft:flower_forest + - minecraft:birch_forest +woodskip_fish_golden_star: + show-in-fishfinder: false + material: paper + display: + name: '<#CD5C5C>Woodskip Fish <#FFD700>(Golden Star)' + lore: + - 'A very sensitive fish that can only' + - 'live in pools deep in the forest' + - 'size: {size}cm' + weight: 10 + group: gold + time: 6000 + difficulty: 1-4 + custom-model-data: 691 + size: 16~29 + price: + base: 25 + bonus: 2.8 + requirements: + biome: + - minecraft:dark_forest + - minecraft:forest + - minecraft:flower_forest + - minecraft:birch_forest +sturgeon_fish: + material: paper + nick: <#48D1CC>Sturgeon Fish + display: + name: '<#48D1CC>Sturgeon Fish' + lore: + - 'An ancient bottom-feeder with a dwindling' + - 'population. Females can live up to 150 years' + - 'size: {size}cm' + weight: 5 + time: 10000 + difficulty: 1-3 + custom-model-data: 692 + size: 1~5 + price: + base: 200 + bonus: 10 + requirements: + ypos: + - -64~0 +sturgeon_fish_silver_star: + show-in-fishfinder: false + material: paper + display: + name: '<#48D1CC>Sturgeon Fish <#F5F5F5>(Silver Star)' + lore: + - 'An ancient bottom-feeder with a dwindling' + - 'population. Females can live up to 150 years' + - 'size: {size}cm' + weight: 2 + group: silver + time: 10000 + difficulty: 1-5 + custom-model-data: 693 + size: 5~15 + price: + base: 250 + bonus: 10 + requirements: + ypos: + - -64~0 +sturgeon_fish_golden_star: + show-in-fishfinder: false + material: paper + display: + name: '<#48D1CC>Sturgeon Fish <#FFD700>(Golden Star)' + lore: + - 'An ancient bottom-feeder with a dwindling' + - 'population. Females can live up to 150 years' + - 'size: {size}cm' + weight: 1 + time: 10000 + group: gold + difficulty: 1-7 + custom-model-data: 694 + size: 15~30 + price: + base: 300 + bonus: 10 + requirements: + ypos: + - -64~0 \ No newline at end of file