From 5212ef64bfbf202160dcdbb24fb193c117a2d99d Mon Sep 17 00:00:00 2001 From: Matthew Cech Date: Sun, 2 Jun 2019 17:49:23 -0700 Subject: [PATCH] = Selectively adjusted casing on localization stubs. --- src/commands/CommandBeansShow.java | 6 +- src/commands/CommandBenchmark.java | 4 +- src/commands/CommandBetBeans.java | 12 +-- src/commands/CommandBetHistory.java | 4 +- src/commands/CommandBlurry.java | 2 +- src/commands/CommandBoop.java | 8 +- src/commands/CommandCatch.java | 2 +- src/commands/CommandChangeIndicator.java | 6 +- src/commands/CommandChoose.java | 6 +- src/commands/CommandColiru.java | 4 +- src/commands/CommandCrouton.java | 2 +- src/commands/CommandDBFlush.java | 2 +- src/commands/CommandDBStats.java | 2 +- src/commands/CommandDoWork.java | 4 +- src/commands/CommandEightBall.java | 44 ++++---- src/commands/CommandFetch.java | 16 +-- src/commands/CommandGiveBeans.java | 8 +- src/commands/CommandGuildRoleAdd.java | 8 +- src/commands/CommandGuildRoleAllowed.java | 6 +- src/commands/CommandGuildRoleList.java | 4 +- src/commands/CommandGuildRoleNotAllowed.java | 6 +- src/commands/CommandGuildRoleRemove.java | 8 +- src/commands/CommandHelp.java | 4 +- src/commands/CommandHelpBuilder.java | 2 +- src/commands/CommandInfo.java | 4 +- src/commands/CommandInvite.java | 2 +- src/commands/CommandJDoodle.java | 4 +- src/commands/CommandMap.java | 12 +-- src/commands/CommandPerish.java | 2 +- src/commands/CommandPing.java | 4 +- src/commands/CommandPollManage.java | 2 +- src/commands/CommandPollResults.java | 4 +- src/commands/CommandPollShow.java | 8 +- src/commands/CommandPollVote.java | 12 +-- src/commands/CommandRPEnd.java | 6 +- src/commands/CommandRPG.java | 4 +- src/commands/CommandRPStart.java | 2 +- src/commands/CommandRaffleEnd.java | 6 +- src/commands/CommandRaffleJoin.java | 6 +- src/commands/CommandRaffleSpin.java | 6 +- src/commands/CommandRaffleStart.java | 6 +- src/commands/CommandRating.java | 8 +- src/commands/CommandRole.java | 10 +- src/commands/CommandRoll.java | 4 +- src/commands/CommandShutdown.java | 6 +- src/commands/CommandStark.java | 2 +- src/commands/CommandStats.java | 2 +- src/commands/CommandTeey.java | 2 +- src/commands/CommandTradeBeans.java | 12 +-- src/commands/CommandTweet.java | 4 +- src/commands/CommandWolfram.java | 6 +- src/commands/CommandYeet.java | 2 +- src/core/LocCommands.java | 4 +- src/core/LocStrings.java | 4 +- src/core/ObjectBuilderFactory.java | 102 +++++++++---------- 55 files changed, 214 insertions(+), 214 deletions(-) diff --git a/src/commands/CommandBeansShow.java b/src/commands/CommandBeansShow.java index 0878608..086fc6b 100644 --- a/src/commands/CommandBeansShow.java +++ b/src/commands/CommandBeansShow.java @@ -9,13 +9,13 @@ public class CommandBeansShow extends Command public CommandBeansShow(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) { if(input.mentions == null) - res.Call(String.format(LocStrings.Stub("BeansShowDisplay"), user.GetBeans())); + res.Call(String.format(LocStrings.stub("BeansShowDisplay"), user.GetBeans())); else { String mentionedBeans = ""; @@ -23,7 +23,7 @@ public class CommandBeansShow extends Command { mentionedBeans += mentioned.name + " has " + mentioned.GetBeans() + " "; } - res.Call(String.format(LocStrings.Stub("BeansShowMentioned"), mentionedBeans)); + res.Call(String.format(LocStrings.stub("BeansShowMentioned"), mentionedBeans)); } } } diff --git a/src/commands/CommandBenchmark.java b/src/commands/CommandBenchmark.java index 86c4289..f727e9d 100644 --- a/src/commands/CommandBenchmark.java +++ b/src/commands/CommandBenchmark.java @@ -25,7 +25,7 @@ public class CommandBenchmark extends Command } @Override - public String getHelpText() { 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) @@ -47,7 +47,7 @@ public class CommandBenchmark extends Command if(commandOutput == null) { - res.Call(LocStrings.Stub("BenchmarkInvalid")); + res.Call(LocStrings.stub("BenchmarkInvalid")); return; } diff --git a/src/commands/CommandBetBeans.java b/src/commands/CommandBetBeans.java index e359b5a..24ef524 100644 --- a/src/commands/CommandBetBeans.java +++ b/src/commands/CommandBetBeans.java @@ -11,7 +11,7 @@ public class CommandBetBeans extends Command public CommandBetBeans(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) @@ -24,19 +24,19 @@ public class CommandBetBeans extends Command bet = Integer.parseInt(input.args); if(bet < 50) { - res.Call(LocStrings.Stub("BetBeansLowBet")); + res.Call(LocStrings.stub("BetBeansLowBet")); return; } } catch (NumberFormatException e) { - res.Call(LocStrings.Stub("BetBeansNotValid")); + res.Call(LocStrings.stub("BetBeansNotValid")); return; } if(user.GetBeans() < bet) { - res.Call(LocStrings.Stub("BetBeansNotEnough")); + res.Call(LocStrings.stub("BetBeansNotEnough")); return; } @@ -51,14 +51,14 @@ public class CommandBetBeans extends Command if(win == 0) { - res.Call(LocStrings.Stub("BetBeansLose")); + res.Call(LocStrings.stub("BetBeansLose")); guild.beans.Add(bet); return; } user.ChangeBeans(bet*win); guild.beans.Subtract(bet*win); - res.Call(String.format(LocStrings.Stub("BetBeansWin"), "" + (bet*win))); + res.Call(String.format(LocStrings.stub("BetBeansWin"), "" + (bet*win))); } private int getWinning(int [] slots) diff --git a/src/commands/CommandBetHistory.java b/src/commands/CommandBetHistory.java index 0a87b87..a1d5c3d 100644 --- a/src/commands/CommandBetHistory.java +++ b/src/commands/CommandBetHistory.java @@ -15,11 +15,11 @@ public class CommandBetHistory extends Command public CommandBetHistory(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) { - res.Call(String.format(LocStrings.Stub("BetHistoryOutput"), guild.beans.Get())); + res.Call(String.format(LocStrings.stub("BetHistoryOutput"), guild.beans.Get())); } } \ No newline at end of file diff --git a/src/commands/CommandBlurry.java b/src/commands/CommandBlurry.java index 9fe2c3e..fcc0605 100644 --- a/src/commands/CommandBlurry.java +++ b/src/commands/CommandBlurry.java @@ -17,7 +17,7 @@ public class CommandBlurry extends Command public CommandBlurry(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { return LocStrings.Stub("BlurryInfo"); }; + public String getHelpText() { return LocStrings.stub("BlurryInfo"); }; private static Long num = 0l; diff --git a/src/commands/CommandBoop.java b/src/commands/CommandBoop.java index 6862c22..c706e36 100644 --- a/src/commands/CommandBoop.java +++ b/src/commands/CommandBoop.java @@ -60,7 +60,7 @@ public class CommandBoop extends Command } @Override - public String getHelpText() { return LocStrings.Stub("BoopInfo"); } + public String getHelpText() { return LocStrings.stub("BoopInfo"); } // Called when the command is run! @Override @@ -69,14 +69,14 @@ public class CommandBoop extends Command if(input.mentions == null) { boopTracker.ApplyBoop(); - res.Call(String.format(LocStrings.Stub("BoopStandard"), user.name, boopTracker.HowMany())); + res.Call(String.format(LocStrings.stub("BoopStandard"), user.name, boopTracker.HowMany())); } else { if(input.mentions.length == 1) { boopTracker.ApplyBoop(); - res.Call(String.format(LocStrings.Stub("BoopPerson"), user.name, input.mentions[0].name)); + res.Call(String.format(LocStrings.stub("BoopPerson"), user.name, input.mentions[0].name)); return; } @@ -90,7 +90,7 @@ public class CommandBoop extends Command booped += "and " + input.mentions[i].name; } - res.Call(String.format(LocStrings.Stub("BoopMultiple"), user.name, booped)); + res.Call(String.format(LocStrings.stub("BoopMultiple"), user.name, booped)); } } } \ No newline at end of file diff --git a/src/commands/CommandCatch.java b/src/commands/CommandCatch.java index 576b936..bd74917 100644 --- a/src/commands/CommandCatch.java +++ b/src/commands/CommandCatch.java @@ -23,7 +23,7 @@ public class CommandCatch extends Command private static Long num = 0l; @Override - public String getHelpText() { return LocStrings.Stub("CatchInfo"); } + public String getHelpText() { return LocStrings.stub("CatchInfo"); } // Called when the command is run! @Override diff --git a/src/commands/CommandChangeIndicator.java b/src/commands/CommandChangeIndicator.java index 0bb9b31..eff955f 100644 --- a/src/commands/CommandChangeIndicator.java +++ b/src/commands/CommandChangeIndicator.java @@ -9,7 +9,7 @@ public class CommandChangeIndicator extends Command public CommandChangeIndicator(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) @@ -17,7 +17,7 @@ public class CommandChangeIndicator extends Command String arg = input.args.trim(); if(arg.length() == 0) { - res.Call(LocStrings.Stub("ChangeIndicatorError")); + res.Call(LocStrings.stub("ChangeIndicatorError")); return; } @@ -29,6 +29,6 @@ public class CommandChangeIndicator extends Command } guild.SetCommandIndicator(indicator); - res.Call(String.format(LocStrings.Stub("ChangeIndicatorChanged"), guild.GetCommandIndicator())); + res.Call(String.format(LocStrings.stub("ChangeIndicatorChanged"), guild.GetCommandIndicator())); } } diff --git a/src/commands/CommandChoose.java b/src/commands/CommandChoose.java index f226e44..d5478bc 100644 --- a/src/commands/CommandChoose.java +++ b/src/commands/CommandChoose.java @@ -14,7 +14,7 @@ public class CommandChoose extends Command public CommandChoose(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) @@ -22,10 +22,10 @@ public class CommandChoose extends Command String [] choices = input.args.split(","); if(choices.length == 1) { - res.Call(LocStrings.Stub("ChooseOne")); + res.Call(LocStrings.stub("ChooseOne")); return; } - res.Call(String.format(LocStrings.Stub("ChooseChoice"), (choices[(int) (Math.random()*choices.length)]).toString())); + res.Call(String.format(LocStrings.stub("ChooseChoice"), (choices[(int) (Math.random()*choices.length)]).toString())); } } diff --git a/src/commands/CommandColiru.java b/src/commands/CommandColiru.java index 2087df2..0ca72d7 100644 --- a/src/commands/CommandColiru.java +++ b/src/commands/CommandColiru.java @@ -12,14 +12,14 @@ public class CommandColiru extends Command public CommandColiru(KittyRole level, KittyRating rating) { super(level, rating);} @Override - public String getHelpText() { 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) { if(input.args.trim().length() < 1) { - res.Call(LocStrings.Stub("ColiruError")); + res.Call(LocStrings.stub("ColiruError")); return; } diff --git a/src/commands/CommandCrouton.java b/src/commands/CommandCrouton.java index 1ca9f38..3002fca 100644 --- a/src/commands/CommandCrouton.java +++ b/src/commands/CommandCrouton.java @@ -18,7 +18,7 @@ public class CommandCrouton extends Command public CommandCrouton(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) diff --git a/src/commands/CommandDBFlush.java b/src/commands/CommandDBFlush.java index 061fa7e..fd7c08f 100644 --- a/src/commands/CommandDBFlush.java +++ b/src/commands/CommandDBFlush.java @@ -19,7 +19,7 @@ public class CommandDBFlush extends Command public CommandDBFlush(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) diff --git a/src/commands/CommandDBStats.java b/src/commands/CommandDBStats.java index e28c2a8..ff02330 100644 --- a/src/commands/CommandDBStats.java +++ b/src/commands/CommandDBStats.java @@ -26,7 +26,7 @@ public class CommandDBStats extends Command } @Override - public String getHelpText() { 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) diff --git a/src/commands/CommandDoWork.java b/src/commands/CommandDoWork.java index bda8347..ad5e17a 100644 --- a/src/commands/CommandDoWork.java +++ b/src/commands/CommandDoWork.java @@ -15,7 +15,7 @@ public class CommandDoWork extends Command public CommandDoWork(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { return LocStrings.Stub("DoWorkInfo"); } + public String getHelpText() { return LocStrings.stub("DoWorkInfo"); } // Called when the command is run! @Override @@ -28,6 +28,6 @@ public class CommandDoWork extends Command thispieceofshit += Math.log((double)i); } - res.Call(LocStrings.Stub("DoWorkFinished")); + res.Call(LocStrings.stub("DoWorkFinished")); } } \ No newline at end of file diff --git a/src/commands/CommandEightBall.java b/src/commands/CommandEightBall.java index e3ac564..f4253a3 100644 --- a/src/commands/CommandEightBall.java +++ b/src/commands/CommandEightBall.java @@ -8,40 +8,40 @@ public class CommandEightBall extends Command { String [] answers = { - LocStrings.Stub("EightBallYes1") - , LocStrings.Stub("EightBallYes2") - , LocStrings.Stub("EightBallYes3") - , LocStrings.Stub("EightBallYes4") - , LocStrings.Stub("EightBallYes5") - , LocStrings.Stub("EightBallYes6") - , LocStrings.Stub("EightBallYes7") - , LocStrings.Stub("EightBallYes8") - , LocStrings.Stub("EightBallYes9") - , LocStrings.Stub("EightBallYes10") + LocStrings.stub("EightBallYes1") + , LocStrings.stub("EightBallYes2") + , LocStrings.stub("EightBallYes3") + , LocStrings.stub("EightBallYes4") + , LocStrings.stub("EightBallYes5") + , LocStrings.stub("EightBallYes6") + , LocStrings.stub("EightBallYes7") + , LocStrings.stub("EightBallYes8") + , LocStrings.stub("EightBallYes9") + , LocStrings.stub("EightBallYes10") - , LocStrings.Stub("EightBallMaybe1") - , LocStrings.Stub("EightBallMaybe2") - , LocStrings.Stub("EightBallMaybe3") - , LocStrings.Stub("EightBallMaybe4") - , LocStrings.Stub("EightBallMaybe5") + , LocStrings.stub("EightBallMaybe1") + , LocStrings.stub("EightBallMaybe2") + , LocStrings.stub("EightBallMaybe3") + , LocStrings.stub("EightBallMaybe4") + , LocStrings.stub("EightBallMaybe5") - , LocStrings.Stub("EightBallNo1") - , LocStrings.Stub("EightBallNo2") - , LocStrings.Stub("EightBallNo3") - , LocStrings.Stub("EightBallNo4") - , LocStrings.Stub("EightBallNo5") + , LocStrings.stub("EightBallNo1") + , LocStrings.stub("EightBallNo2") + , LocStrings.stub("EightBallNo3") + , LocStrings.stub("EightBallNo4") + , LocStrings.stub("EightBallNo5") }; public CommandEightBall(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) { if(input.args.trim().length() < 1) - res.Call(LocStrings.Stub("EightBallError")); + res.Call(LocStrings.stub("EightBallError")); res.Call(answers[(int) (Math.random()*answers.length)]); } diff --git a/src/commands/CommandFetch.java b/src/commands/CommandFetch.java index 1d1607c..33518b0 100644 --- a/src/commands/CommandFetch.java +++ b/src/commands/CommandFetch.java @@ -15,7 +15,7 @@ public class CommandFetch extends Command public CommandFetch(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) @@ -27,22 +27,22 @@ public class CommandFetch extends Command switch(num) { case 1: - res.Call(String.format(LocStrings.Stub("FetchBringBack"), emote)); + res.Call(String.format(LocStrings.stub("FetchBringBack"), emote)); break; case 2: - res.Call(String.format(LocStrings.Stub("FetchRunAway"))); + res.Call(String.format(LocStrings.stub("FetchRunAway"))); break; case 3: - res.Call(String.format(LocStrings.Stub("FetchBringBackWrong"), guild.emoji.get((int)(Math.random() * guild.emoji.size()) + 1))); + res.Call(String.format(LocStrings.stub("FetchBringBackWrong"), guild.emoji.get((int)(Math.random() * guild.emoji.size()) + 1))); break; case 4: - res.Call(String.format(LocStrings.Stub("FetchEat"), emote)); + res.Call(String.format(LocStrings.stub("FetchEat"), emote)); break; case 5: - res.Call(String.format(LocStrings.Stub("FetchCatchRun"), emote)); + res.Call(String.format(LocStrings.stub("FetchCatchRun"), emote)); break; case 6: - res.Call(String.format(LocStrings.Stub("FetchStare"), user.name)); + res.Call(String.format(LocStrings.stub("FetchStare"), user.name)); break; default: res.Call("" + num); @@ -50,7 +50,7 @@ public class CommandFetch extends Command } else { - res.Call(String.format(LocStrings.Stub("FetchError"))); + res.Call(String.format(LocStrings.stub("FetchError"))); System.out.println(emote); } } diff --git a/src/commands/CommandGiveBeans.java b/src/commands/CommandGiveBeans.java index cb01a8d..03fb3ff 100644 --- a/src/commands/CommandGiveBeans.java +++ b/src/commands/CommandGiveBeans.java @@ -9,7 +9,7 @@ public class CommandGiveBeans extends Command public CommandGiveBeans (KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) @@ -17,7 +17,7 @@ public class CommandGiveBeans extends Command // First, make sure someone is mentioned if(input.mentions == null) { - res.Call(LocStrings.Stub("GiveBeansNoneMentioned")); + res.Call(LocStrings.stub("GiveBeansNoneMentioned")); return; } @@ -42,7 +42,7 @@ public class CommandGiveBeans extends Command // If there wasn't a number we could find, well, nothing we can do. if(beans == null) { - res.Call(LocStrings.Stub("GiveBeansInvalid")); + res.Call(LocStrings.stub("GiveBeansInvalid")); return; } @@ -50,7 +50,7 @@ public class CommandGiveBeans extends Command for(int i = 0; i < input.mentions.length; i++) { input.mentions[i].ChangeBeans(beans); - res.Call(String.format(LocStrings.Stub("GiveBeansSuccess"), input.mentions[i].name, "" + beans)); + res.Call(String.format(LocStrings.stub("GiveBeansSuccess"), input.mentions[i].name, "" + beans)); } } } diff --git a/src/commands/CommandGuildRoleAdd.java b/src/commands/CommandGuildRoleAdd.java index ebca762..605ca45 100644 --- a/src/commands/CommandGuildRoleAdd.java +++ b/src/commands/CommandGuildRoleAdd.java @@ -15,7 +15,7 @@ public class CommandGuildRoleAdd extends Command public CommandGuildRoleAdd(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) @@ -25,16 +25,16 @@ public class CommandGuildRoleAdd extends Command { if(guild.control.addRole(user.discordID, role)) { - res.Call(String.format(LocStrings.Stub("GuildRoleAddSuccess"), role, user.name)); + res.Call(String.format(LocStrings.stub("GuildRoleAddSuccess"), role, user.name)); } else { - res.Call(String.format(LocStrings.Stub("GuildRoleAddFailure"), role, user.name)); + res.Call(String.format(LocStrings.stub("GuildRoleAddFailure"), role, user.name)); } } else { - res.Call(String.format(LocStrings.Stub("GuildRoleAddNotAllowed"), role)); + res.Call(String.format(LocStrings.stub("GuildRoleAddNotAllowed"), role)); } } } \ No newline at end of file diff --git a/src/commands/CommandGuildRoleAllowed.java b/src/commands/CommandGuildRoleAllowed.java index c61a101..556f447 100644 --- a/src/commands/CommandGuildRoleAllowed.java +++ b/src/commands/CommandGuildRoleAllowed.java @@ -15,7 +15,7 @@ public class CommandGuildRoleAllowed extends Command public CommandGuildRoleAllowed(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) @@ -27,12 +27,12 @@ public class CommandGuildRoleAllowed extends Command role = roles[i].trim(); if(guild.roleList.contains(role)) { - res.Call(LocStrings.Stub("GuildRoleAllowedDuplicate")); + res.Call(LocStrings.stub("GuildRoleAllowedDuplicate")); } else { guild.roleList.add(role); - res.Call(String.format(LocStrings.Stub("GuildRoleAllowedSuccess"), role)); + res.Call(String.format(LocStrings.stub("GuildRoleAllowedSuccess"), role)); } } } diff --git a/src/commands/CommandGuildRoleList.java b/src/commands/CommandGuildRoleList.java index 52557f6..61dda19 100644 --- a/src/commands/CommandGuildRoleList.java +++ b/src/commands/CommandGuildRoleList.java @@ -17,7 +17,7 @@ public class CommandGuildRoleList extends Command String roles = ""; if(guild.roleList.isEmpty()) { - res.Call(String.format(LocStrings.Stub("GuildRoleListEmpty"))); + res.Call(String.format(LocStrings.stub("GuildRoleListEmpty"))); return; } for(int i = 0; i < guild.roleList.size(); i++) @@ -26,6 +26,6 @@ public class CommandGuildRoleList extends Command roles += " and "; roles += guild.roleList.get(i); } - res.Call(String.format(LocStrings.Stub("GuildRoleListOutput"), roles)); + res.Call(String.format(LocStrings.stub("GuildRoleListOutput"), roles)); } } \ No newline at end of file diff --git a/src/commands/CommandGuildRoleNotAllowed.java b/src/commands/CommandGuildRoleNotAllowed.java index 76f7a1f..f6c21da 100644 --- a/src/commands/CommandGuildRoleNotAllowed.java +++ b/src/commands/CommandGuildRoleNotAllowed.java @@ -15,7 +15,7 @@ public class CommandGuildRoleNotAllowed extends Command public CommandGuildRoleNotAllowed(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) @@ -28,11 +28,11 @@ public class CommandGuildRoleNotAllowed extends Command if(guild.roleList.contains(role)) { guild.roleList.remove(role); - res.Call(LocStrings.Stub("GuildRoleNotAllowedSuccess")); + res.Call(LocStrings.stub("GuildRoleNotAllowedSuccess")); } else { - res.Call(String.format(LocStrings.Stub("GuildRoleNotAllowedFailure"), role)); + res.Call(String.format(LocStrings.stub("GuildRoleNotAllowedFailure"), role)); } } } diff --git a/src/commands/CommandGuildRoleRemove.java b/src/commands/CommandGuildRoleRemove.java index e44d129..a5a5ba7 100644 --- a/src/commands/CommandGuildRoleRemove.java +++ b/src/commands/CommandGuildRoleRemove.java @@ -15,7 +15,7 @@ public class CommandGuildRoleRemove extends Command public CommandGuildRoleRemove(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) @@ -25,16 +25,16 @@ public class CommandGuildRoleRemove extends Command { if(guild.control.removeRole(user.discordID, role)) { - res.Call(String.format(LocStrings.Stub("GuildRoleRemoveSuccess"), role, user.name)); + res.Call(String.format(LocStrings.stub("GuildRoleRemoveSuccess"), role, user.name)); } else { - res.Call(String.format(LocStrings.Stub("GuildRoleRemoveFailure"), role, user.name)); + res.Call(String.format(LocStrings.stub("GuildRoleRemoveFailure"), role, user.name)); } } else { - res.Call(String.format(LocStrings.Stub("GuildRoleRemoveNotAllowed"), role)); + res.Call(String.format(LocStrings.stub("GuildRoleRemoveNotAllowed"), role)); } } } \ No newline at end of file diff --git a/src/commands/CommandHelp.java b/src/commands/CommandHelp.java index 9277e7c..a03cea9 100644 --- a/src/commands/CommandHelp.java +++ b/src/commands/CommandHelp.java @@ -15,7 +15,7 @@ public class CommandHelp extends Command public CommandHelp(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) @@ -24,7 +24,7 @@ public class CommandHelp extends Command if(help == null) { - help = LocStrings.Stub("HelpDisplay"); + help = LocStrings.stub("HelpDisplay"); } else { diff --git a/src/commands/CommandHelpBuilder.java b/src/commands/CommandHelpBuilder.java index 4c747db..d2f6242 100644 --- a/src/commands/CommandHelpBuilder.java +++ b/src/commands/CommandHelpBuilder.java @@ -26,7 +26,7 @@ public class CommandHelpBuilder extends Command { } @Override - public String getHelpText() { 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) diff --git a/src/commands/CommandInfo.java b/src/commands/CommandInfo.java index f15e62f..3a53874 100644 --- a/src/commands/CommandInfo.java +++ b/src/commands/CommandInfo.java @@ -15,11 +15,11 @@ public class CommandInfo extends Command public CommandInfo(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) { - res.Call(LocStrings.Stub("InfoResponse")); + res.Call(LocStrings.stub("InfoResponse")); } } \ No newline at end of file diff --git a/src/commands/CommandInvite.java b/src/commands/CommandInvite.java index 077b040..809ba1c 100644 --- a/src/commands/CommandInvite.java +++ b/src/commands/CommandInvite.java @@ -10,7 +10,7 @@ public class CommandInvite extends Command public CommandInvite(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) diff --git a/src/commands/CommandJDoodle.java b/src/commands/CommandJDoodle.java index d1eb630..b9b5b7a 100644 --- a/src/commands/CommandJDoodle.java +++ b/src/commands/CommandJDoodle.java @@ -12,14 +12,14 @@ public class CommandJDoodle extends Command public CommandJDoodle(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) { if(input.args.trim().length() < 1) { - res.Call(LocStrings.Stub("JDoodleError")); + res.Call(LocStrings.stub("JDoodleError")); return; } diff --git a/src/commands/CommandMap.java b/src/commands/CommandMap.java index add05a1..a0b88c5 100644 --- a/src/commands/CommandMap.java +++ b/src/commands/CommandMap.java @@ -23,7 +23,7 @@ public class CommandMap extends Command public CommandMap(KittyRole roleLevel, KittyRating contentRating) { super(roleLevel, contentRating); } @Override - public String getHelpText() { 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) @@ -60,7 +60,7 @@ public class CommandMap extends Command } catch(NumberFormatException e) { - res.Call(LocStrings.Stub("MapInvalid")); + res.Call(LocStrings.stub("MapInvalid")); return; } @@ -76,10 +76,10 @@ public class CommandMap extends Command } // Response header creation - header += LocStrings.Stub("MapVersion") + "\n"; - header += LocStrings.Stub("MapSeed") + ": `" + seed + "`, "; - header += LocStrings.Stub("MapWidth") + "`"+ width +"`, "; - header += LocStrings.Stub("MapHeight") + ": `"+ height + "`\n"; + header += LocStrings.stub("MapVersion") + "\n"; + header += LocStrings.stub("MapSeed") + ": `" + seed + "`, "; + header += LocStrings.stub("MapWidth") + "`"+ width +"`, "; + header += LocStrings.stub("MapHeight") + ": `"+ height + "`\n"; // Response body creation body += "```\n"; diff --git a/src/commands/CommandPerish.java b/src/commands/CommandPerish.java index 1847659..84a33b2 100644 --- a/src/commands/CommandPerish.java +++ b/src/commands/CommandPerish.java @@ -23,7 +23,7 @@ public class CommandPerish extends Command public CommandPerish(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { return LocStrings.Stub("PerishInfo"); }; + public String getHelpText() { return LocStrings.stub("PerishInfo"); }; private static Long num = 0l; diff --git a/src/commands/CommandPing.java b/src/commands/CommandPing.java index 351f8b0..d732ccf 100644 --- a/src/commands/CommandPing.java +++ b/src/commands/CommandPing.java @@ -15,12 +15,12 @@ public class CommandPing extends Command public CommandPing(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) { - res.Call(LocStrings.Stub("PingResponse")); + res.Call(LocStrings.stub("PingResponse")); } } diff --git a/src/commands/CommandPollManage.java b/src/commands/CommandPollManage.java index 4fc304b..62b24f9 100644 --- a/src/commands/CommandPollManage.java +++ b/src/commands/CommandPollManage.java @@ -14,7 +14,7 @@ public class CommandPollManage extends Command public CommandPollManage(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) diff --git a/src/commands/CommandPollResults.java b/src/commands/CommandPollResults.java index 4ba0785..e42ff94 100644 --- a/src/commands/CommandPollResults.java +++ b/src/commands/CommandPollResults.java @@ -10,7 +10,7 @@ public class CommandPollResults extends Command public CommandPollResults(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) @@ -28,7 +28,7 @@ public class CommandPollResults extends Command for(int i = 0; i < votes.size(); i++) { - results += String.format(LocStrings.Stub("PollResultsResponse"), votes.get(i).votes, votes.get(i).choice, (int)(((double)votes.get(i).votes) / ((double)totalVotes) * 100)); + results += String.format(LocStrings.stub("PollResultsResponse"), votes.get(i).votes, votes.get(i).choice, (int)(((double)votes.get(i).votes) / ((double)totalVotes) * 100)); } res.Call(results); diff --git a/src/commands/CommandPollShow.java b/src/commands/CommandPollShow.java index 4aaf848..cd332a3 100644 --- a/src/commands/CommandPollShow.java +++ b/src/commands/CommandPollShow.java @@ -8,18 +8,18 @@ public class CommandPollShow extends Command public CommandPollShow(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) { if(!guild.polling) { - res.Call(LocStrings.Stub("PollShowNoPoll")); + res.Call(LocStrings.stub("PollShowNoPoll")); return; } - String poll = String.format(LocStrings.Stub("PollShowPoll"), guild.poll); - poll += LocStrings.Stub("PollShowChoices"); + String poll = String.format(LocStrings.stub("PollShowPoll"), guild.poll); + poll += LocStrings.stub("PollShowChoices"); for(int i = 0; i < guild.choices.size(); i++) { poll += (i+1) + ": `" + guild.choices.get(i).choice + "`\n"; diff --git a/src/commands/CommandPollVote.java b/src/commands/CommandPollVote.java index 75de872..2a9de19 100644 --- a/src/commands/CommandPollVote.java +++ b/src/commands/CommandPollVote.java @@ -8,7 +8,7 @@ public class CommandPollVote extends Command public CommandPollVote(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) @@ -17,7 +17,7 @@ public class CommandPollVote extends Command { if(guild.hasVoted.contains(user.uniqueID)) { - res.Call(LocStrings.Stub("PollVoteAlreadyVoted")); + res.Call(LocStrings.stub("PollVoteAlreadyVoted")); return; } try @@ -25,23 +25,23 @@ public class CommandPollVote extends Command int voteNum = Integer.parseInt(input.args)-1; if(voteNum >= guild.choices.size() || voteNum < 0) { - res.Call(String.format(LocStrings.Stub("PollVoteNotValidVote"), voteNum)); + res.Call(String.format(LocStrings.stub("PollVoteNotValidVote"), voteNum)); return; } KittyPoll polled = guild.choices.get(voteNum); polled.votes++; guild.hasVoted.add(user.uniqueID); - res.Call(LocStrings.Stub("PollVoteSuccess") + " `" + polled.choice + "`!"); + res.Call(LocStrings.stub("PollVoteSuccess") + " `" + polled.choice + "`!"); return; } catch (NumberFormatException e) { - res.Call(LocStrings.Stub("PollVoteNotValidNumber")); + res.Call(LocStrings.stub("PollVoteNotValidNumber")); return; } } - res.Call(LocStrings.Stub("PollVoteNoPoll")); + res.Call(LocStrings.stub("PollVoteNoPoll")); } } diff --git a/src/commands/CommandRPEnd.java b/src/commands/CommandRPEnd.java index 1aed3ae..55ac7ee 100644 --- a/src/commands/CommandRPEnd.java +++ b/src/commands/CommandRPEnd.java @@ -14,7 +14,7 @@ public class CommandRPEnd extends Command public CommandRPEnd (KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) @@ -33,11 +33,11 @@ public class CommandRPEnd extends Command if(sending != null) { res.CallFile(sending, "txt"); - res.Call(LocStrings.Stub("RPEndFileOut")); + res.Call(LocStrings.stub("RPEndFileOut")); } else { - res.Call(LocStrings.Stub("RPEndError")); + res.Call(LocStrings.stub("RPEndError")); } } } diff --git a/src/commands/CommandRPG.java b/src/commands/CommandRPG.java index 275c79c..02a7bdc 100644 --- a/src/commands/CommandRPG.java +++ b/src/commands/CommandRPG.java @@ -23,7 +23,7 @@ public class CommandRPG extends Command } @Override - public String getHelpText() { return LocStrings.Stub("RPGInfo"); }; + public String getHelpText() { return LocStrings.stub("RPGInfo"); }; @Override @@ -44,7 +44,7 @@ public class CommandRPG extends Command if(result == null) { - res.Call(LocStrings.Stub("RPGInvalid")); + res.Call(LocStrings.stub("RPGInvalid")); return; } diff --git a/src/commands/CommandRPStart.java b/src/commands/CommandRPStart.java index 3e03635..3e530bd 100644 --- a/src/commands/CommandRPStart.java +++ b/src/commands/CommandRPStart.java @@ -12,7 +12,7 @@ public class CommandRPStart extends Command public CommandRPStart (KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) diff --git a/src/commands/CommandRaffleEnd.java b/src/commands/CommandRaffleEnd.java index 6d7bc72..9da8b0f 100644 --- a/src/commands/CommandRaffleEnd.java +++ b/src/commands/CommandRaffleEnd.java @@ -15,18 +15,18 @@ public class CommandRaffleEnd extends Command public CommandRaffleEnd(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) { if(guild.endRaffle()) { - res.Call(LocStrings.Stub("RaffleEndSuccess")); + res.Call(LocStrings.stub("RaffleEndSuccess")); } else { - res.Call(LocStrings.Stub("RaffleEndFailure")); + res.Call(LocStrings.stub("RaffleEndFailure")); } } } \ No newline at end of file diff --git a/src/commands/CommandRaffleJoin.java b/src/commands/CommandRaffleJoin.java index c575443..8676693 100644 --- a/src/commands/CommandRaffleJoin.java +++ b/src/commands/CommandRaffleJoin.java @@ -15,18 +15,18 @@ public class CommandRaffleJoin extends Command public CommandRaffleJoin(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) { if(guild.joinRaffle(user)) { - res.Call(LocStrings.Stub("RaffleJoinSuccess")); + res.Call(LocStrings.stub("RaffleJoinSuccess")); } else { - res.Call(LocStrings.Stub("RaffleJoinFailure")); + res.Call(LocStrings.stub("RaffleJoinFailure")); } } } diff --git a/src/commands/CommandRaffleSpin.java b/src/commands/CommandRaffleSpin.java index 380a84e..888f2a7 100644 --- a/src/commands/CommandRaffleSpin.java +++ b/src/commands/CommandRaffleSpin.java @@ -15,18 +15,18 @@ public class CommandRaffleSpin extends Command public CommandRaffleSpin(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) { try { - res.Call(String.format(LocStrings.Stub("RaffleSpinSuccess"), guild.chooseRaffleWinner().name)); + res.Call(String.format(LocStrings.stub("RaffleSpinSuccess"), guild.chooseRaffleWinner().name)); } catch(Exception e) { - res.Call(LocStrings.Stub("RaffleSpinFailure")); + res.Call(LocStrings.stub("RaffleSpinFailure")); } } } \ No newline at end of file diff --git a/src/commands/CommandRaffleStart.java b/src/commands/CommandRaffleStart.java index cd359c3..f29fd34 100644 --- a/src/commands/CommandRaffleStart.java +++ b/src/commands/CommandRaffleStart.java @@ -15,7 +15,7 @@ public class CommandRaffleStart extends Command public CommandRaffleStart(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { return LocStrings.Stub("RaffleStartInfo"); } + public String getHelpText() { return LocStrings.stub("RaffleStartInfo"); } public int beanCost; @@ -33,11 +33,11 @@ public class CommandRaffleStart extends Command if(guild.startRaffle(beanCost)) { - res.Call(String.format(LocStrings.Stub("RaffleStartSuccess"), beanCost)); + res.Call(String.format(LocStrings.stub("RaffleStartSuccess"), beanCost)); } else { - res.Call(LocStrings.Stub("RaffleStartFailure")); + res.Call(LocStrings.stub("RaffleStartFailure")); } } } diff --git a/src/commands/CommandRating.java b/src/commands/CommandRating.java index 0ae8427..3ad142e 100644 --- a/src/commands/CommandRating.java +++ b/src/commands/CommandRating.java @@ -15,7 +15,7 @@ public class CommandRating extends Command public CommandRating(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { return LocStrings.Stub("RatingInfo"); } + public String getHelpText() { return LocStrings.stub("RatingInfo"); } // Called when the command is run! @Override @@ -55,11 +55,11 @@ public class CommandRating extends Command } if(newRating != null) - res.Call(LocStrings.Stub("RatingChanged") + " " + newRating); + res.Call(LocStrings.stub("RatingChanged") + " " + newRating); else - res.Call(LocStrings.Stub("RatingInvalid") + " `" + input.args + "`"); + res.Call(LocStrings.stub("RatingInvalid") + " `" + input.args + "`"); if(newRating.equals("Filtered")) - res.Call(LocStrings.Stub("RatingWarning")); + res.Call(LocStrings.stub("RatingWarning")); } } \ No newline at end of file diff --git a/src/commands/CommandRole.java b/src/commands/CommandRole.java index c4aa7eb..b569247 100644 --- a/src/commands/CommandRole.java +++ b/src/commands/CommandRole.java @@ -9,20 +9,20 @@ public class CommandRole extends Command public CommandRole (KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) { if(input.args.isEmpty()) { - res.Call(LocStrings.Stub("RoleStandardResponse") + " " + user.GetRole().name() + "!"); + res.Call(LocStrings.stub("RoleStandardResponse") + " " + user.GetRole().name() + "!"); return; } if(user.GetRole().getValue() < KittyRole.Admin.getValue()) { - res.Call(String.format(LocStrings.Stub("RoleError"), KittyRole.Admin.toString())); + res.Call(String.format(LocStrings.stub("RoleError"), KittyRole.Admin.toString())); return; } @@ -46,7 +46,7 @@ public class CommandRole extends Command break; default: - res.Call(LocStrings.Stub("RoleNeededRole")); + res.Call(LocStrings.stub("RoleNeededRole")); return; } String users = ""; @@ -56,6 +56,6 @@ public class CommandRole extends Command users += input.mentions[i].name + " "; } - res.Call(String.format(LocStrings.Stub("RoleChanged"), users, newRole.name())); + res.Call(String.format(LocStrings.stub("RoleChanged"), users, newRole.name())); } } diff --git a/src/commands/CommandRoll.java b/src/commands/CommandRoll.java index d077104..3525157 100644 --- a/src/commands/CommandRoll.java +++ b/src/commands/CommandRoll.java @@ -16,7 +16,7 @@ public class CommandRoll extends Command public CommandRoll(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) @@ -27,7 +27,7 @@ public class CommandRoll extends Command } catch(Exception e) { - res.Call(LocStrings.Stub("RollError")); + res.Call(LocStrings.stub("RollError")); } } diff --git a/src/commands/CommandShutdown.java b/src/commands/CommandShutdown.java index 776f370..45fe80e 100644 --- a/src/commands/CommandShutdown.java +++ b/src/commands/CommandShutdown.java @@ -20,7 +20,7 @@ public class CommandShutdown extends Command public CommandShutdown(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { return LocStrings.Stub("ShutdownInfo"); } + public String getHelpText() { return LocStrings.stub("ShutdownInfo"); } // Called when the command is run! @Override @@ -46,7 +46,7 @@ public class CommandShutdown extends Command if(isSafe) { // Force upkeep, this works so long as upkeep is on the main thread. - res.CallImmediate(LocStrings.Stub("ShutdownSafe")); + res.CallImmediate(LocStrings.stub("ShutdownSafe")); DatabaseManager.instance.upkeep(); GlobalLog.Warn(LogFilter.Command, LocStrings.Lookup("ShutdownSafe")); @@ -54,7 +54,7 @@ public class CommandShutdown extends Command } else { - res.CallImmediate(LocStrings.Stub("ShutdownUnsafe"));// "``"); + res.CallImmediate(LocStrings.stub("ShutdownUnsafe"));// "``"); GlobalLog.Warn(LogFilter.Command, LocStrings.Lookup("ShutdownSafe")); System.exit(0); } diff --git a/src/commands/CommandStark.java b/src/commands/CommandStark.java index 299794a..3f3a2d5 100644 --- a/src/commands/CommandStark.java +++ b/src/commands/CommandStark.java @@ -17,7 +17,7 @@ public class CommandStark extends Command public CommandStark(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { return LocStrings.Stub("StarkInfo"); }; + public String getHelpText() { return LocStrings.stub("StarkInfo"); }; private static Long num = 0l; diff --git a/src/commands/CommandStats.java b/src/commands/CommandStats.java index b6f5649..75c7fe2 100644 --- a/src/commands/CommandStats.java +++ b/src/commands/CommandStats.java @@ -17,7 +17,7 @@ public class CommandStats extends Command public CommandStats(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { return LocStrings.Stub("StatsInfo"); } + public String getHelpText() { return LocStrings.stub("StatsInfo"); } // Called when the command is run! @Override diff --git a/src/commands/CommandTeey.java b/src/commands/CommandTeey.java index 9023064..f11ba14 100644 --- a/src/commands/CommandTeey.java +++ b/src/commands/CommandTeey.java @@ -23,7 +23,7 @@ public class CommandTeey extends Command private static Long num = 0l; @Override - public String getHelpText() { return LocStrings.Stub("TeeyInfo"); } + public String getHelpText() { return LocStrings.stub("TeeyInfo"); } // Called when the command is run! @Override diff --git a/src/commands/CommandTradeBeans.java b/src/commands/CommandTradeBeans.java index 9a7dd90..e713ba9 100644 --- a/src/commands/CommandTradeBeans.java +++ b/src/commands/CommandTradeBeans.java @@ -15,14 +15,14 @@ public class CommandTradeBeans extends Command public CommandTradeBeans(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) { if(input.mentions == null) { - res.Call(LocStrings.Stub("TradeBeansNoTargetError")); + res.Call(LocStrings.stub("TradeBeansNoTargetError")); return; } @@ -32,25 +32,25 @@ public class CommandTradeBeans extends Command } catch (NumberFormatException e) { - res.Call(LocStrings.Stub("TradeBeansIntParseError")); + res.Call(LocStrings.stub("TradeBeansIntParseError")); return; } if(user.GetBeans() < beans) { - res.Call(LocStrings.Stub("TradeBeansNotEnoughError")); + res.Call(LocStrings.stub("TradeBeansNotEnoughError")); return; } if(beans < 0) { - res.Call(String.format(LocStrings.Stub("TradeBeansStealingBeans"), user.name)); + res.Call(String.format(LocStrings.stub("TradeBeansStealingBeans"), user.name)); user.ChangeBeans(-10); return; } input.mentions[0].ChangeBeans(beans); user.ChangeBeans(-beans); - res.Call(String.format(LocStrings.Stub("TradeBeansSuccess"), user.name, input.mentions[0].name, beans)); + res.Call(String.format(LocStrings.stub("TradeBeansSuccess"), user.name, input.mentions[0].name, beans)); } } diff --git a/src/commands/CommandTweet.java b/src/commands/CommandTweet.java index a95e09e..fd1669e 100644 --- a/src/commands/CommandTweet.java +++ b/src/commands/CommandTweet.java @@ -11,7 +11,7 @@ public class CommandTweet extends Command public CommandTweet(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String getHelpText() { 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) @@ -20,7 +20,7 @@ public class CommandTweet extends Command try { res.Call(tweet.tweet(input.args)); } catch (Exception e) { - res.Call(LocStrings.Stub("TweetError")); + res.Call(LocStrings.stub("TweetError")); } } } diff --git a/src/commands/CommandWolfram.java b/src/commands/CommandWolfram.java index 731c58a..a1a0b6e 100644 --- a/src/commands/CommandWolfram.java +++ b/src/commands/CommandWolfram.java @@ -15,13 +15,13 @@ public class CommandWolfram extends Command public CommandWolfram(KittyRole level, KittyRating rating) { super(level, rating);} @Override - public String getHelpText() { 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) { if(input.args == null || input.args.trim().length() == 0) - res.Call(LocStrings.Stub("WolframNoArgs")); + res.Call(LocStrings.stub("WolframNoArgs")); try { @@ -31,7 +31,7 @@ public class CommandWolfram extends Command } catch (IOException e) { - res.Call(LocStrings.Stub("WolframError")); + res.Call(LocStrings.stub("WolframError")); } } } \ No newline at end of file diff --git a/src/commands/CommandYeet.java b/src/commands/CommandYeet.java index c4b0b53..ac9f947 100644 --- a/src/commands/CommandYeet.java +++ b/src/commands/CommandYeet.java @@ -23,7 +23,7 @@ public class CommandYeet extends Command private static Long num = 0l; @Override - public String getHelpText() { return LocStrings.Stub("YeetInfo"); } + public String getHelpText() { return LocStrings.stub("YeetInfo"); } // Called when the command is run! @Override diff --git a/src/core/LocCommands.java b/src/core/LocCommands.java index 6d5b9bd..59f30a8 100644 --- a/src/core/LocCommands.java +++ b/src/core/LocCommands.java @@ -11,7 +11,7 @@ import dataStructures.Pair; public class LocCommands extends BaseLocFile { public static final String fileName = "locCommands.config"; - public static final String function = "LocCommands.Stub"; + public static final String function = "LocCommands.stub"; private static LocCommands instance; @@ -38,7 +38,7 @@ public class LocCommands extends BaseLocFile } // Returns a pair, the raw key and the stub key - public static Pair Stub(String toStub) + public static Pair stub(String toStub) { return new Pair(toStub, instance.GetKey(toStub)); } diff --git a/src/core/LocStrings.java b/src/core/LocStrings.java index 7b95573..642a75a 100644 --- a/src/core/LocStrings.java +++ b/src/core/LocStrings.java @@ -10,7 +10,7 @@ import utils.io.FileMonitor; public class LocStrings extends BaseLocFile { public static final String fileName = "locStrings.config"; - public static final String function = "LocStrings.Stub"; + public static final String function = "LocStrings.stub"; private static LocStrings instance; @@ -36,7 +36,7 @@ public class LocStrings extends BaseLocFile } } - public static String Stub(String toStub) + public static String stub(String toStub) { return Lookup(toStub); } diff --git a/src/core/ObjectBuilderFactory.java b/src/core/ObjectBuilderFactory.java index 24738b4..692953c 100644 --- a/src/core/ObjectBuilderFactory.java +++ b/src/core/ObjectBuilderFactory.java @@ -337,63 +337,63 @@ public class ObjectBuilderFactory CommandManager manager = new CommandManager(commandEnabler); // Dev - manager.Register(LocCommands.Stub("work"), new CommandDoWork(KittyRole.Dev, KittyRating.Safe)); - manager.Register(LocCommands.Stub("shutdown"), new CommandShutdown(KittyRole.Dev, KittyRating.Safe)); - manager.Register(LocCommands.Stub("stats"), new CommandStats(KittyRole.Dev, KittyRating.Safe)); - manager.Register(LocCommands.Stub("invite"), new CommandInvite(KittyRole.Dev, KittyRating.Safe)); - manager.Register(LocCommands.Stub("buildHelp"), new CommandHelpBuilder(KittyRole.Dev, KittyRating.Safe)); - manager.Register(LocCommands.Stub("tweet"), new CommandTweet(KittyRole.Dev, KittyRating.Safe)); - manager.Register(LocCommands.Stub("dbflush"), new CommandDBFlush(KittyRole.Dev, KittyRating.Safe)); - manager.Register(LocCommands.Stub("dbstats"), new CommandDBStats(KittyRole.Dev, KittyRating.Safe)); + manager.Register(LocCommands.stub("work"), new CommandDoWork(KittyRole.Dev, KittyRating.Safe)); + manager.Register(LocCommands.stub("shutdown"), new CommandShutdown(KittyRole.Dev, KittyRating.Safe)); + manager.Register(LocCommands.stub("stats"), new CommandStats(KittyRole.Dev, KittyRating.Safe)); + manager.Register(LocCommands.stub("invite"), new CommandInvite(KittyRole.Dev, KittyRating.Safe)); + manager.Register(LocCommands.stub("buildHelp"), new CommandHelpBuilder(KittyRole.Dev, KittyRating.Safe)); + manager.Register(LocCommands.stub("tweet"), new CommandTweet(KittyRole.Dev, KittyRating.Safe)); + manager.Register(LocCommands.stub("dbflush"), new CommandDBFlush(KittyRole.Dev, KittyRating.Safe)); + manager.Register(LocCommands.stub("dbstats"), new CommandDBStats(KittyRole.Dev, KittyRating.Safe)); // Admin - manager.Register(LocCommands.Stub("rating"), new CommandRating(KittyRole.Admin, KittyRating.Safe)); - manager.Register(LocCommands.Stub("indicator"), new CommandChangeIndicator(KittyRole.Admin, KittyRating.Safe)); - manager.Register(LocCommands.Stub("guildroleallowed"), new CommandGuildRoleAllowed(KittyRole.Admin, KittyRating.Safe)); - manager.Register(LocCommands.Stub("guildrolenotallowed"), new CommandGuildRoleNotAllowed(KittyRole.Admin, KittyRating.Safe)); + manager.Register(LocCommands.stub("rating"), new CommandRating(KittyRole.Admin, KittyRating.Safe)); + manager.Register(LocCommands.stub("indicator"), new CommandChangeIndicator(KittyRole.Admin, KittyRating.Safe)); + manager.Register(LocCommands.stub("guildroleallowed"), new CommandGuildRoleAllowed(KittyRole.Admin, KittyRating.Safe)); + manager.Register(LocCommands.stub("guildrolenotallowed"), new CommandGuildRoleNotAllowed(KittyRole.Admin, KittyRating.Safe)); // Mod - manager.Register(LocCommands.Stub("poll"), new CommandPollManage(KittyRole.Mod, KittyRating.Safe)); - manager.Register(LocCommands.Stub("givebeans"), new CommandGiveBeans(KittyRole.Mod, KittyRating.Safe)); - manager.Register(LocCommands.Stub("rpg"), new CommandRPG(KittyRole.Mod, KittyRating.Safe)); - manager.Register(LocCommands.Stub("rafflestart"), new CommandRaffleStart(KittyRole.Mod, KittyRating.Safe)); - manager.Register(LocCommands.Stub("rafflespin"), new CommandRaffleSpin(KittyRole.Mod, KittyRating.Safe)); - manager.Register(LocCommands.Stub("raffleend"), new CommandRaffleEnd(KittyRole.Mod, KittyRating.Safe)); + manager.Register(LocCommands.stub("poll"), new CommandPollManage(KittyRole.Mod, KittyRating.Safe)); + manager.Register(LocCommands.stub("givebeans"), new CommandGiveBeans(KittyRole.Mod, KittyRating.Safe)); + manager.Register(LocCommands.stub("rpg"), new CommandRPG(KittyRole.Mod, KittyRating.Safe)); + manager.Register(LocCommands.stub("rafflestart"), new CommandRaffleStart(KittyRole.Mod, KittyRating.Safe)); + manager.Register(LocCommands.stub("rafflespin"), new CommandRaffleSpin(KittyRole.Mod, KittyRating.Safe)); + manager.Register(LocCommands.stub("raffleend"), new CommandRaffleEnd(KittyRole.Mod, KittyRating.Safe)); // General - manager.Register(LocCommands.Stub("fetch"), new CommandFetch(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("guildroleadd"), new CommandGuildRoleAdd(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("guildroleremove"), new CommandGuildRoleRemove(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("teey"), new CommandTeey(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("perish, thenperish"), new CommandPerish(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("yeet"), new CommandYeet(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("ping"), new CommandPing(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("boop"), new CommandBoop(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("roll"), new CommandRoll(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("choose"), new CommandChoose(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("help"), new CommandHelp(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("info, about"), new CommandInfo(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("vote"), new CommandPollVote(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("results"), new CommandPollResults(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("showpoll"), new CommandPollShow(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("wolfram"), new CommandWolfram(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("c++, g++, cplus, cpp"), new CommandColiru(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("java, jdoodle"), new CommandJDoodle(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("beans"), new CommandBeansShow(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("role"), new CommandRole(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("bet"), new CommandBetBeans(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("map"), new CommandMap(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("rpstart"), new CommandRPStart(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("rpend"), new CommandRPEnd(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("tony, stark, dontfeelgood, dontfeelsogood"), new CommandStark(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("blur"), new CommandBlurry(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("eightball, 8ball"), new CommandEightBall(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("catch"), new CommandCatch(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("guildrolelist"), new CommandGuildRoleList(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("bethistory"), new CommandBetHistory(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("crouton"), new CommandCrouton(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("benchmark, bench"), new CommandBenchmark(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("rafflejoin"), new CommandRaffleJoin(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("fetch"), new CommandFetch(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("guildroleadd"), new CommandGuildRoleAdd(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("guildroleremove"), new CommandGuildRoleRemove(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("teey"), new CommandTeey(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("perish, thenperish"), new CommandPerish(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("yeet"), new CommandYeet(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("ping"), new CommandPing(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("boop"), new CommandBoop(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("roll"), new CommandRoll(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("choose"), new CommandChoose(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("help"), new CommandHelp(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("info, about"), new CommandInfo(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("vote"), new CommandPollVote(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("results"), new CommandPollResults(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("showpoll"), new CommandPollShow(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("wolfram"), new CommandWolfram(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("c++, g++, cplus, cpp"), new CommandColiru(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("java, jdoodle"), new CommandJDoodle(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("beans"), new CommandBeansShow(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("role"), new CommandRole(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("bet"), new CommandBetBeans(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("map"), new CommandMap(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("rpstart"), new CommandRPStart(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("rpend"), new CommandRPEnd(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("tony, stark, dontfeelgood, dontfeelsogood"), new CommandStark(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("blur"), new CommandBlurry(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("eightball, 8ball"), new CommandEightBall(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("catch"), new CommandCatch(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("guildrolelist"), new CommandGuildRoleList(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("bethistory"), new CommandBetHistory(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("crouton"), new CommandCrouton(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("benchmark, bench"), new CommandBenchmark(KittyRole.General, KittyRating.Safe)); + manager.Register(LocCommands.stub("rafflejoin"), new CommandRaffleJoin(KittyRole.General, KittyRating.Safe)); return manager; }