From 6a709942cef7d94d777993da5664e5d66f5efa10 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 30 Jun 2019 03:33:49 -0400 Subject: [PATCH] =Started character subcommand routine and edited guildrole class names --- .../characters/CommandCharacterCreate.java | 28 ++++++++++++++ .../CommandCharacterEditBio.java | 2 +- .../CommandCharacterEditName.java | 2 +- .../CommandCharacterEditURL.java | 2 +- .../characters/CommandCharacterMain.java | 33 +++++++++++++++++ .../CommandCharacterSearch.java | 2 +- .../general/CommandCharacterCreate.java | 37 ------------------- .../guildrole/CommandGuildRoleMain.java | 8 ++-- ...ndGuildRoleAdd.java => SubCommandAdd.java} | 4 +- ...oleAllowed.java => SubCommandAllowed.java} | 4 +- ...GuildRoleList.java => SubCommandList.java} | 4 +- ...Allowed.java => SubCommandNotAllowed.java} | 4 +- ...dRoleRemove.java => SubCommandRemove.java} | 4 +- src/core/ObjectBuilderFactory.java | 8 +--- 14 files changed, 81 insertions(+), 61 deletions(-) create mode 100644 src/commands/characters/CommandCharacterCreate.java rename src/commands/{general => characters}/CommandCharacterEditBio.java (97%) rename src/commands/{general => characters}/CommandCharacterEditName.java (97%) rename src/commands/{general => characters}/CommandCharacterEditURL.java (97%) create mode 100644 src/commands/characters/CommandCharacterMain.java rename src/commands/{general => characters}/CommandCharacterSearch.java (97%) delete mode 100644 src/commands/general/CommandCharacterCreate.java rename src/commands/guildrole/{CommandGuildRoleAdd.java => SubCommandAdd.java} (84%) rename src/commands/guildrole/{CommandGuildRoleAllowed.java => SubCommandAllowed.java} (85%) rename src/commands/guildrole/{CommandGuildRoleList.java => SubCommandList.java} (84%) rename src/commands/guildrole/{CommandGuildRoleNotAllowed.java => SubCommandNotAllowed.java} (85%) rename src/commands/guildrole/{CommandGuildRoleRemove.java => SubCommandRemove.java} (84%) diff --git a/src/commands/characters/CommandCharacterCreate.java b/src/commands/characters/CommandCharacterCreate.java new file mode 100644 index 0000000..7ce5eba --- /dev/null +++ b/src/commands/characters/CommandCharacterCreate.java @@ -0,0 +1,28 @@ +package commands.characters; + +import core.CharacterManager; +import core.LocStrings; +import core.SubCommand; +import core.SubCommandFormattable; +import dataStructures.*; + +public class CommandCharacterCreate extends SubCommand +{ + public CommandCharacterCreate(KittyRole level, KittyRating rating) { super(level, rating); } + + @Override + public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input) + { + String [] info = input.split(","); + if(info.length < 3) + { + return new SubCommandFormattable (LocStrings.stub("CharacterCreateNullInfo")); + } + if(CharacterManager.instance.addCharacter(user, info[0], info[1], info[2])) + { + return new SubCommandFormattable (LocStrings.stub("CharacterCreateSuccess")); + + } + return new SubCommandFormattable (LocStrings.stub("CharacterCreateDuplicate")); + } +} \ No newline at end of file diff --git a/src/commands/general/CommandCharacterEditBio.java b/src/commands/characters/CommandCharacterEditBio.java similarity index 97% rename from src/commands/general/CommandCharacterEditBio.java rename to src/commands/characters/CommandCharacterEditBio.java index 80eb8b8..be786a0 100644 --- a/src/commands/general/CommandCharacterEditBio.java +++ b/src/commands/characters/CommandCharacterEditBio.java @@ -1,4 +1,4 @@ -package commands.general; +package commands.characters; import core.CharacterManager; import core.Command; diff --git a/src/commands/general/CommandCharacterEditName.java b/src/commands/characters/CommandCharacterEditName.java similarity index 97% rename from src/commands/general/CommandCharacterEditName.java rename to src/commands/characters/CommandCharacterEditName.java index e60b374..e278774 100644 --- a/src/commands/general/CommandCharacterEditName.java +++ b/src/commands/characters/CommandCharacterEditName.java @@ -1,4 +1,4 @@ -package commands.general; +package commands.characters; import core.CharacterManager; import core.Command; diff --git a/src/commands/general/CommandCharacterEditURL.java b/src/commands/characters/CommandCharacterEditURL.java similarity index 97% rename from src/commands/general/CommandCharacterEditURL.java rename to src/commands/characters/CommandCharacterEditURL.java index 697f42a..5d2b6c8 100644 --- a/src/commands/general/CommandCharacterEditURL.java +++ b/src/commands/characters/CommandCharacterEditURL.java @@ -1,4 +1,4 @@ -package commands.general; +package commands.characters; import core.CharacterManager; import core.Command; diff --git a/src/commands/characters/CommandCharacterMain.java b/src/commands/characters/CommandCharacterMain.java new file mode 100644 index 0000000..6a4bdce --- /dev/null +++ b/src/commands/characters/CommandCharacterMain.java @@ -0,0 +1,33 @@ +package commands.characters; + +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 CommandCharacterMain extends Command +{ + SubCommandFramework framework = new SubCommandFramework(); + public CommandCharacterMain(KittyRole level, KittyRating rating) + { + super(level, rating); + } + + @Override + public String getHelpText() { return LocStrings.stub("CharacterInfo"); } + + + + + @Override + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + { + framework.run(guild, channel, user, input.args).Call(res); + } +} \ No newline at end of file diff --git a/src/commands/general/CommandCharacterSearch.java b/src/commands/characters/CommandCharacterSearch.java similarity index 97% rename from src/commands/general/CommandCharacterSearch.java rename to src/commands/characters/CommandCharacterSearch.java index 173b5f5..79d44c7 100644 --- a/src/commands/general/CommandCharacterSearch.java +++ b/src/commands/characters/CommandCharacterSearch.java @@ -1,4 +1,4 @@ -package commands.general; +package commands.characters; import java.util.ArrayList; diff --git a/src/commands/general/CommandCharacterCreate.java b/src/commands/general/CommandCharacterCreate.java deleted file mode 100644 index fffcf96..0000000 --- a/src/commands/general/CommandCharacterCreate.java +++ /dev/null @@ -1,37 +0,0 @@ -package commands.general; - -import core.CharacterManager; -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 CommandCharacterCreate extends Command -{ - public CommandCharacterCreate(KittyRole level, KittyRating rating) { super(level, rating); } - - @Override - public String getHelpText() { return LocStrings.stub("CharacterCreateInfo"); } - - @Override - public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) - { - String [] info = input.args.split(","); - if(info.length < 3) - { - res.send(LocStrings.stub("CharacterCreateNullInfo")); - return; - } - if(CharacterManager.instance.addCharacter(user, info[0], info[1], info[2])) - { - res.send(LocStrings.stub("CharacterCreateSuccess")); - return; - } - res.send(LocStrings.stub("CharacterCreateDuplicate")); - } -} \ No newline at end of file diff --git a/src/commands/guildrole/CommandGuildRoleMain.java b/src/commands/guildrole/CommandGuildRoleMain.java index 2210aa4..2c5807d 100644 --- a/src/commands/guildrole/CommandGuildRoleMain.java +++ b/src/commands/guildrole/CommandGuildRoleMain.java @@ -17,10 +17,10 @@ public class CommandGuildRoleMain extends Command 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)); + framework.addCommand("add", new SubCommandAdd (KittyRole.General, KittyRating.Safe)); + framework.addCommand("remove", new SubCommandRemove(KittyRole.General, KittyRating.Safe)); + framework.addCommand("allowed", new SubCommandAllowed(KittyRole.Admin, KittyRating.Safe)); + framework.addCommand("unallowed", new SubCommandNotAllowed(KittyRole.Admin, KittyRating.Safe)); } @Override diff --git a/src/commands/guildrole/CommandGuildRoleAdd.java b/src/commands/guildrole/SubCommandAdd.java similarity index 84% rename from src/commands/guildrole/CommandGuildRoleAdd.java rename to src/commands/guildrole/SubCommandAdd.java index ed332e3..37c9617 100644 --- a/src/commands/guildrole/CommandGuildRoleAdd.java +++ b/src/commands/guildrole/SubCommandAdd.java @@ -8,9 +8,9 @@ import dataStructures.KittyRating; import dataStructures.KittyRole; import dataStructures.KittyUser; -public class CommandGuildRoleAdd extends SubCommand +public class SubCommandAdd extends SubCommand { - public CommandGuildRoleAdd(KittyRole level, KittyRating rating) { super(level, rating); } + public SubCommandAdd(KittyRole level, KittyRating rating) { super(level, rating); } @Override public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input) diff --git a/src/commands/guildrole/CommandGuildRoleAllowed.java b/src/commands/guildrole/SubCommandAllowed.java similarity index 85% rename from src/commands/guildrole/CommandGuildRoleAllowed.java rename to src/commands/guildrole/SubCommandAllowed.java index f1833da..95fd093 100644 --- a/src/commands/guildrole/CommandGuildRoleAllowed.java +++ b/src/commands/guildrole/SubCommandAllowed.java @@ -9,9 +9,9 @@ import dataStructures.KittyRating; import dataStructures.KittyRole; import dataStructures.KittyUser; -public class CommandGuildRoleAllowed extends SubCommand +public class SubCommandAllowed extends SubCommand { - public CommandGuildRoleAllowed(KittyRole level, KittyRating rating) { super(level, rating); } + public SubCommandAllowed(KittyRole level, KittyRating rating) { super(level, rating); } @Override public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input) diff --git a/src/commands/guildrole/CommandGuildRoleList.java b/src/commands/guildrole/SubCommandList.java similarity index 84% rename from src/commands/guildrole/CommandGuildRoleList.java rename to src/commands/guildrole/SubCommandList.java index 7517fb4..5bf3163 100644 --- a/src/commands/guildrole/CommandGuildRoleList.java +++ b/src/commands/guildrole/SubCommandList.java @@ -9,10 +9,10 @@ import dataStructures.KittyRating; import dataStructures.KittyRole; import dataStructures.KittyUser; -public class CommandGuildRoleList extends SubCommand +public class SubCommandList extends SubCommand { - public CommandGuildRoleList(KittyRole level, KittyRating rating) { super(level, rating);} + public SubCommandList(KittyRole level, KittyRating rating) { super(level, rating);} @Override public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input) diff --git a/src/commands/guildrole/CommandGuildRoleNotAllowed.java b/src/commands/guildrole/SubCommandNotAllowed.java similarity index 85% rename from src/commands/guildrole/CommandGuildRoleNotAllowed.java rename to src/commands/guildrole/SubCommandNotAllowed.java index da48d0b..f11ec28 100644 --- a/src/commands/guildrole/CommandGuildRoleNotAllowed.java +++ b/src/commands/guildrole/SubCommandNotAllowed.java @@ -9,9 +9,9 @@ import dataStructures.KittyRating; import dataStructures.KittyRole; import dataStructures.KittyUser; -public class CommandGuildRoleNotAllowed extends SubCommand +public class SubCommandNotAllowed extends SubCommand { - public CommandGuildRoleNotAllowed(KittyRole level, KittyRating rating) { super(level, rating); } + public SubCommandNotAllowed(KittyRole level, KittyRating rating) { super(level, rating); } @Override public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input) diff --git a/src/commands/guildrole/CommandGuildRoleRemove.java b/src/commands/guildrole/SubCommandRemove.java similarity index 84% rename from src/commands/guildrole/CommandGuildRoleRemove.java rename to src/commands/guildrole/SubCommandRemove.java index 3372a09..ad5fd53 100644 --- a/src/commands/guildrole/CommandGuildRoleRemove.java +++ b/src/commands/guildrole/SubCommandRemove.java @@ -5,9 +5,9 @@ import core.SubCommand; import core.SubCommandFormattable; import dataStructures.*; -public class CommandGuildRoleRemove extends SubCommand +public class SubCommandRemove extends SubCommand { - public CommandGuildRoleRemove(KittyRole level, KittyRating rating) { super(level, rating); } + public SubCommandRemove(KittyRole level, KittyRating rating) { super(level, rating); } @Override public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input) diff --git a/src/core/ObjectBuilderFactory.java b/src/core/ObjectBuilderFactory.java index dc5821c..6a41530 100644 --- a/src/core/ObjectBuilderFactory.java +++ b/src/core/ObjectBuilderFactory.java @@ -7,6 +7,7 @@ import java.util.concurrent.Semaphore; import javax.security.auth.login.LoginException; +import commands.characters.*; import commands.general.*; import commands.guildrole.CommandGuildRoleMain; import core.lua.PluginManager; @@ -15,11 +16,7 @@ import main.Main; import net.dv8tion.jda.core.AccountType; import net.dv8tion.jda.core.JDA; import net.dv8tion.jda.core.JDABuilder; -import net.dv8tion.jda.core.entities.Emote; -import net.dv8tion.jda.core.entities.Game; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.User; +import net.dv8tion.jda.core.entities.*; import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent; import offline.Ref; import utils.AdminControl; @@ -427,7 +424,6 @@ public class ObjectBuilderFactory 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));