diff --git a/assets/commands.config b/assets/commands.config new file mode 100644 index 0000000..60fa826 --- /dev/null +++ b/assets/commands.config @@ -0,0 +1,66 @@ +[CommandEnabler] +addguildrole=1 +allowedguildrole=1 +beans=1 +benchmark, bench=1 +bet=1 +bethistory=1 +blur=1 +boop=1 +buildhelp=1 +c++, g++, cplus, cpp=1 +catch=1 +charactercreate=1 +charactereditbio=1 +charactereditname=1 +characterediturl=1 +choose=1 +color, colour=1 +crouton=1 +dbflush=1 +dbstats=1 +defaultdance=1 +derp=1 +e621=1 +eightball, 8ball=1 +fetch=1 +givebeans=1 +guildroleadd=1 +guildroleallowed=1 +guildrolelist=1 +guildrolenotallowed=1 +guildroleremove=1 +help=1 +indicator=1 +info, about=1 +invite=1 +java, jdoodle=1 +kittyrole=1 +leaderboard=1 +map=1 +perish, thenperish=1 +ping=1 +poll=1 +raffleend=1 +rafflejoin=1 +rafflespin=1 +rafflestart=1 +rating=1 +remind=1 +results=1 +role=1 +roll=1 +rpend=1 +rpg=1 +rpstart=1 +searchcharacter=1 +showpoll=1 +shutdown=1 +stats=1 +teey=1 +tony, stark, dontfeelgood, dontfeelsogood=1 +tweet=1 +vote=1 +wolfram=1 +work=1 +yeet=1 diff --git a/assets/locCommands.config b/assets/locCommands.config new file mode 100644 index 0000000..10dd5fb --- /dev/null +++ b/assets/locCommands.config @@ -0,0 +1,66 @@ +[ObjectBuilderFactory] +indicator= +yeet= +guildroleremove= +bethistory= +benchmark, bench= +rating= +poll= +rafflespin= +charactereditURL= +bet= +guildrolelist= +stats= +catch= +color, colour= +guildroleadd= +results= +wolfram= +givebeans= +c++, g++, cplus, cpp= +work= +rpend= +java, jdoodle= +rafflejoin= +guildroleallowed= +leaderboard= +buildHelp= +dbflush= +shutdown= +boop= +tony, stark, dontfeelgood, dontfeelsogood=tony, stark, dontfeelgood, dontfeelsogood, snap +role= +raffleend= +ping= +charactereditbio= +roll= +kittyrole= +blur= +choose= +rpstart= +guildrolenotallowed=guildrolenotallowed, rolelistremove +remind= +derp= +perish, thenperish= +teey= +searchcharacter= +dbstats= +rafflestart= +beans= +eightball, 8ball= +vote= +map= +info, about= +e621= +showpoll= +rpg= +defaultdance= +tweet= +charactercreate= +help= +charactereditname= +fetch= +crouton= +invite= + + diff --git a/assets/locStrings.config b/assets/locStrings.config new file mode 100644 index 0000000..6cb9892 --- /dev/null +++ b/assets/locStrings.config @@ -0,0 +1,301 @@ +[CommandBenchmark] +BenchmarkInfo= +BenchmarkInvalid= + +[CommandBetHistory] +BetHistoryOutput= +BetHistoryInfo= + +[CommandPollManage] +PollManageInfo= + +[CommandGuildRoleNotAllowed] +GuildRoleNotAllowedFailure= +GuildRoleNotAllowedNoArgs= +GuildRoleNotAllowedSuccess= + +[CommandCatch] +CatchInfo= + +[CommandLeaderboard] +LeaderboardInfo= +LeaderboardTitle= + +[CommandGuildRoleList] +GuildRoleListOutput= +GuildRoleListEmpty= + +[CommandRoll] +RollError= +RollInfo= + +[CommandGuildRoleAllowed] +GuildRoleAllowedSuccess= +GuildRoleAllowedDuplicate= + +[CommandStats] +StatsInfo= + +[CommandRole] +RoleInfo= +RoleStandardResponse= +RoleError= +RoleChanged= +RoleNeededRole= + +[CommandJDoodle] +JDoodleInfo= +JDoodleError= + +[CommandChangeIndicator] +ChangeIndicatorInfo= +ChangeIndicatorError= +ChangeIndicatorChanged= + +[CommandPerish] +PerishInfo= + +[CommandTradeBeans] +TradeBeansNoTargetError= +TradeBeansSuccess= +TradeBeansStealingBeans= +TradeBeansInfo= +TradeBeansIntParseError= +TradeBeansNotEnoughError= + +[CommandPollVote] +PollVoteInfo= +PollVoteNotValidNumber= +PollVoteNoPoll= +PollVoteAlreadyVoted= +PollVoteNotValidVote= +PollVoteSuccess= + +[CommandShutdown] +ShutdownSafe= +ShutdownUnsafe= +ShutdownInfo= + +[CommandRaffleSpin] +RaffleSpinInfo= +RaffleSpinSuccess= +RaffleSpinFailure= + +[CommandRaffleEnd] +RaffleEndSuccess= +RaffleEndInfo= +RaffleEndFailure= + +[CommandCharacterSearch] +CharacterSearchNoCharacterFound= +CharacterSearchMultipleCharacterHeader= +CharacterSearchMultipleCharacter= +CharacterSearchOneCharacter= +CharacterSearchInfo= + +[CommandColor] +ColorNotSearchable= +ColorInfo= + +[CommandDoWork] +DoWorkInfo= +DoWorkFinished= + +[CommandRPStart] +RPStartInfo= + +[CommandBlurry] +BlurryInfo= + +[CommandRating] +RatingInfo= +RatingWarning= +RatingChanged= +RatingInvalid= + +[CommandDBStats] +DBStatsInfo= + +[CommandGiveBeans] +GiveBeansNoneMentioned= +GiveBeansSuccess= +GiveBeansInvalid= +GiveBeansInfo= + +[CommandPollShow] +PollShowInfo= +PollShowNoPoll= +PollShowPoll= +PollShowChoices= + +[CommandHelpBuilder] +HelpBuilderInfo= + +[CommandGuildRoleMain] +GuildRoleInfo= + +[CommandCharacterEditURL] +CharacterEditURLInfo= +CharacterEditURLNotValid= +CharacterEditURLSuccess= +CharacterEditURLNotAuth= + +[CommandRPG] +RPGInfo= +RPGInvalid= + +[CommandFetch] +FetchError= +FetchEat= +FetchInfo= +FetchCatchRun= +FetchRunAway= +FetchBringBack= +FetchBringBackWrong= +FetchStare= + +[CommandInfo] +InfoResponse= +InfoInfo= + +[CommandGuildRoleRemove] +GuildRoleRemoveNotAllowed= +GuildRoleRemoveFailure= +GuildRoleRemoveSuccess= + +[CommandWolfram] +WolframError= +WolframInfo= +WolframNoArgs= + +[CommandMap] +MapInfo= +MapInvalid= +MapVersion= +MapSeed= +MapWidth= +MapHeight= + +[CommandBeansShow] +BeansShowDisplay= +BeansShowMentioned= +BeansShowInfo= + +[CommandRaffleStart] +RaffleStartSuccess= +RaffleStartFailure= +RaffleStartInfo= + +[CommandHelp] +HelpInfo= +HelpDisplay= + +[CommandCharacterEditBio] +CharacterEditBioSuccess= +CharacterEditBioNotAuth= +CharacterEditBioInfo= +CharacterEditBioNotValid= + +[CommandCharacterEditName] +CharacterEditNameInfo= +CharacterEditNameNotValid= +CharacterEditNameSuccess= +CharacterEditNameNotAuth= + +[CommandTweet] +TweetInfo= +TweetError= + +[CommandColiru] +ColiruError= +ColiruInfo= + +[CommandStark] +StarkInfo= + +[CommandRemind] +RemindInfo= + +[CommandYeet] +YeetInfo= + +[CommandCrouton] +CroutonInfo= + +[CommandCharacterCreate] +CharacterCreateDuplicate= +CharacterCreateInfo= +CharacterCreateSuccess= +CharacterCreateNullInfo= + +[CommandTeey] +TeeyInfo= + +[CommandBetBeans] +BetBeansInfo= +BetBeansLowBet= +BetBeansNotValid= +BetBeansLose= +BetBeansNotEnough= +BetBeansWin= + +[CommandPollResults] +PollResultsResponse= +PollResultsInfo= + +[CommandRPEnd] +RPEndError= +RPEndInfo= +RPEndFileOut= + +[CommandBoop] +BoopPerson= +BoopInfo= +BoopStandard= +BoopMultiple= + +[CommandPing] +PingResponse= +PingInfo= + +[CommandChoose] +ChooseChoice= +ChooseOne= +ChooseInfo= + +[CommandEightBall] +EightBallYes4= +EightBallYes3= +EightBallYes2= +EightBallYes1= +EightBallYes8= +EightBallYes7= +EightBallYes6= +EightBallYes5= +EightBallMaybe1= +EightBallMaybe2= +EightBallMaybe3= +EightBallError= +EightBallMaybe4= +EightBallMaybe5= +EightBallInfo= +EightBallNo5= +EightBallNo3= +EightBallNo4= +EightBallNo1= +EightBallNo2= +EightBallYes9= +EightBallYes10= + +[CommandInvite] +InviteInfo= + +[CommandRaffleJoin] +RaffleJoinFailure= +RaffleJoinInfo= +RaffleJoinSuccess= + +[CommandDBFlush] +DBFlushInfo= + + diff --git a/src/commands/CommandGuildRoleAdd.java b/src/commands/CommandGuildRoleAdd.java deleted file mode 100644 index b4d212e..0000000 --- a/src/commands/CommandGuildRoleAdd.java +++ /dev/null @@ -1,40 +0,0 @@ -package commands; - -import core.Command; -import core.LocStrings; -import dataStructures.KittyChannel; -import dataStructures.KittyGuild; -import dataStructures.KittyRating; -import dataStructures.KittyRole; -import dataStructures.KittyUser; -import dataStructures.Response; -import dataStructures.UserInput; - -public class CommandGuildRoleAdd extends Command -{ - public CommandGuildRoleAdd(KittyRole level, KittyRating rating) { super(level, rating); } - - @Override - public String getHelpText() { return LocStrings.stub("GuildRoleAddInfo"); }; - - @Override - public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) - { - String role = input.args.split(" ")[0]; - if(guild.roleList.contains(role)) - { - if(guild.control.addRole(user.discordID, role)) - { - res.send(String.format(LocStrings.stub("GuildRoleAddSuccess"), role, user.name)); - } - else - { - res.send(String.format(LocStrings.stub("GuildRoleAddFailure"), role, user.name)); - } - } - else - { - res.send(String.format(LocStrings.stub("GuildRoleAddNotAllowed"), role)); - } - } -} \ No newline at end of file diff --git a/src/commands/CommandGuildRoleAllowed.java b/src/commands/CommandGuildRoleAllowed.java deleted file mode 100644 index cc40bb2..0000000 --- a/src/commands/CommandGuildRoleAllowed.java +++ /dev/null @@ -1,39 +0,0 @@ -package commands; - -import core.Command; -import core.LocStrings; -import dataStructures.KittyChannel; -import dataStructures.KittyGuild; -import dataStructures.KittyRating; -import dataStructures.KittyRole; -import dataStructures.KittyUser; -import dataStructures.Response; -import dataStructures.UserInput; - -public class CommandGuildRoleAllowed extends Command -{ - public CommandGuildRoleAllowed(KittyRole level, KittyRating rating) { super(level, rating); } - - @Override - public String getHelpText() { return LocStrings.stub("GuildRoleAllowedInfo"); } - - @Override - public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) - { - String [] roles = input.args.split(","); - String role; - for(int i = 0; i < roles.length; i++) - { - role = roles[i].trim(); - if(guild.roleList.contains(role)) - { - res.send(LocStrings.stub("GuildRoleAllowedDuplicate")); - } - else - { - guild.roleList.add(role); - res.send(String.format(LocStrings.stub("GuildRoleAllowedSuccess"), role)); - } - } - } -} \ No newline at end of file diff --git a/src/commands/CommandGuildRoleList.java b/src/commands/CommandGuildRoleList.java deleted file mode 100644 index f23a30e..0000000 --- a/src/commands/CommandGuildRoleList.java +++ /dev/null @@ -1,31 +0,0 @@ -package commands; - -import core.Command; -import core.LocStrings; -import dataStructures.*; -import network.NetworkColiru; - -public class CommandGuildRoleList extends Command -{ - NetworkColiru compiler = new NetworkColiru(); - - public CommandGuildRoleList(KittyRole level, KittyRating rating) { super(level, rating);} - - @Override - public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) - { - String roles = ""; - if(guild.roleList.isEmpty()) - { - res.send(String.format(LocStrings.stub("GuildRoleListEmpty"))); - return; - } - for(int i = 0; i < guild.roleList.size(); i++) - { - if(i > 0) - roles += " and "; - roles += guild.roleList.get(i); - } - res.send(String.format(LocStrings.stub("GuildRoleListOutput"), roles)); - } -} \ No newline at end of file diff --git a/src/commands/CommandGuildRoleNotAllowed.java b/src/commands/CommandGuildRoleNotAllowed.java deleted file mode 100644 index d95c440..0000000 --- a/src/commands/CommandGuildRoleNotAllowed.java +++ /dev/null @@ -1,39 +0,0 @@ -package commands; - -import core.Command; -import core.LocStrings; -import dataStructures.KittyChannel; -import dataStructures.KittyGuild; -import dataStructures.KittyRating; -import dataStructures.KittyRole; -import dataStructures.KittyUser; -import dataStructures.Response; -import dataStructures.UserInput; - -public class CommandGuildRoleNotAllowed extends Command -{ - public CommandGuildRoleNotAllowed(KittyRole level, KittyRating rating) { super(level, rating); } - - @Override - public String getHelpText() { return LocStrings.stub("GuildRoleNotAllowedInfo"); } - - @Override - public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) - { - String [] roles = input.args.split(","); - String role; - for(int i = 0; i < roles.length; i++) - { - role = roles[i].trim(); - if(guild.roleList.contains(role)) - { - guild.roleList.remove(role); - res.send(LocStrings.stub("GuildRoleNotAllowedSuccess")); - } - else - { - res.send(String.format(LocStrings.stub("GuildRoleNotAllowedFailure"), role)); - } - } - } -} \ No newline at end of file diff --git a/src/commands/CommandGuildRoleRemove.java b/src/commands/CommandGuildRoleRemove.java deleted file mode 100644 index 32ab8e6..0000000 --- a/src/commands/CommandGuildRoleRemove.java +++ /dev/null @@ -1,40 +0,0 @@ -package commands; - -import core.Command; -import core.LocStrings; -import dataStructures.KittyChannel; -import dataStructures.KittyGuild; -import dataStructures.KittyRating; -import dataStructures.KittyRole; -import dataStructures.KittyUser; -import dataStructures.Response; -import dataStructures.UserInput; - -public class CommandGuildRoleRemove extends Command -{ - public CommandGuildRoleRemove(KittyRole level, KittyRating rating) { super(level, rating); } - - @Override - public String getHelpText() { return LocStrings.stub("GuildRoleRemoveInfo"); }; - - @Override - public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) - { - String role = input.args.split(" ")[0]; - if(guild.roleList.contains(role)) - { - if(guild.control.removeRole(user.discordID, role)) - { - res.send(String.format(LocStrings.stub("GuildRoleRemoveSuccess"), role, user.name)); - } - else - { - res.send(String.format(LocStrings.stub("GuildRoleRemoveFailure"), role, user.name)); - } - } - else - { - res.send(String.format(LocStrings.stub("GuildRoleRemoveNotAllowed"), role)); - } - } -} \ No newline at end of file diff --git a/src/commands/CommandBeansShow.java b/src/commands/general/CommandBeansShow.java similarity index 93% rename from src/commands/CommandBeansShow.java rename to src/commands/general/CommandBeansShow.java index 8f25af7..f87b862 100644 --- a/src/commands/CommandBeansShow.java +++ b/src/commands/general/CommandBeansShow.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandBenchmark.java b/src/commands/general/CommandBenchmark.java similarity index 97% rename from src/commands/CommandBenchmark.java rename to src/commands/general/CommandBenchmark.java index bd66977..eca0f4a 100644 --- a/src/commands/CommandBenchmark.java +++ b/src/commands/general/CommandBenchmark.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandBetBeans.java b/src/commands/general/CommandBetBeans.java similarity index 93% rename from src/commands/CommandBetBeans.java rename to src/commands/general/CommandBetBeans.java index 19618a6..25e0eb9 100644 --- a/src/commands/CommandBetBeans.java +++ b/src/commands/general/CommandBetBeans.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.util.Random; diff --git a/src/commands/CommandBetHistory.java b/src/commands/general/CommandBetHistory.java similarity index 96% rename from src/commands/CommandBetHistory.java rename to src/commands/general/CommandBetHistory.java index 0f7b541..0e7a872 100644 --- a/src/commands/CommandBetHistory.java +++ b/src/commands/general/CommandBetHistory.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandBlurry.java b/src/commands/general/CommandBlurry.java similarity index 96% rename from src/commands/CommandBlurry.java rename to src/commands/general/CommandBlurry.java index 221cc80..145510e 100644 --- a/src/commands/CommandBlurry.java +++ b/src/commands/general/CommandBlurry.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.awt.Color; import java.awt.image.BufferedImage; diff --git a/src/commands/CommandBoop.java b/src/commands/general/CommandBoop.java similarity index 98% rename from src/commands/CommandBoop.java rename to src/commands/general/CommandBoop.java index fc4a1c3..cb9104b 100644 --- a/src/commands/CommandBoop.java +++ b/src/commands/general/CommandBoop.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.*; import dataStructures.KittyChannel; diff --git a/src/commands/CommandCatch.java b/src/commands/general/CommandCatch.java similarity index 98% rename from src/commands/CommandCatch.java rename to src/commands/general/CommandCatch.java index ceaa01d..394bee6 100644 --- a/src/commands/CommandCatch.java +++ b/src/commands/general/CommandCatch.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.io.File; import java.io.IOException; diff --git a/src/commands/CommandChangeIndicator.java b/src/commands/general/CommandChangeIndicator.java similarity index 93% rename from src/commands/CommandChangeIndicator.java rename to src/commands/general/CommandChangeIndicator.java index e3d73e8..f26ca52 100644 --- a/src/commands/CommandChangeIndicator.java +++ b/src/commands/general/CommandChangeIndicator.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandCharacterCreate.java b/src/commands/general/CommandCharacterCreate.java similarity index 97% rename from src/commands/CommandCharacterCreate.java rename to src/commands/general/CommandCharacterCreate.java index 0933ed8..fffcf96 100644 --- a/src/commands/CommandCharacterCreate.java +++ b/src/commands/general/CommandCharacterCreate.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.CharacterManager; import core.Command; diff --git a/src/commands/CommandCharacterEditBio.java b/src/commands/general/CommandCharacterEditBio.java similarity index 97% rename from src/commands/CommandCharacterEditBio.java rename to src/commands/general/CommandCharacterEditBio.java index 4d42579..80eb8b8 100644 --- a/src/commands/CommandCharacterEditBio.java +++ b/src/commands/general/CommandCharacterEditBio.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.CharacterManager; import core.Command; diff --git a/src/commands/CommandCharacterEditName.java b/src/commands/general/CommandCharacterEditName.java similarity index 97% rename from src/commands/CommandCharacterEditName.java rename to src/commands/general/CommandCharacterEditName.java index 7382331..e60b374 100644 --- a/src/commands/CommandCharacterEditName.java +++ b/src/commands/general/CommandCharacterEditName.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.CharacterManager; import core.Command; diff --git a/src/commands/CommandCharacterEditURL.java b/src/commands/general/CommandCharacterEditURL.java similarity index 97% rename from src/commands/CommandCharacterEditURL.java rename to src/commands/general/CommandCharacterEditURL.java index 39a8c5c..697f42a 100644 --- a/src/commands/CommandCharacterEditURL.java +++ b/src/commands/general/CommandCharacterEditURL.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.CharacterManager; import core.Command; diff --git a/src/commands/CommandCharacterSearch.java b/src/commands/general/CommandCharacterSearch.java similarity index 98% rename from src/commands/CommandCharacterSearch.java rename to src/commands/general/CommandCharacterSearch.java index 5cabef0..173b5f5 100644 --- a/src/commands/CommandCharacterSearch.java +++ b/src/commands/general/CommandCharacterSearch.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.util.ArrayList; diff --git a/src/commands/CommandChoose.java b/src/commands/general/CommandChoose.java similarity index 93% rename from src/commands/CommandChoose.java rename to src/commands/general/CommandChoose.java index bb71dd4..7fc258e 100644 --- a/src/commands/CommandChoose.java +++ b/src/commands/general/CommandChoose.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.*; import dataStructures.KittyChannel; diff --git a/src/commands/CommandColiru.java b/src/commands/general/CommandColiru.java similarity index 92% rename from src/commands/CommandColiru.java rename to src/commands/general/CommandColiru.java index 9dc39c1..e2a2ad1 100644 --- a/src/commands/CommandColiru.java +++ b/src/commands/general/CommandColiru.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandColor.java b/src/commands/general/CommandColor.java similarity index 99% rename from src/commands/CommandColor.java rename to src/commands/general/CommandColor.java index a4c2059..d159bc0 100644 --- a/src/commands/CommandColor.java +++ b/src/commands/general/CommandColor.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.awt.Color; import java.awt.Graphics2D; diff --git a/src/commands/CommandCrouton.java b/src/commands/general/CommandCrouton.java similarity index 97% rename from src/commands/CommandCrouton.java rename to src/commands/general/CommandCrouton.java index 7552b87..f25c81f 100644 --- a/src/commands/CommandCrouton.java +++ b/src/commands/general/CommandCrouton.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.awt.Color; diff --git a/src/commands/CommandDBFlush.java b/src/commands/general/CommandDBFlush.java similarity index 97% rename from src/commands/CommandDBFlush.java rename to src/commands/general/CommandDBFlush.java index bfdcaa9..9af292d 100644 --- a/src/commands/CommandDBFlush.java +++ b/src/commands/general/CommandDBFlush.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.Constants; diff --git a/src/commands/CommandDBStats.java b/src/commands/general/CommandDBStats.java similarity index 97% rename from src/commands/CommandDBStats.java rename to src/commands/general/CommandDBStats.java index 4e6e4cd..0ba3c51 100644 --- a/src/commands/CommandDBStats.java +++ b/src/commands/general/CommandDBStats.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/src/commands/CommandDoWork.java b/src/commands/general/CommandDoWork.java similarity index 97% rename from src/commands/CommandDoWork.java rename to src/commands/general/CommandDoWork.java index 1cbc063..734ff3f 100644 --- a/src/commands/CommandDoWork.java +++ b/src/commands/general/CommandDoWork.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.*; import dataStructures.KittyChannel; diff --git a/src/commands/CommandEightBall.java b/src/commands/general/CommandEightBall.java similarity index 94% rename from src/commands/CommandEightBall.java rename to src/commands/general/CommandEightBall.java index 2b97f79..f902f32 100644 --- a/src/commands/CommandEightBall.java +++ b/src/commands/general/CommandEightBall.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandFetch.java b/src/commands/general/CommandFetch.java similarity index 95% rename from src/commands/CommandFetch.java rename to src/commands/general/CommandFetch.java index 29c578a..0834467 100644 --- a/src/commands/CommandFetch.java +++ b/src/commands/general/CommandFetch.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandGiveBeans.java b/src/commands/general/CommandGiveBeans.java similarity index 94% rename from src/commands/CommandGiveBeans.java rename to src/commands/general/CommandGiveBeans.java index 51f55bb..d17d005 100644 --- a/src/commands/CommandGiveBeans.java +++ b/src/commands/general/CommandGiveBeans.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandHelp.java b/src/commands/general/CommandHelp.java similarity index 93% rename from src/commands/CommandHelp.java rename to src/commands/general/CommandHelp.java index 41d33ec..7408040 100644 --- a/src/commands/CommandHelp.java +++ b/src/commands/general/CommandHelp.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.*; import dataStructures.KittyChannel; diff --git a/src/commands/CommandHelpBuilder.java b/src/commands/general/CommandHelpBuilder.java similarity index 99% rename from src/commands/CommandHelpBuilder.java rename to src/commands/general/CommandHelpBuilder.java index 85c46f5..4f8e0c7 100644 --- a/src/commands/CommandHelpBuilder.java +++ b/src/commands/general/CommandHelpBuilder.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/commands/CommandInfo.java b/src/commands/general/CommandInfo.java similarity index 92% rename from src/commands/CommandInfo.java rename to src/commands/general/CommandInfo.java index 8869203..a784274 100644 --- a/src/commands/CommandInfo.java +++ b/src/commands/general/CommandInfo.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandInvite.java b/src/commands/general/CommandInvite.java similarity index 92% rename from src/commands/CommandInvite.java rename to src/commands/general/CommandInvite.java index efb2f71..a94587b 100644 --- a/src/commands/CommandInvite.java +++ b/src/commands/general/CommandInvite.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandJDoodle.java b/src/commands/general/CommandJDoodle.java similarity index 92% rename from src/commands/CommandJDoodle.java rename to src/commands/general/CommandJDoodle.java index 67165f0..7d44a23 100644 --- a/src/commands/CommandJDoodle.java +++ b/src/commands/general/CommandJDoodle.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandLeaderboard.java b/src/commands/general/CommandLeaderboard.java similarity index 99% rename from src/commands/CommandLeaderboard.java rename to src/commands/general/CommandLeaderboard.java index 8b58323..3d5c54d 100644 --- a/src/commands/CommandLeaderboard.java +++ b/src/commands/general/CommandLeaderboard.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.util.ArrayList; import java.util.List; diff --git a/src/commands/CommandMap.java b/src/commands/general/CommandMap.java similarity index 99% rename from src/commands/CommandMap.java rename to src/commands/general/CommandMap.java index 0edf9de..cadd84f 100644 --- a/src/commands/CommandMap.java +++ b/src/commands/general/CommandMap.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.util.Random; diff --git a/src/commands/CommandPerish.java b/src/commands/general/CommandPerish.java similarity index 98% rename from src/commands/CommandPerish.java rename to src/commands/general/CommandPerish.java index d372510..74d426c 100644 --- a/src/commands/CommandPerish.java +++ b/src/commands/general/CommandPerish.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.awt.Color; import java.awt.image.BufferedImage; diff --git a/src/commands/CommandPing.java b/src/commands/general/CommandPing.java similarity index 96% rename from src/commands/CommandPing.java rename to src/commands/general/CommandPing.java index e5f8d62..ed155e6 100644 --- a/src/commands/CommandPing.java +++ b/src/commands/general/CommandPing.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.*; import dataStructures.KittyChannel; diff --git a/src/commands/CommandPollManage.java b/src/commands/general/CommandPollManage.java similarity index 93% rename from src/commands/CommandPollManage.java rename to src/commands/general/CommandPollManage.java index 5457a1b..a1ecd32 100644 --- a/src/commands/CommandPollManage.java +++ b/src/commands/general/CommandPollManage.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.*; import dataStructures.KittyChannel; diff --git a/src/commands/CommandPollResults.java b/src/commands/general/CommandPollResults.java similarity index 93% rename from src/commands/CommandPollResults.java rename to src/commands/general/CommandPollResults.java index 638bb81..016439b 100644 --- a/src/commands/CommandPollResults.java +++ b/src/commands/general/CommandPollResults.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.util.ArrayList; diff --git a/src/commands/CommandPollShow.java b/src/commands/general/CommandPollShow.java similarity index 92% rename from src/commands/CommandPollShow.java rename to src/commands/general/CommandPollShow.java index c92ab2d..bb2d277 100644 --- a/src/commands/CommandPollShow.java +++ b/src/commands/general/CommandPollShow.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.*; import dataStructures.*; diff --git a/src/commands/CommandPollVote.java b/src/commands/general/CommandPollVote.java similarity index 93% rename from src/commands/CommandPollVote.java rename to src/commands/general/CommandPollVote.java index b3012f1..af37b14 100644 --- a/src/commands/CommandPollVote.java +++ b/src/commands/general/CommandPollVote.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.*; import dataStructures.*; diff --git a/src/commands/CommandRPEnd.java b/src/commands/general/CommandRPEnd.java similarity index 93% rename from src/commands/CommandRPEnd.java rename to src/commands/general/CommandRPEnd.java index 355b691..e3da256 100644 --- a/src/commands/CommandRPEnd.java +++ b/src/commands/general/CommandRPEnd.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/commands/CommandRPG.java b/src/commands/general/CommandRPG.java similarity index 97% rename from src/commands/CommandRPG.java rename to src/commands/general/CommandRPG.java index 6230dc0..8f62d7d 100644 --- a/src/commands/CommandRPG.java +++ b/src/commands/general/CommandRPG.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandRPStart.java b/src/commands/general/CommandRPStart.java similarity index 92% rename from src/commands/CommandRPStart.java rename to src/commands/general/CommandRPStart.java index 866b6f8..f0794f1 100644 --- a/src/commands/CommandRPStart.java +++ b/src/commands/general/CommandRPStart.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.util.ArrayList; diff --git a/src/commands/CommandRaffleEnd.java b/src/commands/general/CommandRaffleEnd.java similarity index 96% rename from src/commands/CommandRaffleEnd.java rename to src/commands/general/CommandRaffleEnd.java index 735c604..bc89124 100644 --- a/src/commands/CommandRaffleEnd.java +++ b/src/commands/general/CommandRaffleEnd.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandRaffleJoin.java b/src/commands/general/CommandRaffleJoin.java similarity index 96% rename from src/commands/CommandRaffleJoin.java rename to src/commands/general/CommandRaffleJoin.java index 0b6a78f..3003a8e 100644 --- a/src/commands/CommandRaffleJoin.java +++ b/src/commands/general/CommandRaffleJoin.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandRaffleSpin.java b/src/commands/general/CommandRaffleSpin.java similarity index 96% rename from src/commands/CommandRaffleSpin.java rename to src/commands/general/CommandRaffleSpin.java index 3889252..ff6111d 100644 --- a/src/commands/CommandRaffleSpin.java +++ b/src/commands/general/CommandRaffleSpin.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandRaffleStart.java b/src/commands/general/CommandRaffleStart.java similarity index 97% rename from src/commands/CommandRaffleStart.java rename to src/commands/general/CommandRaffleStart.java index 57468a3..0c72142 100644 --- a/src/commands/CommandRaffleStart.java +++ b/src/commands/general/CommandRaffleStart.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandRating.java b/src/commands/general/CommandRating.java similarity index 98% rename from src/commands/CommandRating.java rename to src/commands/general/CommandRating.java index 6947e77..19be0c2 100644 --- a/src/commands/CommandRating.java +++ b/src/commands/general/CommandRating.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/general/CommandRemind.java b/src/commands/general/CommandRemind.java new file mode 100644 index 0000000..156e8dd --- /dev/null +++ b/src/commands/general/CommandRemind.java @@ -0,0 +1,40 @@ +package commands.general; + +import core.Command; +import core.LocStrings; +import dataStructures.*; + +public class CommandRemind extends Command +{ +public CommandRemind(KittyRole level, KittyRating rating) { super(level, rating); } + + @Override + public String getHelpText() { return LocStrings.stub("RemindInfo"); }; + + @Override + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + { + long time; + try + { + time = Long.parseLong(input.args.split(" ")[0]); + } + catch(Exception e) + { + res.send("That's not a valid time"); + return; + } + + res.send("Ok! I'll remind you!"); + + try + { + Thread.sleep(time * 1000 * 60); + res.send("<@" + user.discordID + "> don't forget: " + input.args.substring(input.args.indexOf(" "))); + } + catch (InterruptedException e) + { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/src/commands/CommandRole.java b/src/commands/general/CommandRole.java similarity index 94% rename from src/commands/CommandRole.java rename to src/commands/general/CommandRole.java index 1abee3a..ca4c742 100644 --- a/src/commands/CommandRole.java +++ b/src/commands/general/CommandRole.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandRoll.java b/src/commands/general/CommandRoll.java similarity index 94% rename from src/commands/CommandRoll.java rename to src/commands/general/CommandRoll.java index 046c2c0..30c9d31 100644 --- a/src/commands/CommandRoll.java +++ b/src/commands/general/CommandRoll.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.util.Stack; diff --git a/src/commands/CommandShutdown.java b/src/commands/general/CommandShutdown.java similarity index 98% rename from src/commands/CommandShutdown.java rename to src/commands/general/CommandShutdown.java index b6de2ea..beb901d 100644 --- a/src/commands/CommandShutdown.java +++ b/src/commands/general/CommandShutdown.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.DatabaseManager; diff --git a/src/commands/CommandStark.java b/src/commands/general/CommandStark.java similarity index 94% rename from src/commands/CommandStark.java rename to src/commands/general/CommandStark.java index 9795b6e..c412adc 100644 --- a/src/commands/CommandStark.java +++ b/src/commands/general/CommandStark.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.awt.Color; import java.awt.image.BufferedImage; diff --git a/src/commands/CommandStats.java b/src/commands/general/CommandStats.java similarity index 99% rename from src/commands/CommandStats.java rename to src/commands/general/CommandStats.java index eeaa4ac..b6aa642 100644 --- a/src/commands/CommandStats.java +++ b/src/commands/general/CommandStats.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandTeey.java b/src/commands/general/CommandTeey.java similarity index 98% rename from src/commands/CommandTeey.java rename to src/commands/general/CommandTeey.java index 0bcd7b9..5c5b924 100644 --- a/src/commands/CommandTeey.java +++ b/src/commands/general/CommandTeey.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.io.File; import java.io.IOException; diff --git a/src/commands/CommandTradeBeans.java b/src/commands/general/CommandTradeBeans.java similarity index 98% rename from src/commands/CommandTradeBeans.java rename to src/commands/general/CommandTradeBeans.java index efb7627..5829c0e 100644 --- a/src/commands/CommandTradeBeans.java +++ b/src/commands/general/CommandTradeBeans.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandTweet.java b/src/commands/general/CommandTweet.java similarity index 92% rename from src/commands/CommandTweet.java rename to src/commands/general/CommandTweet.java index 5334900..6a16e9b 100644 --- a/src/commands/CommandTweet.java +++ b/src/commands/general/CommandTweet.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import core.Command; import core.LocStrings; diff --git a/src/commands/CommandWolfram.java b/src/commands/general/CommandWolfram.java similarity index 93% rename from src/commands/CommandWolfram.java rename to src/commands/general/CommandWolfram.java index ee341cc..e6a63a5 100644 --- a/src/commands/CommandWolfram.java +++ b/src/commands/general/CommandWolfram.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.io.File; import java.io.IOException; diff --git a/src/commands/CommandYeet.java b/src/commands/general/CommandYeet.java similarity index 98% rename from src/commands/CommandYeet.java rename to src/commands/general/CommandYeet.java index 7bcaf2b..cc9f56d 100644 --- a/src/commands/CommandYeet.java +++ b/src/commands/general/CommandYeet.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.io.File; import java.io.IOException; diff --git a/src/commands/guildrole/CommandGuildRoleAdd.java b/src/commands/guildrole/CommandGuildRoleAdd.java new file mode 100644 index 0000000..ed332e3 --- /dev/null +++ b/src/commands/guildrole/CommandGuildRoleAdd.java @@ -0,0 +1,36 @@ +package commands.guildrole; + +import core.SubCommand; +import core.SubCommandFormattable; +import dataStructures.KittyChannel; +import dataStructures.KittyGuild; +import dataStructures.KittyRating; +import dataStructures.KittyRole; +import dataStructures.KittyUser; + +public class CommandGuildRoleAdd extends SubCommand +{ + public CommandGuildRoleAdd(KittyRole level, KittyRating rating) { super(level, rating); } + + @Override + public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input) + { + String role = input.split(" ")[0]; + if(guild.roleList.contains(role)) + { + if(guild.control.addRole(user.discordID, role)) + { + return new SubCommandFormattable("ADDED RIN YOU NEED TO FIX THIS"); + } + else + { + return new SubCommandFormattable("FAILED RIN YOU NEED TO FIX THIS TOO"); + } + } + else + { + return new SubCommandFormattable("NOT ALLOWED FIX THIS ONE TOO SNEP FACE"); + } + } + +} \ No newline at end of file diff --git a/src/commands/guildrole/CommandGuildRoleAllowed.java b/src/commands/guildrole/CommandGuildRoleAllowed.java new file mode 100644 index 0000000..f1833da --- /dev/null +++ b/src/commands/guildrole/CommandGuildRoleAllowed.java @@ -0,0 +1,37 @@ +package commands.guildrole; + +import core.LocStrings; +import core.SubCommand; +import core.SubCommandFormattable; +import dataStructures.KittyChannel; +import dataStructures.KittyGuild; +import dataStructures.KittyRating; +import dataStructures.KittyRole; +import dataStructures.KittyUser; + +public class CommandGuildRoleAllowed extends SubCommand +{ + public CommandGuildRoleAllowed(KittyRole level, KittyRating rating) { super(level, rating); } + + @Override + public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input) + { + String [] roles = input.split(","); + String role; + String formatted = ""; + for(int i = 0; i < roles.length; i++) + { + role = roles[i].trim(); + if(guild.roleList.contains(role)) + { + formatted += String.format(LocStrings.stub("GuildRoleAllowedDuplicate"), role); + } + else + { + guild.roleList.add(role); + formatted += (String.format(LocStrings.stub("GuildRoleAllowedSuccess"), role)); + } + } + return new SubCommandFormattable(formatted); + } +} \ No newline at end of file diff --git a/src/commands/guildrole/CommandGuildRoleList.java b/src/commands/guildrole/CommandGuildRoleList.java new file mode 100644 index 0000000..7517fb4 --- /dev/null +++ b/src/commands/guildrole/CommandGuildRoleList.java @@ -0,0 +1,33 @@ +package commands.guildrole; + +import core.LocStrings; +import core.SubCommand; +import core.SubCommandFormattable; +import dataStructures.KittyChannel; +import dataStructures.KittyGuild; +import dataStructures.KittyRating; +import dataStructures.KittyRole; +import dataStructures.KittyUser; + +public class CommandGuildRoleList extends SubCommand +{ + + public CommandGuildRoleList(KittyRole level, KittyRating rating) { super(level, rating);} + + @Override + public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input) + { + String roles = ""; + if(guild.roleList.isEmpty()) + { + return new SubCommandFormattable(String.format(LocStrings.stub("GuildRoleListEmpty"))); + } + for(int i = 0; i < guild.roleList.size(); i++) + { + if(i > 0) + roles += "\n"; + roles += guild.roleList.get(i); + } + return new SubCommandFormattable(String.format(LocStrings.stub("GuildRoleListOutput"), roles)); + } +} \ No newline at end of file diff --git a/src/commands/guildrole/CommandGuildRoleMain.java b/src/commands/guildrole/CommandGuildRoleMain.java new file mode 100644 index 0000000..2210aa4 --- /dev/null +++ b/src/commands/guildrole/CommandGuildRoleMain.java @@ -0,0 +1,37 @@ +package commands.guildrole; + +import core.Command; +import core.LocStrings; +import core.SubCommandFramework; +import dataStructures.KittyChannel; +import dataStructures.KittyGuild; +import dataStructures.KittyRating; +import dataStructures.KittyRole; +import dataStructures.KittyUser; +import dataStructures.Response; +import dataStructures.UserInput; + +public class CommandGuildRoleMain extends Command +{ + SubCommandFramework framework = new SubCommandFramework(); + public CommandGuildRoleMain(KittyRole level, KittyRating rating) + { + super(level, rating); + framework.addCommand("add", new CommandGuildRoleAdd (KittyRole.General, KittyRating.Safe)); + framework.addCommand("remove", new CommandGuildRoleRemove(KittyRole.General, KittyRating.Safe)); + framework.addCommand("allowed", new CommandGuildRoleAllowed(KittyRole.Admin, KittyRating.Safe)); + framework.addCommand("unallowed", new CommandGuildRoleNotAllowed(KittyRole.Admin, KittyRating.Safe)); + } + + @Override + public String getHelpText() { return LocStrings.stub("GuildRoleInfo"); } + + + + + @Override + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + { + framework.run(guild, channel, user, input.args).Call(res); + } +} diff --git a/src/commands/guildrole/CommandGuildRoleNotAllowed.java b/src/commands/guildrole/CommandGuildRoleNotAllowed.java new file mode 100644 index 0000000..da48d0b --- /dev/null +++ b/src/commands/guildrole/CommandGuildRoleNotAllowed.java @@ -0,0 +1,35 @@ +package commands.guildrole; + +import core.LocStrings; +import core.SubCommand; +import core.SubCommandFormattable; +import dataStructures.KittyChannel; +import dataStructures.KittyGuild; +import dataStructures.KittyRating; +import dataStructures.KittyRole; +import dataStructures.KittyUser; + +public class CommandGuildRoleNotAllowed extends SubCommand +{ + public CommandGuildRoleNotAllowed(KittyRole level, KittyRating rating) { super(level, rating); } + + @Override + public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input) + { + input = input.toLowerCase(); + String [] roles = input.split(","); + for(String role:roles) + { + if(guild.roleList.contains(role.trim())) + { + guild.roleList.remove(role); + return new SubCommandFormattable(LocStrings.stub("GuildRoleNotAllowedSuccess")); + } + else + { + return new SubCommandFormattable(String.format(LocStrings.stub("GuildRoleNotAllowedFailure"), role)); + } + } + return new SubCommandFormattable(String.format(LocStrings.stub("GuildRoleNotAllowedNoArgs"))); + } +} \ No newline at end of file diff --git a/src/commands/guildrole/CommandGuildRoleRemove.java b/src/commands/guildrole/CommandGuildRoleRemove.java new file mode 100644 index 0000000..3372a09 --- /dev/null +++ b/src/commands/guildrole/CommandGuildRoleRemove.java @@ -0,0 +1,35 @@ +package commands.guildrole; + +import core.LocStrings; +import core.SubCommand; +import core.SubCommandFormattable; +import dataStructures.*; + +public class CommandGuildRoleRemove extends SubCommand +{ + public CommandGuildRoleRemove(KittyRole level, KittyRating rating) { super(level, rating); } + + @Override + public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input) + { + String role = input.split(" ")[0]; + String formatted = ""; + if(guild.roleList.contains(role)) + { + if(guild.control.removeRole(user.discordID, role)) + { + formatted += (String.format(LocStrings.stub("GuildRoleRemoveSuccess"), role, user.name)); + } + else + { + formatted += (String.format(LocStrings.stub("GuildRoleRemoveFailure"), role, user.name)); + } + } + else + { + formatted += (String.format(LocStrings.stub("GuildRoleRemoveNotAllowed"), role)); + } + + return new SubCommandFormattable(formatted); + } +} \ No newline at end of file diff --git a/src/core/ObjectBuilderFactory.java b/src/core/ObjectBuilderFactory.java index c36c62b..c5567fb 100644 --- a/src/core/ObjectBuilderFactory.java +++ b/src/core/ObjectBuilderFactory.java @@ -7,6 +7,8 @@ import java.util.concurrent.Semaphore; import javax.security.auth.login.LoginException; +import commands.general.*; +import commands.guildrole.CommandGuildRoleMain; import core.lua.PluginManager; import dataStructures.*; import main.Main; @@ -377,6 +379,60 @@ public class ObjectBuilderFactory return commandManager; + // Admin + manager.register(LocCommands.stub("rating"), new CommandRating(KittyRole.Admin, KittyRating.Safe)); + manager.register(LocCommands.stub("indicator"), new CommandChangeIndicator(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)); + + // General + manager.register(LocCommands.stub("fetch"), new CommandFetch(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("kittyrole"), 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("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("charactercreate"), new CommandCharacterCreate(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("searchcharacter"), new CommandCharacterSearch(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("charactereditbio"), new CommandCharacterEditBio(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("charactereditname"), new CommandCharacterEditName(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("charactereditURL"), new CommandCharacterEditURL(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("leaderboard"), new CommandLeaderboard(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("color, colour"), new CommandColor(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("remind"), new CommandRemind(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("role"), new CommandGuildRoleMain(KittyRole.General, KittyRating.Safe)); + + return manager; } // Default database manager construction. It can be constructed diff --git a/src/core/SubCommandFramework.java b/src/core/SubCommandFramework.java index 7906468..ee44eaf 100644 --- a/src/core/SubCommandFramework.java +++ b/src/core/SubCommandFramework.java @@ -22,11 +22,12 @@ public class SubCommandFramework if(commands.put(name, command) != null) GlobalLog.error("Multiple registration of a name with name '" + name + "'!"); - GlobalLog.log("Registered " + name); + GlobalLog.log("Registered SubCommand " + name); } public SubCommandFormattable run(KittyGuild guild, KittyChannel channel, KittyUser user, String input) { + System.out.print(input); SubCommandFormattable res = commands.get(input.split(" ")[0].toLowerCase()).OnRun(guild, channel, user, input.substring(input.indexOf(" "))); return res; }