Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/alttd/AltitudeBot.java
This commit is contained in:
2022-04-23 16:30:17 +02:00
39 changed files with 977 additions and 287 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ public class Logger { //TODO make this log to a file
if (!logDir.exists())
{
if (!logDir.mkdir()) {
System.out.println("UNABLE TO CREATE LOGGING DIRECTORY");
Logger.info("UNABLE TO CREATE LOGGING DIRECTORY");
System.exit(1);
}
}
+4 -4
View File
@@ -2,7 +2,7 @@ package com.alttd.util;
import com.alttd.commandManager.CommandManager;
import com.alttd.commandManager.ScopeInfo;
import com.alttd.commandManager.SubCommand;
import com.alttd.commandManager.SubOption;
import com.alttd.config.MessagesConfig;
import com.alttd.templates.Parser;
import com.alttd.templates.Template;
@@ -113,9 +113,9 @@ public class Util {
}
}
public static void registerSubcommands(HashMap<String, SubCommand> subCommandMap, SubCommand... subCommands) {
for (SubCommand subCommand : subCommands)
subCommandMap.put(subCommand.getName(), subCommand);
public static void registerSubOptions(HashMap<String, SubOption> subCommandMap, SubOption... subOptions) {
for (SubOption subOption : subOptions)
subCommandMap.put(subOption.getName(), subOption);
}
public static boolean validateGuildMessageChannel(SlashCommandInteraction interaction, GuildMessageChannel channel, ChannelType channelType, @NotNull Member member) {