Skip to content

Commit d6c7712

Browse files
committed
Don't display file extensions, they aren't important.
1 parent b378cc0 commit d6c7712

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/testing/dialogs/sound/MusicsTable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public MusicsTable(){
5959
String ext = f.extension();
6060
if(ext.equals("mp3") || ext.equals("ogg")){
6161
//Check for override
62-
int vanillaIndex = vanillaMusic.indexOf(s -> getName(s).equals(f.name()));
62+
int vanillaIndex = vanillaMusic.indexOf(s -> getName(s).equals(f.nameWithoutExtension()));
6363
if(vanillaIndex != -1){
6464
Music overwritten = vanillaMusic.get(vanillaIndex);
6565
modMusic.addUnique(overwritten);
@@ -178,7 +178,7 @@ public void modMusicList(Table t, Seq<Music> musics){
178178
public String getName(Music s){
179179
if(s == null) return "none";
180180
String full = s.toString();
181-
return full.substring(full.lastIndexOf("/") + 1);
181+
return full.substring(full.lastIndexOf("/") + 1, full.length() - 4);
182182
}
183183

184184
private void switchMusic(Music music){

src/testing/dialogs/sound/SoundsTable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public SoundsTable(AudioBus soundRoomBus){
6161
String ext = f.extension();
6262
if(ext.equals("mp3") || ext.equals("ogg")){
6363
//Check for override
64-
int vanillaIndex = vanillaSounds.indexOf(s -> getName(s).equals(f.name()));
64+
int vanillaIndex = vanillaSounds.indexOf(s -> getName(s).equals(f.nameWithoutExtension()));
6565
if(vanillaIndex != -1){
6666
Sound overwritten = vanillaSounds.get(vanillaIndex);
6767
modSounds.addUnique(overwritten);
@@ -239,7 +239,7 @@ public void modSoundList(Table t, Seq<Sound> sounds){
239239

240240
public String getName(Sound s){
241241
String full = s.toString();
242-
return full.substring(full.lastIndexOf("/") + 1);
242+
return full.substring(full.lastIndexOf("/") + 1, full.length() - 4);
243243
}
244244

245245
public void stopSounds(){

0 commit comments

Comments
 (0)