= Updated capitalization

This commit is contained in:
Matthew Cech
2019-06-02 17:43:20 -07:00
parent ff399b138d
commit e5b94d7a7e
54 changed files with 111 additions and 110 deletions
+2 -2
View File
@@ -9,10 +9,10 @@ public class CommandBeansShow extends Command
public CommandBeansShow(KittyRole level, KittyRating rating) { super(level, rating); } public CommandBeansShow(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("BeansShowInfo"); }; public String getHelpText() { return LocStrings.Stub("BeansShowInfo"); };
@Override @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) if(input.mentions == null)
res.Call(String.format(LocStrings.Stub("BeansShowDisplay"), user.GetBeans())); res.Call(String.format(LocStrings.Stub("BeansShowDisplay"), user.GetBeans()));
+3 -3
View File
@@ -25,16 +25,16 @@ public class CommandBenchmark extends Command
} }
@Override @Override
public String HelpText() { return LocStrings.Stub("BenchmarkInfo"); } public String getHelpText() { return LocStrings.Stub("BenchmarkInfo"); }
@Override @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(); framework.Update();
if(input.args == null || input.args.length() == 0) if(input.args == null || input.args.length() == 0)
{ {
String output = HelpText(); String output = getHelpText();
res.Call(output); res.Call(output);
return; return;
} }
+2 -2
View File
@@ -11,10 +11,10 @@ public class CommandBetBeans extends Command
public CommandBetBeans(KittyRole level, KittyRating rating) { super(level, rating); } public CommandBetBeans(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("BetBeansInfo"); } public String getHelpText() { return LocStrings.Stub("BetBeansInfo"); }
@Override @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 = ""; String call = "";
int bet = 0; int bet = 0;
+2 -2
View File
@@ -15,10 +15,10 @@ public class CommandBetHistory extends Command
public CommandBetHistory(KittyRole level, KittyRating rating) { super(level, rating); } public CommandBetHistory(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("BetHistoryInfo"); } public String getHelpText() { return LocStrings.Stub("BetHistoryInfo"); }
@Override @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())); res.Call(String.format(LocStrings.Stub("BetHistoryOutput"), guild.beans.Get()));
} }
+2 -2
View File
@@ -17,12 +17,12 @@ public class CommandBlurry extends Command
public CommandBlurry(KittyRole level, KittyRating rating) { super(level, rating); } public CommandBlurry(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("BlurryInfo"); }; public String getHelpText() { return LocStrings.Stub("BlurryInfo"); };
private static Long num = 0l; private static Long num = 0l;
@Override @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 name = null;
String filename = null; String filename = null;
+2 -2
View File
@@ -60,11 +60,11 @@ public class CommandBoop extends Command
} }
@Override @Override
public String HelpText() { return LocStrings.Stub("BoopInfo"); } public String getHelpText() { return LocStrings.Stub("BoopInfo"); }
// Called when the command is run! // Called when the command is run!
@Override @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) if(input.mentions == null)
{ {
+2 -2
View File
@@ -23,11 +23,11 @@ public class CommandCatch extends Command
private static Long num = 0l; private static Long num = 0l;
@Override @Override
public String HelpText() { return LocStrings.Stub("CatchInfo"); } public String getHelpText() { return LocStrings.Stub("CatchInfo"); }
// Called when the command is run! // Called when the command is run!
@Override @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 name = null;
File catchFile = null; File catchFile = null;
+2 -2
View File
@@ -9,10 +9,10 @@ public class CommandChangeIndicator extends Command
public CommandChangeIndicator(KittyRole level, KittyRating rating) { super(level, rating); } public CommandChangeIndicator(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("ChangeIndicatorInfo"); } public String getHelpText() { return LocStrings.Stub("ChangeIndicatorInfo"); }
@Override @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(); String arg = input.args.trim();
if(arg.length() == 0) if(arg.length() == 0)
+2 -2
View File
@@ -14,10 +14,10 @@ public class CommandChoose extends Command
public CommandChoose(KittyRole level, KittyRating rating) { super(level, rating); } public CommandChoose(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("ChooseInfo"); } public String getHelpText() { return LocStrings.Stub("ChooseInfo"); }
@Override @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(","); String [] choices = input.args.split(",");
if(choices.length == 1) if(choices.length == 1)
+2 -2
View File
@@ -12,10 +12,10 @@ public class CommandColiru extends Command
public CommandColiru(KittyRole level, KittyRating rating) { super(level, rating);} public CommandColiru(KittyRole level, KittyRating rating) { super(level, rating);}
@Override @Override
public String HelpText() { return LocStrings.Stub("ColiruInfo"); } public String getHelpText() { return LocStrings.Stub("ColiruInfo"); }
@Override @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) if(input.args.trim().length() < 1)
{ {
+2 -2
View File
@@ -18,10 +18,10 @@ public class CommandCrouton extends Command
public CommandCrouton(KittyRole level, KittyRating rating) { super(level, rating); } public CommandCrouton(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("CroutonInfo"); }; public String getHelpText() { return LocStrings.Stub("CroutonInfo"); };
@Override @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(); KittyEmbed embed = new KittyEmbed();
embed.authorImage = "https://crouton.net/crouton.png"; embed.authorImage = "https://crouton.net/crouton.png";
+2 -2
View File
@@ -19,10 +19,10 @@ public class CommandDBFlush extends Command
public CommandDBFlush(KittyRole level, KittyRating rating) { super(level, rating); } public CommandDBFlush(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("DBFlushInfo"); } public String getHelpText() { return LocStrings.Stub("DBFlushInfo"); }
@Override @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(); int numUpdated = DatabaseManager.instance.upkeep();
+2 -2
View File
@@ -26,10 +26,10 @@ public class CommandDBStats extends Command
} }
@Override @Override
public String HelpText() { return LocStrings.Stub("DBStatsInfo"); } public String getHelpText() { return LocStrings.Stub("DBStatsInfo"); }
@Override @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(); KittyEmbed embed = new KittyEmbed();
embed.title = "Database Info"; embed.title = "Database Info";
+2 -2
View File
@@ -15,11 +15,11 @@ public class CommandDoWork extends Command
public CommandDoWork(KittyRole level, KittyRating rating) { super(level, rating); } public CommandDoWork(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("DoWorkInfo"); } public String getHelpText() { return LocStrings.Stub("DoWorkInfo"); }
// Called when the command is run! // Called when the command is run!
@Override @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") @SuppressWarnings("unused")
long thispieceofshit = 0; long thispieceofshit = 0;
+2 -2
View File
@@ -35,10 +35,10 @@ public class CommandEightBall extends Command
public CommandEightBall(KittyRole level, KittyRating rating) { super(level, rating); } public CommandEightBall(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("EightBallInfo"); } public String getHelpText() { return LocStrings.Stub("EightBallInfo"); }
@Override @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) if(input.args.trim().length() < 1)
res.Call(LocStrings.Stub("EightBallError")); res.Call(LocStrings.Stub("EightBallError"));
+2 -2
View File
@@ -15,10 +15,10 @@ public class CommandFetch extends Command
public CommandFetch(KittyRole level, KittyRating rating) { super(level, rating); } public CommandFetch(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("FetchInfo"); } public String getHelpText() { return LocStrings.Stub("FetchInfo"); }
@Override @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]; String emote = input.args.split(" ")[0];
if(emote.startsWith("<") && emote.endsWith(">")) if(emote.startsWith("<") && emote.endsWith(">"))
+2 -2
View File
@@ -9,10 +9,10 @@ public class CommandGiveBeans extends Command
public CommandGiveBeans (KittyRole level, KittyRating rating) { super(level, rating); } public CommandGiveBeans (KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("GiveBeansInfo"); } public String getHelpText() { return LocStrings.Stub("GiveBeansInfo"); }
@Override @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; int beans = 0;
try { try {
+2 -2
View File
@@ -15,10 +15,10 @@ public class CommandGuildRoleAdd extends Command
public CommandGuildRoleAdd(KittyRole level, KittyRating rating) { super(level, rating); } public CommandGuildRoleAdd(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("GuildRoleAddInfo"); }; public String getHelpText() { return LocStrings.Stub("GuildRoleAddInfo"); };
@Override @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]; String role = input.args.split(" ")[0];
if(guild.roleList.contains(role)) if(guild.roleList.contains(role))
+2 -2
View File
@@ -15,10 +15,10 @@ public class CommandGuildRoleAllowed extends Command
public CommandGuildRoleAllowed(KittyRole level, KittyRating rating) { super(level, rating); } public CommandGuildRoleAllowed(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("GuildRoleAllowedInfo"); } public String getHelpText() { return LocStrings.Stub("GuildRoleAllowedInfo"); }
@Override @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 [] roles = input.args.split(",");
String role; String role;
+1 -1
View File
@@ -12,7 +12,7 @@ public class CommandGuildRoleList extends Command
public CommandGuildRoleList(KittyRole level, KittyRating rating) { super(level, rating);} public CommandGuildRoleList(KittyRole level, KittyRating rating) { super(level, rating);}
@Override @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 = ""; String roles = "";
if(guild.roleList.isEmpty()) if(guild.roleList.isEmpty())
+2 -2
View File
@@ -15,10 +15,10 @@ public class CommandGuildRoleNotAllowed extends Command
public CommandGuildRoleNotAllowed(KittyRole level, KittyRating rating) { super(level, rating); } public CommandGuildRoleNotAllowed(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("GuildRoleNotAllowedInfo"); } public String getHelpText() { return LocStrings.Stub("GuildRoleNotAllowedInfo"); }
@Override @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 [] roles = input.args.split(",");
String role; String role;
+2 -2
View File
@@ -15,10 +15,10 @@ public class CommandGuildRoleRemove extends Command
public CommandGuildRoleRemove(KittyRole level, KittyRating rating) { super(level, rating); } public CommandGuildRoleRemove(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("GuildRoleRemoveInfo"); }; public String getHelpText() { return LocStrings.Stub("GuildRoleRemoveInfo"); };
@Override @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]; String role = input.args.split(" ")[0];
if(guild.roleList.contains(role)) if(guild.roleList.contains(role))
+2 -2
View File
@@ -15,10 +15,10 @@ public class CommandHelp extends Command
public CommandHelp(KittyRole level, KittyRating rating) { super(level, rating); } public CommandHelp(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("HelpInfo"); } public String getHelpText() { return LocStrings.Stub("HelpInfo"); }
@Override @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); String help = Stats.instance.GetHelpText(input.args);
+3 -3
View File
@@ -26,10 +26,10 @@ public class CommandHelpBuilder extends Command {
} }
@Override @Override
public String HelpText() { return LocStrings.Stub("HelpBuilderInfo"); } public String getHelpText() { return LocStrings.Stub("HelpBuilderInfo"); }
@Override @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 // Holds command groups
HashMap<KittyRole, ArrayList<Command>> commandsByRole = new HashMap<KittyRole, ArrayList<Command>>(); HashMap<KittyRole, ArrayList<Command>> commandsByRole = new HashMap<KittyRole, ArrayList<Command>>();
@@ -121,7 +121,7 @@ public class CommandHelpBuilder extends Command {
accumulated += leadStart + keys.get(j) + leadEnd; accumulated += leadStart + keys.get(j) + leadEnd;
} }
accumulated += leadFollow + commands.get(i).HelpText() + lineDelimiter;; accumulated += leadFollow + commands.get(i).getHelpText() + lineDelimiter;;
} }
accumulated += sectionEnd; accumulated += sectionEnd;
+2 -2
View File
@@ -15,10 +15,10 @@ public class CommandInfo extends Command
public CommandInfo(KittyRole level, KittyRating rating) { super(level, rating); } public CommandInfo(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("InfoInfo"); } public String getHelpText() { return LocStrings.Stub("InfoInfo"); }
@Override @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")); res.Call(LocStrings.Stub("InfoResponse"));
} }
+2 -2
View File
@@ -10,10 +10,10 @@ public class CommandInvite extends Command
public CommandInvite(KittyRole level, KittyRating rating) { super(level, rating); } public CommandInvite(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("InviteInfo"); } public String getHelpText() { return LocStrings.Stub("InviteInfo"); }
@Override @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 res.Call("https://discordapp.com/oauth2/authorize?&client_id="+ Ref.CliID
+"&scope=bot&permissions=8"); +"&scope=bot&permissions=8");
+2 -2
View File
@@ -12,10 +12,10 @@ public class CommandJDoodle extends Command
public CommandJDoodle(KittyRole level, KittyRating rating) { super(level, rating); } public CommandJDoodle(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("JDoodleInfo"); } public String getHelpText() { return LocStrings.Stub("JDoodleInfo"); }
@Override @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) if(input.args.trim().length() < 1)
{ {
+2 -2
View File
@@ -23,10 +23,10 @@ public class CommandMap extends Command
public CommandMap(KittyRole roleLevel, KittyRating contentRating) { super(roleLevel, contentRating); } public CommandMap(KittyRole roleLevel, KittyRating contentRating) { super(roleLevel, contentRating); }
@Override @Override
public String HelpText() { return String.format(LocStrings.Stub("MapInfo"), "" + MaxWidth, "" + MaxHeight); } public String getHelpText() { return String.format(LocStrings.Stub("MapInfo"), "" + MaxWidth, "" + MaxHeight); }
@Override @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 // Variables
int width = 35; int width = 35;
+2 -2
View File
@@ -23,12 +23,12 @@ public class CommandPerish extends Command
public CommandPerish(KittyRole level, KittyRating rating) { super(level, rating); } public CommandPerish(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("PerishInfo"); }; public String getHelpText() { return LocStrings.Stub("PerishInfo"); };
private static Long num = 0l; private static Long num = 0l;
@Override @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 name = null;
String filename = null; String filename = null;
+2 -2
View File
@@ -15,11 +15,11 @@ public class CommandPing extends Command
public CommandPing(KittyRole level, KittyRating rating) { super(level, rating); } public CommandPing(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("PingInfo"); } public String getHelpText() { return LocStrings.Stub("PingInfo"); }
// Called when the command is run! // Called when the command is run!
@Override @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")); res.Call(LocStrings.Stub("PingResponse"));
} }
+2 -2
View File
@@ -14,10 +14,10 @@ public class CommandPollManage extends Command
public CommandPollManage(KittyRole level, KittyRating rating) { super(level, rating); } public CommandPollManage(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("PollManageInfo"); } public String getHelpText() { return LocStrings.Stub("PollManageInfo"); }
@Override @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()) switch(input.args.split(" ")[0].toLowerCase())
{ {
+2 -2
View File
@@ -10,10 +10,10 @@ public class CommandPollResults extends Command
public CommandPollResults(KittyRole level, KittyRating rating) { super(level, rating); } public CommandPollResults(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("PollResultsInfo"); } public String getHelpText() { return LocStrings.Stub("PollResultsInfo"); }
@Override @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 = ""; String results = "";
int totalVotes = 0; int totalVotes = 0;
+2 -2
View File
@@ -8,10 +8,10 @@ public class CommandPollShow extends Command
public CommandPollShow(KittyRole level, KittyRating rating) { super(level, rating); } public CommandPollShow(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("PollShowInfo"); } public String getHelpText() { return LocStrings.Stub("PollShowInfo"); }
@Override @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) if(!guild.polling)
{ {
+2 -2
View File
@@ -8,10 +8,10 @@ public class CommandPollVote extends Command
public CommandPollVote(KittyRole level, KittyRating rating) { super(level, rating); } public CommandPollVote(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("PollVoteInfo"); } public String getHelpText() { return LocStrings.Stub("PollVoteInfo"); }
@Override @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) if(guild.polling)
{ {
+2 -2
View File
@@ -14,10 +14,10 @@ public class CommandRPEnd extends Command
public CommandRPEnd (KittyRole level, KittyRating rating) { super(level, rating); } public CommandRPEnd (KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("RPEndInfo"); } public String getHelpText() { return LocStrings.Stub("RPEndInfo"); }
@Override @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; File sending = null;
+3 -3
View File
@@ -23,15 +23,15 @@ public class CommandRPG extends Command
} }
@Override @Override
public String HelpText() { return LocStrings.Stub("RPGInfo"); }; public String getHelpText() { return LocStrings.Stub("RPGInfo"); };
@Override @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) if(input.args == null || input.args.length() == 0)
{ {
String output = HelpText(); String output = getHelpText();
res.Call(output); res.Call(output);
return; return;
} }
+2 -2
View File
@@ -12,10 +12,10 @@ public class CommandRPStart extends Command
public CommandRPStart (KittyRole level, KittyRating rating) { super(level, rating); } public CommandRPStart (KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("RPStartInfo"); } public String getHelpText() { return LocStrings.Stub("RPStartInfo"); }
@Override @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 <KittyUser> users = new ArrayList<KittyUser>(); ArrayList <KittyUser> users = new ArrayList<KittyUser>();
users.add(user); users.add(user);
+2 -2
View File
@@ -15,10 +15,10 @@ public class CommandRaffleEnd extends Command
public CommandRaffleEnd(KittyRole level, KittyRating rating) { super(level, rating); } public CommandRaffleEnd(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("RaffleEndInfo"); } public String getHelpText() { return LocStrings.Stub("RaffleEndInfo"); }
@Override @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()) if(guild.endRaffle())
{ {
+2 -2
View File
@@ -15,10 +15,10 @@ public class CommandRaffleJoin extends Command
public CommandRaffleJoin(KittyRole level, KittyRating rating) { super(level, rating); } public CommandRaffleJoin(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("RaffleJoinInfo"); } public String getHelpText() { return LocStrings.Stub("RaffleJoinInfo"); }
@Override @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)) if(guild.joinRaffle(user))
{ {
+2 -2
View File
@@ -15,10 +15,10 @@ public class CommandRaffleSpin extends Command
public CommandRaffleSpin(KittyRole level, KittyRating rating) { super(level, rating); } public CommandRaffleSpin(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("RaffleSpinInfo"); } public String getHelpText() { return LocStrings.Stub("RaffleSpinInfo"); }
@Override @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 try
{ {
+3 -2
View File
@@ -15,12 +15,12 @@ public class CommandRaffleStart extends Command
public CommandRaffleStart(KittyRole level, KittyRating rating) { super(level, rating); } public CommandRaffleStart(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("RaffleStartInfo"); } public String getHelpText() { return LocStrings.Stub("RaffleStartInfo"); }
public int beanCost; public int beanCost;
@Override @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 try
{ {
@@ -30,6 +30,7 @@ public class CommandRaffleStart extends Command
{ {
beanCost = 100; beanCost = 100;
} }
if(guild.startRaffle(beanCost)) if(guild.startRaffle(beanCost))
{ {
res.Call(String.format(LocStrings.Stub("RaffleStartSuccess"), beanCost)); res.Call(String.format(LocStrings.Stub("RaffleStartSuccess"), beanCost));
+2 -2
View File
@@ -15,11 +15,11 @@ public class CommandRating extends Command
public CommandRating(KittyRole level, KittyRating rating) { super(level, rating); } public CommandRating(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("RatingInfo"); } public String getHelpText() { return LocStrings.Stub("RatingInfo"); }
// Called when the command is run! // Called when the command is run!
@Override @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; String newRating = null;
switch(input.args.toLowerCase().trim()) switch(input.args.toLowerCase().trim())
+2 -2
View File
@@ -9,10 +9,10 @@ public class CommandRole extends Command
public CommandRole (KittyRole level, KittyRating rating) { super(level, rating); } public CommandRole (KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("RoleInfo"); } public String getHelpText() { return LocStrings.Stub("RoleInfo"); }
@Override @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()) if(input.args.isEmpty())
{ {
+2 -2
View File
@@ -16,10 +16,10 @@ public class CommandRoll extends Command
public CommandRoll(KittyRole level, KittyRating rating) { super(level, rating); } public CommandRoll(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("RollInfo"); } public String getHelpText() { return LocStrings.Stub("RollInfo"); }
@Override @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 try
{ {
+2 -2
View File
@@ -20,11 +20,11 @@ public class CommandShutdown extends Command
public CommandShutdown(KittyRole level, KittyRating rating) { super(level, rating); } public CommandShutdown(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("ShutdownInfo"); } public String getHelpText() { return LocStrings.Stub("ShutdownInfo"); }
// Called when the command is run! // Called when the command is run!
@Override @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. // Flag the shutdown immediately.
Stats.instance.IndicateShutdown(); Stats.instance.IndicateShutdown();
+2 -2
View File
@@ -17,12 +17,12 @@ public class CommandStark extends Command
public CommandStark(KittyRole level, KittyRating rating) { super(level, rating); } public CommandStark(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("StarkInfo"); }; public String getHelpText() { return LocStrings.Stub("StarkInfo"); };
private static Long num = 0l; private static Long num = 0l;
@Override @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 name = null;
String filename = null; String filename = null;
+2 -2
View File
@@ -17,11 +17,11 @@ public class CommandStats extends Command
public CommandStats(KittyRole level, KittyRating rating) { super(level, rating); } public CommandStats(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("StatsInfo"); } public String getHelpText() { return LocStrings.Stub("StatsInfo"); }
// Called when the command is run! // Called when the command is run!
@Override @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"; String out = "```\n";
Stats stats = Stats.instance; Stats stats = Stats.instance;
+2 -2
View File
@@ -23,11 +23,11 @@ public class CommandTeey extends Command
private static Long num = 0l; private static Long num = 0l;
@Override @Override
public String HelpText() { return LocStrings.Stub("TeeyInfo"); } public String getHelpText() { return LocStrings.Stub("TeeyInfo"); }
// Called when the command is run! // Called when the command is run!
@Override @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 name = null;
File teeyFile = null; File teeyFile = null;
+2 -2
View File
@@ -15,10 +15,10 @@ public class CommandTradeBeans extends Command
public CommandTradeBeans(KittyRole level, KittyRating rating) { super(level, rating); } public CommandTradeBeans(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("TradeBeansInfo"); } public String getHelpText() { return LocStrings.Stub("TradeBeansInfo"); }
@Override @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) if(input.mentions == null)
{ {
+2 -2
View File
@@ -11,10 +11,10 @@ public class CommandTweet extends Command
public CommandTweet(KittyRole level, KittyRating rating) { super(level, rating); } public CommandTweet(KittyRole level, KittyRating rating) { super(level, rating); }
@Override @Override
public String HelpText() { return LocStrings.Stub("TweetInfo"); } public String getHelpText() { return LocStrings.Stub("TweetInfo"); }
@Override @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 //TODO: Figure out how to pass pictures correctly
try { try {
+2 -2
View File
@@ -15,10 +15,10 @@ public class CommandWolfram extends Command
public CommandWolfram(KittyRole level, KittyRating rating) { super(level, rating);} public CommandWolfram(KittyRole level, KittyRating rating) { super(level, rating);}
@Override @Override
public String HelpText() { return LocStrings.Stub("WolframInfo"); } public String getHelpText() { return LocStrings.Stub("WolframInfo"); }
@Override @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) if(input.args == null || input.args.trim().length() == 0)
res.Call(LocStrings.Stub("WolframNoArgs")); res.Call(LocStrings.Stub("WolframNoArgs"));
+2 -2
View File
@@ -23,11 +23,11 @@ public class CommandYeet extends Command
private static Long num = 0l; private static Long num = 0l;
@Override @Override
public String HelpText() { return LocStrings.Stub("YeetInfo"); } public String getHelpText() { return LocStrings.Stub("YeetInfo"); }
// Called when the command is run! // Called when the command is run!
@Override @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 name = null;
File yeetFile = null; File yeetFile = null;
+3 -3
View File
@@ -59,7 +59,7 @@ public abstract class Command
if(!CanCall(guild, channel, user)) if(!CanCall(guild, channel, user))
return; return;
OnRun(guild, channel, user, input, res); onRun(guild, channel, user, input, res);
} }
public ArrayList<String> RegisteredNames() public ArrayList<String> RegisteredNames()
@@ -79,12 +79,12 @@ public abstract class Command
// OVERRIDE ME! (This is not required but advised!) // OVERRIDE ME! (This is not required but advised!)
// Returns if the command succeeded or not. // 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() + "!"; return "No help text has been added yet for " + this.getClass().getSimpleName() + "!";
} }
// OVERRIDE ME! (This is required) // OVERRIDE ME! (This is required)
// Returns if the command succeeded or not. // 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);
} }
+1 -1
View File
@@ -116,7 +116,7 @@ public class CommandManager
Command command = commands.get(lookup); Command command = commands.get(lookup);
if(command != null) if(command != null)
return command.HelpText(); return command.getHelpText();
return null; return null;
} }