lever1209/nopalmo-java
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added mostly complete support for dual commands

Browse source 
basically writing one command for both dms and a guild or having one
file and different functions based on where it was called

Signed-off-by: deepCurse <leverplays@gmail.com>
This commit is contained in:
lever1209 2021-12-06 14:01:02 -04:00
commit 168e45d745
No known key found for this signature in database
GPG key ID: EEBCBB60C9DFC782
18 changed files with 304 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/pkg/deepCurse/nopalmo/manager/DirectCommandManager.java
View file

@ -12,15 +12,15 @@ import java.util.concurrent.Executors;
import java.util.regex.Pattern;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import pkg.deepCurse.nopalmo.command.DirectCommand;
import pkg.deepCurse.nopalmo.command.directCommand.info.DirectMessagePing;
import pkg.deepCurse.nopalmo.command.CommandInterface.DirectCommandInterface;
import pkg.deepCurse.nopalmo.command.commands.Ping;
import pkg.deepCurse.nopalmo.core.Boot;
import pkg.deepCurse.nopalmo.database.DatabaseTools;
import pkg.deepCurse.nopalmo.global.Tools;
public class DirectCommandManager {
public class DirectCommandManager extends CommandManager {
private final Map<String, DirectCommand> directCommandMap = new HashMap<>();
private final Map<String, DirectCommandInterface> directCommandMap = new HashMap<>();
private static Executor executor = null;
public DirectCommandManager() {
@ -30,11 +30,11 @@ public class DirectCommandManager {
public void init() {
addCommand(new DirectMessagePing());
addCommand(new Ping());
}
private void addCommand(DirectCommand c) {
private void addCommand(DirectCommandInterface c) {
if (!directCommandMap.containsKey(c.getCommandName())) {
directCommandMap.put(c.getCommandName(), c);
} else {
@ -43,11 +43,11 @@ public class DirectCommandManager {
}
}
public Collection<DirectCommand> getDirectCommands() {
public Collection<DirectCommandInterface> getDirectCommands() {
return directCommandMap.values();
}
public DirectCommand getCommand(String commandName) {
public DirectCommandInterface getCommand(String commandName) {
if (commandName != null) {
return directCommandMap.get(commandName);
}
@ -69,11 +69,8 @@ public class DirectCommandManager {
long commandStartTime = System.currentTimeMillis();
try {
// ArrayList<String> newArguments = new ArrayList<String>();
// ArrayList<String> commandFlags = new ArrayList<String>();
DirectCommandBlob commandBlob = new DirectCommandBlob(messageReceivedEvent);
DirectCommand directCommand = directCommandMap.get(command);
DirectCommandInterface directCommand = directCommandMap.get(command);
HashMap<String, Argument> argumentList = new HashMap<String, Argument>();
boolean printTime = false;
@ -142,7 +139,7 @@ public class DirectCommandManager {
commandBlob.setCommandManager(this);
if (remainsValid) {
directCommand.runCommand(commandBlob, argumentList);
directCommand.runDirectCommand(commandBlob, argumentList);
}
if (printTime) {