greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Some bass stuff

Browse source
This commit is contained in:
GregTCLTK 2020-01-17 17:36:58 +01:00
parent 00e1f841b4
commit 534cf4f50c
No known key found for this signature in database
GPG key ID: A91BADE5C070FF67
3 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/bbn/hadder/audio/TrackManager.java
View file

@ -48,10 +48,10 @@ public class TrackManager extends AudioEventAdapter {
@Override @Override
public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
Guild g = queue.poll().getAuthor().getGuild();
if (loop) { if (loop) {
player.playTrack(track.makeClone()); player.playTrack(track.makeClone());
} else if (queue.isEmpty()) { } else if (queue.isEmpty()) {
Guild g = queue.poll().getAuthor().getGuild();
g.getAudioManager().closeAudioConnection(); g.getAudioManager().closeAudioConnection();
} else { } else {
player.playTrack(queue.element().getTrack().makeClone()); player.playTrack(queue.element().getTrack().makeClone());

29
src/main/java/com/bbn/hadder/commands/music/BassCommand.java
View file

@ -6,6 +6,7 @@ package com.bbn.hadder.commands.music;
import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
import com.sedmelluq.discord.lavaplayer.filter.equalizer.EqualizerFactory; import com.sedmelluq.discord.lavaplayer.filter.equalizer.EqualizerFactory;
public class BassCommand implements Command { public class BassCommand implements Command {
@ -15,15 +16,27 @@ public class BassCommand implements Command {
@Override @Override
public void executed(String[] args, CommandEvent event) { public void executed(String[] args, CommandEvent event) {
if (args.length > 0) { if (args.length > 0) {
float value = Float.parseFloat(args[0]); if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) {
EqualizerFactory equalizer = new EqualizerFactory(); if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) {
for (int i = 0; i < BASS_BOOST.length; i++) { float value = Float.parseFloat(args[0]);
equalizer.setGain(i, BASS_BOOST[i] + value); 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); } else event.getHelpCommand().sendHelp(this, event);
event.getAudioManager().getPlayer(event.getGuild()).setFilterFactory(equalizer);
event.getTextChannel().sendMessage("Bruh, set dae bass").queue();
}
} }
@Override @Override

3
src/main/resources/Translations/Translations_en.properties
View file

@ -174,6 +174,9 @@ commands.moderation.editrules.success.title = Successfully changed
commands.moderation.editrules.success.description = I successfully changed the rules commands.moderation.editrules.success.description = I successfully changed the rules
commands.moderation.editrules.help.description = Edits the rules message. 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.title = Successfully connected
commands.music.join.success.description = I successfully connected to %extra%. commands.music.join.success.description = I successfully connected to %extra%.
commands.music.join.error.connecting.already.title = Already connected commands.music.join.error.connecting.already.title = Already connected