diff --git a/build.gradle b/build.gradle index b5118c8..d548c0f 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id "io.freefair.lombok" version "6.2.0" } -mainClassName = 'codes.ztereohype.ztereomusic.Bot' +mainClassName = 'codes.ztereohype.ztereomusic.ZtereoMUSIC' version '0.0.1' diff --git a/src/main/java/codes/ztereohype/ztereomusic/Bot.java b/src/main/java/codes/ztereohype/ztereomusic/ZtereoMUSIC.java similarity index 80% rename from src/main/java/codes/ztereohype/ztereomusic/Bot.java rename to src/main/java/codes/ztereohype/ztereomusic/ZtereoMUSIC.java index 5b21cdc..3b4d3c4 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/Bot.java +++ b/src/main/java/codes/ztereohype/ztereomusic/ZtereoMUSIC.java @@ -28,8 +28,8 @@ import static net.dv8tion.jda.api.requests.GatewayIntent.GUILD_VOICE_STATES; @Getter @Setter(AccessLevel.PRIVATE) -public class Bot { - public static final Bot INSTANCE = new Bot(); +public class ZtereoMUSIC { + public static final ZtereoMUSIC INSTANCE = new ZtereoMUSIC(); private final Map commandMap = new HashMap<>(); private final Map commandAliases = new HashMap<>(); @@ -40,25 +40,25 @@ public class Bot { private AudioPlayerManager playerManager; private Map guildMusicPlayerMap = new HashMap<>(); - private Bot() { + private ZtereoMUSIC() { } - public static Bot getInstance() { - return Bot.INSTANCE; + public static ZtereoMUSIC getInstance() { + return ZtereoMUSIC.INSTANCE; } @SneakyThrows({ JsonSyntaxException.class, FileNotFoundException.class, LoginException.class, InterruptedException.class }) public static void main(String[] args) { - Bot bot = Bot.getInstance(); + ZtereoMUSIC ztereoMUSIC = ZtereoMUSIC.getInstance(); - bot.setConfig(Config.loadFrom("./config.json5")); - bot.setJda(JDABuilder.createDefault(bot.getConfig().getPropreties().get("token"), GUILD_MESSAGES, - GUILD_VOICE_STATES).build().awaitReady()); + ztereoMUSIC.setConfig(Config.loadFrom("./config.json5")); + ztereoMUSIC.setJda(JDABuilder.createDefault(ztereoMUSIC.getConfig().getPropreties().get("token"), GUILD_MESSAGES, + GUILD_VOICE_STATES).build().awaitReady()); - bot.setupAudio(); - bot.setCommands(); - bot.setListeners(); + ztereoMUSIC.setupAudio(); + ztereoMUSIC.setCommands(); + ztereoMUSIC.setListeners(); } private void setCommands() { diff --git a/src/main/java/codes/ztereohype/ztereomusic/audio/GuildMusicPlayers.java b/src/main/java/codes/ztereohype/ztereomusic/audio/GuildMusicPlayers.java index 9db3cdf..f2906de 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/audio/GuildMusicPlayers.java +++ b/src/main/java/codes/ztereohype/ztereomusic/audio/GuildMusicPlayers.java @@ -1,6 +1,6 @@ package codes.ztereohype.ztereomusic.audio; -import codes.ztereohype.ztereomusic.Bot; +import codes.ztereohype.ztereomusic.ZtereoMUSIC; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.MessageChannel; import net.dv8tion.jda.api.entities.VoiceChannel; @@ -14,14 +14,14 @@ public class GuildMusicPlayers { // If I get called in a different vc I delete the old manager if (!isInSameVC) { - Bot.getInstance().getGuildMusicPlayerMap().remove(guildId); + ZtereoMUSIC.getInstance().getGuildMusicPlayerMap().remove(guildId); } - GuildMusicPlayer musicPlayer = Bot.getInstance().getGuildMusicPlayerMap().get(guildId); + GuildMusicPlayer musicPlayer = ZtereoMUSIC.getInstance().getGuildMusicPlayerMap().get(guildId); if (musicPlayer == null) { - musicPlayer = new GuildMusicPlayer(Bot.getInstance().getPlayerManager(), infoChannel); - Bot.getInstance().getGuildMusicPlayerMap().put(guildId, musicPlayer); + musicPlayer = new GuildMusicPlayer(ZtereoMUSIC.getInstance().getPlayerManager(), infoChannel); + ZtereoMUSIC.getInstance().getGuildMusicPlayerMap().put(guildId, musicPlayer); guild.getAudioManager().openAudioConnection(requestedChannel); } @@ -33,7 +33,7 @@ public class GuildMusicPlayers { // stops player, disconnects from vc, and deletes the wrapper public static void removeGuildAudioPlayer(Guild guild) { long guildId = guild.getIdLong(); - GuildMusicPlayer musicPlayer = Bot.getInstance().getGuildMusicPlayerMap().get(guildId); + GuildMusicPlayer musicPlayer = ZtereoMUSIC.getInstance().getGuildMusicPlayerMap().get(guildId); if (musicPlayer == null) return; @@ -41,6 +41,6 @@ public class GuildMusicPlayers { guild.getAudioManager().closeAudioConnection(); //todo: remove this when will be part of disconnection listener - Bot.getInstance().getGuildMusicPlayerMap().remove(guildId); + ZtereoMUSIC.getInstance().getGuildMusicPlayerMap().remove(guildId); } } diff --git a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Play.java b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Play.java index 4c83261..3bbf0eb 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Play.java +++ b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Play.java @@ -1,6 +1,6 @@ package codes.ztereohype.ztereomusic.command.commands; -import codes.ztereohype.ztereomusic.Bot; +import codes.ztereohype.ztereomusic.ZtereoMUSIC; import codes.ztereohype.ztereomusic.audio.GuildMusicPlayer; import codes.ztereohype.ztereomusic.audio.GuildMusicPlayers; import codes.ztereohype.ztereomusic.command.Command; @@ -43,7 +43,7 @@ public class Play implements Command { VoiceChannel voiceChannel = author.getVoiceState().getChannel(); MessageChannel messageChannel = messageEvent.getChannel(); AudioManager manager = guild.getAudioManager(); - AudioPlayerManager playerManager = Bot.getInstance().getPlayerManager(); + AudioPlayerManager playerManager = ZtereoMUSIC.getInstance().getPlayerManager(); // check if args merged are/have url, if so try to feed it into lava, else try to youtube api the fuck out of it. String mergedArgs = String.join(" ", args); diff --git a/src/main/java/codes/ztereohype/ztereomusic/listeners/CommandListener.java b/src/main/java/codes/ztereohype/ztereomusic/listeners/CommandListener.java index e9f2407..b6ab840 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/listeners/CommandListener.java +++ b/src/main/java/codes/ztereohype/ztereomusic/listeners/CommandListener.java @@ -1,6 +1,6 @@ package codes.ztereohype.ztereomusic.listeners; -import codes.ztereohype.ztereomusic.Bot; +import codes.ztereohype.ztereomusic.ZtereoMUSIC; import codes.ztereohype.ztereomusic.command.Command; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; @@ -12,9 +12,9 @@ import java.util.Map; public class CommandListener extends ListenerAdapter { // TODO: load prefix from a config - private static final String PREFIX = Bot.getInstance().getConfig().getPropreties().get("prefix"); - private static final Map COMMAND_MAP = Bot.getInstance().getCommandMap(); - private static final Map COMMAND_ALIASES = Bot.getInstance().getCommandAliases(); + private static final String PREFIX = ZtereoMUSIC.getInstance().getConfig().getPropreties().get("prefix"); + private static final Map COMMAND_MAP = ZtereoMUSIC.getInstance().getCommandMap(); + private static final Map COMMAND_ALIASES = ZtereoMUSIC.getInstance().getCommandAliases(); @Override public void onMessageReceived(@Nonnull MessageReceivedEvent event) {