Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

got rid of dependency injection, it doesn't add anything at this point and only slows down things and makes a mess. Also some refactoring.

Browse Source
This commit is contained in:
yugecin
2017-05-21 11:12:55 +02:00
parent 1ebf2c2dcb
commit ec53f531c8
72 changed files with 675 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/itdelatrisu/opsu/states/Splash.java
View File

@@ -21,19 +21,16 @@ package itdelatrisu.opsu.states;
import itdelatrisu.opsu.GameImage;
import itdelatrisu.opsu.audio.MusicController;
import itdelatrisu.opsu.audio.SoundController;
import itdelatrisu.opsu.beatmap.BeatmapParser;
import itdelatrisu.opsu.beatmap.BeatmapSetList;
import itdelatrisu.opsu.beatmap.OszUnpacker;
import itdelatrisu.opsu.replay.ReplayImporter;
import itdelatrisu.opsu.ui.UI;
import org.newdawn.slick.Color;
import org.newdawn.slick.Graphics;
import org.newdawn.slick.Input;
import org.newdawn.slick.util.Log;
import yugecin.opsudance.core.inject.Inject;
import yugecin.opsudance.core.state.BaseOpsuState;
import static yugecin.opsudance.core.InstanceContainer.*;
import static yugecin.opsudance.options.Options.*;
/**
@@ -43,18 +40,6 @@ import static yugecin.opsudance.options.Options.*;
*/
public class Splash extends BaseOpsuState {
@Inject
private SongMenu songMenu;
@Inject
private ReplayImporter replayImporter;
@Inject
private OszUnpacker oszUnpacker;
@Inject
private BeatmapParser beatmapParser;
/** Whether or not loading has completed. */
private boolean finished;
@@ -72,7 +57,7 @@ public class Splash extends BaseOpsuState {
super.revalidate();
// pre-revalidate some states to reduce lag between switching
songMenu.revalidate();
songMenuState.revalidate();
if (inited) {
return;
@@ -82,7 +67,7 @@ public class Splash extends BaseOpsuState {
thread = new Thread() {
@Override
public void run() {
oszUnpacker.unpackAll();
oszunpacker.unpackAll();
beatmapParser.parseAll();
replayImporter.importAll();
@@ -105,7 +90,7 @@ public class Splash extends BaseOpsuState {
// initialize song list
if (BeatmapSetList.get().size() == 0) {
MusicController.playThemeSong(config.themeBeatmap);
displayContainer.switchStateInstantly(MainMenu.class);
displayContainer.switchStateInstantly(mainmenuState);
return;
}
@@ -113,9 +98,9 @@ public class Splash extends BaseOpsuState {
if (OPTION_ENABLE_THEME_SONG.state) {
MusicController.playThemeSong(config.themeBeatmap);
} else {
songMenu.setFocus(BeatmapSetList.get().getRandomNode(), -1, true, true);
songMenuState.setFocus(BeatmapSetList.get().getRandomNode(), -1, true, true);
}
displayContainer.switchStateInstantly(MainMenu.class);
displayContainer.switchStateInstantly(mainmenuState);
}
@Override