diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java index f7bd0c8ef..fad3756e7 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java @@ -14,7 +14,8 @@ import com.gmail.nossr50.locale.mcLocale; public class AcrobaticsCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!(sender instanceof Player)) { + if (!(sender instanceof Player)) + { sender.sendMessage("This command does not support console useage."); return true; } @@ -46,7 +47,6 @@ public class AcrobaticsCommand implements CommandExecutor { player.sendMessage(mcLocale.getString("m.AcrobaticsRollChance", new Object[] { percentage })); player.sendMessage(mcLocale.getString("m.AcrobaticsGracefulRollChance", new Object[] { gracepercentage })); player.sendMessage(mcLocale.getString("m.AcrobaticsDodgeChance", new Object[] { dodgepercentage })); - return true; } } \ No newline at end of file diff --git a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java index 8578faef1..f0b4bed3d 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java @@ -1,5 +1,6 @@ package com.gmail.nossr50.commands.skills; +import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -7,6 +8,7 @@ import org.bukkit.entity.Player; import com.gmail.nossr50.Users; import com.gmail.nossr50.mcPermissions; +import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; @@ -29,6 +31,8 @@ public class ExcavationCommand implements CommandExecutor { ticks++; } + + player.sendMessage(""); player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillExcavation") })); player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainExcavation") })); @@ -39,8 +43,44 @@ public class ExcavationCommand implements CommandExecutor { player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsExcavation1_0"), mcLocale.getString("m.EffectsExcavation1_1") })); player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsExcavation2_0"), mcLocale.getString("m.EffectsExcavation2_1") })); player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") })); - player.sendMessage(mcLocale.getString("m.ExcavationGreenTerraLength", new Object[] { ticks })); + player.sendMessage(mcLocale.getString("m.ExcavationGigaDrillBreakerLength", new Object[] { ticks })); + if (args.length >= 1) + { + if(args[0].equals("?")) + { + if(args[1].equals("1")) + { + player.sendMessage("==EXCAVATION=="); + player.sendMessage(""); + player.sendMessage("==XP Gain=="); + player.sendMessage("Base XP: " + LoadProperties.mbase); + player.sendMessage(ChatColor.GRAY + "Awarded for digging Dirt, Grass, Sand, Gravel, "); + player.sendMessage(ChatColor.GRAY + "Soul Sand, Mycelium, and Clay."); + player.sendMessage("Treasures: Varies by item"); + player.sendMessage(ChatColor.GRAY + "Awarded for finding items while digging."); + player.sendMessage(""); + player.sendMessage("==Abilities=="); + player.sendMessage("Giga Drill Breaker"); + player.sendMessage(ChatColor.GRAY + "Right-click with a shovel in hand to prep this ability."); + player.sendMessage(ChatColor.GRAY + "Allows for instabreaking of associated blocks."); + player.sendMessage(""); + player.sendMessage("==Subskills=="); + player.sendMessage("Treasure Hunter"); + player.sendMessage(ChatColor.GRAY + "Randomly find valuable items while digging."); + player.sendMessage(ChatColor.GRAY + "Items found vary depending on skill level."); + player.sendMessage(""); + player.sendMessage("==PAGE 1 of 1=="); + } + + } + else + { + player.sendMessage(ChatColor.RED + "Usage is /excavation ? [page]"); + } + + } + return true; } } diff --git a/src/main/resources/locale/locale_de.properties b/src/main/resources/locale/locale_de.properties index 381c0aeef..3bc7eb2a2 100644 --- a/src/main/resources/locale/locale_de.properties +++ b/src/main/resources/locale/locale_de.properties @@ -201,7 +201,7 @@ m.EffectsExcavation1_0=[[YELLOW]]Giga Bohrer (Faehigkeit) m.EffectsExcavation1_1=[[AQUA]]3x Drop Rate, 3x EXP, +Tempo m.EffectsExcavation2_0=[[YELLOW]]Schatzjaeger m.EffectsExcavation2_1=[[AQUA]]Faehigkeit nach Schaetzen zu graben -m.ExcavationGreenTerraLength=[[YELLOW]]Giga Bohrer Dauer: [[GREEN]]{0}s +m.ExcavationGigaDrillBreakerLength=[[YELLOW]]Giga Bohrer Dauer: [[GREEN]]{0}s mcBlockListener.PlacedAnvil=[[DARK_AQUA]]Du hast einen Ambos platziert, du kannst hier Werkzeuge und Ruestungen reparieren. mcEntityListener.WolfComesBack=[[DARK_AQUA]]Dein Wolf hastet zurueck zu dir... mcPlayerListener.AbilitiesOff=Faehigkeiten nutzen (rechtsklick) aus diff --git a/src/main/resources/locale/locale_en_us.properties b/src/main/resources/locale/locale_en_us.properties index 1b2237dc7..f84a60877 100644 --- a/src/main/resources/locale/locale_en_us.properties +++ b/src/main/resources/locale/locale_en_us.properties @@ -203,7 +203,7 @@ m.EffectsExcavation1_0=Giga Drill Breaker (ABILITY) m.EffectsExcavation1_1=3x Drop Rate, 3x EXP, +Speed m.EffectsExcavation2_0=Treasure Hunter m.EffectsExcavation2_1=Ability to dig for treasure -m.ExcavationGreenTerraLength=[[RED]]Giga Drill Breaker Length: [[YELLOW]]{0}s +m.ExcavationGigaDrillBreakerLength=[[RED]]Giga Drill Breaker Length: [[YELLOW]]{0}s mcBlockListener.PlacedAnvil=[[DARK_RED]]You have placed an anvil, anvils can repair tools and armor. mcEntityListener.WolfComesBack=[[DARK_GRAY]]Your wolf scurries back to you... mcPlayerListener.AbilitiesOff=Ability use toggled off diff --git a/src/main/resources/locale/locale_es_es.properties b/src/main/resources/locale/locale_es_es.properties index 1a176b1be..ae7b17a63 100644 --- a/src/main/resources/locale/locale_es_es.properties +++ b/src/main/resources/locale/locale_es_es.properties @@ -201,7 +201,7 @@ m.EffectsExcavation1_0=Ultra perforador (HABILIDAD) m.EffectsExcavation1_1=Triple beneficio, Triple EXP, + Velocidad m.EffectsExcavation2_0=Cazatesoros m.EffectsExcavation2_1=Habilidad para excavar y obtener tesoros -m.ExcavationGreenTerraLength=[[RED]]Duracion de Ultra perforador: [[YELLOW]]{0}s +m.ExcavationGigaDrillBreakerLength=[[RED]]Duracion de Ultra perforador: [[YELLOW]]{0}s mcBlockListener.PlacedAnvil=[[DARK_RED]]Has establecido un yunque, Los yunques pueden reparar herramientas y armadura. mcEntityListener.WolfComesBack=[[DARK_GRAY]]El lobo se escabuye hacia ti... mcPlayerListener.AbilitiesOff=Uso de habilidad desactivada diff --git a/src/main/resources/locale/locale_fi.properties b/src/main/resources/locale/locale_fi.properties index 532b055ac..1cc746557 100644 --- a/src/main/resources/locale/locale_fi.properties +++ b/src/main/resources/locale/locale_fi.properties @@ -201,7 +201,7 @@ m.EffectsExcavation1_0=Giga Drill Breaker (TAITO) m.EffectsExcavation1_1=3x saaliin määrä, 3x kokemuspisteiden määrä, +Nopeus m.EffectsExcavation2_0=Aarteenmetsästäjä m.EffectsExcavation2_1=Taito jonka avulla voit kaivaa aarteita -m.ExcavationGreenTerraLength=[[RED]]Giga Drill Breaker kesto: [[YELLOW]]{0}s +m.ExcavationGigaDrillBreakerLength=[[RED]]Giga Drill Breaker kesto: [[YELLOW]]{0}s mcBlockListener.PlacedAnvil=[[DARK_RED]]Olet asettanut alasimen maahan, sillä voit korjata työkaluja ja haarniskoja. mcEntityListener.WolfComesBack=[[DARK_GRAY]]Sutesi kipittää takaisin luoksesi... mcPlayerListener.AbilitiesOff=Taitojen käyttö pois päältä diff --git a/src/main/resources/locale/locale_fr.properties b/src/main/resources/locale/locale_fr.properties index f0f040092..223d62c15 100644 --- a/src/main/resources/locale/locale_fr.properties +++ b/src/main/resources/locale/locale_fr.properties @@ -201,7 +201,7 @@ m.EffectsExcavation1_0=Super broyeur (capacit m.EffectsExcavation1_1=3x Butin, 3x XP, +Vitesse m.EffectsExcavation2_0=Chercheur de trésors m.EffectsExcavation2_1=Capacité de trouver un trésor -m.ExcavationGreenTerraLength=[[RED]]Durée de la capacité spéciale : [[YELLOW]]{0}s +m.ExcavationGigaDrillBreakerLength=[[RED]]Durée de la capacité spéciale : [[YELLOW]]{0}s mcBlockListener.PlacedAnvil=[[DARK_RED]]Vous avez placé une enclume, Les enclumes peuvent réparer les outils et l'armure. mcEntityListener.WolfComesBack=[[DARK_GRAY]]Votre loup revient vers vous... mcPlayerListener.AbilitiesOff=Capacité spéciale désactivée diff --git a/src/main/resources/locale/locale_nl.properties b/src/main/resources/locale/locale_nl.properties index 4b0f8fa62..fa30ffc50 100644 --- a/src/main/resources/locale/locale_nl.properties +++ b/src/main/resources/locale/locale_nl.properties @@ -207,7 +207,7 @@ m.EffectsExcavation1_0=Giga Drilboor (ABILITY) m.EffectsExcavation1_1=3x drop, 3x XP, hogere snelheid m.EffectsExcavation2_0=Schatzoeker m.EffectsExcavation2_1=Mogelijkheid om schatten te zoeken -m.ExcavationGreenTerraLength=[[RED]]Giga Drilboor lengte: [[YELLOW]]{0}s +m.ExcavationGigaDrillBreakerLength=[[RED]]Giga Drilboor lengte: [[YELLOW]]{0}s mcBlockListener.PlacedAnvil=[[DARK_RED]]Je hebt een aambeeld geplaatst. Hierop kun je tools en armor repareren. mcEntityListener.WolfComesBack=[[DARK_GRAY]]Je wolf dribbelt terug naar je... mcPlayerListener.AbilitiesOff=Ability activatie is uit diff --git a/src/main/resources/locale/locale_pl.properties b/src/main/resources/locale/locale_pl.properties index 8b3b07fea..2bbc9e679 100644 --- a/src/main/resources/locale/locale_pl.properties +++ b/src/main/resources/locale/locale_pl.properties @@ -201,7 +201,7 @@ m.EffectsExcavation1_0=Super Szybka Saperka (UMIEJETNOSC) m.EffectsExcavation1_1=Zwiekszona szybkosc kopania i trzykrotnie wiekszy urobek i zdobyte doswiadczenie. m.EffectsExcavation2_0=Lowca Skarbow m.EffectsExcavation2_1=Umiejetnosc znajdywania skarbow -m.ExcavationGreenTerraLength=[[RED]]Czas trwania Super Szybkiej Saperki: [[YELLOW]]{0} sekund. +m.ExcavationGigaDrillBreakerLength=[[RED]]Czas trwania Super Szybkiej Saperki: [[YELLOW]]{0} sekund. mcBlockListener.PlacedAnvil=[[DARK_RED]]Polozyles kowadlo, ktore pozwala na naprawe przedmiotow. mcEntityListener.WolfComesBack=[[DARK_GRAY]]Twoj wilk przybiega z powrotem. mcPlayerListener.AbilitiesOff=Uzywanie umiejetnosci wylaczone diff --git a/src/main/resources/locale/locale_pt_br.properties b/src/main/resources/locale/locale_pt_br.properties index f6ed7f00f..b9166f1e8 100644 --- a/src/main/resources/locale/locale_pt_br.properties +++ b/src/main/resources/locale/locale_pt_br.properties @@ -207,7 +207,7 @@ m.EffectsExcavation1_0=Super Broca (HABILIDADE ESPECIAL) m.EffectsExcavation1_1=Drop x3, EXP x3, mais velocidade m.EffectsExcavation2_0=Caçad/or de Tesouros m.EffectsExcavation2_1=Encontra itens raros enquanto cava -m.ExcavationGreenTerraLength=[[RED]]Duraçao da Super Broca: [[YELLOW]]{0}s +m.ExcavationGigaDrillBreakerLength=[[RED]]Duraçao da Super Broca: [[YELLOW]]{0}s mcBlockListener.PlacedAnvil=[[DARK_RED]] Você colocou uma bigorna, a bigorna pode reparar ferramentas e armaduras. mcEntityListener.WolfComesBack=[[DARK_GRAY]]Seu lobo voltou para você... mcPlayerListener.AbilitiesOff=Habilidade especial desabilitada diff --git a/src/main/resources/locale/locale_ru.properties b/src/main/resources/locale/locale_ru.properties index 4655124dd..c84d1081f 100644 --- a/src/main/resources/locale/locale_ru.properties +++ b/src/main/resources/locale/locale_ru.properties @@ -202,7 +202,7 @@ m.EffectsExcavation1_0= m.EffectsExcavation1_1=3-îé äðîï, 3-îé îïûò, Óâåëè÷åíèå ñêîðîñòè m.EffectsExcavation2_0=Îõîòíèê çà ñîêðîâèùàìè m.EffectsExcavation2_1=Ñïîñîáíîñòü êîïàòü ñîêðîâèùà -m.ExcavationGreenTerraLength=[[RED]]Ïðîäîëæèòåëüíîñòü "Ìåãà äðåëè": [[YELLOW]]{0}s +m.ExcavationGigaDrillBreakerLength=[[RED]]Ïðîäîëæèòåëüíîñòü "Ìåãà äðåëè": [[YELLOW]]{0}s mcBlockListener.PlacedAnvil=[[DARK_RED]]Âû ðàçìåñòèëè íàêîâàëüíè è òåïåðü ìîæåòå ÷èíèòü âåùè. mcEntityListener.WolfComesBack=[[DARK_GRAY]]Âàø âîëê õî÷åò âåðíóòüñÿ ê âàì mcPlayerListener.AbilitiesOff=Èñïîëüçîâàíèå ñïîñîáíîñòåé âûêëþ÷åíî