From 294372941e2687f2a16aea1a5f655e8b310b2a20 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 15 Jan 2020 18:10:19 +0100 Subject: [PATCH 01/19] lol wakatime command --- src/main/java/com/bbn/hadder/Hadder.java | 3 +- .../hadder/commands/misc/WakaTimeCommand.java | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index b4a6cbb..063d826 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -103,7 +103,8 @@ public class Hadder { new StopCommand(), new BlacklistCommand(), new PauseCommand(), - new LoopCommand()), config, helpCommand); + new LoopCommand(), + new WakaTimeCommand()), config, helpCommand); builder.addEventListeners( new MentionListener(rethink), diff --git a/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java b/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java new file mode 100644 index 0000000..9cee11d --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java @@ -0,0 +1,36 @@ +package com.bbn.hadder.commands.misc; + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; + +/** + * @author Skidder / GregTCLTK + */ + +public class WakaTimeCommand implements Command { + + @Override + public void executed(String[] args, CommandEvent event) { + + } + + @Override + public String[] labels() { + return new String[]{"wakatime", "wk"}; + } + + @Override + public String description() { + return "Show WakaTime stats."; + } + + @Override + public String usage() { + return "[WakaTime-User]"; + } + + @Override + public String example() { + return "@Skidder"; + } +} -- 2.45.3 From 4725f4a12369aaa93a1b3a82f3cdd4ba59f8d5ff Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 15 Jan 2020 18:18:06 +0100 Subject: [PATCH 02/19] TODO Gh command --- .../java/com/bbn/hadder/commands/misc/GitHubCommand.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java index 906798e..8c1ffd6 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java @@ -79,6 +79,9 @@ public class GitHubCommand implements Command { } } } else { + event.getHelpCommand().sendHelp(this, event); + /* + TODO: THIS event.getTextChannel().sendMessage( event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, @@ -86,7 +89,7 @@ public class GitHubCommand implements Command { "", "commands.misc.github.connect.description", "(https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942)") - .build()).queue(); + .build()).queue(); */ } } -- 2.45.3 From c13e5249d1dc690d95ae523352be353b5e084c10 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 15 Jan 2020 19:48:30 +0100 Subject: [PATCH 03/19] More error messages --- .../hadder/commands/misc/WakaTimeCommand.java | 31 +++++++++++++++++++ .../Translations/Translations_en.properties | 4 +++ 2 files changed, 35 insertions(+) diff --git a/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java b/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java index 9cee11d..c779e7c 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java @@ -2,6 +2,14 @@ package com.bbn.hadder.commands.misc; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; /** * @author Skidder / GregTCLTK @@ -11,7 +19,30 @@ public class WakaTimeCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { + if (args.length == 1) { + Request request = new Request.Builder().url("https://wakatime.com/api/v1/users/" + args[0]).build(); + try { + Response response = new OkHttpClient().newCall(request).execute(); + JSONObject json = new JSONObject(response.body().string()); + event.getTextChannel().sendMessage("jisdfids").queue(); + } catch (JSONException e) { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + MessageEditor.MessageType.ERROR, + "commands.misc.wakatime.user.error.title", + "commands.misc.wakatime.user.error.description").build()).queue(); + } catch (IOException | NullPointerException e) { + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.ERROR, + "commands.misc.wakatime.api.error.title", + "commands.misc.wakatime.api.error.description") + .build() + ).queue(); + } + } else { + event.getHelpCommand().sendHelp(this, event); + } } @Override diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 9167e2d..76505d1 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -73,6 +73,10 @@ commands.misc.screenshare.number.error.description = This isn't a Number. commands.misc.screenshare.channel.existing.error = Hol' up commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is in this Guild. commands.misc.screenshare.help.description = Shows you the link to share your screen. +commands.misc.wakatime.api.error.title = API error +commands.misc.wakatime.api.error.description = The WakaTime API might be down at the moment\! +commands.misc.wakatime.user.error.title = User doesn't exist +commands.misc.wakatime.user.error.description = I can not find a user named like this\! commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% -- 2.45.3 From 13155d68fb4a169f6dc72007f76d0cfcc45e98a5 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 15 Jan 2020 20:26:52 +0100 Subject: [PATCH 04/19] Some music stuff :( --- src/main/java/com/bbn/hadder/audio/TrackManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index 91fa146..b1db573 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -48,7 +48,7 @@ public class TrackManager extends AudioEventAdapter { @Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { - Guild g = queue.element().getAuthor().getGuild(); + Guild g = queue.poll().getAuthor().getGuild(); if (loop) { player.playTrack(track.makeClone()); } else if (queue.isEmpty()) { -- 2.45.3 From 0973651870f717b1e8bdda006430d05550a595b2 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 15 Jan 2020 20:43:21 +0100 Subject: [PATCH 05/19] Authorization stuff --- .../java/com/bbn/hadder/commands/misc/WakaTimeCommand.java | 2 +- src/main/java/com/bbn/hadder/core/Config.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java b/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java index c779e7c..dd3f64c 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java @@ -20,7 +20,7 @@ public class WakaTimeCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (args.length == 1) { - Request request = new Request.Builder().url("https://wakatime.com/api/v1/users/" + args[0]).build(); + Request request = new Request.Builder().url("https://wakatime.com/api/v1/users/" + args[0]).addHeader("Authorization", "Basic " + event.getConfig().getWakaTimeToken()).build(); try { Response response = new OkHttpClient().newCall(request).execute(); diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/com/bbn/hadder/core/Config.java index 942c382..a19fe35 100644 --- a/src/main/java/com/bbn/hadder/core/Config.java +++ b/src/main/java/com/bbn/hadder/core/Config.java @@ -103,6 +103,10 @@ public class Config { return config.getJSONObject("Tokens").getString("GitHub"); } + public String getWakaTimeToken() { + return config.getJSONObject("Tokens").getString("WakaTime"); + } + public String getMythicalBotListToken() { return config.getJSONObject("Tokens").getString("MythicalBotList"); } -- 2.45.3 From 69761c6428423475fdec3b274869df868e084b66 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 15 Jan 2020 20:54:29 +0100 Subject: [PATCH 06/19] Some wakatime stuff --- .../java/com/bbn/hadder/commands/misc/WakaTimeCommand.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java b/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java index dd3f64c..9fbe4fd 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java @@ -25,7 +25,9 @@ public class WakaTimeCommand implements Command { try { Response response = new OkHttpClient().newCall(request).execute(); JSONObject json = new JSONObject(response.body().string()); - event.getTextChannel().sendMessage("jisdfids").queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "", + "").build()).queue(); } catch (JSONException e) { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, -- 2.45.3 From 910adbca11e0e39d0cce4d8f3152513611502125 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2020 13:30:38 +0000 Subject: [PATCH 07/19] Bump JDA from 4.1.0_97 to 4.1.0_99 Bumps JDA from 4.1.0_97 to 4.1.0_99. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 569e8aa..470de55 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ net.dv8tion JDA - 4.1.0_97 + 4.1.0_99 org.json -- 2.45.3 From 04a965c3b98340fabaadcb77d200cd6046cf07b9 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 16 Jan 2020 18:32:18 +0100 Subject: [PATCH 08/19] Translation --- src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java | 2 +- src/main/resources/Translations/Translations_en.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java b/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java index 9fbe4fd..c1ad8d9 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java @@ -54,7 +54,7 @@ public class WakaTimeCommand implements Command { @Override public String description() { - return "Show WakaTime stats."; + return "commands.misc.wakatime.help.description"; } @Override diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 76505d1..a3f02b3 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -77,6 +77,7 @@ commands.misc.wakatime.api.error.title = API error commands.misc.wakatime.api.error.description = The WakaTime API might be down at the moment\! commands.misc.wakatime.user.error.title = User doesn't exist commands.misc.wakatime.user.error.description = I can not find a user named like this\! +commands.misc.wakatime.help.description = Show the WakaTime stats of the specified user. commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% -- 2.45.3 From 82135650fe48fe0399360daa9ec5bfeeb0bfb7b1 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 16 Jan 2020 19:10:20 +0100 Subject: [PATCH 09/19] Bye WakaTime :( --- src/main/java/com/bbn/hadder/Hadder.java | 3 +- .../hadder/commands/misc/WakaTimeCommand.java | 69 ------------------- .../Translations/Translations_en.properties | 5 -- 3 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 063d826..b4a6cbb 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -103,8 +103,7 @@ public class Hadder { new StopCommand(), new BlacklistCommand(), new PauseCommand(), - new LoopCommand(), - new WakaTimeCommand()), config, helpCommand); + new LoopCommand()), config, helpCommand); builder.addEventListeners( new MentionListener(rethink), diff --git a/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java b/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java deleted file mode 100644 index c1ad8d9..0000000 --- a/src/main/java/com/bbn/hadder/commands/misc/WakaTimeCommand.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.bbn.hadder.commands.misc; - -import com.bbn.hadder.commands.Command; -import com.bbn.hadder.commands.CommandEvent; -import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; - -/** - * @author Skidder / GregTCLTK - */ - -public class WakaTimeCommand implements Command { - - @Override - public void executed(String[] args, CommandEvent event) { - if (args.length == 1) { - Request request = new Request.Builder().url("https://wakatime.com/api/v1/users/" + args[0]).addHeader("Authorization", "Basic " + event.getConfig().getWakaTimeToken()).build(); - - try { - Response response = new OkHttpClient().newCall(request).execute(); - JSONObject json = new JSONObject(response.body().string()); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "", - "").build()).queue(); - } catch (JSONException e) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( - MessageEditor.MessageType.ERROR, - "commands.misc.wakatime.user.error.title", - "commands.misc.wakatime.user.error.description").build()).queue(); - } catch (IOException | NullPointerException e) { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( - MessageEditor.MessageType.ERROR, - "commands.misc.wakatime.api.error.title", - "commands.misc.wakatime.api.error.description") - .build() - ).queue(); - } - } else { - event.getHelpCommand().sendHelp(this, event); - } - } - - @Override - public String[] labels() { - return new String[]{"wakatime", "wk"}; - } - - @Override - public String description() { - return "commands.misc.wakatime.help.description"; - } - - @Override - public String usage() { - return "[WakaTime-User]"; - } - - @Override - public String example() { - return "@Skidder"; - } -} diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index a3f02b3..9167e2d 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -73,11 +73,6 @@ commands.misc.screenshare.number.error.description = This isn't a Number. commands.misc.screenshare.channel.existing.error = Hol' up commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is in this Guild. commands.misc.screenshare.help.description = Shows you the link to share your screen. -commands.misc.wakatime.api.error.title = API error -commands.misc.wakatime.api.error.description = The WakaTime API might be down at the moment\! -commands.misc.wakatime.user.error.title = User doesn't exist -commands.misc.wakatime.user.error.description = I can not find a user named like this\! -commands.misc.wakatime.help.description = Show the WakaTime stats of the specified user. commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% -- 2.45.3 From 26d712dcbd9a66fcd22be6e963ace64130c84752 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 16 Jan 2020 19:50:13 +0100 Subject: [PATCH 10/19] Remove a line lol --- src/main/java/com/bbn/hadder/listener/MentionListener.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index 238b2d8..cd14129 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -13,7 +13,6 @@ public class MentionListener extends ListenerAdapter { private Rethink rethink; - public MentionListener(Rethink rethink) { this.rethink = rethink; } -- 2.45.3 From d07e8deefdeb204c4a010b0443f1b6f28bd45024 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 16 Jan 2020 19:51:18 +0100 Subject: [PATCH 11/19] Not needed --- src/main/java/com/bbn/hadder/core/Config.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/com/bbn/hadder/core/Config.java index a19fe35..942c382 100644 --- a/src/main/java/com/bbn/hadder/core/Config.java +++ b/src/main/java/com/bbn/hadder/core/Config.java @@ -103,10 +103,6 @@ public class Config { return config.getJSONObject("Tokens").getString("GitHub"); } - public String getWakaTimeToken() { - return config.getJSONObject("Tokens").getString("WakaTime"); - } - public String getMythicalBotListToken() { return config.getJSONObject("Tokens").getString("MythicalBotList"); } -- 2.45.3 From 054d967b708f7b335749434f7190f6974a5a0184 Mon Sep 17 00:00:00 2001 From: Hax Date: Thu, 16 Jan 2020 21:00:54 +0100 Subject: [PATCH 12/19] Vom Bra muss der Benzer --- src/main/java/com/bbn/hadder/Hadder.java | 3 +- .../com/bbn/hadder/audio/AudioManager.java | 1 + .../hadder/commands/music/BassCommand.java | 48 +++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/bbn/hadder/commands/music/BassCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index b4a6cbb..0494551 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -103,7 +103,8 @@ public class Hadder { new StopCommand(), new BlacklistCommand(), new PauseCommand(), - new LoopCommand()), config, helpCommand); + new LoopCommand(), + new BassCommand()), config, helpCommand); builder.addEventListeners( new MentionListener(rethink), diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/com/bbn/hadder/audio/AudioManager.java index 6dd6f18..4e7b730 100644 --- a/src/main/java/com/bbn/hadder/audio/AudioManager.java +++ b/src/main/java/com/bbn/hadder/audio/AudioManager.java @@ -30,6 +30,7 @@ public class AudioManager { public AudioManager() { AudioSourceManagers.registerRemoteSources(myManager); + myManager.getConfiguration().setFilterHotSwapEnabled(true); } public boolean hasPlayer(Guild guild) { diff --git a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java b/src/main/java/com/bbn/hadder/commands/music/BassCommand.java new file mode 100644 index 0000000..1b7b4de --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/music/BassCommand.java @@ -0,0 +1,48 @@ +/* + * @author Hax / Hax6775 / Schlauer_Hax + */ + +package com.bbn.hadder.commands.music; + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; +import com.sedmelluq.discord.lavaplayer.filter.equalizer.EqualizerFactory; + +public class BassCommand implements Command { + private static final float[] BASS_BOOST = { 0.2f, 0.15f, 0.1f, 0.05f, 0.0f, -0.05f, -0.1f, -0.1f, -0.1f, -0.1f, -0.1f, + -0.1f, -0.1f, -0.1f, -0.1f }; + + @Override + public void executed(String[] args, CommandEvent event) { + if (args.length==1) { + float value = Float.parseFloat(args[0]); + EqualizerFactory equalizer = new EqualizerFactory(); + for (int i = 0; i < BASS_BOOST.length; i++) { + equalizer.setGain(i, BASS_BOOST[i] + value); + } + event.getAudioManager().getPlayer(event.getGuild()).setFrameBufferDuration(500); + event.getAudioManager().getPlayer(event.getGuild()).setFilterFactory(equalizer); + event.getTextChannel().sendMessage("Bruh, set dae bass").queue(); + } + } + + @Override + public String[] labels() { + return new String[]{"bass"}; + } + + @Override + public String description() { + return null; + } + + @Override + public String usage() { + return null; + } + + @Override + public String example() { + return null; + } +} -- 2.45.3 From 28b1c755fadadc34e4d6985efa64071c888fe624 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 17 Jan 2020 15:20:49 +0100 Subject: [PATCH 13/19] Translation fix --- src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java index a7d3546..2f6b835 100644 --- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java @@ -35,7 +35,7 @@ public class VolumeCommand implements Command { } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.volume.error.connected.title", - "commands.volume.stop.error.connected.description") + "commands.volume.error.connected.description") .build()).queue(); } } else { -- 2.45.3 From 76886f1bf8cc324328035d79d6722107335ea34a Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 17 Jan 2020 17:32:54 +0100 Subject: [PATCH 14/19] Bass Command Help stuff --- .../com/bbn/hadder/commands/music/BassCommand.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java b/src/main/java/com/bbn/hadder/commands/music/BassCommand.java index 1b7b4de..a08c1ac 100644 --- a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/BassCommand.java @@ -1,5 +1,5 @@ /* - * @author Hax / Hax6775 / Schlauer_Hax + @author Hax / Hax6775 / Schlauer_Hax */ package com.bbn.hadder.commands.music; @@ -14,7 +14,7 @@ public class BassCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - if (args.length==1) { + if (args.length == 1) { float value = Float.parseFloat(args[0]); EqualizerFactory equalizer = new EqualizerFactory(); for (int i = 0; i < BASS_BOOST.length; i++) { @@ -33,16 +33,16 @@ public class BassCommand implements Command { @Override public String description() { - return null; + return "commands.music.bass.help.description"; } @Override public String usage() { - return null; + return "[Bass-Level]"; } @Override public String example() { - return null; + return "1000"; } } -- 2.45.3 From 53a00f79c8ebc26b64bd26eff234a5239fce981c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 17 Jan 2020 17:33:29 +0100 Subject: [PATCH 15/19] Some stuff lol --- src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java index 2f6b835..fa2b886 100644 --- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java @@ -12,7 +12,7 @@ public class VolumeCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - if (args.length > 0) { + if (args.length == 1) { if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { try { -- 2.45.3 From 9564eeab7d7313fc6b4baa8f64f6bd04e70c1256 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 17 Jan 2020 17:33:58 +0100 Subject: [PATCH 16/19] Wait I think this is better --- src/main/java/com/bbn/hadder/commands/music/BassCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java b/src/main/java/com/bbn/hadder/commands/music/BassCommand.java index a08c1ac..70ce4b7 100644 --- a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/BassCommand.java @@ -14,7 +14,7 @@ public class BassCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - if (args.length == 1) { + if (args.length > 0) { float value = Float.parseFloat(args[0]); EqualizerFactory equalizer = new EqualizerFactory(); for (int i = 0; i < BASS_BOOST.length; i++) { diff --git a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java index fa2b886..2f6b835 100644 --- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java @@ -12,7 +12,7 @@ public class VolumeCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - if (args.length == 1) { + if (args.length > 0) { if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { try { -- 2.45.3 From 7ed0d5a7ee6dc096de4ad6201730e2c0ad2db4ed Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 17 Jan 2020 17:35:26 +0100 Subject: [PATCH 17/19] i18n fix --- src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java index 2f6b835..b39fbf2 100644 --- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java @@ -35,7 +35,7 @@ public class VolumeCommand implements Command { } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.volume.error.connected.title", - "commands.volume.error.connected.description") + "commands.music.volume.error.connected.description") .build()).queue(); } } else { -- 2.45.3 From 00e1f841b4c659513263044d1f3fd2813b06886a Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 17 Jan 2020 17:35:56 +0100 Subject: [PATCH 18/19] :^) --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 0494551..2dd1812 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -119,7 +119,7 @@ public class Hadder { try { shardManager = builder.build(); - } catch (LoginException e) { + } catch (Exception e) { e.printStackTrace(); } } -- 2.45.3 From 534cf4f50ce193da0363c89b49591918994ea0ce Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 17 Jan 2020 17:36:58 +0100 Subject: [PATCH 19/19] Some bass stuff --- .../com/bbn/hadder/audio/TrackManager.java | 2 +- .../hadder/commands/music/BassCommand.java | 29 ++++++++++++++----- .../Translations/Translations_en.properties | 3 ++ 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index b1db573..5154b80 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -48,10 +48,10 @@ 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()); diff --git a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java b/src/main/java/com/bbn/hadder/commands/music/BassCommand.java index 70ce4b7..c227118 100644 --- a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/BassCommand.java @@ -6,6 +6,7 @@ package com.bbn.hadder.commands.music; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; import com.sedmelluq.discord.lavaplayer.filter.equalizer.EqualizerFactory; public class BassCommand implements Command { @@ -15,15 +16,27 @@ public class BassCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (args.length > 0) { - float value = Float.parseFloat(args[0]); - EqualizerFactory equalizer = new EqualizerFactory(); - for (int i = 0; i < BASS_BOOST.length; i++) { - equalizer.setGain(i, BASS_BOOST[i] + value); + if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { + if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + float value = Float.parseFloat(args[0]); + EqualizerFactory equalizer = new EqualizerFactory(); + for (int i = 0; i < BASS_BOOST.length; i++) { + equalizer.setGain(i, BASS_BOOST[i] + value); + } + event.getAudioManager().getPlayer(event.getGuild()).setFrameBufferDuration(500); + event.getAudioManager().getPlayer(event.getGuild()).setFilterFactory(equalizer); + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.bass.error.connected.title", + "commands.music.bass.error.connected.description") + .build()).queue(); + } + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.info.error.title", + "commands.music.info.error.description").build()).queue(); } - event.getAudioManager().getPlayer(event.getGuild()).setFrameBufferDuration(500); - event.getAudioManager().getPlayer(event.getGuild()).setFilterFactory(equalizer); - event.getTextChannel().sendMessage("Bruh, set dae bass").queue(); - } + } else event.getHelpCommand().sendHelp(this, event); } @Override 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