diff --git a/assets/config.csv b/assets/config.csv index a36f9dd..b5c9deb 100644 --- a/assets/config.csv +++ b/assets/config.csv @@ -16,6 +16,7 @@ "Localized Commands","dbstats","" "Localized Commands","defaultdance","" "Localized Commands","derp","" +"Localized Commands","dew","" "Localized Commands","e621","" "Localized Commands","eightball, 8ball","" "Localized Commands","fetch","" @@ -107,6 +108,7 @@ "Localized Strings","DBFlushInfo","Takes all objects queued for the database and writes them to the database, then says how many were written." "Localized Strings","DBStatsInfo","Shows current statistics for the database" "Localized Strings","DefaultDanceInfo","y'all know forknife, get ready to dance, or make a friend dance with @!" +"Localized Strings","DewInfo","" "Localized Strings","DoWorkFinished","I finished with my work! :D" "Localized Strings","DoWorkInfo","Occupies a core for a few seconds" "Localized Strings","EightBallError","Hmm? You'll need to ask a question!" @@ -198,7 +200,7 @@ "Localized Strings","RaffleEndFailure","I don't think there's one going!" "Localized Strings","RaffleEndInfo","" "Localized Strings","RaffleEndSuccess","You ended the raffle!" -"Localized Strings","RaffleInfo","Raffle is a super command!\n\t`raffle start \"# of beans\"` will start a raffle with an entrance fee of the number of beans! Defaults to 100.\n\t`raffle end` will stop the raffle!\n\t`raffle spin` will choose a winner, you can only win once!\n\t`raffle join` will add you to the raffle!" +"Localized Strings","RaffleInfo","Raffle is a super command!\n\t`raffle start \""# of beans\""` will start a raffle with an entrance fee of the number of beans! Defaults to 100.\n\t`raffle end` will stop the raffle!\n\t`raffle spin` will choose a winner, you can only win once!\n\t`raffle join` will add you to the raffle!" "Localized Strings","RaffleJoinFailure","You can't join again!" "Localized Strings","RaffleJoinInfo","" "Localized Strings","RaffleJoinSuccess","You joined the raffle! Good luck!" @@ -212,7 +214,7 @@ "Localized Strings","RatingInfo","'0' is fully sfw (Derpi and e621 searches are disabled)\n'1' is filtered (kitty auto appends a sfw tag on any searches)\n'2' is nsfw (any search will go through). Some other words are supported for setting filter as well." "Localized Strings","RatingInvalid","Invalid content rating" "Localized Strings","RatingWarning","Warning: NSFW may slip through, images are only based on tags on their respective sites!" -"Localized Strings","RemindInfo","`remind \"# of mins\" \"reminder\"` I'll remind you to do something!" +"Localized Strings","RemindInfo","`remind \""# of mins\"" \""reminder\""` I'll remind you to do something!" "Localized Strings","RoleChanged","Changed %s to role `%s`!" "Localized Strings","RoleError","You aren't allowed to do that! You must have the KittyRole '%' or higher!" "Localized Strings","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.\nBlacklist will not allow the user to interact with kitty anymore, general mod and admin will give the user access to those commands." @@ -267,6 +269,7 @@ "Command Enabler","dbstats","1" "Command Enabler","defaultdance","1" "Command Enabler","derp","1" +"Command Enabler","dew","1" "Command Enabler","e621","1" "Command Enabler","eightball, 8ball","1" "Command Enabler","fetch","1" diff --git a/src/commands/dew/CommandDew.java b/src/commands/dew/CommandDew.java index 4ce91bd..a6a6a9e 100644 --- a/src/commands/dew/CommandDew.java +++ b/src/commands/dew/CommandDew.java @@ -1,6 +1,7 @@ package commands.dew; import core.Command; +import core.LocStrings; import core.SubCommandFramework; import dataStructures.KittyChannel; import dataStructures.KittyGuild; @@ -11,8 +12,18 @@ import dataStructures.Response; import dataStructures.UserInput; public class CommandDew extends Command { - + SubCommandFramework framework = new SubCommandFramework(); + + @Override + public String getHelpText() { return LocStrings.stub("DewInfo"); } + + @Override + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + { + framework.run(guild, channel, user, input).Call(res); + } + public CommandDew(KittyRole level, KittyRating rating) { super(level, rating); @@ -20,9 +31,4 @@ public class CommandDew extends Command { framework.addCommand("start", new CommandDewStart(KittyRole.Dev, KittyRating.Safe)); } - @Override - public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) - { - framework.run(guild, channel, user, input).Call(res); - } } diff --git a/src/core/CommandManager.java b/src/core/CommandManager.java index 8abd3fc..d7a0eb8 100644 --- a/src/core/CommandManager.java +++ b/src/core/CommandManager.java @@ -6,6 +6,7 @@ import java.util.Map.Entry; import commands.benchmark.CommandBenchmark; import commands.characters.CommandCharacterMain; +import commands.dew.CommandDew; import commands.general.*; import commands.guildrole.CommandGuildRoleMain; import commands.mod.CommandModMain; @@ -114,6 +115,7 @@ public class CommandManager this.register(LocCommands.stub("raffle"), new CommandRaffleMain(KittyRole.General, KittyRating.Safe)); this.register(LocCommands.stub("poll"), new CommandPollMain(KittyRole.General, KittyRating.Safe)); this.register(LocCommands.stub("music"), new CommandMusicMain(KittyRole.General, KittyRating.Safe)); + this.register(LocCommands.stub("dew"), new CommandDew(KittyRole.Dev, KittyRating.Safe)); } // Allows the command manager to keep track of a command. Takes a pair (the un-localized and localzied commands)