spawnrys/FUCK-CustomDiscs
1
0
Fork 0
mirror of https://github.com/SPAWNRYS-ban/FUCK-CustomDiscs.git synced 2025-12-10 13:30:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Begin work on mp3 support

Browse Source 
Add mp3spi as a dependency.
This commit is contained in:
Navoei
2022-07-19 21:25:58 -05:00
parent ad050cf940
commit 2c5381b7d9
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -18,6 +18,10 @@ processResources {
dependencies { dependencies {
implementation("com.googlecode.soundlibs:mp3spi:${mp3spi_version}") {
exclude group: 'junit', module: 'junit'
}
implementation 'com.google.code.findbugs:jsr305:3.0.2' implementation 'com.google.code.findbugs:jsr305:3.0.2'
// To use this dependency, you need to compile bukkit by yourself // To use this dependency, you need to compile bukkit by yourself

2
gradle.properties
View File

@@ -2,6 +2,8 @@ org.gradle.jvmargs=-Xmx2G
java_version=17 java_version=17
mp3spi_version=1.9.5.4
bukkit_api_version=1.19 bukkit_api_version=1.19
bukkit_version=1.19-R0.1-SNAPSHOT bukkit_version=1.19-R0.1-SNAPSHOT

4
src/main/java/me/Navoei/customdiscsplugin/command/CustomDisc.java
View File

@@ -46,10 +46,10 @@ public class CustomDisc implements CommandExecutor {
File getDirectory = new File(CustomDiscs.getInstance().getDataFolder(), "musicdata"); File getDirectory = new File(CustomDiscs.getInstance().getDataFolder(), "musicdata");
File songFile = new File(getDirectory.getPath(), filename); File songFile = new File(getDirectory.getPath(), filename);
if (songFile.exists()) { if (songFile.exists()) {
if (getFileExtension(filename).equals("wav")) { if (getFileExtension(filename).equals("wav") || getFileExtension(filename).equals("mp3")) {
songname = args[0]; songname = args[0];
} else { } else {
p.sendMessage(ChatColor.RED + "File is not in wav format!"); p.sendMessage(ChatColor.RED + "File is not in wav or mp3 format!");
return true; return true;
} }
} else { } else {

19
src/main/java/me/Navoei/customdiscsplugin/event/JukeBox.java
View File

@@ -7,7 +7,6 @@ import me.Navoei.customdiscsplugin.VoicePlugin;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextDecoration;
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@@ -39,8 +38,7 @@ import java.util.concurrent.ConcurrentHashMap;
public class JukeBox implements Listener { public class JukeBox implements Listener {
private final Map<UUID, AudioPlayer> playerMap = new ConcurrentHashMap<>(); private final Map<UUID, AudioPlayer> playerMap = new ConcurrentHashMap<>();
public static AudioFormat FORMAT = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, 48000.0F, 16, 1, 2, 48000.0F, false); public static AudioFormat FORMAT = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, 48000F, 16, 1, 2, 48000F, false);
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onInsert(PlayerInteractEvent event) throws IOException { public void onInsert(PlayerInteractEvent event) throws IOException {
@@ -98,6 +96,7 @@ public class JukeBox implements Listener {
} catch (Exception e) { } catch (Exception e) {
player.sendMessage(ChatColor.RED + "An error occurred while trying to play the music!"); player.sendMessage(ChatColor.RED + "An error occurred while trying to play the music!");
e.printStackTrace();
} }
} else { } else {
player.sendMessage(ChatColor.RED + "Sound file not found."); player.sendMessage(ChatColor.RED + "Sound file not found.");
@@ -217,9 +216,17 @@ public class JukeBox implements Listener {
} }
public static short[] readSoundFile(Path file) throws UnsupportedAudioFileException, IOException { public static short[] readSoundFile(Path file) throws UnsupportedAudioFileException, IOException {
AudioInputStream inputStream = AudioSystem.getAudioInputStream(file.toFile()); return VoicePlugin.voicechatApi.getAudioConverter().bytesToShorts(convertFormat(file, FORMAT));
AudioInputStream convertedInputStream = AudioSystem.getAudioInputStream(FORMAT, inputStream); }
return VoicePlugin.voicechatApi.getAudioConverter().bytesToShorts(convertedInputStream.readAllBytes());
public static byte[] convertFormat(Path file, AudioFormat audioFormat) throws UnsupportedAudioFileException, IOException {
try (AudioInputStream source = AudioSystem.getAudioInputStream(file.toFile())) {
AudioFormat sourceFormat = source.getFormat();
AudioFormat convertFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, sourceFormat.getSampleRate(), 16, sourceFormat.getChannels(), sourceFormat.getChannels() * 2, sourceFormat.getSampleRate(), false);
AudioInputStream stream1 = AudioSystem.getAudioInputStream(convertFormat, source);
AudioInputStream stream2 = AudioSystem.getAudioInputStream(audioFormat, stream1);
return stream2.readAllBytes();
}
} }
public boolean isCustomMusicDisc(PlayerInteractEvent e) { public boolean isCustomMusicDisc(PlayerInteractEvent e) {