From 3a467b3da49b91d9d15502c63cb0e99671ecfb42 Mon Sep 17 00:00:00 2001 From: Glitchfinder Date: Mon, 12 Nov 2012 16:18:27 -0800 Subject: [PATCH] Adding Fishermans Diet ability to fishing. --- .../commands/skills/FishingCommand.java | 27 +++++++++++++ .../nossr50/listeners/EntityListener.java | 38 ++++++++++++++++--- .../com/gmail/nossr50/util/Permissions.java | 4 ++ .../resources/locale/locale_cs_CZ.properties | 3 ++ .../resources/locale/locale_cy.properties | 3 ++ .../resources/locale/locale_da.properties | 3 ++ .../resources/locale/locale_de.properties | 3 ++ .../resources/locale/locale_en_US.properties | 7 +++- .../resources/locale/locale_es.properties | 3 ++ .../resources/locale/locale_fi.properties | 3 ++ .../resources/locale/locale_fr.properties | 3 ++ .../resources/locale/locale_it.properties | 3 ++ .../resources/locale/locale_ko.properties | 3 ++ .../resources/locale/locale_lv.properties | 3 ++ .../resources/locale/locale_nl.properties | 3 ++ .../resources/locale/locale_no.properties | 3 ++ .../resources/locale/locale_pl.properties | 3 ++ .../resources/locale/locale_pt_BR.properties | 3 ++ .../resources/locale/locale_ru.properties | 3 ++ .../resources/locale/locale_sv.properties | 3 ++ .../resources/locale/locale_tr_TR.properties | 3 ++ .../resources/locale/locale_zh_CN.properties | 3 ++ src/main/resources/plugin.yml | 3 ++ 23 files changed, 126 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java index dcc33ef24..e7f095d6c 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java @@ -10,10 +10,12 @@ public class FishingCommand extends SkillCommand { private int lootTier; private String magicChance; private String shakeChance; + private String fishermansDietRank; private boolean canTreasureHunt; private boolean canMagicHunt; private boolean canShake; + private boolean canFishermansDiet; public FishingCommand() { super(SkillType.FISHING); @@ -24,6 +26,22 @@ public class FishingCommand extends SkillCommand { lootTier = Fishing.getFishingLootTier(profile); magicChance = percent.format((float) lootTier / 15); shakeChance = String.valueOf(Fishing.getShakeChance(lootTier)); + + if (skillValue >= 1000) { + fishermansDietRank = "5"; + } + else if (skillValue >= 800) { + fishermansDietRank = "4"; + } + else if (skillValue >= 600) { + fishermansDietRank = "3"; + } + else if (skillValue >= 400) { + fishermansDietRank = "2"; + } + else { + fishermansDietRank = "1"; + } } @Override @@ -31,6 +49,7 @@ public class FishingCommand extends SkillCommand { canTreasureHunt = permInstance.fishingTreasures(player); canMagicHunt = permInstance.fishingMagic(player); canShake = permInstance.shakeMob(player); + canFishermansDiet = permInstance.fishermansDiet(player); } @Override @@ -51,6 +70,10 @@ public class FishingCommand extends SkillCommand { if (canShake) { player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5") })); } + + if (canFishermansDiet) { + player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.6"), LocaleLoader.getString("Fishing.Effect.7") })); + } } @Override @@ -76,5 +99,9 @@ public class FishingCommand extends SkillCommand { player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", new Object[] { shakeChance })); } } + + if (canFishermansDiet) { + player.sendMessage(LocaleLoader.getString("Fishing.Ability.FD", new Object[] { fishermansDietRank })); + } } } diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java index 739099d4c..133f86c6d 100644 --- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java @@ -261,10 +261,6 @@ public class EntityListener implements Listener { int currentFoodLevel = player.getFoodLevel(); int newFoodLevel = event.getFoodLevel(); - if (!Permissions.getInstance().farmersDiet(player)) { - return; - } - /* * Some foods have 3 ranks * Some foods have 5 ranks @@ -275,65 +271,97 @@ public class EntityListener implements Listener { if (newFoodLevel > currentFoodLevel) { Material food = player.getItemInHand().getType(); int herbLevel = profile.getSkillLevel(SkillType.HERBALISM); + int fishLevel = profile.getSkillLevel(SkillType.FISHING); int foodChange = newFoodLevel - currentFoodLevel; int rankChange = 0; + boolean fish = false; + boolean herb = false; switch (food) { case BREAD: /* BREAD RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ 1000 */ rankChange = 200; + herb = true; break; case COOKIE: /* COOKIE RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */ rankChange = 400; + herb = true; break; case MELON: /* MELON RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */ rankChange = 400; + herb = true; break; case MUSHROOM_SOUP: /* MUSHROOM SOUP RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @ 1000 */ rankChange = 200; + herb = true; break; case CARROT_ITEM: /* CARROT RESTORES 2 HUNGER - RESTORES 4 1/2 HUNGER @ 1000 */ rankChange = 200; + herb = true; break; case POTATO_ITEM: /* POTATO RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */ rankChange = 400; + herb = true; break; case BAKED_POTATO: /* BAKED POTATO RESTORES 3 HUNGER - RESTORES 5 1/2 HUNGER @ 1000 */ rankChange = 200; + herb = true; break; case POISONOUS_POTATO: /* POISONOUS POTATO RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */ rankChange = 400; + herb = true; break; case GOLDEN_CARROT: /* GOLDEN CARROT RESTORES 3 HUNGER - RESTORES 5 1/2 HUNGER @ 1000 */ rankChange = 200; + herb = true; break; case PUMPKIN_PIE: /* PUMPKIN PIE RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @ 1000 */ rankChange = 200; + herb = true; + break; + + case RAW_FISH: + /* RAW FISH RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */ + rankChange = 400; + fish = true; + break; + + case COOKED_FISH: + /* COOKED FISH RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ 1000 */ + rankChange = 200; + fish = true; break; default: return; } + if (herb && !Permissions.getInstance().farmersDiet(player)) { + return; + } + else if (fish && !Permissions.getInstance().fishermansDiet(player)) { + return; + } + for (int i = 200; i <= 1000; i += rankChange) { - if (herbLevel >= i) { + if ((herb && herbLevel >= i) || (fish && fishLevel >= i)) { foodChange++; } } diff --git a/src/main/java/com/gmail/nossr50/util/Permissions.java b/src/main/java/com/gmail/nossr50/util/Permissions.java index d72f4bbb8..daeb486c3 100644 --- a/src/main/java/com/gmail/nossr50/util/Permissions.java +++ b/src/main/java/com/gmail/nossr50/util/Permissions.java @@ -120,6 +120,10 @@ public class Permissions { return player.hasPermission("mcmmo.ability.fishing.magic"); } + public boolean fishermansDiet(Player player) { + return player.hasPermission("mcmmo.ability.fishing.fishermansdiet"); + } + /* * MCMMO.ABILITY.MINING.* */ diff --git a/src/main/resources/locale/locale_cs_CZ.properties b/src/main/resources/locale/locale_cs_CZ.properties index d9a8dea6b..c4fc31971 100644 --- a/src/main/resources/locale/locale_cs_CZ.properties +++ b/src/main/resources/locale/locale_cs_CZ.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunt Fishing.Ability.Locked.0=UZAMKNUTO DO UROVNE DOVEDNOSTI 150+ (SHAKE) Fishing.Ability.Rank=[[RED]]Lovec Poklad\u016f Level: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Treasure Hunter (Passive) Fishing.Effect.1=Fish up misc. objects Fishing.Effect.2=Magicky Lovec Fishing.Effect.3=Find Enchanted Items Fishing.Effect.4=Shake (vs. Entities) Fishing.Effect.5=Shake items off of mobs w/ fishing pole +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]Nasel si poklad! Fishing.Listener=Rybareni: diff --git a/src/main/resources/locale/locale_cy.properties b/src/main/resources/locale/locale_cy.properties index 74176bce8..0f70eaf61 100644 --- a/src/main/resources/locale/locale_cy.properties +++ b/src/main/resources/locale/locale_cy.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunt Fishing.Ability.Locked.0=DAN GLO HYD 150 + SKILL (YSGYTLAETH) Fishing.Ability.Rank=[[RED]]Treasure Hunter Rank: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Treasure Hunter (Passive) Fishing.Effect.1=Fish up misc. objects Fishing.Effect.2=Magic Hunter Fishing.Effect.3=Find Enchanted Items Fishing.Effect.4=Shake (vs. Entities) Fishing.Effect.5=Shake items off of mobs w/ fishing pole +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]Treasure found! Fishing.Listener=Fishing: diff --git a/src/main/resources/locale/locale_da.properties b/src/main/resources/locale/locale_da.properties index 057436ece..523a46604 100644 --- a/src/main/resources/locale/locale_da.properties +++ b/src/main/resources/locale/locale_da.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunt Fishing.Ability.Locked.0=L\u00c5ST INDTIL 150+ I F\u00c6RDIGHED (SHAKE) Fishing.Ability.Rank=[[RED]]Treasure Hunter Rank: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Treasure Hunter (Passive) Fishing.Effect.1=Fish up misc. objects Fishing.Effect.2=Magic Hunter Fishing.Effect.3=Find Enchanted Items Fishing.Effect.4=Shake (vs. Entities) Fishing.Effect.5=Shake items off of mobs w/ fishing pole +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]Du har fundet en skat! Fishing.Listener=Fishing: diff --git a/src/main/resources/locale/locale_de.properties b/src/main/resources/locale/locale_de.properties index a1f14ed4c..d69b147d5 100644 --- a/src/main/resources/locale/locale_de.properties +++ b/src/main/resources/locale/locale_de.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]Magiej\u00e4ger: [[GRAY]] **Verbessert sich mit Scha Fishing.Ability.Locked.0=Gesperrt bis Level 150+ (SHAKE) Fishing.Ability.Rank=[[RED]]Schatzj\u00e4ger Rang: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Schatzj\u00e4ger (Passiv) Fishing.Effect.1=Fish up misc. objects Fishing.Effect.2=Magiej\u00e4ger Fishing.Effect.3=Find Enchanted Items Fishing.Effect.4=Shake (vs. Entities) Fishing.Effect.5=Shake items off of mobs w/ fishing pole +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[AQUA]]Du hast einen Schatz gefunden! Fishing.Listener=Angeln: diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index 0bd4b8bf1..333d0d0a7 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -103,12 +103,15 @@ Fishing.Ability.Info=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunt Fishing.Ability.Locked.0=LOCKED UNTIL 150+ SKILL (SHAKE) Fishing.Ability.Rank=[[RED]]Treasure Hunter Rank: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]Shake Chance: [[YELLOW]]{0}% +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Treasure Hunter (Passive) Fishing.Effect.1=Fish up misc. objects Fishing.Effect.2=Magic Hunter Fishing.Effect.3=Find Enchanted Items Fishing.Effect.4=Shake (vs. Entities) Fishing.Effect.5=Shake items off of mobs w/ fishing pole +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]Treasure found! Fishing.Listener=Fishing: @@ -122,14 +125,14 @@ Herbalism.Ability.FD=[[RED]]Farmers Diet: [[YELLOW]]Rank {0} Herbalism.Ability.GTe.Length=[[RED]]Green Terra Length: [[YELLOW]]{0}s Herbalism.Ability.GTh.Chance=[[RED]]Green Thumb Chance: [[YELLOW]]{0} Herbalism.Ability.GTh.Fail=[[RED]]**GREEN THUMB FAIL** -Herbalism.Ability.GTh.Stage=[[RED]]Green Thumb Stage: [[YELLOW]] Wheat grows in stage {0} +Herbalism.Ability.GTh.Stage=[[RED]]Green Thumb Stage: [[YELLOW]] Crops grow in stage {0} Herbalism.Ability.GTh=[[GREEN]]**GREEN THUMB** Herbalism.Ability.Lower=[[GRAY]]**YOU LOWER YOUR HOE** Herbalism.Ability.Ready=[[GREEN]]**YOU READY YOUR HOE** Herbalism.Effect.0=Green Terra (ABILITY) Herbalism.Effect.1=Spread the Terra, 3x Drops Herbalism.Effect.2=Green Thumb (Wheat) -Herbalism.Effect.3=Auto-Plants wheat when harvesting +Herbalism.Effect.3=Auto-Plants crops when harvesting Herbalism.Effect.4=Green Thumb (Cobble/Stone Brick/Dirt) Herbalism.Effect.5=Make bricks mossy, or make grass grow Herbalism.Effect.6=Farmer's Diet diff --git a/src/main/resources/locale/locale_es.properties b/src/main/resources/locale/locale_es.properties index 4cb81acd1..a955457ec 100644 --- a/src/main/resources/locale/locale_es.properties +++ b/src/main/resources/locale/locale_es.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]Cazador M\u00e1gico: [[GRAY]] **Mejora con Rango de Fishing.Ability.Locked.0=BLOQUEADO HASTA HABILIDAD 150+ (SACUDIDA) Fishing.Ability.Rank=[[RED]]Cazador de Tesoros: [[YELLOW]]Rango {0}/5 Fishing.Ability.Shake=[[RED]]Sacudida: [[YELLOW]]Arrancar items de monstruos, mutilandolos en el proceso. +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Cazador de Tesoros (Pasivo) Fishing.Effect.1=Pescar objetos miscel\u00e1neos Fishing.Effect.2=Cazador M\u00e1gico Fishing.Effect.3=Encuentra Objetos Encantados Fishing.Effect.4=Sacudir (contra Entidades) Fishing.Effect.5=Sacudir los items fuera de los monstruos con la ca\u00f1a de pescar +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Probabilidad de Cazador M\u00e1gico: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]\u00a1Tesoro encontrado! Fishing.Listener=Pescador: diff --git a/src/main/resources/locale/locale_fi.properties b/src/main/resources/locale/locale_fi.properties index cdfcb5373..841f6bcad 100644 --- a/src/main/resources/locale/locale_fi.properties +++ b/src/main/resources/locale/locale_fi.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunt Fishing.Ability.Locked.0=LOCKED UNTIL 150+ SKILL (SHAKE) Fishing.Ability.Rank=[[RED]]Treasure Hunter Rank: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Treasure Hunter (Passive) Fishing.Effect.1=Fish up misc. objects Fishing.Effect.2=Magic Hunter Fishing.Effect.3=Find Enchanted Items Fishing.Effect.4=Shake (vs. Entities) Fishing.Effect.5=Shake items off of mobs w/ fishing pole +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]Treasure found! Fishing.Listener=Fishing: diff --git a/src/main/resources/locale/locale_fr.properties b/src/main/resources/locale/locale_fr.properties index bdbe1daac..abd381a91 100644 --- a/src/main/resources/locale/locale_fr.properties +++ b/src/main/resources/locale/locale_fr.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]P\u00eache magique : [[GRAY]] **S\'am\u00e9liore via Fishing.Ability.Locked.0=VERROUILL\u00c9 AVANT 150+ (Secousse) Fishing.Ability.Rank=[[RED]]Chasseur de tr\u00e9sors : [[YELLOW]] Rang {0}/5 Fishing.Ability.Shake=[[RED]]Secousse : [[YELLOW]]Arrache des objets des monstres, les mutilant par la m\u00eame occasion ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Chasseur de tr\u00e9sors Fishing.Effect.1=Remonte des objets inhabituels Fishing.Effect.2=P\u00eache magique Fishing.Effect.3=Remonte des objets magiques Fishing.Effect.4=Secousse (sur monstres) Fishing.Effect.5=Fait tomber des objets des monstres avec une canne \u00e0 p\u00eache +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]Tr\u00e9sor d\u00e9couvert ! Fishing.Listener=P\u00eache : diff --git a/src/main/resources/locale/locale_it.properties b/src/main/resources/locale/locale_it.properties index 9ff6da42f..37ca87dbe 100644 --- a/src/main/resources/locale/locale_it.properties +++ b/src/main/resources/locale/locale_it.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]Cacciatore di Magia: [[GRAY]] **Migliora insieme al Fishing.Ability.Locked.0=BLOCCATO FINO AD ABILITA\' 150+ (SCUOTERE) Fishing.Ability.Rank=[[RED]]Grado di Cacciatore di Tesori: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]Scuotere: [[YELLOW]]Strappa oggetti dai mob, mutilandoli durante il procedimento ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Cacciatore di Tesori (Passivo) Fishing.Effect.1=Ripesca oggetti vari Fishing.Effect.2=Cacciatore di Magia Fishing.Effect.3=Trova Oggetti Incantati Fishing.Effect.4=Scuotere (contro Entit\u00e0) Fishing.Effect.5=Scrolla oggetti di dosso ai mob con una canna da pesca +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Possibilit\u00e0 di Cacciatore di Magia: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]Hai trovato un tesoro! Fishing.Listener=Pesca: diff --git a/src/main/resources/locale/locale_ko.properties b/src/main/resources/locale/locale_ko.properties index d51a095ab..941885361 100644 --- a/src/main/resources/locale/locale_ko.properties +++ b/src/main/resources/locale/locale_ko.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunt Fishing.Ability.Locked.0=LOCKED UNTIL 150+ SKILL (SHAKE) Fishing.Ability.Rank=[[RED]]Treasure Hunter Rank: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Treasure Hunter (Passive) Fishing.Effect.1=Fish up misc. objects Fishing.Effect.2=Magic Hunter Fishing.Effect.3=Find Enchanted Items Fishing.Effect.4=Shake (vs. Entities) Fishing.Effect.5=Shake items off of mobs w/ fishing pole +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]Treasure found! Fishing.Listener=Fishing: diff --git a/src/main/resources/locale/locale_lv.properties b/src/main/resources/locale/locale_lv.properties index 5ecc030df..3303a4344 100644 --- a/src/main/resources/locale/locale_lv.properties +++ b/src/main/resources/locale/locale_lv.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunt Fishing.Ability.Locked.0=LOCKED UNTIL 150+ SKILL (SHAKE) Fishing.Ability.Rank=[[RED]]Treasure Hunter Rank: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Treasure Hunter (Passive) Fishing.Effect.1=Fish up misc. objects Fishing.Effect.2=Magic Hunter Fishing.Effect.3=Find Enchanted Items Fishing.Effect.4=Shake (vs. Entities) Fishing.Effect.5=Shake items off of mobs w/ fishing pole +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]Treasure found! Fishing.Listener=Zvejo\u0161ana: diff --git a/src/main/resources/locale/locale_nl.properties b/src/main/resources/locale/locale_nl.properties index 0cb73a4ae..c341339a3 100644 --- a/src/main/resources/locale/locale_nl.properties +++ b/src/main/resources/locale/locale_nl.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunt Fishing.Ability.Locked.0=LOCKED UNTIL 150+ SKILL (SHAKE) Fishing.Ability.Rank=[[RED]]Treasure Hunter Rank: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Treasure Hunter (Passive) Fishing.Effect.1=Fish up misc. objects Fishing.Effect.2=Magic Hunter Fishing.Effect.3=Find Enchanted Items Fishing.Effect.4=Shake (vs. Entities) Fishing.Effect.5=Shake items off of mobs w/ fishing pole +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]Treasure found! Fishing.Listener=Vissen: diff --git a/src/main/resources/locale/locale_no.properties b/src/main/resources/locale/locale_no.properties index 2c35bb21a..81a675121 100644 --- a/src/main/resources/locale/locale_no.properties +++ b/src/main/resources/locale/locale_no.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunt Fishing.Ability.Locked.0=L\u00e5st til 150 + ferdighet (Shake) Fishing.Ability.Rank=[[RED]]Treasure Hunter Rank: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Treasure Hunter (Passive) Fishing.Effect.1=Fish up misc. objects Fishing.Effect.2=Magic Hunter Fishing.Effect.3=Find Enchanted Items Fishing.Effect.4=Shake (vs. Entities) Fishing.Effect.5=Shake items off of mobs w/ fishing pole +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]Treasure found! Fishing.Listener=Fishing: diff --git a/src/main/resources/locale/locale_pl.properties b/src/main/resources/locale/locale_pl.properties index 2bc8dc523..38fe0e5e5 100644 --- a/src/main/resources/locale/locale_pl.properties +++ b/src/main/resources/locale/locale_pl.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunt Fishing.Ability.Locked.0=LOCKED UNTIL 150+ SKILL (SHAKE) Fishing.Ability.Rank=[[RED]]Ranga lowienia skarbow: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Lowca Skarbow (Pasywna) Fishing.Effect.1=Fish up misc. objects Fishing.Effect.2=Magiczny Lowca Fishing.Effect.3=Znajdowanie Zakletych Przedmiotow Fishing.Effect.4=Shake (vs. Entities) Fishing.Effect.5=Shake items off of mobs w/ fishing pole +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]Treasure found! Fishing.Listener=Fishing: diff --git a/src/main/resources/locale/locale_pt_BR.properties b/src/main/resources/locale/locale_pt_BR.properties index e5cf84b80..0d44ffd66 100644 --- a/src/main/resources/locale/locale_pt_BR.properties +++ b/src/main/resources/locale/locale_pt_BR.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunt Fishing.Ability.Locked.0=LOCKED UNTIL 150+ SKILL (SHAKE) Fishing.Ability.Rank=[[RED]]Treasure Hunter Rank: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Treasure Hunter (Passive) Fishing.Effect.1=Fish up misc. objects Fishing.Effect.2=Magic Hunter Fishing.Effect.3=Find Enchanted Items Fishing.Effect.4=Shake (vs. Entities) Fishing.Effect.5=Shake items off of mobs w/ fishing pole +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]Treasure found! Fishing.Listener=Fishing: diff --git a/src/main/resources/locale/locale_ru.properties b/src/main/resources/locale/locale_ru.properties index 111f4472a..f128209a5 100644 --- a/src/main/resources/locale/locale_ru.properties +++ b/src/main/resources/locale/locale_ru.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]\u041e\u0445\u043e\u0442\u043d\u0438\u043a \u0417\u0 Fishing.Ability.Locked.0=\u0417\u0410\u0411\u041b\u041e\u041a\u0418\u0420\u041e\u0412\u0410\u041d\u041e \u0414\u041e 150+ \u0423\u0420\u041e\u0412\u041d\u042f \u041d\u0410\u0412\u042b\u041a\u0410 (\u0412\u0421\u0422\u0420\u042f\u0421\u041a\u0410) Fishing.Ability.Rank=[[RED]]\u0420\u0430\u043d\u0433 \u041e\u0445\u043e\u0442\u043d\u0438\u043a\u0430 \u0437\u0430 \u0421\u043e\u043a\u0440\u043e\u0432\u0438\u0449\u0430\u043c\u0438: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]\u0412\u0441\u0442\u0440\u044f\u0441\u043a\u0430: [[YELLOW]]\u0412\u044b\u0442\u0440\u044f\u0445\u0438\u0432\u0430\u0439\u0442\u0435 \u0432\u0435\u0449\u0438 \u0438\u0437 \u043c\u043e\u0431\u043e\u0432, \u043a\u0430\u043b\u0435\u0447\u0430 \u0438\u0445 \u0432 \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u0435 ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=\u041e\u0445\u043e\u0442\u043d\u0438\u043a \u0437\u0430 \u0421\u043e\u043a\u0440\u043e\u0432\u0438\u0449\u0430\u043c\u0438 (\u041f\u0430\u0441\u0441\u0438\u0432\u043d\u043e\u0435) Fishing.Effect.1=\u041b\u043e\u0432\u043b\u044f \u0440\u0430\u0437\u043d\u044b\u0445 \u043f\u0440\u0435\u0434\u043c\u0435\u0442\u043e\u0432 Fishing.Effect.2=\u041e\u0445\u043e\u0442\u043d\u0438\u043a \u0417\u0430 \u041c\u0430\u0433\u0438\u0435\u0439 Fishing.Effect.3=\u041d\u0430\u0445\u043e\u0434\u043a\u0430 \u0417\u0430\u0447\u0430\u0440\u043e\u0432\u0430\u043d\u044b\u0445 \u041f\u0440\u0435\u0434\u043c\u0435\u0442\u043e\u0432 Fishing.Effect.4=\u0412\u0441\u0442\u0440\u044f\u0441\u043a\u0430 (\u0421\u0443\u0449\u0435\u0441\u0442\u0432) Fishing.Effect.5=\u0412\u044b\u0442\u0440\u044f\u0445\u0438\u0432\u0430\u0439\u0442\u0435 \u0432\u0435\u0449\u0438 \u0438\u0437 \u043c\u043e\u0431\u043e\u0432 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0443\u0434\u043e\u0447\u043a\u0438 +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]\u0428\u0430\u043d\u0441 \u041e\u0445\u043e\u0442\u043d\u0438\u043a\u0430 \u0417\u0430 \u041c\u0430\u0433\u0438\u0435\u0439: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]\u041d\u0430\u0439\u0434\u0435\u043d\u043e \u0441\u043e\u043a\u0440\u043e\u0432\u0438\u0449\u0435! Fishing.Listener=\u0420\u044b\u0431\u043e\u043b\u043e\u0432\u0441\u0442\u0432\u043e: diff --git a/src/main/resources/locale/locale_sv.properties b/src/main/resources/locale/locale_sv.properties index d7d7b3e55..ebf607c83 100644 --- a/src/main/resources/locale/locale_sv.properties +++ b/src/main/resources/locale/locale_sv.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunt Fishing.Ability.Locked.0=LOCKED UNTIL 150+ SKILL (SHAKE) Fishing.Ability.Rank=[[RED]]Treasure Hunter Rank: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Treasure Hunter (Passive) Fishing.Effect.1=Fish up misc. objects Fishing.Effect.2=Magic Hunter Fishing.Effect.3=Find Enchanted Items Fishing.Effect.4=Shake (vs. Entities) Fishing.Effect.5=Shake items off of mobs w/ fishing pole +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]Treasure found! Fishing.Listener=Fishing: diff --git a/src/main/resources/locale/locale_tr_TR.properties b/src/main/resources/locale/locale_tr_TR.properties index be09bc72d..c42fbea39 100644 --- a/src/main/resources/locale/locale_tr_TR.properties +++ b/src/main/resources/locale/locale_tr_TR.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunt Fishing.Ability.Locked.0=LOCKED UNTIL 150+ SKILL (SHAKE) Fishing.Ability.Rank=[[RED]]Treasure Hunter Rank: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=Treasure Hunter (Passive) Fishing.Effect.1=Fish up misc. objects Fishing.Effect.2=Magic Hunter Fishing.Effect.3=Find Enchanted Items Fishing.Effect.4=Shake (vs. Entities) Fishing.Effect.5=Shake items off of mobs w/ fishing pole +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]Treasure found! Fishing.Listener=Fishing: diff --git a/src/main/resources/locale/locale_zh_CN.properties b/src/main/resources/locale/locale_zh_CN.properties index 7dbe27468..f14da1636 100644 --- a/src/main/resources/locale/locale_zh_CN.properties +++ b/src/main/resources/locale/locale_zh_CN.properties @@ -77,12 +77,15 @@ Fishing.Ability.Info=[[RED]]\u9b54\u6cd5\u730e\u4eba: [[GRAY]] ** \u968f\u7740\u Fishing.Ability.Locked.0=\u6280\u80fd 150+ \u89e3\u9501 (\u6643\u52a8\u602a\u7269) Fishing.Ability.Rank=[[RED]]\u5b9d\u7269\u730e\u4eba\u7b49\u7ea7: [[YELLOW]]{0}/5 Fishing.Ability.Shake=[[RED]]\u6643\u52a8\u602a\u7269: [[YELLOW]]\u5411\u602a\u7269\u6325\u52a8\u9c7c\u7aff\u4f7f\u5b83\u4eec\u8eab\u4e0a\u7684\u7269\u54c1\u6389\u843d, \u540c\u65f6\u51cf\u5c11\u5b83\u4eec\u7684\u8840\u91cf ;_; +Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0} Fishing.Effect.0=\u5b9d\u7269\u730e\u4eba (\u88ab\u52a8\u6280\u80fd) Fishing.Effect.1=\u9493\u5230\u6742\u7269 Fishing.Effect.2=\u9b54\u6cd5\u730e\u4eba Fishing.Effect.3=\u627e\u5230\u9644\u9b54\u7269\u54c1 Fishing.Effect.4=\u6643\u52a8\u602a\u7269 (\u5bf9\u602a\u7269\u4f7f\u7528) Fishing.Effect.5=\u7528\u9c7c\u7aff\u628a\u602a\u7269\u8eab\u4e0a\u7684\u4e1c\u897f\u6447\u4e0b\u6765 +Fishing.Effect.6=Fisherman's Diet +Fishing.Effect.7=Improves hunger restored from fished foods Fishing.Enchant.Chance=[[RED]]\u9b54\u6cd5\u730e\u4eba\u51e0\u7387: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]\u53d1\u73b0\u5b9d\u7269\u4e86\uff01 Fishing.Listener=\u9493\u9c7c: diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index e231df3e4..5fb56fcf1 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -333,12 +333,15 @@ permissions: mcmmo.ability.fishing.shakemob: true mcmmo.ability.fishing.treasures: true mcmmo.ability.fishing.magic: true + mcmmo.ability.fishing.fishermansdiet: true mcmmo.ability.fishing.shakemob: description: Allows access to the Shake Mob ability mcmmo.ability.fishing.treasures: description: Allows treasure drops from Fishing mcmmo.ability.fishing.magic: description: Allows enchanted drops from Fishing + mcmmo.ability.fishing.fishermansdiet: + description: Allows access to the Fishermans's Diet ability mcmmo.ability.mining.*: description: Allows access to all Mining abilities children: