From 51e40610a2dbc7cb7eecc475174f0d9a7731985a Mon Sep 17 00:00:00 2001 From: Matthew Cech Date: Wed, 19 Jun 2019 20:03:16 -0700 Subject: [PATCH] = Benchmark subsystem formatting update --- src/commands/CommandBeansShow.java | 4 +-- src/commands/CommandBenchmark.java | 10 +++--- src/commands/CommandBetBeans.java | 12 +++---- src/commands/CommandBetHistory.java | 2 +- src/commands/CommandBoop.java | 6 ++-- src/commands/CommandChangeIndicator.java | 6 ++-- src/commands/CommandCharacterCreate.java | 6 ++-- src/commands/CommandCharacterEditBio.java | 6 ++-- src/commands/CommandCharacterEditName.java | 6 ++-- src/commands/CommandCharacterEditURL.java | 6 ++-- src/commands/CommandCharacterSearch.java | 8 ++--- src/commands/CommandChoose.java | 6 ++-- src/commands/CommandColiru.java | 4 +-- src/commands/CommandColor.java | 4 +-- src/commands/CommandCrouton.java | 2 +- src/commands/CommandDBFlush.java | 2 +- src/commands/CommandDBStats.java | 2 +- src/commands/CommandDoWork.java | 2 +- src/commands/CommandEightBall.java | 4 +-- src/commands/CommandFetch.java | 16 ++++----- src/commands/CommandGiveBeans.java | 6 ++-- src/commands/CommandGuildRoleAdd.java | 6 ++-- src/commands/CommandGuildRoleAllowed.java | 4 +-- src/commands/CommandGuildRoleList.java | 4 +-- src/commands/CommandGuildRoleNotAllowed.java | 4 +-- src/commands/CommandGuildRoleRemove.java | 6 ++-- src/commands/CommandHelp.java | 2 +- src/commands/CommandInfo.java | 2 +- src/commands/CommandInvite.java | 2 +- src/commands/CommandJDoodle.java | 4 +-- src/commands/CommandLeaderboard.java | 2 +- src/commands/CommandMap.java | 4 +-- src/commands/CommandPing.java | 2 +- src/commands/CommandPollManage.java | 6 ++-- src/commands/CommandPollResults.java | 2 +- src/commands/CommandPollShow.java | 4 +-- src/commands/CommandPollVote.java | 10 +++--- src/commands/CommandRPEnd.java | 4 +-- src/commands/CommandRPG.java | 6 ++-- src/commands/CommandRPStart.java | 2 +- src/commands/CommandRaffleEnd.java | 4 +-- src/commands/CommandRaffleJoin.java | 4 +-- src/commands/CommandRaffleSpin.java | 4 +-- src/commands/CommandRaffleStart.java | 4 +-- src/commands/CommandRating.java | 6 ++-- src/commands/CommandRole.java | 8 ++--- src/commands/CommandRoll.java | 4 +-- src/commands/CommandStats.java | 2 +- src/commands/CommandTradeBeans.java | 10 +++--- src/commands/CommandTweet.java | 4 +-- src/commands/CommandWolfram.java | 4 +-- .../benchmark/BenchmarkCommandCompare.java | 4 +-- .../benchmark/BenchmarkCommandFind.java | 4 +-- .../benchmark/BenchmarkCommandInfo.java | 6 ++-- src/core/benchmark/BenchmarkCommand.java | 2 +- src/core/benchmark/BenchmarkFormattable.java | 6 ++-- src/core/benchmark/BenchmarkFramework.java | 24 ++++++------- src/core/benchmark/BenchmarkLog.java | 6 ++-- src/core/benchmark/BenchmarkManager.java | 36 +++++++++---------- src/dataStructures/Response.java | 4 +-- src/main/Main.java | 2 +- 61 files changed, 172 insertions(+), 172 deletions(-) diff --git a/src/commands/CommandBeansShow.java b/src/commands/CommandBeansShow.java index 086fc6b..08db78f 100644 --- a/src/commands/CommandBeansShow.java +++ b/src/commands/CommandBeansShow.java @@ -15,7 +15,7 @@ public class CommandBeansShow extends Command 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 f727e9d..bdfaa03 100644 --- a/src/commands/CommandBenchmark.java +++ b/src/commands/CommandBenchmark.java @@ -30,27 +30,27 @@ public class CommandBenchmark extends Command @Override 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) { String output = getHelpText(); - res.Call(output); + res.call(output); return; } BenchmarkFormattable commandOutput = null; synchronized(framework) { - commandOutput = framework.Run(input.args.trim()); + commandOutput = framework.run(input.args.trim()); } if(commandOutput == null) { - res.Call(LocStrings.stub("BenchmarkInvalid")); + res.call(LocStrings.stub("BenchmarkInvalid")); return; } - commandOutput.Call(res); + commandOutput.call(res); } } \ No newline at end of file diff --git a/src/commands/CommandBetBeans.java b/src/commands/CommandBetBeans.java index 24ef524..e8440af 100644 --- a/src/commands/CommandBetBeans.java +++ b/src/commands/CommandBetBeans.java @@ -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; } @@ -47,18 +47,18 @@ public class CommandBetBeans extends Command win = getWinning(slots); - res.Call(call); + res.call(call); 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 a1d5c3d..700e26e 100644 --- a/src/commands/CommandBetHistory.java +++ b/src/commands/CommandBetHistory.java @@ -20,6 +20,6 @@ public class CommandBetHistory extends Command @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/CommandBoop.java b/src/commands/CommandBoop.java index c706e36..7abc488 100644 --- a/src/commands/CommandBoop.java +++ b/src/commands/CommandBoop.java @@ -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/CommandChangeIndicator.java b/src/commands/CommandChangeIndicator.java index eff955f..c8786d6 100644 --- a/src/commands/CommandChangeIndicator.java +++ b/src/commands/CommandChangeIndicator.java @@ -17,18 +17,18 @@ 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; } String indicator = arg.substring(0, 1); if(indicator.charAt(0) == '\n' || indicator.charAt(0) == '\t' || indicator.charAt(0) == '\r') { - res.Call(LocStrings.Lookup("ChangeIndicatorError")); + res.call(LocStrings.Lookup("ChangeIndicatorError")); return; } 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/CommandCharacterCreate.java b/src/commands/CommandCharacterCreate.java index 9a3b5c0..53b0165 100644 --- a/src/commands/CommandCharacterCreate.java +++ b/src/commands/CommandCharacterCreate.java @@ -24,14 +24,14 @@ public class CommandCharacterCreate extends Command String [] info = input.args.split(","); if(info.length < 3) { - res.Call(LocStrings.stub("CharacterCreateNullInfo")); + res.call(LocStrings.stub("CharacterCreateNullInfo")); return; } if(CharacterManager.instance.addCharacter(user, info[0], info[1], info[2])) { - res.Call(LocStrings.stub("CharacterCreateSuccess")); + res.call(LocStrings.stub("CharacterCreateSuccess")); return; } - res.Call(LocStrings.stub("CharacterCreateDuplicate")); + res.call(LocStrings.stub("CharacterCreateDuplicate")); } } \ No newline at end of file diff --git a/src/commands/CommandCharacterEditBio.java b/src/commands/CommandCharacterEditBio.java index 7f37e75..f22c420 100644 --- a/src/commands/CommandCharacterEditBio.java +++ b/src/commands/CommandCharacterEditBio.java @@ -21,18 +21,18 @@ public class CommandCharacterEditBio extends Command } catch(Exception e) { - res.Call(LocStrings.stub("CharacterEditBioNotValid")); + res.call(LocStrings.stub("CharacterEditBioNotValid")); return; } KittyCharacter character = CharacterManager.instance.searchCharacter(input.args.split(" ")[0]).get(0); if(character.getOwner().equals(user)) { CharacterManager.instance.editBio(character, input.args.substring(input.args.indexOf(' '))); - res.Call(LocStrings.stub("CharacterEditBioSuccess")); + res.call(LocStrings.stub("CharacterEditBioSuccess")); } else { - res.Call(LocStrings.stub("CharacterEditBioNotAuth")); + res.call(LocStrings.stub("CharacterEditBioNotAuth")); } } } \ No newline at end of file diff --git a/src/commands/CommandCharacterEditName.java b/src/commands/CommandCharacterEditName.java index 92615e8..fcddca6 100644 --- a/src/commands/CommandCharacterEditName.java +++ b/src/commands/CommandCharacterEditName.java @@ -21,18 +21,18 @@ public class CommandCharacterEditName extends Command } catch(Exception e) { - res.Call(LocStrings.stub("CharacterEditNameNotValid")); + res.call(LocStrings.stub("CharacterEditNameNotValid")); return; } KittyCharacter character = CharacterManager.instance.searchCharacter(input.args.split(" ")[0]).get(0); if(character.getOwner().equals(user)) { CharacterManager.instance.editName(character, input.args.substring(input.args.indexOf(' '))); - res.Call(LocStrings.stub("CharacterEditNameSuccess")); + res.call(LocStrings.stub("CharacterEditNameSuccess")); } else { - res.Call(LocStrings.stub("CharacterEditNameNotAuth")); + res.call(LocStrings.stub("CharacterEditNameNotAuth")); } } } \ No newline at end of file diff --git a/src/commands/CommandCharacterEditURL.java b/src/commands/CommandCharacterEditURL.java index 387722a..cabfcbc 100644 --- a/src/commands/CommandCharacterEditURL.java +++ b/src/commands/CommandCharacterEditURL.java @@ -21,18 +21,18 @@ public class CommandCharacterEditURL extends Command } catch(Exception e) { - res.Call(LocStrings.stub("CharacterEditURLNotValid")); + res.call(LocStrings.stub("CharacterEditURLNotValid")); return; } KittyCharacter character = CharacterManager.instance.searchCharacter(input.args.split(" ")[0]).get(0); if(character.getOwner().equals(user)) { CharacterManager.instance.editRefImage(character, input.args.substring(input.args.indexOf(' '))); - res.Call(LocStrings.stub("CharacterEditURLSuccess")); + res.call(LocStrings.stub("CharacterEditURLSuccess")); } else { - res.Call(LocStrings.stub("CharacterEditURLNotAuth")); + res.call(LocStrings.stub("CharacterEditURLNotAuth")); } } } \ No newline at end of file diff --git a/src/commands/CommandCharacterSearch.java b/src/commands/CommandCharacterSearch.java index 46b125b..aaf3698 100644 --- a/src/commands/CommandCharacterSearch.java +++ b/src/commands/CommandCharacterSearch.java @@ -20,21 +20,21 @@ public class CommandCharacterSearch extends Command ArrayList characters = CharacterManager.instance.searchCharacter(input.args); if(characters.size() < 1) { - res.Call(LocStrings.stub("CharacterSearchNoCharacterFound")); + res.call(LocStrings.stub("CharacterSearchNoCharacterFound")); return; } if(characters.size() > 1) { - res.Call(LocStrings.stub("CharacterSearchMultipleCharacterHeader")); + res.call(LocStrings.stub("CharacterSearchMultipleCharacterHeader")); for(KittyCharacter character:characters) { - res.Call(String.format(LocStrings.stub("CharacterSearchMultipleCharacter"), character.getName(), character.getOwner().name, character.getUID())); + res.call(String.format(LocStrings.stub("CharacterSearchMultipleCharacter"), character.getName(), character.getOwner().name, character.getUID())); } return; } else { - res.Call(String.format(LocStrings.stub("CharacterSearchOneCharacter"), characters.get(0).getOwner().name, characters.get(0).getName(), characters.get(0).getBio(), characters.get(0).getRefImage(), characters.get(0).getUID())); + res.call(String.format(LocStrings.stub("CharacterSearchOneCharacter"), characters.get(0).getOwner().name, characters.get(0).getName(), characters.get(0).getBio(), characters.get(0).getRefImage(), characters.get(0).getUID())); } } } \ No newline at end of file diff --git a/src/commands/CommandChoose.java b/src/commands/CommandChoose.java index 1143985..fbcecb7 100644 --- a/src/commands/CommandChoose.java +++ b/src/commands/CommandChoose.java @@ -21,7 +21,7 @@ public class CommandChoose extends Command { if(input.args.trim().length() == 0) { - res.Call(Stats.instance.GetHelpText(input.key)); + res.call(Stats.instance.GetHelpText(input.key)); return; } @@ -29,10 +29,10 @@ public class CommandChoose extends Command 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 0ca72d7..3091670 100644 --- a/src/commands/CommandColiru.java +++ b/src/commands/CommandColiru.java @@ -19,11 +19,11 @@ public class CommandColiru extends Command { if(input.args.trim().length() < 1) { - res.Call(LocStrings.stub("ColiruError")); + res.call(LocStrings.stub("ColiruError")); return; } - res.Call(compiler.compileCPlus(input.args)); + res.call(compiler.compileCPlus(input.args)); } } diff --git a/src/commands/CommandColor.java b/src/commands/CommandColor.java index b16a371..fd19c89 100644 --- a/src/commands/CommandColor.java +++ b/src/commands/CommandColor.java @@ -37,7 +37,7 @@ public class CommandColor extends Command // Verify the color was even found if(colorData == null) { - res.Call(LocStrings.stub("ColorNotSearchable")); + res.call(LocStrings.stub("ColorNotSearchable")); return; } @@ -76,7 +76,7 @@ public class CommandColor extends Command response.footerText = "All percentages and values are rounded to the nearest whole number!" + (colorData.name.exact_match_name ? "" : " '" + colorData.name.value + "' is actually " + colorData.name.closest_named_hex + "."); // Send then delete the temp local files - res.CallEmbed(response); + res.callEmbed(response); ImageUtils.BlockingFileDelete(file); }; diff --git a/src/commands/CommandCrouton.java b/src/commands/CommandCrouton.java index 3002fca..2ea8800 100644 --- a/src/commands/CommandCrouton.java +++ b/src/commands/CommandCrouton.java @@ -34,7 +34,7 @@ public class CommandCrouton extends Command embed.imageURL = "https://crouton.net/crouton.png"; - res.CallEmbed(embed); + res.callEmbed(embed); } } diff --git a/src/commands/CommandDBFlush.java b/src/commands/CommandDBFlush.java index 4f26c03..5c11278 100644 --- a/src/commands/CommandDBFlush.java +++ b/src/commands/CommandDBFlush.java @@ -30,6 +30,6 @@ public class CommandDBFlush extends Command embed.descriptionText = "**Dirty:** " + numUpdated; embed.color = Config.ColorDefault; - res.CallEmbed(embed); + res.callEmbed(embed); } } diff --git a/src/commands/CommandDBStats.java b/src/commands/CommandDBStats.java index 7a856e4..448f923 100644 --- a/src/commands/CommandDBStats.java +++ b/src/commands/CommandDBStats.java @@ -38,6 +38,6 @@ public class CommandDBStats extends Command embed.descriptionText += "**Last Upkeep:** " + dateFormat.format(DatabaseManager.instance.getLastUpkeep()) + " UTC-7"; embed.color = Config.ColorDefault; - res.CallEmbed(embed); + res.callEmbed(embed); } } diff --git a/src/commands/CommandDoWork.java b/src/commands/CommandDoWork.java index ad5e17a..840a2d1 100644 --- a/src/commands/CommandDoWork.java +++ b/src/commands/CommandDoWork.java @@ -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 f4253a3..531e49c 100644 --- a/src/commands/CommandEightBall.java +++ b/src/commands/CommandEightBall.java @@ -41,8 +41,8 @@ public class CommandEightBall extends Command 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)]); + res.call(answers[(int) (Math.random()*answers.length)]); } } diff --git a/src/commands/CommandFetch.java b/src/commands/CommandFetch.java index 33518b0..25fee6f 100644 --- a/src/commands/CommandFetch.java +++ b/src/commands/CommandFetch.java @@ -27,30 +27,30 @@ 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); + res.call("" + num); } } 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 03fb3ff..32dd44c 100644 --- a/src/commands/CommandGiveBeans.java +++ b/src/commands/CommandGiveBeans.java @@ -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 605ca45..0943511 100644 --- a/src/commands/CommandGuildRoleAdd.java +++ b/src/commands/CommandGuildRoleAdd.java @@ -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 556f447..f8e7b29 100644 --- a/src/commands/CommandGuildRoleAllowed.java +++ b/src/commands/CommandGuildRoleAllowed.java @@ -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 61dda19..7ac0c47 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 f6c21da..6e4c844 100644 --- a/src/commands/CommandGuildRoleNotAllowed.java +++ b/src/commands/CommandGuildRoleNotAllowed.java @@ -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 a5a5ba7..275af3a 100644 --- a/src/commands/CommandGuildRoleRemove.java +++ b/src/commands/CommandGuildRoleRemove.java @@ -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 1fb6574..8c0a5e9 100644 --- a/src/commands/CommandHelp.java +++ b/src/commands/CommandHelp.java @@ -27,7 +27,7 @@ public class CommandHelp extends Command help = LocStrings.stub("HelpDisplay"); } - res.Call(help); + res.call(help); } } \ No newline at end of file diff --git a/src/commands/CommandInfo.java b/src/commands/CommandInfo.java index 3a53874..80bafcf 100644 --- a/src/commands/CommandInfo.java +++ b/src/commands/CommandInfo.java @@ -20,6 +20,6 @@ public class CommandInfo extends Command @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 809ba1c..b6b576d 100644 --- a/src/commands/CommandInvite.java +++ b/src/commands/CommandInvite.java @@ -15,7 +15,7 @@ public class CommandInvite extends Command @Override 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"); } } \ No newline at end of file diff --git a/src/commands/CommandJDoodle.java b/src/commands/CommandJDoodle.java index b9b5b7a..6ba5149 100644 --- a/src/commands/CommandJDoodle.java +++ b/src/commands/CommandJDoodle.java @@ -19,10 +19,10 @@ public class CommandJDoodle extends Command { if(input.args.trim().length() < 1) { - res.Call(LocStrings.stub("JDoodleError")); + res.call(LocStrings.stub("JDoodleError")); return; } - res.Call(compiler.compileJava(input.args)); + res.call(compiler.compileJava(input.args)); } } diff --git a/src/commands/CommandLeaderboard.java b/src/commands/CommandLeaderboard.java index f20c921..2ed622e 100644 --- a/src/commands/CommandLeaderboard.java +++ b/src/commands/CommandLeaderboard.java @@ -94,6 +94,6 @@ public class CommandLeaderboard extends Command } // Write out embed result - res.CallEmbed(embed); + res.callEmbed(embed); } } diff --git a/src/commands/CommandMap.java b/src/commands/CommandMap.java index a0b88c5..575f7e9 100644 --- a/src/commands/CommandMap.java +++ b/src/commands/CommandMap.java @@ -60,7 +60,7 @@ public class CommandMap extends Command } catch(NumberFormatException e) { - res.Call(LocStrings.stub("MapInvalid")); + res.call(LocStrings.stub("MapInvalid")); return; } @@ -87,7 +87,7 @@ public class CommandMap extends Command body += "\n```"; // Send back the map - res.Call(header + body); + res.call(header + body); } // Verifies and appropriately caps input as necessary diff --git a/src/commands/CommandPing.java b/src/commands/CommandPing.java index d732ccf..a75e3e8 100644 --- a/src/commands/CommandPing.java +++ b/src/commands/CommandPing.java @@ -21,6 +21,6 @@ public class CommandPing extends Command @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 62b24f9..5d1d738 100644 --- a/src/commands/CommandPollManage.java +++ b/src/commands/CommandPollManage.java @@ -22,15 +22,15 @@ public class CommandPollManage extends Command switch(input.args.split(" ")[0].toLowerCase()) { case "start": - res.Call(guild.startPoll(input.args.substring(input.args.indexOf(' ')).trim())); + res.call(guild.startPoll(input.args.substring(input.args.indexOf(' ')).trim())); break; case "choice": - res.Call(guild.addChoiceToPoll(input.args.substring(input.args.indexOf(' ')).trim())); + res.call(guild.addChoiceToPoll(input.args.substring(input.args.indexOf(' ')).trim())); break; case "stop": - res.Call(guild.endPoll()); + res.call(guild.endPoll()); break; default: diff --git a/src/commands/CommandPollResults.java b/src/commands/CommandPollResults.java index e42ff94..b066d0d 100644 --- a/src/commands/CommandPollResults.java +++ b/src/commands/CommandPollResults.java @@ -31,6 +31,6 @@ public class CommandPollResults extends Command 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); + res.call(results); } } diff --git a/src/commands/CommandPollShow.java b/src/commands/CommandPollShow.java index cd332a3..6006dc1 100644 --- a/src/commands/CommandPollShow.java +++ b/src/commands/CommandPollShow.java @@ -15,7 +15,7 @@ public class CommandPollShow extends Command { if(!guild.polling) { - res.Call(LocStrings.stub("PollShowNoPoll")); + res.call(LocStrings.stub("PollShowNoPoll")); return; } String poll = String.format(LocStrings.stub("PollShowPoll"), guild.poll); @@ -25,6 +25,6 @@ public class CommandPollShow extends Command poll += (i+1) + ": `" + guild.choices.get(i).choice + "`\n"; } - res.Call(poll); + res.call(poll); } } diff --git a/src/commands/CommandPollVote.java b/src/commands/CommandPollVote.java index 2a9de19..17cfbde 100644 --- a/src/commands/CommandPollVote.java +++ b/src/commands/CommandPollVote.java @@ -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 55ac7ee..b4500f9 100644 --- a/src/commands/CommandRPEnd.java +++ b/src/commands/CommandRPEnd.java @@ -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 02a7bdc..2f46a65 100644 --- a/src/commands/CommandRPG.java +++ b/src/commands/CommandRPG.java @@ -32,7 +32,7 @@ public class CommandRPG extends Command if(input.args == null || input.args.length() == 0) { String output = getHelpText(); - res.Call(output); + res.call(output); return; } @@ -44,10 +44,10 @@ public class CommandRPG extends Command if(result == null) { - res.Call(LocStrings.stub("RPGInvalid")); + res.call(LocStrings.stub("RPGInvalid")); return; } - res.Call(result); + res.call(result); } } diff --git a/src/commands/CommandRPStart.java b/src/commands/CommandRPStart.java index 3e530bd..8ce235c 100644 --- a/src/commands/CommandRPStart.java +++ b/src/commands/CommandRPStart.java @@ -27,6 +27,6 @@ public class CommandRPStart extends Command } } - res.Call(RPManager.instance.newRP(channel, users)); + res.call(RPManager.instance.newRP(channel, users)); } } diff --git a/src/commands/CommandRaffleEnd.java b/src/commands/CommandRaffleEnd.java index 9da8b0f..804e3cf 100644 --- a/src/commands/CommandRaffleEnd.java +++ b/src/commands/CommandRaffleEnd.java @@ -22,11 +22,11 @@ public class CommandRaffleEnd extends Command { 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 8676693..c216650 100644 --- a/src/commands/CommandRaffleJoin.java +++ b/src/commands/CommandRaffleJoin.java @@ -22,11 +22,11 @@ public class CommandRaffleJoin extends Command { 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 888f2a7..3eefeb7 100644 --- a/src/commands/CommandRaffleSpin.java +++ b/src/commands/CommandRaffleSpin.java @@ -22,11 +22,11 @@ public class CommandRaffleSpin extends Command { 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 f29fd34..429c0d4 100644 --- a/src/commands/CommandRaffleStart.java +++ b/src/commands/CommandRaffleStart.java @@ -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 3ad142e..1ae6171 100644 --- a/src/commands/CommandRating.java +++ b/src/commands/CommandRating.java @@ -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 b569247..c7c83d1 100644 --- a/src/commands/CommandRole.java +++ b/src/commands/CommandRole.java @@ -16,13 +16,13 @@ public class CommandRole extends Command { 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 3525157..c76c850 100644 --- a/src/commands/CommandRoll.java +++ b/src/commands/CommandRoll.java @@ -23,11 +23,11 @@ public class CommandRoll extends Command { try { - res.Call(rollDice(input.args)); + res.call(rollDice(input.args)); } catch(Exception e) { - res.Call(LocStrings.stub("RollError")); + res.call(LocStrings.stub("RollError")); } } diff --git a/src/commands/CommandStats.java b/src/commands/CommandStats.java index 75c7fe2..dc4ff72 100644 --- a/src/commands/CommandStats.java +++ b/src/commands/CommandStats.java @@ -66,6 +66,6 @@ public class CommandStats extends Command + " Cached Users: " + userCount; out += "\n```"; - res.Call(out); + res.call(out); } } diff --git a/src/commands/CommandTradeBeans.java b/src/commands/CommandTradeBeans.java index e713ba9..a26fb7a 100644 --- a/src/commands/CommandTradeBeans.java +++ b/src/commands/CommandTradeBeans.java @@ -22,7 +22,7 @@ public class CommandTradeBeans extends Command { 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 fd1669e..403eb0e 100644 --- a/src/commands/CommandTweet.java +++ b/src/commands/CommandTweet.java @@ -18,9 +18,9 @@ public class CommandTweet extends Command { //TODO: Figure out how to pass pictures correctly try { - res.Call(tweet.tweet(input.args)); + 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 9483a23..15f706c 100644 --- a/src/commands/CommandWolfram.java +++ b/src/commands/CommandWolfram.java @@ -21,7 +21,7 @@ public class CommandWolfram extends Command 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/benchmark/BenchmarkCommandCompare.java b/src/commands/benchmark/BenchmarkCommandCompare.java index 182a335..1052091 100644 --- a/src/commands/benchmark/BenchmarkCommandCompare.java +++ b/src/commands/benchmark/BenchmarkCommandCompare.java @@ -10,7 +10,7 @@ import core.benchmark.BenchmarkManager; public class BenchmarkCommandCompare extends BenchmarkCommand { - public BenchmarkFormattable OnRun(BenchmarkManager manager, BenchmarkInput input) + public BenchmarkFormattable onRun(BenchmarkManager manager, BenchmarkInput input) { final String lineDelimiter = "\n"; String output = ""; @@ -24,7 +24,7 @@ public class BenchmarkCommandCompare extends BenchmarkCommand if(i != 0) output += lineDelimiter; - List entries = manager.FindModel(inputSplit[i]); + List entries = manager.findModel(inputSplit[i]); if(entries.size() < 1) output += "Couldn't find any models containing `" + inputSplit[i] + "`!"; diff --git a/src/commands/benchmark/BenchmarkCommandFind.java b/src/commands/benchmark/BenchmarkCommandFind.java index f0ac9e8..ab01624 100644 --- a/src/commands/benchmark/BenchmarkCommandFind.java +++ b/src/commands/benchmark/BenchmarkCommandFind.java @@ -9,12 +9,12 @@ public class BenchmarkCommandFind extends BenchmarkCommand private final String lineDelimiter = "\n"; private final int listMax = 30; - public BenchmarkFormattable OnRun(BenchmarkManager manager, BenchmarkInput input) + public BenchmarkFormattable onRun(BenchmarkManager manager, BenchmarkInput input) { String output = ""; String searchString = input.value.trim(); - List entries = manager.FindModel(searchString); + List entries = manager.findModel(searchString); if(entries.size() > 0) { diff --git a/src/commands/benchmark/BenchmarkCommandInfo.java b/src/commands/benchmark/BenchmarkCommandInfo.java index 2fb7dae..08f2af2 100644 --- a/src/commands/benchmark/BenchmarkCommandInfo.java +++ b/src/commands/benchmark/BenchmarkCommandInfo.java @@ -74,16 +74,16 @@ public class BenchmarkCommandInfo extends BenchmarkCommand } @Override - public BenchmarkFormattable OnRun(BenchmarkManager manager, BenchmarkInput input) + public BenchmarkFormattable onRun(BenchmarkManager manager, BenchmarkInput input) { String searchString = input.value.trim(); long start = System.currentTimeMillis(); - List entries = manager.FindModel(searchString); + List entries = manager.findModel(searchString); if(entries.size() < 1) return new BenchmarkFormattable("Couldn't find any models containing `" + searchString + "`!"); - List sortedEntries = manager.EvaluateLevenshteinDistance(entries, searchString); + List sortedEntries = manager.evaluateLevenshteinDistance(entries, searchString); BenchmarkEntry entry = sortedEntries.get(0); KittyEmbed embed = FormatInfoEmbed(entry); diff --git a/src/core/benchmark/BenchmarkCommand.java b/src/core/benchmark/BenchmarkCommand.java index 96a808e..3b04e59 100644 --- a/src/core/benchmark/BenchmarkCommand.java +++ b/src/core/benchmark/BenchmarkCommand.java @@ -6,5 +6,5 @@ public abstract class BenchmarkCommand { } // OVERRIDE ME - public abstract BenchmarkFormattable OnRun(BenchmarkManager manager, BenchmarkInput input); + public abstract BenchmarkFormattable onRun(BenchmarkManager manager, BenchmarkInput input); } diff --git a/src/core/benchmark/BenchmarkFormattable.java b/src/core/benchmark/BenchmarkFormattable.java index 7c75bfa..f2462b8 100644 --- a/src/core/benchmark/BenchmarkFormattable.java +++ b/src/core/benchmark/BenchmarkFormattable.java @@ -30,11 +30,11 @@ public class BenchmarkFormattable this.resString = null; } - public void Call(Response res) + public void call(Response res) { if(resEmbed == null) - res.Call(resString); + res.call(resString); else - res.CallEmbed(resEmbed); + res.callEmbed(resEmbed); } } diff --git a/src/core/benchmark/BenchmarkFramework.java b/src/core/benchmark/BenchmarkFramework.java index 4c12c6e..948f7f1 100644 --- a/src/core/benchmark/BenchmarkFramework.java +++ b/src/core/benchmark/BenchmarkFramework.java @@ -16,43 +16,43 @@ public class BenchmarkFramework this.benchmarkManager = new BenchmarkManager(); this.benchmarkCommand = new HashMap(); - RegisterCommand("find", new BenchmarkCommandFind()); - RegisterCommand("compare", new BenchmarkCommandCompare()); - RegisterCommand("info", new BenchmarkCommandInfo()); + registerCommand("find", new BenchmarkCommandFind()); + registerCommand("compare", new BenchmarkCommandCompare()); + registerCommand("info", new BenchmarkCommandInfo()); } // Runs a command if possible. - public BenchmarkFormattable Run(String args) + public BenchmarkFormattable run(String args) { BenchmarkInput input = new BenchmarkInput(args); - return ExecuteCommand(input.key, input); + return executeCommand(input.key, input); } - public void Update() + public void update() { synchronized(benchmarkManager) { - benchmarkManager.Update(); + benchmarkManager.update(); } } // Registers a command - private void RegisterCommand(String commandName, BenchmarkCommand command) + private void registerCommand(String commandName, BenchmarkCommand command) { commandName = commandName.toLowerCase(); if(benchmarkCommand.put(commandName, command) != null) - BenchmarkLog.Log("Multiple registration of a command with name '" + commandName + "'!"); + BenchmarkLog.log("Multiple registration of a command with name '" + commandName + "'!"); - BenchmarkLog.Log("Registered " + commandName); + BenchmarkLog.log("Registered " + commandName); } // Executes a command with the specified name, and provides it with some extra input data. - private BenchmarkFormattable ExecuteCommand(String name, BenchmarkInput input) + private BenchmarkFormattable executeCommand(String name, BenchmarkInput input) { BenchmarkCommand command = benchmarkCommand.get(name.toLowerCase()); if(command != null && benchmarkManager != null) - return command.OnRun(benchmarkManager, input); + return command.onRun(benchmarkManager, input); return null; } diff --git a/src/core/benchmark/BenchmarkLog.java b/src/core/benchmark/BenchmarkLog.java index e9c1f98..999b5a0 100644 --- a/src/core/benchmark/BenchmarkLog.java +++ b/src/core/benchmark/BenchmarkLog.java @@ -5,7 +5,7 @@ import utils.GlobalLog; //Logging shim public class BenchmarkLog { - public static void Log(String str) { GlobalLog.Log("[Benchmark] " + str); } - public static void Warn(String str) { GlobalLog.Warn("[Benchmark] " + str); } - public static void Error(String str) { GlobalLog.Error(" [Benchmark] " + str); } + public static void log(String str) { GlobalLog.Log("[Benchmark] " + str); } + public static void warn(String str) { GlobalLog.Warn("[Benchmark] " + str); } + public static void error(String str) { GlobalLog.Error(" [Benchmark] " + str); } } diff --git a/src/core/benchmark/BenchmarkManager.java b/src/core/benchmark/BenchmarkManager.java index dcf5612..466454f 100644 --- a/src/core/benchmark/BenchmarkManager.java +++ b/src/core/benchmark/BenchmarkManager.java @@ -33,13 +33,13 @@ public class BenchmarkManager directoryMonitor = new DirectoryMonitor(directory); needsUpdate = false; - RebuildLookup(); + rebuildLookup(); - BenchmarkLog.Log("Took " + (Instant.now().toEpochMilli() - start) + " ms to load " + raw.size() + " entries from " + directoryMonitor.GetCurrentFiles().size() + " file" + (raw.size() > 1 ? "s" : "")); + BenchmarkLog.log("Took " + (Instant.now().toEpochMilli() - start) + " ms to load " + raw.size() + " entries from " + directoryMonitor.GetCurrentFiles().size() + " file" + (raw.size() > 1 ? "s" : "")); } // Rebuilds the files being monitored - public void RebuildLookup() + public void rebuildLookup() { long start = Instant.now().toEpochMilli(); @@ -66,17 +66,17 @@ public class BenchmarkManager } else { - BenchmarkLog.Warn("No " + extension + " files where found in " + directory); + BenchmarkLog.warn("No " + extension + " files where found in " + directory); } } long end = Instant.now().toEpochMilli(); - BenchmarkLog.Log("Rebuilt data in " + (end - start) + "ms"); + BenchmarkLog.log("Rebuilt data in " + (end - start) + "ms"); } // Re-evaluates and re-orders the input list based on the Levenshtein distance of the // original search and the contents of the provided list of benchmark entries. - public List EvaluateLevenshteinDistance(List entries, String search) + public List evaluateLevenshteinDistance(List entries, String search) { // Populate cost list with heuristic results List> cost = new ArrayList>(); @@ -86,7 +86,7 @@ public class BenchmarkManager BenchmarkEntry entry = entries.get(i); String entryString = entry.brand + " " + entry.model; - int heuristic = LevenshteinHeuristic(entryString, search, bestSoFar); + int heuristic = levenshteinHeuristic(entryString, search, bestSoFar); if(heuristic < bestSoFar) bestSoFar = heuristic; @@ -120,7 +120,7 @@ public class BenchmarkManager // Returns cost based on distance of characters from string. This is a kinda sloppy way // to do it, but because I keep tabs on the best result so far, it could be much worse. // Still chucks a lot - a non-recursive result w/ memoization would be best but this will do. - private int LevenshteinHeuristic(String str1, String str2, int bestSoFar) + private int levenshteinHeuristic(String str1, String str2, int bestSoFar) { int cost; @@ -139,15 +139,15 @@ public class BenchmarkManager if(distance > bestSoFar) return distance; - int s1 = LevenshteinHeuristic(str1.substring(1), str2, bestSoFar) + 1; - int s2 = LevenshteinHeuristic(str1, str2.substring(1), bestSoFar) + 1; - int s3 = LevenshteinHeuristic(str1.substring(1), str2.substring(1), bestSoFar) + cost; + int s1 = levenshteinHeuristic(str1.substring(1), str2, bestSoFar) + 1; + int s2 = levenshteinHeuristic(str1, str2.substring(1), bestSoFar) + 1; + int s3 = levenshteinHeuristic(str1.substring(1), str2.substring(1), bestSoFar) + cost; return min(new int[] {s1, s2, s3 }); } // Search for a substring in the model name - public List FindModel(String modelSubstr) + public List findModel(String modelSubstr) { long start = Instant.now().toEpochMilli(); List matching = new ArrayList(); @@ -161,27 +161,27 @@ public class BenchmarkManager matching.add(e); } - BenchmarkLog.Log("Searched for '" + searchSubstr + "' for "+ (Instant.now().toEpochMilli() - start) + "ms and found " + matching.size() + " entries."); + BenchmarkLog.log("Searched for '" + searchSubstr + "' for "+ (Instant.now().toEpochMilli() - start) + "ms and found " + matching.size() + " entries."); return matching; } // Keeps tabs on any changes of the files. - public void Update() + public void update() { needsUpdate = false; - directoryMonitor.Update(this::OnRescan, this::OnRescan, this::OnRescan); + directoryMonitor.Update(this::onRescan, this::onRescan, this::onRescan); if(needsUpdate) - RebuildLookup(); + rebuildLookup(); } // When a file is changed, handle it. - private void OnRescan(MonitoredFile file) + private void onRescan(MonitoredFile file) { // For now, all we need is to note that something was adjusted. if(file.path.toString().contains(extension)) { - BenchmarkLog.Log("File status changed: " + file.path); + BenchmarkLog.log("File status changed: " + file.path); needsUpdate = true; } } diff --git a/src/dataStructures/Response.java b/src/dataStructures/Response.java index ab0fc03..c46a6db 100644 --- a/src/dataStructures/Response.java +++ b/src/dataStructures/Response.java @@ -30,7 +30,7 @@ public class Response } // Builds a nicely formatted embedded message based on information provided - public void CallEmbed(KittyEmbed embedInfo) + public void callEmbed(KittyEmbed embedInfo) { EmbedBuilder embed = new EmbedBuilder(); @@ -89,7 +89,7 @@ public class Response } // Queues a standard text-based message response to the channel that issued the command. - public void Call(String toRespondWith) + public void call(String toRespondWith) { GlobalLog.Log(LogFilter.Response, "Sending response: " + toRespondWith); if(toRespondWith.length() > discordMessageMax) diff --git a/src/main/Main.java b/src/main/Main.java index 3573590..2e9dfbc 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -106,7 +106,7 @@ public class Main extends ListenerAdapter } else { - response.Call(pluginOutput.get(i)); + response.call(pluginOutput.get(i)); } } }