From fe4b5466c79eb32c67d436ebd6372b454df66d0c Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Tue, 28 Jan 2020 02:40:09 +0100 Subject: [PATCH] Class names are uppercase now, you happy now Dashiell? Also, "?" alias --- .../dynamichelp/Dynamichelp.java | 22 +++++++++++++++++++ .../{helpCommand.java => HelpCommand.java} | 8 +++---- .../dynamichelp/dynamichelp.java | 21 ------------------ .../dynamichelp/langmodule/lang.java | 6 ++--- src/main/resources/plugin.yml | 2 +- 5 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 src/main/java/pl/laststation/youhavetrouble/dynamichelp/Dynamichelp.java rename src/main/java/pl/laststation/youhavetrouble/dynamichelp/commands/{helpCommand.java => HelpCommand.java} (82%) delete mode 100644 src/main/java/pl/laststation/youhavetrouble/dynamichelp/dynamichelp.java diff --git a/src/main/java/pl/laststation/youhavetrouble/dynamichelp/Dynamichelp.java b/src/main/java/pl/laststation/youhavetrouble/dynamichelp/Dynamichelp.java new file mode 100644 index 0000000..29faaaf --- /dev/null +++ b/src/main/java/pl/laststation/youhavetrouble/dynamichelp/Dynamichelp.java @@ -0,0 +1,22 @@ +package pl.laststation.youhavetrouble.dynamichelp; + +import org.bukkit.plugin.java.JavaPlugin; +import pl.laststation.youhavetrouble.dynamichelp.commands.HelpCommand; + +public class Dynamichelp extends JavaPlugin { + + public void onEnable() { + + plugin = this; + + saveDefaultConfig(); + getCommand("help").setExecutor(new HelpCommand(this)); + getCommand("?").setExecutor(new HelpCommand(this)); + } + + private static Dynamichelp plugin; + + public static Dynamichelp getPlugin(){ return plugin; } + + + } diff --git a/src/main/java/pl/laststation/youhavetrouble/dynamichelp/commands/helpCommand.java b/src/main/java/pl/laststation/youhavetrouble/dynamichelp/commands/HelpCommand.java similarity index 82% rename from src/main/java/pl/laststation/youhavetrouble/dynamichelp/commands/helpCommand.java rename to src/main/java/pl/laststation/youhavetrouble/dynamichelp/commands/HelpCommand.java index 1ae45e2..92128c0 100644 --- a/src/main/java/pl/laststation/youhavetrouble/dynamichelp/commands/helpCommand.java +++ b/src/main/java/pl/laststation/youhavetrouble/dynamichelp/commands/HelpCommand.java @@ -4,13 +4,13 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import pl.laststation.youhavetrouble.dynamichelp.dynamichelp; +import pl.laststation.youhavetrouble.dynamichelp.Dynamichelp; import pl.laststation.youhavetrouble.dynamichelp.langmodule.lang; -public class helpCommand implements CommandExecutor { +public class HelpCommand implements CommandExecutor { - public helpCommand(dynamichelp plugin) { + public HelpCommand(Dynamichelp plugin) { } @@ -23,7 +23,7 @@ public class helpCommand implements CommandExecutor { commandSender.sendMessage(lang.getTranslatedString(p, "too-many-arguments")); return true; } else if (args.length == 1) { - if (dynamichelp.getPlugin().getConfig().getString("lang.en_us."+args[0]) == null) { + if (Dynamichelp.getPlugin().getConfig().getString("lang.en_us."+args[0]) == null) { commandSender.sendMessage(lang.getTranslatedString(p, "invalid-page")); return true; } diff --git a/src/main/java/pl/laststation/youhavetrouble/dynamichelp/dynamichelp.java b/src/main/java/pl/laststation/youhavetrouble/dynamichelp/dynamichelp.java deleted file mode 100644 index 0bb259f..0000000 --- a/src/main/java/pl/laststation/youhavetrouble/dynamichelp/dynamichelp.java +++ /dev/null @@ -1,21 +0,0 @@ -package pl.laststation.youhavetrouble.dynamichelp; - -import org.bukkit.plugin.java.JavaPlugin; -import pl.laststation.youhavetrouble.dynamichelp.commands.helpCommand; - -public class dynamichelp extends JavaPlugin { - - public void onEnable() { - - plugin = this; - - saveDefaultConfig(); - getCommand("help").setExecutor(new helpCommand(this)); - } - - private static dynamichelp plugin; - - public static dynamichelp getPlugin(){ return plugin; } - - - } diff --git a/src/main/java/pl/laststation/youhavetrouble/dynamichelp/langmodule/lang.java b/src/main/java/pl/laststation/youhavetrouble/dynamichelp/langmodule/lang.java index 8776391..35f167f 100644 --- a/src/main/java/pl/laststation/youhavetrouble/dynamichelp/langmodule/lang.java +++ b/src/main/java/pl/laststation/youhavetrouble/dynamichelp/langmodule/lang.java @@ -1,7 +1,7 @@ package pl.laststation.youhavetrouble.dynamichelp.langmodule; import org.bukkit.entity.Player; -import pl.laststation.youhavetrouble.dynamichelp.dynamichelp; +import pl.laststation.youhavetrouble.dynamichelp.Dynamichelp; public class lang { @@ -14,8 +14,8 @@ public class lang { public static String getTranslatedString(Player p, String msg) { String plocale = p.getLocale(); - String tmessage = dynamichelp.getPlugin().getConfig().getString("lang." + plocale + "." + msg); - String dmessage = dynamichelp.getPlugin().getConfig().getString("lang.en_us." + msg); + String tmessage = Dynamichelp.getPlugin().getConfig().getString("lang." + plocale + "." + msg); + String dmessage = Dynamichelp.getPlugin().getConfig().getString("lang.en_us." + msg); if (tmessage == null) { if (dmessage == null) { return " "; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 8cee7c0..7acc50e 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,4 +1,4 @@ -main: pl.laststation.youhavetrouble.dynamichelp.dynamichelp +main: pl.laststation.youhavetrouble.Dynamichelp.Dynamichelp name: DynamicLangHelp version: 1.0.0 description: Dynamic Locale Help command