Skip to content

Commit b2c554e

Browse files
committed
Fix Music being somewhat bad...
1 parent 742e7e3 commit b2c554e

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ extraJavaModuleInfo {
4949

5050
repositories {
5151
mavenCentral()
52+
mavenLocal()
5253

5354
maven {
5455
url = 'https://maven.minecraftforge.net/'
@@ -70,7 +71,7 @@ dependencies {
7071

7172
installer('org.mangorage:installer:4.0.20')
7273

73-
bootstrap("org.mangorage:mangobotbootstrap:1.0.31")
74+
bootstrap("org.mangorage:mangobotbootstrap:1.0.36")
7475
plugin('org.mangorage:mangobot:12.0.63')
7576

7677
library('org.slf4j:slf4j-simple:2.0.13') // Use a recent version)

src/main/java/org/mangorage/mangobotplugin/commands/music/MusicPlayer.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222

2323
package org.mangorage.mangobotplugin.commands.music;
2424

25+
import com.sedmelluq.discord.lavaplayer.player.AudioConfiguration;
2526
import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
2627
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
2728
import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayer;
2829
import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
2930
import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter;
3031
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
3132
import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
32-
import com.sedmelluq.discord.lavaplayer.track.AudioReference;
3333
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
3434
import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason;
3535
import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
@@ -68,6 +68,10 @@ private MusicPlayer(String guildID) {
6868
this.manager = new DefaultAudioPlayerManager();
6969
this.audioPlayer = new DefaultAudioPlayer(manager);
7070

71+
72+
manager.enableGcMonitoring();
73+
manager.getConfiguration().setResamplingQuality(AudioConfiguration.ResamplingQuality.HIGH);
74+
7175
MusicUtil.registerRemoteSources(manager);
7276

7377
audioPlayer.addListener(this);

src/main/java/org/mangorage/mangobotplugin/commands/music/MusicUtil.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
package org.mangorage.mangobotplugin.commands.music;
2424

2525
import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
26-
import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
2726
import com.sedmelluq.discord.lavaplayer.source.bandcamp.BandcampAudioSourceManager;
2827
import com.sedmelluq.discord.lavaplayer.source.http.HttpAudioSourceManager;
2928
import com.sedmelluq.discord.lavaplayer.source.local.LocalAudioSourceManager;
@@ -42,27 +41,24 @@
4241
import org.mangorage.commonutils.log.LogHelper;
4342
import org.mangorage.commonutils.misc.PagedList;
4443
import org.mangorage.entrypoint.MangoBotCore;
45-
import org.mangorage.mangobotplugin.pagedlist.PagedListAction;
4644
import org.mangorage.mangobotplugin.pagedlist.PagedListManager;
4745
import org.mangorage.mangobotplugin.pagedlist.PagedListWithAction;
4846

49-
import java.util.List;
50-
5147
public class MusicUtil {
5248
public static void connectToAudioChannel(VoiceChannel channel) {
5349
try {
5450
Guild guild = channel.getGuild();
5551
AudioManager audioManager = guild.getAudioManager();
52+
MusicPlayer musicPlayer = MusicPlayer.getInstance(guild.getId());
5653

57-
audioManager.setSendingHandler(MusicPlayer.getInstance(guild.getId()));
58-
54+
audioManager.setSendingHandler(musicPlayer);
5955
audioManager.setSelfDeafened(true);
6056
audioManager.setSelfMuted(false);
6157
audioManager.setAutoReconnect(true);
6258
audioManager.setSpeakingMode(SpeakingMode.SOUNDSHARE);
6359
audioManager.setConnectTimeout(30_000);
60+
musicPlayer.setVolume(5); // Default volume so nobody gets there ears torn out by sound.
6461

65-
MusicPlayer.getInstance(guild.getId()).setVolume(5); // Default volume so nobody gets there ears torn out by sound.
6662
audioManager.openAudioConnection(channel);
6763
} catch (Exception e) {
6864
LogHelper.error("Failed to connect to voice channel: " + e.getMessage());

0 commit comments

Comments
 (0)