Jonas_Jones/ZtereoMUSIC
1
0
Fork 0
mirror of https://github.com/JonasunderscoreJones/ZtereoMUSIC.git synced 2025-10-25 05:29:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename 'Bot' -> 'ZtereoMUSIC'

Browse source
This commit is contained in:
Reperak 2021-11-07 20:59:26 -06:00
parent d11b9a97a4
commit 087fa0f612
No known key found for this signature in database
GPG key ID: 12F30C9BA6950C0C
5 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -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'

24
src/main/java/codes/ztereohype/ztereomusic/Bot.java → src/main/java/codes/ztereohype/ztereomusic/ZtereoMUSIC.java
View file

@ -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<String, Command> commandMap = new HashMap<>();
private final Map<String, String> commandAliases = new HashMap<>();
@ -40,25 +40,25 @@ public class Bot {
private AudioPlayerManager playerManager;
private Map<Long, GuildMusicPlayer> 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() {

14
src/main/java/codes/ztereohype/ztereomusic/audio/GuildMusicPlayers.java
View file

@ -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);
}
}

4
src/main/java/codes/ztereohype/ztereomusic/command/commands/Play.java
View file

@ -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);

8
src/main/java/codes/ztereohype/ztereomusic/listeners/CommandListener.java
View file

@ -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<String, Command> COMMAND_MAP = Bot.getInstance().getCommandMap();
private static final Map<String, String> COMMAND_ALIASES = Bot.getInstance().getCommandAliases();
private static final String PREFIX = ZtereoMUSIC.getInstance().getConfig().getPropreties().get("prefix");
private static final Map<String, Command> COMMAND_MAP = ZtereoMUSIC.getInstance().getCommandMap();
private static final Map<String, String> COMMAND_ALIASES = ZtereoMUSIC.getInstance().getCommandAliases();
@Override
public void onMessageReceived(@Nonnull MessageReceivedEvent event) {