From 3269df9e1c9f585c4ce12edcf3e3576fa4cbec53 Mon Sep 17 00:00:00 2001 From: Chazoshtare Date: Sat, 7 Aug 2021 01:02:28 +0200 Subject: [PATCH] Remove leftover whitespace --- src/bms/player/beatoraja/BMSResource.java | 4 +-- src/bms/player/beatoraja/MainLoader.java | 4 +-- .../player/beatoraja/select/BarRenderer.java | 28 +++++++++---------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/bms/player/beatoraja/BMSResource.java b/src/bms/player/beatoraja/BMSResource.java index 8ff47ba90..3a7dd8983 100644 --- a/src/bms/player/beatoraja/BMSResource.java +++ b/src/bms/player/beatoraja/BMSResource.java @@ -99,7 +99,7 @@ public boolean setBMSFile(BMSModel model, final Path f, final Config config, BMS while(!bgaloaders.isEmpty() && !bgaloaders.getFirst().isAlive()) { bgaloaders.removeFirst(); } - + if(MainLoader.getIllegalSongCount() == 0) { // Audio, BGAともキャッシュがあるため、何があっても全リロードする BGALoaderThread bgaloader = new BGALoaderThread( @@ -108,7 +108,7 @@ public boolean setBMSFile(BMSModel model, final Path f, final Config config, BMS bgaloader.start(); AudioLoaderThread audioloader = new AudioLoaderThread(model); audioloaders.addLast(audioloader); - audioloader.start(); + audioloader.start(); } return true; } diff --git a/src/bms/player/beatoraja/MainLoader.java b/src/bms/player/beatoraja/MainLoader.java index 96e4a3a47..0d8d88419 100644 --- a/src/bms/player/beatoraja/MainLoader.java +++ b/src/bms/player/beatoraja/MainLoader.java @@ -102,9 +102,7 @@ public static void main(String[] args) { } } - - - if (Files.exists(MainController.configpath) && (bmsPath != null || auto != null)) { + if(Files.exists(MainController.configpath) && (bmsPath != null || auto != null)) { IRConnectionManager.getAllAvailableIRConnectionName(); play(bmsPath, auto, true, null, null, bmsPath != null); } else { diff --git a/src/bms/player/beatoraja/select/BarRenderer.java b/src/bms/player/beatoraja/select/BarRenderer.java index 55b749105..712a158a3 100644 --- a/src/bms/player/beatoraja/select/BarRenderer.java +++ b/src/bms/player/beatoraja/select/BarRenderer.java @@ -111,7 +111,7 @@ public BarRenderer(MusicSelector select) { TableData[] unsortedtables = tdaccessor.readAll(); Array sortedtables = new Array(unsortedtables.length); - + for(String url : select.main.getConfig().getTableURL()) { for(int i = 0;i < unsortedtables.length;i++) { final TableData td = unsortedtables[i]; @@ -122,13 +122,13 @@ public BarRenderer(MusicSelector select) { } } } - + for(TableData td : unsortedtables) { if(td != null) { sortedtables.add(td); } } - + BMSSearchAccessor bmssearcha = new BMSSearchAccessor(main.getConfig().getTablepath()); Array table = new Array(); @@ -169,7 +169,7 @@ public BarRenderer(MusicSelector select) { song.setUrl(chart.url); song.setAppendurl(chart.appendurl); if(chart.mode != null) { - song.setMode(chart.mode.id); + song.setMode(chart.mode.id); } songs[j] = song; } @@ -193,7 +193,7 @@ public BarRenderer(MusicSelector select) { song.setUrl(chart.url); song.setAppendurl(chart.appendurl); if(chart.mode != null) { - song.setMode(chart.mode.id); + song.setMode(chart.mode.id); } songs[j] = song; } @@ -214,7 +214,7 @@ public BarRenderer(MusicSelector select) { } td.setCourse(course); if(td.validate()) { - table.add(new TableBar(select, td, new TableDataAccessor.DifficultyTableAccessor(main.getConfig().getTablepath(), td.getUrl()))); + table.add(new TableBar(select, td, new TableDataAccessor.DifficultyTableAccessor(main.getConfig().getTablepath(), td.getUrl()))); } } } else { @@ -434,17 +434,15 @@ public boolean mousePressed(SkinBar baro, int button, int x, int y) { } private long time; - + public void prepare(MusicSelectSkin skin, SkinBar baro, long time) { - this.time = time; - final long timeMillis = System.currentTimeMillis(); + this.time = time;final long timeMillis = System.currentTimeMillis(); boolean applyMovement = duration != 0 && duration > timeMillis; float angleLerp = 0; if (applyMovement) { angleLerp = angle < 0 ? ((float) (timeMillis - duration)) / angle : ((float) (duration - timeMillis)) / angle; } - for (int i = 0; i < barlength; i++) { // calcurate song bar position final BarArea ba = bararea[i]; @@ -547,11 +545,11 @@ public void render(SkinObjectRenderer sprite, MusicSelectSkin skin, SkinBar baro for (char c : charset) { chars[i++] = c; } - + for(int index = 0;index < SkinBar.BARTEXT_COUNT;index++) { if(baro.getText(index) != null) { - baro.getText(index).prepareFont(String.valueOf(chars)); - } + baro.getText(index).prepareFont(String.valueOf(chars)); + } } } @@ -603,7 +601,7 @@ public void render(SkinObjectRenderer sprite, MusicSelectSkin skin, SkinBar baro final SkinText text = baro.getText(ba.text); if(text != null) { text.setText(ba.sd.getTitle()); - text.draw(sprite, ba.x, ba.y); + text.draw(sprite, ba.x, ba.y); } } @@ -620,7 +618,7 @@ public void render(SkinObjectRenderer sprite, MusicSelectSkin skin, SkinBar baro if (TROPHY[j].equals(trophy.getName())) { final SkinImage trophyImage = baro.getTrophy(j); if(trophyImage != null) { - trophyImage.draw(sprite, ba.x, ba.y); + trophyImage.draw(sprite, ba.x, ba.y); } break; }