New fork of Lavaplayer

README.md

@@ -14,4 +14,4 @@ To compile this maven project into jar file, write it in console (don't forget t
 
 You will see compiled jar file in target folder, you also need to copy your .env file with your parameters in target folder.
 
-To open jar file you have to write `java -jar TouhouClub-1.5.jar` in console (you have to be in the same directory as the jar file).
+To open jar file you have to write `java -jar TouhouClub-1.6.jar` in console (you have to be in the same directory as the jar file).

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>ru.niron3206</groupId>
     <artifactId>TouhouClub</artifactId>
-    <version>1.5</version>
+    <version>1.6</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -24,23 +24,37 @@
             <name>m2-dv8tion</name>
             <url>https://m2.dv8tion.net/releases</url>
         </repository>
+        <repository>
+            <id>arbjergDev-releases</id>
+            <name>Lavalink Repository</name>
+            <url>https://maven.lavalink.dev/releases</url>
+        </repository>
     </repositories>
+
     <dependencies>
         <dependency>
             <groupId>com.github.DV8FromTheWorld</groupId>
             <artifactId>JDA</artifactId>
-                <version>v5.0.0-beta.17</version>
+            <version>v5.0.0-beta.23</version>
+        </dependency>
+
+        <dependency>
+            <groupId>dev.arbjerg</groupId>
+            <artifactId>lavaplayer</artifactId>
+            <version>2.1.2</version>
         </dependency>
+        <dependency>
+            <groupId>dev.lavalink.youtube</groupId>
+            <artifactId>v2</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+
+
         <dependency>
             <groupId>io.github.cdimascio</groupId>
             <artifactId>dotenv-java</artifactId>
             <version>2.3.1</version>
         </dependency>
-        <dependency>
-            <groupId>com.sedmelluq</groupId>
-            <artifactId>lavaplayer</artifactId>
-            <version>1.3.77</version>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -70,10 +84,10 @@
                     </archive>
                 </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>copy-dependencies</id>

src/main/java/ru/niron3206/audioplayer/AutoLeave.java

@@ -2,6 +2,7 @@
 
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.GuildVoiceState;
+import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 
 import java.util.Timer;
 import java.util.TimerTask;
@@ -16,16 +17,19 @@ public AutoLeave(Guild guild) {
 
     public void timer() {
         MusicManager musicManager = PlayerManager.getInstance().getMusicManager(guild);
+
         TimerTask timerTask = new TimerTask() {
             @Override
             public void run() {
 
                 GuildVoiceState selfVoiceState = guild.getSelfMember().getVoiceState();
-                System.out.println("I'm in voice chat (ID: " + selfVoiceState.getChannel().getId() + ")");
+                VoiceChannel channel = selfVoiceState.getChannel().asVoiceChannel();
+
+                System.out.println("I'm in voice chat (ID: " + channel.getId() + ")");
 
                 if ((musicManager.audioPlayer.getPlayingTrack() == null
                         && musicManager.scheduler.queue.isEmpty())
-                        || selfVoiceState.getChannel().asVoiceChannel().getMembers().isEmpty()) {
+                        || channel.getMembers().isEmpty()) {
                     musicManager.scheduler.looping = false;
                     musicManager.audioPlayer.stopTrack();
                     guild.getAudioManager().closeAudioConnection();

src/main/java/ru/niron3206/audioplayer/PlayerManager.java

@@ -7,6 +7,7 @@
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import dev.lavalink.youtube.YoutubeAudioSourceManager;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 
@@ -24,6 +25,9 @@ public PlayerManager() {
         this.musicManager = new HashMap<>();
         this.audioPlayerManager = new DefaultAudioPlayerManager();
 
+        YoutubeAudioSourceManager youtube = new YoutubeAudioSourceManager();
+        audioPlayerManager.registerSourceManager(youtube);
+
         AudioSourceManagers.registerRemoteSources(audioPlayerManager);
         AudioSourceManagers.registerLocalSource(audioPlayerManager);
     }
@@ -93,7 +97,7 @@ public void noMatches() {
 
             @Override
             public void loadFailed(FriendlyException e) {
-                //
+                e.printStackTrace();
             }
         });
     }

src/main/java/ru/niron3206/cmds/music/PlayCommand.java

@@ -26,7 +26,7 @@ public void handle(CommandContext ctx) {
         TextChannel channel = ctx.getEvent().getChannel().asTextChannel();
         List<Message.Attachment> attachments = ctx.getEvent().getMessage().getAttachments();
 
-        if (ctx.getArgs() == null && attachments.size() == 0) {
+        if (ctx.getArgs() == null && attachments.isEmpty()) {
             channel.sendMessage("\uD83D\uDD34 Ничего не понял, вот как должно быть: `~play <ютуб ссылка, ссылка на аудио или прикреплённый аудиофайл>`").queue();
             return;
         }