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

change: cleanup imports

Browse source
This commit is contained in:
ZtereoHYPE 2021-12-28 01:36:17 +01:00
parent a6228af48d
commit fee15771ad
6 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/codes/ztereohype/ztereomusic/audio/CustomAudioLoadResultHandler.java
View file

@ -4,9 +4,7 @@ import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist; import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.MessageChannel; import net.dv8tion.jda.api.entities.MessageChannel;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
public class CustomAudioLoadResultHandler implements AudioLoadResultHandler { public class CustomAudioLoadResultHandler implements AudioLoadResultHandler {
private final TrackManager trackManager; private final TrackManager trackManager;

6
src/main/java/codes/ztereohype/ztereomusic/audio/TrackManagers.java
View file

@ -1,19 +1,17 @@
package codes.ztereohype.ztereomusic.audio; package codes.ztereohype.ztereomusic.audio;
import codes.ztereohype.ztereomusic.ZtereoMUSIC; import codes.ztereohype.ztereomusic.ZtereoMUSIC;
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.MessageChannel; import net.dv8tion.jda.api.entities.MessageChannel;
import net.dv8tion.jda.api.entities.VoiceChannel; import net.dv8tion.jda.api.entities.VoiceChannel;
import net.dv8tion.jda.api.managers.AudioManager; import net.dv8tion.jda.api.managers.AudioManager;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Objects;
public class TrackManagers { public class TrackManagers {
//todo: separate infochannel setting from creation or getting, maybe remove guildtrackmanager should accept a tracc manager? //note: maybe make infoChannel an optional? not sure how to make this better, ask rep
@Nullable @Nullable
public static TrackManager getGuildTrackManager(Guild guild, MessageChannel infoChannel) { public static TrackManager getGuildTrackManager(Guild guild, @Nullable MessageChannel infoChannel) {
long guildId = guild.getIdLong(); long guildId = guild.getIdLong();
TrackManager trackManager = ZtereoMUSIC.getInstance().getGuildTrackManagerMap().get(guildId); TrackManager trackManager = ZtereoMUSIC.getInstance().getGuildTrackManagerMap().get(guildId);

3
src/main/java/codes/ztereohype/ztereomusic/command/commands/Disconnect.java
View file

@ -1,14 +1,11 @@
package codes.ztereohype.ztereomusic.command.commands; package codes.ztereohype.ztereomusic.command.commands;
import codes.ztereohype.ztereomusic.ZtereoMUSIC;
import codes.ztereohype.ztereomusic.audio.TrackManager;
import codes.ztereohype.ztereomusic.audio.TrackManagers; import codes.ztereohype.ztereomusic.audio.TrackManagers;
import codes.ztereohype.ztereomusic.command.Command; import codes.ztereohype.ztereomusic.command.Command;
import codes.ztereohype.ztereomusic.command.CommandMeta; import codes.ztereohype.ztereomusic.command.CommandMeta;
import codes.ztereohype.ztereomusic.command.permissions.VoiceChecks; import codes.ztereohype.ztereomusic.command.permissions.VoiceChecks;
import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.managers.AudioManager;
public class Disconnect implements Command { public class Disconnect implements Command {
private final CommandMeta meta; private final CommandMeta meta;

5
src/main/java/codes/ztereohype/ztereomusic/command/permissions/VoiceChecks.java
View file

@ -1,18 +1,13 @@
package codes.ztereohype.ztereomusic.command.permissions; package codes.ztereohype.ztereomusic.command.permissions;
import codes.ztereohype.ztereomusic.audio.TrackManager; import codes.ztereohype.ztereomusic.audio.TrackManager;
import codes.ztereohype.ztereomusic.audio.TrackManagers;
import lombok.Getter; import lombok.Getter;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.VoiceChannel; import net.dv8tion.jda.api.entities.VoiceChannel;
import net.dv8tion.jda.api.managers.AudioManager;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Objects; import java.util.Objects;
// todo: make an actual good system
// Since these permission checks basically need to run for every single voice-related command,
// we just get the info we need... idk i need to think this through
public enum VoiceChecks { public enum VoiceChecks {
BOT_CONNECTED(new Check() { BOT_CONNECTED(new Check() {
@Override @Override

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

@ -1,15 +1,12 @@
package codes.ztereohype.ztereomusic.listeners; package codes.ztereohype.ztereomusic.listeners;
import codes.ztereohype.ztereomusic.ZtereoMUSIC; import codes.ztereohype.ztereomusic.ZtereoMUSIC;
import codes.ztereohype.ztereomusic.audio.TrackManager;
import codes.ztereohype.ztereomusic.audio.TrackManagers; import codes.ztereohype.ztereomusic.audio.TrackManagers;
import codes.ztereohype.ztereomusic.command.Command; import codes.ztereohype.ztereomusic.command.Command;
import codes.ztereohype.ztereomusic.command.permissions.Check;
import codes.ztereohype.ztereomusic.command.permissions.VoiceChecks; import codes.ztereohype.ztereomusic.command.permissions.VoiceChecks;
import net.dv8tion.jda.api.entities.*; import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.dv8tion.jda.api.managers.AudioManager;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.util.Arrays; import java.util.Arrays;
@ -60,6 +57,7 @@ public class CommandListener extends ListenerAdapter {
try { try {
command.execute(event, args); command.execute(event, args);
} catch (Exception e) { } catch (Exception e) {
//todo: nicer embed with error pls
message.getChannel().sendMessage("uh oh something really bad happened and yeah so yeah everything is aborted and cancelled i give up this is too hard kthxbye").queue(); message.getChannel().sendMessage("uh oh something really bad happened and yeah so yeah everything is aborted and cancelled i give up this is too hard kthxbye").queue();
throw e; throw e;
} }

3
src/main/java/codes/ztereohype/ztereomusic/listeners/vcLeaveListener.java → src/main/java/codes/ztereohype/ztereomusic/listeners/VcLeaveListener.java
View file

@ -1,7 +1,6 @@
package codes.ztereohype.ztereomusic.listeners; package codes.ztereohype.ztereomusic.listeners;
import codes.ztereohype.ztereomusic.ZtereoMUSIC; import codes.ztereohype.ztereomusic.ZtereoMUSIC;
import codes.ztereohype.ztereomusic.audio.TrackManager;
import codes.ztereohype.ztereomusic.audio.TrackManagers; import codes.ztereohype.ztereomusic.audio.TrackManagers;
import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
@ -10,7 +9,7 @@ import net.dv8tion.jda.api.hooks.ListenerAdapter;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
public class vcLeaveListener extends ListenerAdapter { public class VcLeaveListener extends ListenerAdapter {
@Override @Override
public void onGuildVoiceLeave(@Nonnull GuildVoiceLeaveEvent event) { public void onGuildVoiceLeave(@Nonnull GuildVoiceLeaveEvent event) {
Guild guild = event.getGuild(); Guild guild = event.getGuild();