From 392ba0e19ca65b9d1ce81e69abed56526ce93525 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 30 Jun 2019 03:20:46 -0400 Subject: [PATCH 1/2] +Moved guildrole commands to subcommand routine --- assets/commands.config | 2 + assets/locCommands.config | 2 + assets/locStrings.config | 235 +++--------------- src/commands/CommandGuildRoleAdd.java | 40 --- src/commands/CommandGuildRoleAllowed.java | 39 --- src/commands/CommandGuildRoleList.java | 31 --- src/commands/CommandGuildRoleNotAllowed.java | 39 --- src/commands/CommandGuildRoleRemove.java | 40 --- .../{ => general}/CommandBeansShow.java | 2 +- .../{ => general}/CommandBenchmark.java | 2 +- .../{ => general}/CommandBetBeans.java | 2 +- .../{ => general}/CommandBetHistory.java | 2 +- src/commands/{ => general}/CommandBlurry.java | 2 +- src/commands/{ => general}/CommandBoop.java | 2 +- src/commands/{ => general}/CommandCatch.java | 2 +- .../{ => general}/CommandChangeIndicator.java | 2 +- .../{ => general}/CommandCharacterCreate.java | 2 +- .../CommandCharacterEditBio.java | 2 +- .../CommandCharacterEditName.java | 2 +- .../CommandCharacterEditURL.java | 2 +- .../{ => general}/CommandCharacterSearch.java | 2 +- src/commands/{ => general}/CommandChoose.java | 2 +- src/commands/{ => general}/CommandColiru.java | 2 +- src/commands/{ => general}/CommandColor.java | 2 +- .../{ => general}/CommandCrouton.java | 2 +- .../{ => general}/CommandDBFlush.java | 2 +- .../{ => general}/CommandDBStats.java | 2 +- src/commands/{ => general}/CommandDoWork.java | 2 +- .../{ => general}/CommandEightBall.java | 2 +- src/commands/{ => general}/CommandFetch.java | 2 +- .../{ => general}/CommandGiveBeans.java | 2 +- src/commands/{ => general}/CommandHelp.java | 2 +- .../{ => general}/CommandHelpBuilder.java | 2 +- src/commands/{ => general}/CommandInfo.java | 2 +- src/commands/{ => general}/CommandInvite.java | 2 +- .../{ => general}/CommandJDoodle.java | 2 +- .../{ => general}/CommandLeaderboard.java | 2 +- src/commands/{ => general}/CommandMap.java | 2 +- src/commands/{ => general}/CommandPerish.java | 2 +- src/commands/{ => general}/CommandPing.java | 2 +- .../{ => general}/CommandPollManage.java | 2 +- .../{ => general}/CommandPollResults.java | 2 +- .../{ => general}/CommandPollShow.java | 2 +- .../{ => general}/CommandPollVote.java | 2 +- src/commands/{ => general}/CommandRPEnd.java | 2 +- src/commands/{ => general}/CommandRPG.java | 2 +- .../{ => general}/CommandRPStart.java | 2 +- .../{ => general}/CommandRaffleEnd.java | 0 .../{ => general}/CommandRaffleJoin.java | 0 .../{ => general}/CommandRaffleSpin.java | 0 .../{ => general}/CommandRaffleStart.java | 0 src/commands/{ => general}/CommandRating.java | 0 src/commands/general/CommandRemind.java | 40 +++ src/commands/{ => general}/CommandRole.java | 0 src/commands/{ => general}/CommandRoll.java | 0 .../{ => general}/CommandShutdown.java | 2 +- src/commands/{ => general}/CommandStark.java | 2 +- src/commands/{ => general}/CommandStats.java | 2 +- src/commands/{ => general}/CommandTeey.java | 2 +- .../{ => general}/CommandTradeBeans.java | 2 +- src/commands/{ => general}/CommandTweet.java | 2 +- .../{ => general}/CommandWolfram.java | 2 +- src/commands/{ => general}/CommandYeet.java | 2 +- .../guildrole/CommandGuildRoleAdd.java | 36 +++ .../guildrole/CommandGuildRoleAllowed.java | 37 +++ .../guildrole/CommandGuildRoleList.java | 33 +++ .../guildrole/CommandGuildRoleMain.java | 37 +++ .../guildrole/CommandGuildRoleNotAllowed.java | 35 +++ .../guildrole/CommandGuildRoleRemove.java | 35 +++ src/core/ObjectBuilderFactory.java | 12 +- src/core/SubCommand.java | 4 +- src/core/SubCommandFormattable.java | 4 +- src/core/SubCommandFramework.java | 5 +- 73 files changed, 353 insertions(+), 447 deletions(-) delete mode 100644 src/commands/CommandGuildRoleAdd.java delete mode 100644 src/commands/CommandGuildRoleAllowed.java delete mode 100644 src/commands/CommandGuildRoleList.java delete mode 100644 src/commands/CommandGuildRoleNotAllowed.java delete mode 100644 src/commands/CommandGuildRoleRemove.java rename src/commands/{ => general}/CommandBeansShow.java (93%) rename src/commands/{ => general}/CommandBenchmark.java (97%) rename src/commands/{ => general}/CommandBetBeans.java (93%) rename src/commands/{ => general}/CommandBetHistory.java (96%) rename src/commands/{ => general}/CommandBlurry.java (96%) rename src/commands/{ => general}/CommandBoop.java (98%) rename src/commands/{ => general}/CommandCatch.java (98%) rename src/commands/{ => general}/CommandChangeIndicator.java (93%) rename src/commands/{ => general}/CommandCharacterCreate.java (97%) rename src/commands/{ => general}/CommandCharacterEditBio.java (97%) rename src/commands/{ => general}/CommandCharacterEditName.java (97%) rename src/commands/{ => general}/CommandCharacterEditURL.java (97%) rename src/commands/{ => general}/CommandCharacterSearch.java (98%) rename src/commands/{ => general}/CommandChoose.java (93%) rename src/commands/{ => general}/CommandColiru.java (92%) rename src/commands/{ => general}/CommandColor.java (99%) rename src/commands/{ => general}/CommandCrouton.java (97%) rename src/commands/{ => general}/CommandDBFlush.java (97%) rename src/commands/{ => general}/CommandDBStats.java (97%) rename src/commands/{ => general}/CommandDoWork.java (97%) rename src/commands/{ => general}/CommandEightBall.java (94%) rename src/commands/{ => general}/CommandFetch.java (95%) rename src/commands/{ => general}/CommandGiveBeans.java (94%) rename src/commands/{ => general}/CommandHelp.java (93%) rename src/commands/{ => general}/CommandHelpBuilder.java (99%) rename src/commands/{ => general}/CommandInfo.java (92%) rename src/commands/{ => general}/CommandInvite.java (92%) rename src/commands/{ => general}/CommandJDoodle.java (92%) rename src/commands/{ => general}/CommandLeaderboard.java (99%) rename src/commands/{ => general}/CommandMap.java (99%) rename src/commands/{ => general}/CommandPerish.java (98%) rename src/commands/{ => general}/CommandPing.java (96%) rename src/commands/{ => general}/CommandPollManage.java (93%) rename src/commands/{ => general}/CommandPollResults.java (93%) rename src/commands/{ => general}/CommandPollShow.java (92%) rename src/commands/{ => general}/CommandPollVote.java (93%) rename src/commands/{ => general}/CommandRPEnd.java (93%) rename src/commands/{ => general}/CommandRPG.java (97%) rename src/commands/{ => general}/CommandRPStart.java (92%) rename src/commands/{ => general}/CommandRaffleEnd.java (100%) rename src/commands/{ => general}/CommandRaffleJoin.java (100%) rename src/commands/{ => general}/CommandRaffleSpin.java (100%) rename src/commands/{ => general}/CommandRaffleStart.java (100%) rename src/commands/{ => general}/CommandRating.java (100%) create mode 100644 src/commands/general/CommandRemind.java rename src/commands/{ => general}/CommandRole.java (100%) rename src/commands/{ => general}/CommandRoll.java (100%) rename src/commands/{ => general}/CommandShutdown.java (98%) rename src/commands/{ => general}/CommandStark.java (94%) rename src/commands/{ => general}/CommandStats.java (99%) rename src/commands/{ => general}/CommandTeey.java (98%) rename src/commands/{ => general}/CommandTradeBeans.java (98%) rename src/commands/{ => general}/CommandTweet.java (92%) rename src/commands/{ => general}/CommandWolfram.java (93%) rename src/commands/{ => general}/CommandYeet.java (98%) create mode 100644 src/commands/guildrole/CommandGuildRoleAdd.java create mode 100644 src/commands/guildrole/CommandGuildRoleAllowed.java create mode 100644 src/commands/guildrole/CommandGuildRoleList.java create mode 100644 src/commands/guildrole/CommandGuildRoleMain.java create mode 100644 src/commands/guildrole/CommandGuildRoleNotAllowed.java create mode 100644 src/commands/guildrole/CommandGuildRoleRemove.java diff --git a/assets/commands.config b/assets/commands.config index 3dbb66c..60fa826 100644 --- a/assets/commands.config +++ b/assets/commands.config @@ -35,6 +35,7 @@ indicator=1 info, about=1 invite=1 java, jdoodle=1 +kittyrole=1 leaderboard=1 map=1 perish, thenperish=1 @@ -45,6 +46,7 @@ rafflejoin=1 rafflespin=1 rafflestart=1 rating=1 +remind=1 results=1 role=1 roll=1 diff --git a/assets/locCommands.config b/assets/locCommands.config index 706d6a2..10dd5fb 100644 --- a/assets/locCommands.config +++ b/assets/locCommands.config @@ -34,10 +34,12 @@ raffleend= ping= charactereditbio= roll= +kittyrole= blur= choose= rpstart= guildrolenotallowed=guildrolenotallowed, rolelistremove +remind= derp= perish, thenperish= teey= diff --git a/assets/locStrings.config b/assets/locStrings.config index 15f21c5..6cb9892 100644 --- a/assets/locStrings.config +++ b/assets/locStrings.config @@ -1,278 +1,185 @@ [CommandBenchmark] - BenchmarkInvalid=The benchmark operation you were trying to perform was invalid! -BenchmarkInfo=Allows you to lookup PC component benchmarks from UserBenchmark! You can use `bench find +BenchmarkInfo= BenchmarkInvalid= +[CommandBetHistory] +BetHistoryOutput= +BetHistoryInfo= + [CommandPollManage] PollManageInfo= - PollManageInfo='start' will start a new poll with the query of the line you put after, 'choice' will add a choice to the poll, 'stop' will end the poll - -[CommandBetHistory] - BetHistoryOutput=I have %s treats from betting! -BetHistoryOutput= - BetHistoryInfo=Gives how many beans I've ~~stolen~~ won from your bets! -BetHistoryInfo= [CommandGuildRoleNotAllowed] GuildRoleNotAllowedFailure= +GuildRoleNotAllowedNoArgs= GuildRoleNotAllowedSuccess= - GuildRoleNotAllowedInfo=Removes a role from the list that users are allowed to add to themselves. -GuildRoleNotAllowedInfo= - GuildRoleNotAllowedFailure=Unable to remove %s from the list! - GuildRoleNotAllowedSuccess=Removed %s from the allowed roles! [CommandCatch] CatchInfo= - CatchInfo=Play catch with yourself or with a friend with @! [CommandLeaderboard] - LeaderboardTitle=Server Leaderboard - LeaderboardInfo=Shows you the 10 users with the most beans on the server LeaderboardInfo= LeaderboardTitle= [CommandGuildRoleList] GuildRoleListOutput= GuildRoleListEmpty= - GuildRoleListOutput=You can add these roles! %s [CommandRoll] - RollInfo=Based on input of xdy where x is number of dice and y is faces kitty will roll that amount of dice, display the individual rolls and total RollError= - RollError=Didn't work ;3; RollInfo= [CommandGuildRoleAllowed] -GuildRoleAllowedInfo= GuildRoleAllowedSuccess= GuildRoleAllowedDuplicate= [CommandStats] StatsInfo= - StatsInfo=Displays the actively running KittyBot application information [CommandRole] - RoleChanged=Changed %s to role `%s`! RoleInfo= RoleStandardResponse= - RoleError=You aren't allowed to do that! You must have the KittyRole '%' or higher! - RoleStandardResponse=Your role is %s RoleError= - RoleInfo=Will show the current role you have, Admins can change others roles with input of 'role x @y' with x being blacklist, general, mod, or admin. Blacklist will not allow the user to interact with kitty anymore, general mod and admin will give the user access to those commands. RoleChanged= - RoleNeededRole=Please enter `general`, `mod`, or `admin`! RoleNeededRole= [CommandJDoodle] - JDoodleInfo=Will compile any java code you put in! Supports Java 1.8 - JDoodleError=Please provide some java code to get it compiled! JDoodleInfo= JDoodleError= [CommandChangeIndicator] - ChangeIndicatorError=Please specify a letter or symbol to use! - ChangeIndicatorInfo=Changes the command indicator to any single character. By default, it's '!'. If more than one character is provided, the first one is used! - ChangeIndicatorChanged=Indicator changed to `%s` ChangeIndicatorInfo= ChangeIndicatorError= ChangeIndicatorChanged= [CommandPerish] - PerishInfo=Adds a red, 'a n g e r y' overlay to your icon or the icon of a friend you mentioned PerishInfo= [CommandTradeBeans] TradeBeansNoTargetError= TradeBeansSuccess= - TradeBeansStealingBeans=Hey %s! Stealing is wrong! Let's see how you like it! *steals 10 beans* - TradeBeansSuccess=%s gave %s %s beans! - TradeBeansNotEnoughError=You can't give more beans than you have! - TradeBeansIntParseError=That's not a real number! D: - TradeBeansNoTargetError=Don't forget to tag who you want to give the beans to! TradeBeansStealingBeans= - TradeBeansInfo=Give your friends some of your beans! Just don't forget to @ them! TradeBeansInfo= TradeBeansIntParseError= TradeBeansNotEnoughError= [CommandPollVote] - PollVoteInfo=Vote in a poll with the choice number, won't work if no poll is running, you can't change your vote once you have cast it! Be careful! PollVoteInfo= PollVoteNotValidNumber= - PollVoteAlreadyVoted=You already voted - PollVoteNoPoll=There is no poll running! PollVoteNoPoll= PollVoteAlreadyVoted= PollVoteNotValidVote= - PollVoteNotValidNumber=That's not a vaild number! - PollVoteNotValidVote=%s That's not a vaild vote! - PollVoteSuccess=You successfully voted for PollVoteSuccess= [CommandShutdown] ShutdownSafe= ShutdownUnsafe= - ShutdownInfo=Stops kitty. `-s` or `safe` as an argument attempts to sync off the database before shutdown. ShutdownInfo= [CommandRaffleSpin] RaffleSpinInfo= RaffleSpinSuccess= RaffleSpinFailure= - RaffleSpinSuccess=The winner issssssss %s! - RaffleSpinFailure=I can't choose a winner D: - RaffleSpinInfo= [CommandRaffleEnd] RaffleEndSuccess= - RaffleEndSuccess= RaffleEndInfo= - RaffleEndInfo= - RaffleEndFailure=I don't think there's one going! RaffleEndFailure= [CommandCharacterSearch] CharacterSearchNoCharacterFound= CharacterSearchMultipleCharacterHeader= CharacterSearchMultipleCharacter= - CharacterSearchMultipleCharacter=%s is owned by %s. Unique ID is `%s` - CharacterSearchMultipleCharacterHeader=I found a couple characters with that name, use `charactersearch UniqueID` with their Unique ID to find them! - CharacterSearchOneCharacter=I found one character with that name! \n Owner: %s | Name: %s | Bio: %s | Ref: <%s> | Unique ID: `%s` CharacterSearchOneCharacter= -CharacterSearchInfo=Find a character with their name or Unique ID! `charactersearch name` or `charactersearch UniqueID` - CharacterSearchNoCharacterFound=Couldn't find a character with that name or ID! +CharacterSearchInfo= [CommandColor] -ColorNotSearchable=Your color couldn't be parsed! Make sure it's in hex format. Try this! `!color 3F5D54` -ColorInfo=Looks up the provided hex color and outputs it as hex, rgb, hsl, hsv, xyz, and cmyk. Also attempts to name the color, and provies a sample of it! Usage example: `!color #365345` (the # can be omitted) +ColorNotSearchable= +ColorInfo= [CommandDoWork] - DoWorkInfo=Occupies a core for a few seconds - DoWorkFinished=I finished with my work! :D DoWorkInfo= DoWorkFinished= [CommandRPStart] - RPStartInfo=Starts an rp, add people to it by mentioning them! RPStartInfo= [CommandBlurry] - BlurryInfo=Blurs your icon or the icon of a friend you mentioned BlurryInfo= [CommandRating] - RatingInvalid=Invalid content rating RatingInfo= - RatingInfo='0' is fully sfw (Derpi and e621 searches are disabled), '1' is filtered (kitty auto appends a sfw tag on any searches), '2' is nsfw (any search will go through). Some other words are supported for setting filter as well. RatingWarning= - RatingWarning=Warning: NSFW may slip through, images are only based on tags on their respective sites! RatingChanged= RatingInvalid= - RatingChanged=Kittybot content set to %s [CommandDBStats] -DBStatsInfo=Shows current statistics for the database +DBStatsInfo= [CommandGiveBeans] GiveBeansNoneMentioned= - GiveBeansInvalid=That's not a valid number! GiveBeansSuccess= - GiveBeansSuccess=Gave %s %s beans! GiveBeansInvalid= - GiveBeansInfo=Gives beans to the mentioned users! - GiveBeansNoneMentioned=You didn't mention anyone! GiveBeansInfo= [CommandPollShow] PollShowInfo= PollShowNoPoll= - PollShowNoPoll=There is no poll running! - PollShowInfo=Will show the current poll running PollShowPoll= - PollShowChoices=And the choices are:\n PollShowChoices= - PollShowPoll=The current poll is `%s`\n [CommandHelpBuilder] - HelpBuilderInfo=Emit help for all commands as formatted HTML HelpBuilderInfo= +[CommandGuildRoleMain] +GuildRoleInfo= + [CommandCharacterEditURL] -CharacterEditURLInfo=Change the image URL for your character's reference! -CharacterEditURLNotValid=That's not a valid url! -CharacterEditURLSuccess=Successfully changed your reference! -CharacterEditURLNotAuth=You're not authorized to change that character! +CharacterEditURLInfo= +CharacterEditURLNotValid= +CharacterEditURLSuccess= +CharacterEditURLNotAuth= [CommandRPG] - RPGInfo=Admin+ command only right now - experimental text RPG! Format is !rpg RPGInfo= RPGInvalid= - RPGInvalid=Invalid RPG Command! [CommandFetch] - FetchEat=Mine now! *munches on %s* - FetchBringBack=Got it! %s - FetchError=That's not a custom emote! -FetchEat= - FetchInfo=Throw a custom emote and I'll try to bring it back.... maybe -FetchInfo= -FetchRunAway= - FetchStare=*Stares at %s* -FetchBringBack= - FetchRunAway=*Runs away and doesn't return for a long time* - FetchCatchRun=*Catches and runs away with %s* FetchError= +FetchEat= +FetchInfo= FetchCatchRun= +FetchRunAway= +FetchBringBack= FetchBringBackWrong= FetchStare= - FetchBringBackWrong=Got it! %s [CommandInfo] InfoResponse= - InfoResponse=I'm made by `Rin#8904` and `Reverie Wisp#3703`! You can find more info about me along with a Patreon link to support us and GitHub link for filing bugs https://kittybot.net InfoInfo= - InfoInfo=Provides author info and a link to Kitty's website [CommandGuildRoleRemove] GuildRoleRemoveNotAllowed= GuildRoleRemoveFailure= GuildRoleRemoveSuccess= - GuildRoleRemoveNotAllowed=You're not allowed to add %s! -GuildRoleRemoveInfo= - GuildRoleRemoveFailure=I wasn't able to remove %s from %s! - GuildRoleRemoveInfo=Removes a role from you! Just remember to spell it right! - GuildRoleRemoveSuccess=Removed %s from %s! [CommandWolfram] - WolframInfo=Will query wolframalpha with your question and give a full image output of the answer - WolframNoArgs=You need to provide some arguments! WolframError= - WolframError=Something went wrong! WolframInfo= WolframNoArgs= [CommandMap] - MapVersion=Using mapgen v0.1 - MapSeed=Seed - MapInfo=Generates a map! You can pass additional information if you want with the flags `-s +MapInfo= MapInvalid= MapVersion= - `. If one of the fields isn't provided, its default will be used. Note that adjusting the width and height impacts the map outcomes.\n\n**Defaults**\nDefault Seed: Random,\nDefault Width: 35(max %s),\nDefault Height: 25(max %s)\n\n**Key**\nLand: ~\nMountain: ▲\nBeach: =\nForest: ¥\nLava: # - MapInvalid=Invalid arguments provided! - MapWidth=Width -MapInfo= MapSeed= MapWidth= - MapHeight=Height MapHeight= [CommandBeansShow] - BeansShowDisplay=You have %s beans! BeansShowDisplay= BeansShowMentioned= BeansShowInfo= - BeansShowInfo=Displays how many beans you have - BeansShowMentioned=I took a look and %sbeans! [CommandRaffleStart] RaffleStartSuccess= @@ -280,63 +187,39 @@ RaffleStartFailure= RaffleStartInfo= [CommandHelp] - HelpInfo=Lets you look up specific commands, or get a link to a list of all commands. - HelpDisplay=You can get help with a specific command by typing `!help command`! General Commands: `boop, roll, choose, help, info, vote, results, showpoll, wolfram, cplus, java, beans, role, bet, yeet` HelpInfo= HelpDisplay= [CommandCharacterEditBio] -CharacterEditBioSuccess=Successfully changed your bio! -CharacterEditBioNotAuth=You're not authorized to change that character! -CharacterEditBioInfo=Change the short bio for your character! +CharacterEditBioSuccess= +CharacterEditBioNotAuth= +CharacterEditBioInfo= CharacterEditBioNotValid= +[CommandCharacterEditName] +CharacterEditNameInfo= +CharacterEditNameNotValid= +CharacterEditNameSuccess= +CharacterEditNameNotAuth= + [CommandTweet] - TweetInfo=Kitty will tweet to her personal twitter account - TweetError=Tweet command failed! TweetInfo= TweetError= -[CommandGuildRoleAdd] - AddGuildRoleFailure=Failed to add %s to %s - GuildRoleAddNotAllowed=You are not allowed to add %s! -GuildRoleAddSuccess= -GuildRoleAddFailure= - GuildRoleAddSuccess=Added %s to %s - GuildRoleAddInfo=Add a role to yourself! -GuildRoleAddNotAllowed= -GuildRoleAddInfo= - -[CommandCharacterEditName] -CharacterEditNameInfo=Change your character's name! -CharacterEditNameNotValid=That's not a vaild name! -CharacterEditNameSuccess=Successfully changed your name! -CharacterEditNameNotAuth=You're not authorized to change that character! - [CommandColiru] ColiruError= - ColiruError=Please provide some c++ code to attempt to compile! ColiruInfo= - ColiruInfo=Will try to compile any c++ code you put in! Supports up to C++14 standard, uses g++. [CommandStark] StarkInfo= - StarkInfo=Snaps your icon or the icon of a friend you mentioned + +[CommandRemind] +RemindInfo= [CommandYeet] YeetInfo= - YeetInfo=Yeet yourself or yeet a friend with @! - -[CommandAllowedGuildRole] - GuildRoleAllowedDuplicate=Can't add the same role twice! - GuildRoleAllowedInfo=Adds role to the list of roles users are allowed to add to themselves. - GuildRoleAllowedSuccess=Added %s to the allowed roles! - -[CommandDefaultDance] - DefaultDanceInfo=y'all know forknife, get ready to dance, or make a friend dance with @! [CommandCrouton] - CroutonInfo=Crouton CroutonInfo= [CommandCharacterCreate] @@ -346,74 +229,42 @@ CharacterCreateSuccess= CharacterCreateNullInfo= [CommandTeey] - TeeyInfo=Teey yourself back into existance, or teey a friend with @! TeeyInfo= [CommandBetBeans] - BetBeansLose=Sorry, you didn't win, try again! - BetBeansWin=You won %s beans! - BetBeansLowBet=Please bet with at least 20 beans! BetBeansInfo= BetBeansLowBet= BetBeansNotValid= BetBeansLose= BetBeansNotEnough= BetBeansWin= - BetBeansInfo=Allows you to bet your beans, set your amount after the command! Warning! House always wins!\nSets of 3 will get 2x, 4 will get 10x, and 5 will get 1000x - BetBeansNotEnough=You don't have enough beans! - BetBeansNotValid=That's not a valid bet! [CommandPollResults] PollResultsResponse= - PollResultsResponse=%s people voted for %s `%s` with `%s%` !\n - PollResultsInfo=Will show current results of a poll and percentages of votes per choice PollResultsInfo= [CommandRPEnd] - RPEndInfo=Ends RP in channel and gives you a .txt file! RPEndError= - RPEndError=You can't end this RP! - RPEndFileOut=Here's your file! RPEndInfo= RPEndFileOut= [CommandBoop] - BoopMultiple=%s booped several others - %s! BoopPerson= BoopInfo= - BoopInfo=Kitty will react with a counter - BoopStandard=Woah! %s booped me! That's %s total! - BoopPerson=%s booped %s! BoopStandard= BoopMultiple= [CommandPing] - PingInfo=Will respond with Pong! - PingResponse=Pong! PingResponse= PingInfo= [CommandChoose] ChooseChoice= - ChooseOne=I can't choose from *one* thing! ChooseOne= - ChooseChoice=I chooooooose %s! - ChooseInfo=With an input of x,y,z where x y and z are all choices, kitty will choose one ChooseInfo= [CommandEightBall] - EightBallYes9=Yes. - EightBallInfo=Answers a yes or no question! Warning: Kitty can not actually tell the future, she claims no responsibility for any lion mauling, lack of lottery wins, or felony charges. -EightBallError= - EightBallMaybe4=Cannot predict now. - EightBallMaybe5=Concentrate and ask again. - EightBallMaybe2=Ask again later. - EightBallMaybe3=Better not tell you now. - EightBallYes10=Signs point to yes. -EightBallYes9= - EightBallMaybe1=Reply hazy, try again. EightBallYes4= - EightBallError=Hmm? You'll need to ask a question! EightBallYes3= EightBallYes2= EightBallYes1= @@ -424,32 +275,20 @@ EightBallYes5= EightBallMaybe1= EightBallMaybe2= EightBallMaybe3= +EightBallError= EightBallMaybe4= EightBallMaybe5= EightBallInfo= EightBallNo5= - EightBallNo2=My reply is no. EightBallNo3= - EightBallNo1=Don't count on it. EightBallNo4= - EightBallNo4=Outlook not so good. EightBallNo1= - EightBallNo3=My sources say no. EightBallNo2= - EightBallNo5=Very doubtful. - EightBallYes2=It is decidedly so. - EightBallYes1=It is certain. - EightBallYes4=Yes - definitely. - EightBallYes3=Without a doubt. - EightBallYes6=As I see it, yes. - EightBallYes5=You may rely on it. - EightBallYes8=Outlook good. - EightBallYes7=Most likely. +EightBallYes9= EightBallYes10= [CommandInvite] InviteInfo= - InviteInfo=Provides a direct invite link for KittyBot [CommandRaffleJoin] RaffleJoinFailure= @@ -457,6 +296,6 @@ RaffleJoinInfo= RaffleJoinSuccess= [CommandDBFlush] -DBFlushInfo=Takes all objects queued for the database and writes them to the database, then says how many were written. +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 982c0fa..04d8e9a 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.Config; 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 de1fcd5..08bddd0 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 79a1ff6..9e98524 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 100% rename from src/commands/CommandRaffleEnd.java rename to src/commands/general/CommandRaffleEnd.java diff --git a/src/commands/CommandRaffleJoin.java b/src/commands/general/CommandRaffleJoin.java similarity index 100% rename from src/commands/CommandRaffleJoin.java rename to src/commands/general/CommandRaffleJoin.java diff --git a/src/commands/CommandRaffleSpin.java b/src/commands/general/CommandRaffleSpin.java similarity index 100% rename from src/commands/CommandRaffleSpin.java rename to src/commands/general/CommandRaffleSpin.java diff --git a/src/commands/CommandRaffleStart.java b/src/commands/general/CommandRaffleStart.java similarity index 100% rename from src/commands/CommandRaffleStart.java rename to src/commands/general/CommandRaffleStart.java diff --git a/src/commands/CommandRating.java b/src/commands/general/CommandRating.java similarity index 100% rename from src/commands/CommandRating.java rename to src/commands/general/CommandRating.java 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 100% rename from src/commands/CommandRole.java rename to src/commands/general/CommandRole.java diff --git a/src/commands/CommandRoll.java b/src/commands/general/CommandRoll.java similarity index 100% rename from src/commands/CommandRoll.java rename to src/commands/general/CommandRoll.java 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 3e6217a..625d3be 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 e25a9b8..3aaacd0 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 ecfc18a..3907a03 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 986187f..dc5821c 100644 --- a/src/core/ObjectBuilderFactory.java +++ b/src/core/ObjectBuilderFactory.java @@ -7,7 +7,8 @@ import java.util.concurrent.Semaphore; import javax.security.auth.login.LoginException; -import commands.*; +import commands.general.*; +import commands.guildrole.CommandGuildRoleMain; import core.lua.PluginManager; import dataStructures.*; import main.Main; @@ -386,8 +387,6 @@ public class ObjectBuilderFactory // Admin manager.register(LocCommands.stub("rating"), new CommandRating(KittyRole.Admin, KittyRating.Safe)); manager.register(LocCommands.stub("indicator"), new CommandChangeIndicator(KittyRole.Admin, KittyRating.Safe)); - manager.register(LocCommands.stub("guildroleallowed"), new CommandGuildRoleAllowed(KittyRole.Admin, KittyRating.Safe)); - manager.register(LocCommands.stub("guildrolenotallowed"), new CommandGuildRoleNotAllowed(KittyRole.Admin, KittyRating.Safe)); // Mod manager.register(LocCommands.stub("poll"), new CommandPollManage(KittyRole.Mod, KittyRating.Safe)); @@ -399,8 +398,6 @@ public class ObjectBuilderFactory // General manager.register(LocCommands.stub("fetch"), new CommandFetch(KittyRole.General, KittyRating.Safe)); - manager.register(LocCommands.stub("guildroleadd"), new CommandGuildRoleAdd(KittyRole.General, KittyRating.Safe)); - manager.register(LocCommands.stub("guildroleremove"), new CommandGuildRoleRemove(KittyRole.General, KittyRating.Safe)); manager.register(LocCommands.stub("teey"), new CommandTeey(KittyRole.General, KittyRating.Safe)); manager.register(LocCommands.stub("perish, thenperish"), new CommandPerish(KittyRole.General, KittyRating.Safe)); manager.register(LocCommands.stub("yeet"), new CommandYeet(KittyRole.General, KittyRating.Safe)); @@ -417,7 +414,7 @@ public class ObjectBuilderFactory manager.register(LocCommands.stub("c++, g++, cplus, cpp"), new CommandColiru(KittyRole.General, KittyRating.Safe)); manager.register(LocCommands.stub("java, jdoodle"), new CommandJDoodle(KittyRole.General, KittyRating.Safe)); manager.register(LocCommands.stub("beans"), new CommandBeansShow(KittyRole.General, KittyRating.Safe)); - manager.register(LocCommands.stub("role"), new CommandRole(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("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)); @@ -426,7 +423,6 @@ public class ObjectBuilderFactory manager.register(LocCommands.stub("blur"), new CommandBlurry(KittyRole.General, KittyRating.Safe)); manager.register(LocCommands.stub("eightball, 8ball"), new CommandEightBall(KittyRole.General, KittyRating.Safe)); manager.register(LocCommands.stub("catch"), new CommandCatch(KittyRole.General, KittyRating.Safe)); - manager.register(LocCommands.stub("guildrolelist"), new CommandGuildRoleList(KittyRole.General, KittyRating.Safe)); manager.register(LocCommands.stub("bethistory"), new CommandBetHistory(KittyRole.General, KittyRating.Safe)); manager.register(LocCommands.stub("crouton"), new CommandCrouton(KittyRole.General, KittyRating.Safe)); manager.register(LocCommands.stub("benchmark, bench"), new CommandBenchmark(KittyRole.General, KittyRating.Safe)); @@ -438,6 +434,8 @@ public class ObjectBuilderFactory 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; } diff --git a/src/core/SubCommand.java b/src/core/SubCommand.java index c490c06..2b0b81f 100644 --- a/src/core/SubCommand.java +++ b/src/core/SubCommand.java @@ -18,7 +18,7 @@ public abstract class SubCommand private void Reject(KittyUser user, String reason) { - GlobalLog.Warn(LogFilter.Command, this.getClass().getSimpleName() + " from " + user.name + " rejected due to command's " + reason); + GlobalLog.warn(LogFilter.Command, this.getClass().getSimpleName() + " from " + user.name + " rejected due to command's " + reason); } private boolean CanCall(KittyGuild guild, KittyChannel channel, KittyUser user) @@ -31,7 +31,7 @@ public abstract class SubCommand //TODO: ADD CHANNEL CHECK HERE - if(user.GetRole().getValue() >= roleLevel.getValue()) + if(user.getRole().getValue() >= roleLevel.getValue()) { return true; } diff --git a/src/core/SubCommandFormattable.java b/src/core/SubCommandFormattable.java index 6507847..a76d2f4 100644 --- a/src/core/SubCommandFormattable.java +++ b/src/core/SubCommandFormattable.java @@ -33,8 +33,8 @@ public class SubCommandFormattable public void Call(Response res) { if(resEmbed == null) - res.Call(resString); + res.send(resString); else - res.CallEmbed(resEmbed); + res.send(resEmbed); } } diff --git a/src/core/SubCommandFramework.java b/src/core/SubCommandFramework.java index 8a62ef2..ee44eaf 100644 --- a/src/core/SubCommandFramework.java +++ b/src/core/SubCommandFramework.java @@ -20,13 +20,14 @@ public class SubCommandFramework { name = name.toLowerCase(); if(commands.put(name, command) != null) - GlobalLog.Error("Multiple registration of a name with name '" + name + "'!"); + 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; } From 0de91ab8f6fdddd6be43cf26a8206211f020bf30 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 30 Jun 2019 03:21:21 -0400 Subject: [PATCH 2/2] =Bug Fixes for general.commands package --- src/commands/general/CommandRaffleEnd.java | 2 +- src/commands/general/CommandRaffleJoin.java | 2 +- src/commands/general/CommandRaffleSpin.java | 2 +- src/commands/general/CommandRaffleStart.java | 2 +- src/commands/general/CommandRating.java | 2 +- src/commands/general/CommandRole.java | 2 +- src/commands/general/CommandRoll.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/commands/general/CommandRaffleEnd.java b/src/commands/general/CommandRaffleEnd.java index 735c604..bc89124 100644 --- a/src/commands/general/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/general/CommandRaffleJoin.java b/src/commands/general/CommandRaffleJoin.java index 0b6a78f..3003a8e 100644 --- a/src/commands/general/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/general/CommandRaffleSpin.java b/src/commands/general/CommandRaffleSpin.java index 3889252..ff6111d 100644 --- a/src/commands/general/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/general/CommandRaffleStart.java b/src/commands/general/CommandRaffleStart.java index 57468a3..0c72142 100644 --- a/src/commands/general/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/general/CommandRating.java b/src/commands/general/CommandRating.java index 6947e77..19be0c2 100644 --- a/src/commands/general/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/CommandRole.java b/src/commands/general/CommandRole.java index 1abee3a..ca4c742 100644 --- a/src/commands/general/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/general/CommandRoll.java b/src/commands/general/CommandRoll.java index 046c2c0..30c9d31 100644 --- a/src/commands/general/CommandRoll.java +++ b/src/commands/general/CommandRoll.java @@ -1,4 +1,4 @@ -package commands; +package commands.general; import java.util.Stack;