BRanulf/DIsc_Jockey-revive
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix song names not appearing correctly in the command suggester but actually this time

Browse Source
This commit is contained in:
Semmieboy YT 2022-05-31 15:53:30 +02:00
parent 3a7e1778a7
commit 92649340d2
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/semmiedev/disc_jockey/SongLoader.java
View File

@ -29,7 +29,7 @@ public class SongLoader {
BinaryReader reader = new BinaryReader(Files.newInputStream(file.toPath())); BinaryReader reader = new BinaryReader(Files.newInputStream(file.toPath()));
Song song = new Song(); Song song = new Song();
song.fileName = file.getName(); song.fileName = file.getName().replaceAll("[\\n\\r]", "");
song.length = reader.readShort(); song.length = reader.readShort();
@ -41,10 +41,10 @@ public class SongLoader {
} }
song.height = reader.readShort(); song.height = reader.readShort();
song.name = reader.readString(); song.name = reader.readString().replaceAll("[\\n\\r]", "");
song.author = reader.readString(); song.author = reader.readString().replaceAll("[\\n\\r]", "");
song.originalAuthor = reader.readString(); song.originalAuthor = reader.readString().replaceAll("[\\n\\r]", "");
song.description = reader.readString(); song.description = reader.readString().replaceAll("[\\n\\r]", "");
song.tempo = reader.readShort(); song.tempo = reader.readShort();
song.autoSaving = reader.readByte(); song.autoSaving = reader.readByte();
song.autoSavingDuration = reader.readByte(); song.autoSavingDuration = reader.readByte();
@ -54,7 +54,7 @@ public class SongLoader {
song.rightClicks = reader.readInt(); song.rightClicks = reader.readInt();
song.blocksAdded = reader.readInt(); song.blocksAdded = reader.readInt();
song.blocksRemoved = reader.readInt(); song.blocksRemoved = reader.readInt();
song.importFileName = reader.readString(); song.importFileName = reader.readString().replaceAll("[\\n\\r]", "");
if (newFormat) { if (newFormat) {
song.loop = reader.readByte(); song.loop = reader.readByte();
@ -62,10 +62,10 @@ public class SongLoader {
song.loopStartTick = reader.readShort(); song.loopStartTick = reader.readShort();
} }
song.displayName = song.name.replaceAll("\\s|\\n|\\r", "").isEmpty() ? song.fileName : song.name+" ("+song.fileName+")"; song.displayName = song.name.replaceAll("\\s", "").isEmpty() ? song.fileName : song.name+" ("+song.fileName+")";
song.entry = new SongListWidget.SongEntry(song.displayName, SONGS.size()); song.entry = new SongListWidget.SongEntry(song.displayName, SONGS.size());
song.searchableFileName = song.fileName.toLowerCase().replaceAll("\\s|\\n|\\r", ""); song.searchableFileName = song.fileName.toLowerCase().replaceAll("\\s", "");
song.searchableName = song.name.toLowerCase().replaceAll("\\s|\\n|\\r", ""); song.searchableName = song.name.toLowerCase().replaceAll("\\s", "");
short tick = -1; short tick = -1;
short jumps; short jumps;