From 3cc4a469266d2a1677e417df91d9ee4437928795 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 17 Jan 2020 18:01:22 +0100 Subject: [PATCH 01/10] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 41eee21..d1aaab0 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -174,6 +174,9 @@ commands.moderation.editrules.success.title = Successfully changed commands.moderation.editrules.success.description = I successfully changed the rules commands.moderation.editrules.help.description = Edits the rules message. +commands.music.bass.error.connected.title = No channel +commands.music.bass.error.connected.description = You have to be in the same voice channel as the bot to change the bass level. +commands.music.bass.help.description = Change the bass for the song which is played at the moment. commands.music.join.success.title = Successfully connected commands.music.join.success.description = Ich habe mich erfolgreich mit %extra% verbunden. commands.music.join.error.connecting.already.title = Already connected -- 2.45.3 From 934f522bb4c594f5fd8977ae2884bd42c8dbb03f Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 17 Jan 2020 18:01:23 +0100 Subject: [PATCH 02/10] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 9167e2d..5ca0715 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -174,6 +174,9 @@ commands.moderation.editrules.success.title = Successfully changed commands.moderation.editrules.success.description = I successfully changed the rules commands.moderation.editrules.help.description = Edits the rules message. +commands.music.bass.error.connected.title = No channel +commands.music.bass.error.connected.description = You have to be in the same voice channel as the bot to change the bass level. +commands.music.bass.help.description = Change the bass for the song which is played at the moment. commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. commands.music.join.error.connecting.already.title = Already connected -- 2.45.3 From dba704dd547cc18cb4cf9257a7627e971a941898 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 17 Jan 2020 18:01:25 +0100 Subject: [PATCH 03/10] New translations Translations_en.properties (Spanish) New Spanish translation --- src/main/resources/Translations/Translations_es.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index 9167e2d..5ca0715 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -174,6 +174,9 @@ commands.moderation.editrules.success.title = Successfully changed commands.moderation.editrules.success.description = I successfully changed the rules commands.moderation.editrules.help.description = Edits the rules message. +commands.music.bass.error.connected.title = No channel +commands.music.bass.error.connected.description = You have to be in the same voice channel as the bot to change the bass level. +commands.music.bass.help.description = Change the bass for the song which is played at the moment. commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. commands.music.join.error.connecting.already.title = Already connected -- 2.45.3 From 08fd46c32f3aa2d22ddf5bff2bba13831aa7a4ad Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 17 Jan 2020 18:01:26 +0100 Subject: [PATCH 04/10] New translations Translations_en.properties (French) New French translation --- src/main/resources/Translations/Translations_fr.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index 9167e2d..5ca0715 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -174,6 +174,9 @@ commands.moderation.editrules.success.title = Successfully changed commands.moderation.editrules.success.description = I successfully changed the rules commands.moderation.editrules.help.description = Edits the rules message. +commands.music.bass.error.connected.title = No channel +commands.music.bass.error.connected.description = You have to be in the same voice channel as the bot to change the bass level. +commands.music.bass.help.description = Change the bass for the song which is played at the moment. commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. commands.music.join.error.connecting.already.title = Already connected -- 2.45.3 From 33eec6f6cbc96518554fe51e0df1c61c24d5dc2a Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 17 Jan 2020 18:01:28 +0100 Subject: [PATCH 05/10] New translations Translations_en.properties (Russian) New Russian translation --- src/main/resources/Translations/Translations_ru.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index 9167e2d..5ca0715 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -174,6 +174,9 @@ commands.moderation.editrules.success.title = Successfully changed commands.moderation.editrules.success.description = I successfully changed the rules commands.moderation.editrules.help.description = Edits the rules message. +commands.music.bass.error.connected.title = No channel +commands.music.bass.error.connected.description = You have to be in the same voice channel as the bot to change the bass level. +commands.music.bass.help.description = Change the bass for the song which is played at the moment. commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. commands.music.join.error.connecting.already.title = Already connected -- 2.45.3 From c6706a848caf389277111be747b639648c917a3f Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 17 Jan 2020 18:01:29 +0100 Subject: [PATCH 06/10] New translations Translations_en.properties (Turkish) New Turkish translation --- src/main/resources/Translations/Translations_tr.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index 9167e2d..5ca0715 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -174,6 +174,9 @@ commands.moderation.editrules.success.title = Successfully changed commands.moderation.editrules.success.description = I successfully changed the rules commands.moderation.editrules.help.description = Edits the rules message. +commands.music.bass.error.connected.title = No channel +commands.music.bass.error.connected.description = You have to be in the same voice channel as the bot to change the bass level. +commands.music.bass.help.description = Change the bass for the song which is played at the moment. commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. commands.music.join.error.connecting.already.title = Already connected -- 2.45.3 From c88c5b83e931f5d0fd82ecf94870c176ccd1dcb3 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 17 Jan 2020 18:01:30 +0100 Subject: [PATCH 07/10] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- src/main/resources/Translations/Translations_zh.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index 9167e2d..5ca0715 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -174,6 +174,9 @@ commands.moderation.editrules.success.title = Successfully changed commands.moderation.editrules.success.description = I successfully changed the rules commands.moderation.editrules.help.description = Edits the rules message. +commands.music.bass.error.connected.title = No channel +commands.music.bass.error.connected.description = You have to be in the same voice channel as the bot to change the bass level. +commands.music.bass.help.description = Change the bass for the song which is played at the moment. commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. commands.music.join.error.connecting.already.title = Already connected -- 2.45.3 From 08e18bab64c94a68d9a1327f03232a01d7fa951c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 18 Jan 2020 17:02:34 +0100 Subject: [PATCH 08/10] Remove unused import --- src/main/java/com/bbn/hadder/Hadder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 2dd1812..917328f 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -16,7 +16,6 @@ import net.dv8tion.jda.api.entities.Activity; import net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder; import net.dv8tion.jda.api.sharding.ShardManager; -import javax.security.auth.login.LoginException; import java.util.List; public class Hadder { -- 2.45.3 From b9767b0839347d83d71762e00383504241ad33ab Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 19 Jan 2020 11:32:53 +0100 Subject: [PATCH 09/10] Music fix lol --- src/main/java/com/bbn/hadder/audio/TrackManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index 5154b80..08a1363 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -48,13 +48,13 @@ public class TrackManager extends AudioEventAdapter { @Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { + Guild g = queue.poll().getAuthor().getGuild(); if (loop) { player.playTrack(track.makeClone()); } else if (queue.isEmpty()) { - Guild g = queue.poll().getAuthor().getGuild(); g.getAudioManager().closeAudioConnection(); } else { - player.playTrack(queue.element().getTrack().makeClone()); + player.playTrack(queue.element().getTrack()); } } -- 2.45.3 From 6ef8fdfd9b81979faea79d1fc8ca187baecd76aa Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 19 Jan 2020 11:47:11 +0100 Subject: [PATCH 10/10] #328 --- src/main/java/com/bbn/hadder/audio/AudioManager.java | 2 +- src/main/java/com/bbn/hadder/audio/TrackManager.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/com/bbn/hadder/audio/AudioManager.java index 4e7b730..c40002a 100644 --- a/src/main/java/com/bbn/hadder/audio/AudioManager.java +++ b/src/main/java/com/bbn/hadder/audio/AudioManager.java @@ -53,7 +53,7 @@ public class AudioManager { public AudioPlayer createPlayer(Guild guild) { AudioPlayer nPlayer = myManager.createPlayer(); - TrackManager manager = new TrackManager(nPlayer); + TrackManager manager = new TrackManager(nPlayer, this); nPlayer.addListener(manager); guild.getAudioManager().setSendingHandler(new AudioPlayerSendHandler(nPlayer)); players.put(guild.getId(), new AbstractMap.SimpleEntry<>(nPlayer, manager)); diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index 08a1363..c5710fe 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -18,10 +18,12 @@ import java.util.concurrent.LinkedBlockingQueue; public class TrackManager extends AudioEventAdapter { private final AudioPlayer player; + private final AudioManager manager; private final Queue queue; private boolean loop = false; - public TrackManager(AudioPlayer player) { + public TrackManager(AudioPlayer player, AudioManager manager) { + this.manager = manager; this.player = player; this.queue = new LinkedBlockingQueue<>(); } @@ -52,6 +54,9 @@ public class TrackManager extends AudioEventAdapter { if (loop) { player.playTrack(track.makeClone()); } else if (queue.isEmpty()) { + manager.players.remove(g.getId()); + manager.getPlayer(g).destroy(); + manager.getTrackManager(g).purgeQueue(); g.getAudioManager().closeAudioConnection(); } else { player.playTrack(queue.element().getTrack()); -- 2.45.3