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

some shit

Browse source 
Signed-off-by: deepCurse <leverplays@gmail.com>
This commit is contained in:
lever1209 2021-12-13 17:06:27 -04:00
commit bf1d67fb48
No known key found for this signature in database
GPG key ID: EEBCBB60C9DFC782
15 changed files with 434 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import pkg.deepCurse.nopalmo.command.commands.info.Git;
import pkg.deepCurse.nopalmo.command.commands.info.Help;
import pkg.deepCurse.nopalmo.command.commands.info.Info;
import pkg.deepCurse.nopalmo.command.commands.info.Ping;
import pkg.deepCurse.nopalmo.command.commands.info.Reload;
import pkg.deepCurse.nopalmo.command.commands.testing.GuildCommand;
import pkg.deepCurse.nopalmo.command.commands.testing.PrivateCommand;
import pkg.deepCurse.nopalmo.core.Boot;
@ -45,6 +46,7 @@ public class CommandManager {
}
public void init() {
commandMap.clear();
addCommand(new Help(this));// guild
addCommand(new Ping()); // dual
addCommand(new Git()); // dual
@ -52,15 +54,16 @@ public class CommandManager {
addCommand(new Test()); // guild
addCommand(new Info()); // guild direct
addCommand(new GuildCommand()); // guild
addCommand(new PrivateCommand());
addCommand(new PrivateCommand()); // private
addCommand(new Reload()); // dual
}
private void addCommand(CommandInterface c) {
if (!commandMap.containsKey(c.getCommandName())) {
commandMap.put(c.getCommandName(), c);
} else {
commandMap.remove(c.getCommandName());
commandMap.put(c.getCommandName(), c);
for (String i : c.getCommandCalls()) {
// if (!commandMap.containsKey(i)) {
commandMap.put(i, c);
// }
}
}
@ -93,7 +96,9 @@ public class CommandManager {
} else {
return;
}
Users.addUser(event.getAuthor().getIdLong());
final String[] split = message.replaceFirst("(?i)" + Pattern.quote(splicer), "").split("\\s+");
final String commandCall = split[0].toLowerCase();
@ -261,7 +266,7 @@ public class CommandManager {
((PrivateCommandInterface) command).runPrivateCommand(commandBlob, argumentList);
}
if (command instanceof GuildCommandInterface && !event.isFromGuild()) {
if (command instanceof GuildCommandInterface && !event.isFromGuild() && !(command instanceof PrivateCommandInterface)) {
event.getChannel()
.sendMessage(
"Sorry, but you need to be in a "
@ -269,7 +274,7 @@ public class CommandManager {
commandBlob.getAuthorID()) ? "guild" : "server")
+ " to use this command. . .")
.queue();
} else if (command instanceof PrivateCommandInterface && event.isFromGuild()) {
} else if (command instanceof PrivateCommandInterface && event.isFromGuild() && !(command instanceof GuildCommandInterface)) {
event.getChannel().sendMessage("Sorry, but this command will only run in dms. . .").queue();
}
}