diff --git a/src/commands/CommandBeansShow.java b/src/commands/CommandBeansShow.java index b3e2493..0878608 100644 --- a/src/commands/CommandBeansShow.java +++ b/src/commands/CommandBeansShow.java @@ -9,10 +9,10 @@ public class CommandBeansShow extends Command public CommandBeansShow(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("BeansShowInfo"); }; + public String getHelpText() { return LocStrings.Stub("BeansShowInfo"); }; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.mentions == null) res.Call(String.format(LocStrings.Stub("BeansShowDisplay"), user.GetBeans())); diff --git a/src/commands/CommandBenchmark.java b/src/commands/CommandBenchmark.java index d1cd585..86c4289 100644 --- a/src/commands/CommandBenchmark.java +++ b/src/commands/CommandBenchmark.java @@ -25,16 +25,16 @@ public class CommandBenchmark extends Command } @Override - public String HelpText() { return LocStrings.Stub("BenchmarkInfo"); } + public String getHelpText() { return LocStrings.Stub("BenchmarkInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { framework.Update(); if(input.args == null || input.args.length() == 0) { - String output = HelpText(); + String output = getHelpText(); res.Call(output); return; } diff --git a/src/commands/CommandBetBeans.java b/src/commands/CommandBetBeans.java index 5c3dd6d..e359b5a 100644 --- a/src/commands/CommandBetBeans.java +++ b/src/commands/CommandBetBeans.java @@ -11,10 +11,10 @@ public class CommandBetBeans extends Command public CommandBetBeans(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("BetBeansInfo"); } + public String getHelpText() { return LocStrings.Stub("BetBeansInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String call = ""; int bet = 0; diff --git a/src/commands/CommandBetHistory.java b/src/commands/CommandBetHistory.java index 0a190a1..0a87b87 100644 --- a/src/commands/CommandBetHistory.java +++ b/src/commands/CommandBetHistory.java @@ -15,10 +15,10 @@ public class CommandBetHistory extends Command public CommandBetHistory(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("BetHistoryInfo"); } + public String getHelpText() { return LocStrings.Stub("BetHistoryInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { res.Call(String.format(LocStrings.Stub("BetHistoryOutput"), guild.beans.Get())); } diff --git a/src/commands/CommandBlurry.java b/src/commands/CommandBlurry.java index c875ff2..9fe2c3e 100644 --- a/src/commands/CommandBlurry.java +++ b/src/commands/CommandBlurry.java @@ -17,12 +17,12 @@ public class CommandBlurry extends Command public CommandBlurry(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("BlurryInfo"); }; + public String getHelpText() { return LocStrings.Stub("BlurryInfo"); }; private static Long num = 0l; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String name = null; String filename = null; diff --git a/src/commands/CommandBoop.java b/src/commands/CommandBoop.java index 6774212..6862c22 100644 --- a/src/commands/CommandBoop.java +++ b/src/commands/CommandBoop.java @@ -60,11 +60,11 @@ public class CommandBoop extends Command } @Override - public String HelpText() { return LocStrings.Stub("BoopInfo"); } + public String getHelpText() { return LocStrings.Stub("BoopInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.mentions == null) { diff --git a/src/commands/CommandCatch.java b/src/commands/CommandCatch.java index fac6208..576b936 100644 --- a/src/commands/CommandCatch.java +++ b/src/commands/CommandCatch.java @@ -23,11 +23,11 @@ public class CommandCatch extends Command private static Long num = 0l; @Override - public String HelpText() { return LocStrings.Stub("CatchInfo"); } + public String getHelpText() { return LocStrings.Stub("CatchInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String name = null; File catchFile = null; diff --git a/src/commands/CommandChangeIndicator.java b/src/commands/CommandChangeIndicator.java index 287ce3e..0bb9b31 100644 --- a/src/commands/CommandChangeIndicator.java +++ b/src/commands/CommandChangeIndicator.java @@ -9,10 +9,10 @@ public class CommandChangeIndicator extends Command public CommandChangeIndicator(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("ChangeIndicatorInfo"); } + public String getHelpText() { return LocStrings.Stub("ChangeIndicatorInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String arg = input.args.trim(); if(arg.length() == 0) diff --git a/src/commands/CommandChoose.java b/src/commands/CommandChoose.java index e68f783..f226e44 100644 --- a/src/commands/CommandChoose.java +++ b/src/commands/CommandChoose.java @@ -14,10 +14,10 @@ public class CommandChoose extends Command public CommandChoose(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("ChooseInfo"); } + public String getHelpText() { return LocStrings.Stub("ChooseInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String [] choices = input.args.split(","); if(choices.length == 1) diff --git a/src/commands/CommandColiru.java b/src/commands/CommandColiru.java index b2f5f8e..2087df2 100644 --- a/src/commands/CommandColiru.java +++ b/src/commands/CommandColiru.java @@ -12,10 +12,10 @@ public class CommandColiru extends Command public CommandColiru(KittyRole level, KittyRating rating) { super(level, rating);} @Override - public String HelpText() { return LocStrings.Stub("ColiruInfo"); } + public String getHelpText() { return LocStrings.Stub("ColiruInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.args.trim().length() < 1) { diff --git a/src/commands/CommandCrouton.java b/src/commands/CommandCrouton.java index e08821c..1ca9f38 100644 --- a/src/commands/CommandCrouton.java +++ b/src/commands/CommandCrouton.java @@ -18,10 +18,10 @@ public class CommandCrouton extends Command public CommandCrouton(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("CroutonInfo"); }; + public String getHelpText() { return LocStrings.Stub("CroutonInfo"); }; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { KittyEmbed embed = new KittyEmbed(); embed.authorImage = "https://crouton.net/crouton.png"; diff --git a/src/commands/CommandDBFlush.java b/src/commands/CommandDBFlush.java index d0f37b8..061fa7e 100644 --- a/src/commands/CommandDBFlush.java +++ b/src/commands/CommandDBFlush.java @@ -19,10 +19,10 @@ public class CommandDBFlush extends Command public CommandDBFlush(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("DBFlushInfo"); } + public String getHelpText() { return LocStrings.Stub("DBFlushInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { int numUpdated = DatabaseManager.instance.upkeep(); diff --git a/src/commands/CommandDBStats.java b/src/commands/CommandDBStats.java index 033bf34..e28c2a8 100644 --- a/src/commands/CommandDBStats.java +++ b/src/commands/CommandDBStats.java @@ -26,10 +26,10 @@ public class CommandDBStats extends Command } @Override - public String HelpText() { return LocStrings.Stub("DBStatsInfo"); } + public String getHelpText() { return LocStrings.Stub("DBStatsInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { KittyEmbed embed = new KittyEmbed(); embed.title = "Database Info"; diff --git a/src/commands/CommandDoWork.java b/src/commands/CommandDoWork.java index c37f85f..bda8347 100644 --- a/src/commands/CommandDoWork.java +++ b/src/commands/CommandDoWork.java @@ -15,11 +15,11 @@ public class CommandDoWork extends Command public CommandDoWork(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("DoWorkInfo"); } + public String getHelpText() { return LocStrings.Stub("DoWorkInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { @SuppressWarnings("unused") long thispieceofshit = 0; diff --git a/src/commands/CommandEightBall.java b/src/commands/CommandEightBall.java index 2e90413..e3ac564 100644 --- a/src/commands/CommandEightBall.java +++ b/src/commands/CommandEightBall.java @@ -35,10 +35,10 @@ public class CommandEightBall extends Command public CommandEightBall(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("EightBallInfo"); } + public String getHelpText() { return LocStrings.Stub("EightBallInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.args.trim().length() < 1) res.Call(LocStrings.Stub("EightBallError")); diff --git a/src/commands/CommandFetch.java b/src/commands/CommandFetch.java index 569c3c4..1d1607c 100644 --- a/src/commands/CommandFetch.java +++ b/src/commands/CommandFetch.java @@ -15,10 +15,10 @@ public class CommandFetch extends Command public CommandFetch(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("FetchInfo"); } + public String getHelpText() { return LocStrings.Stub("FetchInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String emote = input.args.split(" ")[0]; if(emote.startsWith("<") && emote.endsWith(">")) diff --git a/src/commands/CommandGiveBeans.java b/src/commands/CommandGiveBeans.java index a1469e9..a2c2a93 100644 --- a/src/commands/CommandGiveBeans.java +++ b/src/commands/CommandGiveBeans.java @@ -9,10 +9,10 @@ public class CommandGiveBeans extends Command public CommandGiveBeans (KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("GiveBeansInfo"); } + public String getHelpText() { return LocStrings.Stub("GiveBeansInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { int beans = 0; try { diff --git a/src/commands/CommandGuildRoleAdd.java b/src/commands/CommandGuildRoleAdd.java index f99ea33..ebca762 100644 --- a/src/commands/CommandGuildRoleAdd.java +++ b/src/commands/CommandGuildRoleAdd.java @@ -15,10 +15,10 @@ public class CommandGuildRoleAdd extends Command public CommandGuildRoleAdd(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("GuildRoleAddInfo"); }; + public String getHelpText() { return LocStrings.Stub("GuildRoleAddInfo"); }; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String role = input.args.split(" ")[0]; if(guild.roleList.contains(role)) diff --git a/src/commands/CommandGuildRoleAllowed.java b/src/commands/CommandGuildRoleAllowed.java index 6e30d59..c61a101 100644 --- a/src/commands/CommandGuildRoleAllowed.java +++ b/src/commands/CommandGuildRoleAllowed.java @@ -15,10 +15,10 @@ public class CommandGuildRoleAllowed extends Command public CommandGuildRoleAllowed(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("GuildRoleAllowedInfo"); } + public String getHelpText() { return LocStrings.Stub("GuildRoleAllowedInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String [] roles = input.args.split(","); String role; diff --git a/src/commands/CommandGuildRoleList.java b/src/commands/CommandGuildRoleList.java index b150286..52557f6 100644 --- a/src/commands/CommandGuildRoleList.java +++ b/src/commands/CommandGuildRoleList.java @@ -12,7 +12,7 @@ public class CommandGuildRoleList extends Command public CommandGuildRoleList(KittyRole level, KittyRating rating) { super(level, rating);} @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String roles = ""; if(guild.roleList.isEmpty()) diff --git a/src/commands/CommandGuildRoleNotAllowed.java b/src/commands/CommandGuildRoleNotAllowed.java index 90d244a..76f7a1f 100644 --- a/src/commands/CommandGuildRoleNotAllowed.java +++ b/src/commands/CommandGuildRoleNotAllowed.java @@ -15,10 +15,10 @@ public class CommandGuildRoleNotAllowed extends Command public CommandGuildRoleNotAllowed(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("GuildRoleNotAllowedInfo"); } + public String getHelpText() { return LocStrings.Stub("GuildRoleNotAllowedInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String [] roles = input.args.split(","); String role; diff --git a/src/commands/CommandGuildRoleRemove.java b/src/commands/CommandGuildRoleRemove.java index 0ae47da..e44d129 100644 --- a/src/commands/CommandGuildRoleRemove.java +++ b/src/commands/CommandGuildRoleRemove.java @@ -15,10 +15,10 @@ public class CommandGuildRoleRemove extends Command public CommandGuildRoleRemove(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("GuildRoleRemoveInfo"); }; + public String getHelpText() { return LocStrings.Stub("GuildRoleRemoveInfo"); }; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String role = input.args.split(" ")[0]; if(guild.roleList.contains(role)) diff --git a/src/commands/CommandHelp.java b/src/commands/CommandHelp.java index fd5bd0f..9277e7c 100644 --- a/src/commands/CommandHelp.java +++ b/src/commands/CommandHelp.java @@ -15,10 +15,10 @@ public class CommandHelp extends Command public CommandHelp(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("HelpInfo"); } + public String getHelpText() { return LocStrings.Stub("HelpInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String help = Stats.instance.GetHelpText(input.args); diff --git a/src/commands/CommandHelpBuilder.java b/src/commands/CommandHelpBuilder.java index 89ef69b..4c747db 100644 --- a/src/commands/CommandHelpBuilder.java +++ b/src/commands/CommandHelpBuilder.java @@ -26,10 +26,10 @@ public class CommandHelpBuilder extends Command { } @Override - public String HelpText() { return LocStrings.Stub("HelpBuilderInfo"); } + public String getHelpText() { return LocStrings.Stub("HelpBuilderInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { // Holds command groups HashMap> commandsByRole = new HashMap>(); @@ -121,7 +121,7 @@ public class CommandHelpBuilder extends Command { accumulated += leadStart + keys.get(j) + leadEnd; } - accumulated += leadFollow + commands.get(i).HelpText() + lineDelimiter;; + accumulated += leadFollow + commands.get(i).getHelpText() + lineDelimiter;; } accumulated += sectionEnd; diff --git a/src/commands/CommandInfo.java b/src/commands/CommandInfo.java index 7fee7bf..f15e62f 100644 --- a/src/commands/CommandInfo.java +++ b/src/commands/CommandInfo.java @@ -15,10 +15,10 @@ public class CommandInfo extends Command public CommandInfo(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("InfoInfo"); } + public String getHelpText() { return LocStrings.Stub("InfoInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { res.Call(LocStrings.Stub("InfoResponse")); } diff --git a/src/commands/CommandInvite.java b/src/commands/CommandInvite.java index d74dda5..077b040 100644 --- a/src/commands/CommandInvite.java +++ b/src/commands/CommandInvite.java @@ -10,10 +10,10 @@ public class CommandInvite extends Command public CommandInvite(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("InviteInfo"); } + public String getHelpText() { return LocStrings.Stub("InviteInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { res.Call("https://discordapp.com/oauth2/authorize?&client_id="+ Ref.CliID +"&scope=bot&permissions=8"); diff --git a/src/commands/CommandJDoodle.java b/src/commands/CommandJDoodle.java index ae244e4..d1eb630 100644 --- a/src/commands/CommandJDoodle.java +++ b/src/commands/CommandJDoodle.java @@ -12,10 +12,10 @@ public class CommandJDoodle extends Command public CommandJDoodle(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("JDoodleInfo"); } + public String getHelpText() { return LocStrings.Stub("JDoodleInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.args.trim().length() < 1) { diff --git a/src/commands/CommandMap.java b/src/commands/CommandMap.java index 803b93b..add05a1 100644 --- a/src/commands/CommandMap.java +++ b/src/commands/CommandMap.java @@ -23,10 +23,10 @@ public class CommandMap extends Command public CommandMap(KittyRole roleLevel, KittyRating contentRating) { super(roleLevel, contentRating); } @Override - public String HelpText() { return String.format(LocStrings.Stub("MapInfo"), "" + MaxWidth, "" + MaxHeight); } + public String getHelpText() { return String.format(LocStrings.Stub("MapInfo"), "" + MaxWidth, "" + MaxHeight); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { // Variables int width = 35; diff --git a/src/commands/CommandPerish.java b/src/commands/CommandPerish.java index 73ca6e6..1847659 100644 --- a/src/commands/CommandPerish.java +++ b/src/commands/CommandPerish.java @@ -23,12 +23,12 @@ public class CommandPerish extends Command public CommandPerish(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("PerishInfo"); }; + public String getHelpText() { return LocStrings.Stub("PerishInfo"); }; private static Long num = 0l; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String name = null; String filename = null; diff --git a/src/commands/CommandPing.java b/src/commands/CommandPing.java index 7de6205..351f8b0 100644 --- a/src/commands/CommandPing.java +++ b/src/commands/CommandPing.java @@ -15,11 +15,11 @@ public class CommandPing extends Command public CommandPing(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("PingInfo"); } + public String getHelpText() { return LocStrings.Stub("PingInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { res.Call(LocStrings.Stub("PingResponse")); } diff --git a/src/commands/CommandPollManage.java b/src/commands/CommandPollManage.java index 1a0114d..4fc304b 100644 --- a/src/commands/CommandPollManage.java +++ b/src/commands/CommandPollManage.java @@ -14,10 +14,10 @@ public class CommandPollManage extends Command public CommandPollManage(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("PollManageInfo"); } + public String getHelpText() { return LocStrings.Stub("PollManageInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { switch(input.args.split(" ")[0].toLowerCase()) { diff --git a/src/commands/CommandPollResults.java b/src/commands/CommandPollResults.java index ac36aff..4ba0785 100644 --- a/src/commands/CommandPollResults.java +++ b/src/commands/CommandPollResults.java @@ -10,10 +10,10 @@ public class CommandPollResults extends Command public CommandPollResults(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("PollResultsInfo"); } + public String getHelpText() { return LocStrings.Stub("PollResultsInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String results = ""; int totalVotes = 0; diff --git a/src/commands/CommandPollShow.java b/src/commands/CommandPollShow.java index 08cde19..4aaf848 100644 --- a/src/commands/CommandPollShow.java +++ b/src/commands/CommandPollShow.java @@ -8,10 +8,10 @@ public class CommandPollShow extends Command public CommandPollShow(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("PollShowInfo"); } + public String getHelpText() { return LocStrings.Stub("PollShowInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(!guild.polling) { diff --git a/src/commands/CommandPollVote.java b/src/commands/CommandPollVote.java index d3b48f5..75de872 100644 --- a/src/commands/CommandPollVote.java +++ b/src/commands/CommandPollVote.java @@ -8,10 +8,10 @@ public class CommandPollVote extends Command public CommandPollVote(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("PollVoteInfo"); } + public String getHelpText() { return LocStrings.Stub("PollVoteInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(guild.polling) { diff --git a/src/commands/CommandRPEnd.java b/src/commands/CommandRPEnd.java index 17005d6..1aed3ae 100644 --- a/src/commands/CommandRPEnd.java +++ b/src/commands/CommandRPEnd.java @@ -14,10 +14,10 @@ public class CommandRPEnd extends Command public CommandRPEnd (KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RPEndInfo"); } + public String getHelpText() { return LocStrings.Stub("RPEndInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { File sending = null; diff --git a/src/commands/CommandRPG.java b/src/commands/CommandRPG.java index 733d12d..275c79c 100644 --- a/src/commands/CommandRPG.java +++ b/src/commands/CommandRPG.java @@ -23,15 +23,15 @@ public class CommandRPG extends Command } @Override - public String HelpText() { return LocStrings.Stub("RPGInfo"); }; + public String getHelpText() { return LocStrings.Stub("RPGInfo"); }; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.args == null || input.args.length() == 0) { - String output = HelpText(); + String output = getHelpText(); res.Call(output); return; } diff --git a/src/commands/CommandRPStart.java b/src/commands/CommandRPStart.java index b433cd0..3e03635 100644 --- a/src/commands/CommandRPStart.java +++ b/src/commands/CommandRPStart.java @@ -12,10 +12,10 @@ public class CommandRPStart extends Command public CommandRPStart (KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RPStartInfo"); } + public String getHelpText() { return LocStrings.Stub("RPStartInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { ArrayList users = new ArrayList(); users.add(user); diff --git a/src/commands/CommandRaffleEnd.java b/src/commands/CommandRaffleEnd.java index 47ee4f6..6d7bc72 100644 --- a/src/commands/CommandRaffleEnd.java +++ b/src/commands/CommandRaffleEnd.java @@ -15,10 +15,10 @@ public class CommandRaffleEnd extends Command public CommandRaffleEnd(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RaffleEndInfo"); } + public String getHelpText() { return LocStrings.Stub("RaffleEndInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(guild.endRaffle()) { diff --git a/src/commands/CommandRaffleJoin.java b/src/commands/CommandRaffleJoin.java index a3ff7e0..c575443 100644 --- a/src/commands/CommandRaffleJoin.java +++ b/src/commands/CommandRaffleJoin.java @@ -15,10 +15,10 @@ public class CommandRaffleJoin extends Command public CommandRaffleJoin(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RaffleJoinInfo"); } + public String getHelpText() { return LocStrings.Stub("RaffleJoinInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(guild.joinRaffle(user)) { diff --git a/src/commands/CommandRaffleSpin.java b/src/commands/CommandRaffleSpin.java index ecc1e2e..380a84e 100644 --- a/src/commands/CommandRaffleSpin.java +++ b/src/commands/CommandRaffleSpin.java @@ -15,10 +15,10 @@ public class CommandRaffleSpin extends Command public CommandRaffleSpin(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RaffleSpinInfo"); } + public String getHelpText() { return LocStrings.Stub("RaffleSpinInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { try { diff --git a/src/commands/CommandRaffleStart.java b/src/commands/CommandRaffleStart.java index fb2fac1..cd359c3 100644 --- a/src/commands/CommandRaffleStart.java +++ b/src/commands/CommandRaffleStart.java @@ -15,12 +15,12 @@ public class CommandRaffleStart extends Command public CommandRaffleStart(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RaffleStartInfo"); } + public String getHelpText() { return LocStrings.Stub("RaffleStartInfo"); } public int beanCost; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { try { @@ -30,6 +30,7 @@ public class CommandRaffleStart extends Command { beanCost = 100; } + if(guild.startRaffle(beanCost)) { res.Call(String.format(LocStrings.Stub("RaffleStartSuccess"), beanCost)); diff --git a/src/commands/CommandRating.java b/src/commands/CommandRating.java index 0adaae6..0ae8427 100644 --- a/src/commands/CommandRating.java +++ b/src/commands/CommandRating.java @@ -15,11 +15,11 @@ public class CommandRating extends Command public CommandRating(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RatingInfo"); } + public String getHelpText() { return LocStrings.Stub("RatingInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String newRating = null; switch(input.args.toLowerCase().trim()) diff --git a/src/commands/CommandRole.java b/src/commands/CommandRole.java index e9633b8..c4aa7eb 100644 --- a/src/commands/CommandRole.java +++ b/src/commands/CommandRole.java @@ -9,10 +9,10 @@ public class CommandRole extends Command public CommandRole (KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RoleInfo"); } + public String getHelpText() { return LocStrings.Stub("RoleInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.args.isEmpty()) { diff --git a/src/commands/CommandRoll.java b/src/commands/CommandRoll.java index 1cb7ba7..d077104 100644 --- a/src/commands/CommandRoll.java +++ b/src/commands/CommandRoll.java @@ -16,10 +16,10 @@ public class CommandRoll extends Command public CommandRoll(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RollInfo"); } + public String getHelpText() { return LocStrings.Stub("RollInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { try { diff --git a/src/commands/CommandShutdown.java b/src/commands/CommandShutdown.java index 57538a6..776f370 100644 --- a/src/commands/CommandShutdown.java +++ b/src/commands/CommandShutdown.java @@ -20,11 +20,11 @@ public class CommandShutdown extends Command public CommandShutdown(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("ShutdownInfo"); } + public String getHelpText() { return LocStrings.Stub("ShutdownInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { // Flag the shutdown immediately. Stats.instance.IndicateShutdown(); diff --git a/src/commands/CommandStark.java b/src/commands/CommandStark.java index 16378c8..299794a 100644 --- a/src/commands/CommandStark.java +++ b/src/commands/CommandStark.java @@ -17,12 +17,12 @@ public class CommandStark extends Command public CommandStark(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("StarkInfo"); }; + public String getHelpText() { return LocStrings.Stub("StarkInfo"); }; private static Long num = 0l; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String name = null; String filename = null; diff --git a/src/commands/CommandStats.java b/src/commands/CommandStats.java index 593ff66..b6f5649 100644 --- a/src/commands/CommandStats.java +++ b/src/commands/CommandStats.java @@ -17,11 +17,11 @@ public class CommandStats extends Command public CommandStats(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("StatsInfo"); } + public String getHelpText() { return LocStrings.Stub("StatsInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String out = "```\n"; Stats stats = Stats.instance; diff --git a/src/commands/CommandTeey.java b/src/commands/CommandTeey.java index 6a3394a..9023064 100644 --- a/src/commands/CommandTeey.java +++ b/src/commands/CommandTeey.java @@ -23,11 +23,11 @@ public class CommandTeey extends Command private static Long num = 0l; @Override - public String HelpText() { return LocStrings.Stub("TeeyInfo"); } + public String getHelpText() { return LocStrings.Stub("TeeyInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String name = null; File teeyFile = null; diff --git a/src/commands/CommandTradeBeans.java b/src/commands/CommandTradeBeans.java index 141ab46..9a7dd90 100644 --- a/src/commands/CommandTradeBeans.java +++ b/src/commands/CommandTradeBeans.java @@ -15,10 +15,10 @@ public class CommandTradeBeans extends Command public CommandTradeBeans(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("TradeBeansInfo"); } + public String getHelpText() { return LocStrings.Stub("TradeBeansInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.mentions == null) { diff --git a/src/commands/CommandTweet.java b/src/commands/CommandTweet.java index 8c9770a..a95e09e 100644 --- a/src/commands/CommandTweet.java +++ b/src/commands/CommandTweet.java @@ -11,10 +11,10 @@ public class CommandTweet extends Command public CommandTweet(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("TweetInfo"); } + public String getHelpText() { return LocStrings.Stub("TweetInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { //TODO: Figure out how to pass pictures correctly try { diff --git a/src/commands/CommandWolfram.java b/src/commands/CommandWolfram.java index 4947261..731c58a 100644 --- a/src/commands/CommandWolfram.java +++ b/src/commands/CommandWolfram.java @@ -15,10 +15,10 @@ public class CommandWolfram extends Command public CommandWolfram(KittyRole level, KittyRating rating) { super(level, rating);} @Override - public String HelpText() { return LocStrings.Stub("WolframInfo"); } + public String getHelpText() { return LocStrings.Stub("WolframInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.args == null || input.args.trim().length() == 0) res.Call(LocStrings.Stub("WolframNoArgs")); diff --git a/src/commands/CommandYeet.java b/src/commands/CommandYeet.java index 65ea728..c4b0b53 100644 --- a/src/commands/CommandYeet.java +++ b/src/commands/CommandYeet.java @@ -23,11 +23,11 @@ public class CommandYeet extends Command private static Long num = 0l; @Override - public String HelpText() { return LocStrings.Stub("YeetInfo"); } + public String getHelpText() { return LocStrings.Stub("YeetInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String name = null; File yeetFile = null; diff --git a/src/core/Command.java b/src/core/Command.java index a8defdb..e23e026 100644 --- a/src/core/Command.java +++ b/src/core/Command.java @@ -59,7 +59,7 @@ public abstract class Command if(!CanCall(guild, channel, user)) return; - OnRun(guild, channel, user, input, res); + onRun(guild, channel, user, input, res); } public ArrayList RegisteredNames() @@ -79,12 +79,12 @@ public abstract class Command // OVERRIDE ME! (This is not required but advised!) // Returns if the command succeeded or not. - public String HelpText() + public String getHelpText() { return "No help text has been added yet for " + this.getClass().getSimpleName() + "!"; } // OVERRIDE ME! (This is required) // Returns if the command succeeded or not. - public abstract void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res); + public abstract void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res); } diff --git a/src/core/CommandManager.java b/src/core/CommandManager.java index 5e79a7c..ce7ed49 100644 --- a/src/core/CommandManager.java +++ b/src/core/CommandManager.java @@ -116,7 +116,7 @@ public class CommandManager Command command = commands.get(lookup); if(command != null) - return command.HelpText(); + return command.getHelpText(); return null; }