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.

src/yugecin/opsudance/core/Constants.java

@@ -0,0 +1,32 @@
+/*
+ * opsu!dance - fork of opsu! with cursordance auto
+ * Copyright (C) 2017 yugecin
+ *
+ * opsu!dance is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * opsu!dance is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with opsu!dance.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package yugecin.opsudance.core;
+
+import java.net.URI;
+
+public class Constants {
+
+	public static final String PROJECT_NAME = "opsu!dance";
+	public static final String FONT_NAME = "DroidSansFallback.ttf";
+	public static final String VERSION_FILE = "version";
+	public static final URI REPOSITORY_URI = URI.create("https://github.com/itdelatrisu/opsu");
+	public static final URI DANCE_REPOSITORY_URI = URI.create("https://github.com/yugecin/opsu-dance");
+	public static final String ISSUES_URL = "https://github.com/yugecin/opsu-dance/issues/new?title=%s&body=%s";
+	public static final String VERSION_REMOTE = "https://raw.githubusercontent.com/yugecin/opsu-dance/master/version";
+
+}

src/yugecin/opsudance/core/DisplayContainer.java

@@ -42,21 +42,18 @@ import org.newdawn.slick.util.Log;
 import yugecin.opsudance.core.events.EventBus;
 import yugecin.opsudance.core.errorhandling.ErrorDumpable;
 import yugecin.opsudance.core.events.EventListener;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;
 import yugecin.opsudance.core.state.OpsuState;
 import yugecin.opsudance.core.state.specialstates.BarNotificationState;
 import yugecin.opsudance.core.state.specialstates.BubbleNotificationState;
 import yugecin.opsudance.core.state.specialstates.FpsRenderState;
 import yugecin.opsudance.events.BubbleNotificationEvent;
 import yugecin.opsudance.events.ResolutionOrSkinChangedEvent;
-import yugecin.opsudance.options.Configuration;
-import yugecin.opsudance.skinning.SkinService;
 import yugecin.opsudance.utils.GLHelper;
 
 import java.io.StringWriter;
 
 import static yugecin.opsudance.core.Entrypoint.sout;
+import static yugecin.opsudance.core.InstanceContainer.*;
 import static yugecin.opsudance.options.Options.*;
 
 /**
@@ -64,16 +61,8 @@ import static yugecin.opsudance.options.Options.*;
  */
 public class DisplayContainer implements ErrorDumpable, KeyListener, MouseListener {
 
-	@Inject
-	private SkinService skinService;
-
-	@Inject
-	private Configuration config;
-
 	private static SGL GL = Renderer.get();
 
-	private final InstanceContainer instanceContainer;
-
 	private FpsRenderState fpsState;
 	private BarNotificationState barNotifState;
 	private BubbleNotificationState bubNotifState;
@@ -156,9 +145,7 @@ public class DisplayContainer implements ErrorDumpable, KeyListener, MouseListen
 
 	private final Transition transition = new Transition();
 
-	@Inject
-	public DisplayContainer(InstanceContainer instanceContainer) {
-		this.instanceContainer = instanceContainer;
+	public DisplayContainer() {
 		this.cursor = new Cursor();
 		drawCursor = true;
 
@@ -183,7 +170,7 @@ public class DisplayContainer implements ErrorDumpable, KeyListener, MouseListen
 		setFPS(targetFPS[targetFPSIndex]);
 		MusicController.setMusicVolume(OPTION_MUSIC_VOLUME.val / 100f * OPTION_MASTER_VOLUME.val / 100f);
 
-		skinService.loadSkin();
+		skinservice.loadSkin();
 
 		// initialize game images
 		for (GameImage img : GameImage.values()) {
@@ -210,16 +197,16 @@ public class DisplayContainer implements ErrorDumpable, KeyListener, MouseListen
 		targetRenderInterval = 1000 / targetRendersPerSecond;
 	}
 
-	public void init(Class<? extends OpsuState> startingState) {
+	public void init(OpsuState startingState) {
 		setUPS(OPTION_TARGET_UPS.val);
 		setFPS(targetFPS[targetFPSIndex]);
 
-		state = instanceContainer.provide(startingState);
+		state = startingState;
 		state.enter();
 
-		fpsState = instanceContainer.provide(FpsRenderState.class);
-		bubNotifState = instanceContainer.provide(BubbleNotificationState.class);
-		barNotifState = instanceContainer.provide(BarNotificationState.class);
+		fpsState = new FpsRenderState();
+		bubNotifState = new BubbleNotificationState();
+		barNotifState = new BarNotificationState();
 	}
 
 
@@ -352,7 +339,7 @@ public class DisplayContainer implements ErrorDumpable, KeyListener, MouseListen
 			exitconfirmation = System.currentTimeMillis();
 			return false;
 		}
-		if (Updater.get().getStatus() == Updater.Status.UPDATE_DOWNLOADING) {
+		if (updater.getStatus() == Updater.Status.UPDATE_DOWNLOADING) {
 			EventBus.post(new BubbleNotificationEvent(Updater.EXIT_CONFIRMATION, BubbleNotificationEvent.COMMONCOLOR_PURPLE));
 			exitRequested = false;
 			exitconfirmation = System.currentTimeMillis();
@@ -447,7 +434,7 @@ public class DisplayContainer implements ErrorDumpable, KeyListener, MouseListen
 		sout("GL ready");
 
 		GameImage.init(width, height);
-		Fonts.init(config);
+		Fonts.init();
 
 		EventBus.post(new ResolutionOrSkinChangedEvent(null, width, height));
 	}
@@ -478,33 +465,25 @@ public class DisplayContainer implements ErrorDumpable, KeyListener, MouseListen
 		return state.isInstance(state);
 	}
 
-	public void switchState(Class<? extends OpsuState> newState, int outtime, int intime) {
+	public void switchState(OpsuState state) {
+		switchState(state, 200, 300);
+	}
+
+	public void switchState(OpsuState newstate, int outtime, int intime) {
 		if (transition.progress != -1) {
 			return;
 		}
-		// TODO remove this v
-		OpsuState _newstate = instanceContainer.provide(newState);
 		if (outtime == 0) {
-			switchStateInstantly(_newstate);
-			_newstate = null;
+			switchStateInstantly(newstate);
+			newstate = null;
 		}
-		transition.nextstate = _newstate;
+		transition.nextstate = newstate;
 		transition.total = transition.in = intime;
 		transition.out = outtime;
 		transition.total += outtime;
 		transition.progress = 0;
 	}
 
-	@Deprecated // TODO instcontainer
-	public void switchState(Class<? extends OpsuState> state) {
-		switchState(state, 200, 300);
-	}
-
-	@Deprecated // TODO instcontainer
-	public void switchStateInstantly(Class<? extends OpsuState> state) {
-		switchStateInstantly(instanceContainer.provide(state));
-	}
-
 	public void switchStateInstantly(OpsuState state) {
 		this.state.leave();
 		this.state = state;

src/yugecin/opsudance/core/Entrypoint.java

@@ -19,7 +19,11 @@ package yugecin.opsudance.core;
 
 import itdelatrisu.opsu.downloads.Updater;
 import yugecin.opsudance.OpsuDance;
-import yugecin.opsudance.core.inject.OpsuDanceInjector;
+
+import javax.swing.*;
+
+import static yugecin.opsudance.core.Constants.PROJECT_NAME;
+import static yugecin.opsudance.core.InstanceContainer.*;
 
 public class Entrypoint {
 
@@ -27,10 +31,18 @@ public class Entrypoint {
 
 	public static void main(String[] args) {
 		sout("launched");
-		(new OpsuDanceInjector()).provide(OpsuDance.class).start(args);
 
-		if (Updater.get().getStatus() == Updater.Status.UPDATE_FINAL) {
-			Updater.get().runUpdate();
+		try {
+			InstanceContainer.kickstart();
+		} catch (Exception e) {
+			JOptionPane.showMessageDialog(null, e.getMessage(), "Cannot start " + PROJECT_NAME, JOptionPane.ERROR_MESSAGE);
+			// TODO replace with errorhandler
+		}
+
+		new OpsuDance().start(args);
+
+		if (updater.getStatus() == Updater.Status.UPDATE_FINAL) {
+			updater.runUpdate();
 		}
 	}
 
@@ -39,7 +51,7 @@ public class Entrypoint {
 	}
 
 	public static void sout(String message) {
-		System.out.println(String.format("[%7d] %s", runtime(), message));
+		System.out.println(String.format("[%8d] %s", runtime(), message));
 	}
 
 }

src/yugecin/opsudance/core/Environment.java

@@ -0,0 +1,62 @@
+/*
+ * opsu!dance - fork of opsu! with cursordance auto
+ * Copyright (C) 2017 yugecin
+ *
+ * opsu!dance is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * opsu!dance is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with opsu!dance.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package yugecin.opsudance.core;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.jar.JarFile;
+
+import static yugecin.opsudance.core.Constants.PROJECT_NAME;
+
+public class Environment {
+
+	public final boolean isJarRunning;
+	public final File workingdir;
+	public final JarFile jarfile;
+
+	public Environment() {
+		Class thiz = Environment.class;
+		String thisClassLocation = thiz.getResource(thiz.getSimpleName() + ".class").toString();
+		this.isJarRunning = thisClassLocation.startsWith("jar:");
+		if (!isJarRunning) {
+			this.workingdir = Paths.get(".").toAbsolutePath().normalize().toFile();
+			this.jarfile = null;
+		} else {
+			String wdir = thisClassLocation.substring(6); // remove the jar://
+			String separator = "!/";
+			int separatorIdx = wdir.indexOf(separator);
+			int lastSeparatorIdx = wdir.lastIndexOf(separator);
+			if (separatorIdx != lastSeparatorIdx) {
+				String msg = String.format("%s cannot run from paths containing '!/', please move the file. Current directory: %s",
+					PROJECT_NAME, thisClassLocation.substring(0, lastSeparatorIdx));
+				throw new RuntimeException(msg);
+			}
+			File jar = new File(wdir.substring(0, separatorIdx));
+			this.workingdir = jar.getParentFile();
+			try {
+				this.jarfile = new JarFile(jar);
+			} catch (IOException e) {
+				String msg = String.format("Cannot read from jarfile (%s): %s", jar.getAbsolutePath(),
+					e.getMessage());
+				throw new RuntimeException(msg, e);
+			}
+		}
+	}
+
+}

src/yugecin/opsudance/core/InstanceContainer.java

@@ -0,0 +1,89 @@
+/*
+ * opsu!dance - fork of opsu! with cursordance auto
+ * Copyright (C) 2017 yugecin
+ *
+ * opsu!dance is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * opsu!dance is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with opsu!dance.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package yugecin.opsudance.core;
+
+import itdelatrisu.opsu.NativeLoader;
+import itdelatrisu.opsu.beatmap.BeatmapParser;
+import itdelatrisu.opsu.beatmap.OszUnpacker;
+import itdelatrisu.opsu.downloads.Updater;
+import itdelatrisu.opsu.replay.ReplayImporter;
+import itdelatrisu.opsu.states.*;
+import org.newdawn.slick.util.FileSystemLocation;
+import org.newdawn.slick.util.ResourceLoader;
+import yugecin.opsudance.options.Configuration;
+import yugecin.opsudance.options.OptionsService;
+import yugecin.opsudance.render.GameObjectRenderer;
+import yugecin.opsudance.skinning.SkinService;
+
+import java.io.File;
+
+public class InstanceContainer {
+
+	public static Environment env;
+	public static Configuration config;
+
+	public static OptionsService optionservice;
+	public static SkinService skinservice;
+	public static OszUnpacker oszunpacker;
+	public static ReplayImporter replayImporter;
+	public static BeatmapParser beatmapParser;
+	public static Updater updater;
+
+	public static DisplayContainer displayContainer;
+
+	public static GameObjectRenderer gameObjectRenderer;
+
+	public static Splash splashState;
+	public static MainMenu mainmenuState;
+	public static ButtonMenu buttonState;
+	public static SongMenu songMenuState;
+	public static DownloadsMenu downloadState;
+	public static Game gameState;
+	public static GameRanking gameRankingState;
+	public static GamePauseMenu pauseState;
+
+	public static void kickstart() {
+		updater = new Updater();
+		env = new Environment();
+		config = new Configuration();
+
+		NativeLoader.loadNatives();
+		ResourceLoader.addResourceLocation(new FileSystemLocation(new File("./res/")));
+
+		optionservice = new OptionsService();
+		skinservice = new SkinService();
+		oszunpacker = new OszUnpacker();
+		replayImporter = new ReplayImporter();
+		beatmapParser = new BeatmapParser();
+		updater = new Updater();
+
+		displayContainer = new DisplayContainer();
+
+		gameObjectRenderer = new GameObjectRenderer();
+
+		splashState = new Splash();
+		mainmenuState = new MainMenu();
+		buttonState = new ButtonMenu();
+		songMenuState = new SongMenu();
+		downloadState = new DownloadsMenu();
+		gameState = new Game();
+		gameRankingState = new GameRanking();
+		pauseState = new GamePauseMenu();
+	}
+
+}

src/yugecin/opsudance/core/NotNull.java

@@ -0,0 +1,23 @@
+/*
+ * opsu!dance - fork of opsu! with cursordance auto
+ * Copyright (C) 2017 yugecin
+ *
+ * opsu!dance is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * opsu!dance is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with opsu!dance.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package yugecin.opsudance.core;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.SOURCE) public @interface NotNull {}

src/yugecin/opsudance/core/Nullable.java

@@ -0,0 +1,23 @@
+/*
+ * opsu!dance - fork of opsu! with cursordance auto
+ * Copyright (C) 2017 yugecin
+ *
+ * opsu!dance is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * opsu!dance is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with opsu!dance.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package yugecin.opsudance.core;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.SOURCE) public @interface Nullable {}

src/yugecin/opsudance/core/errorhandling/ErrorHandler.java

@@ -19,6 +19,7 @@ package yugecin.opsudance.core.errorhandling;
 
 import itdelatrisu.opsu.Utils;
 import org.newdawn.slick.util.Log;
+import yugecin.opsudance.core.Constants;
 import yugecin.opsudance.core.DisplayContainer;
 import yugecin.opsudance.options.Configuration;
 import yugecin.opsudance.utils.MiscUtils;
@@ -232,7 +233,7 @@ public class ErrorHandler {
 		} catch (UnsupportedEncodingException e) {
 			Log.warn("URLEncoder failed to encode the auto-filled issue report URL.", e);
 		}
-		return URI.create(String.format(config.ISSUES_URL, issueTitle, issueBody));
+		return URI.create(String.format(Constants.ISSUES_URL, issueTitle, issueBody));
 	}
 
 	private String truncateGithubIssueBody(String body) {

src/yugecin/opsudance/core/inject/OpsuDanceInjector.java

@@ -23,7 +23,6 @@ import itdelatrisu.opsu.beatmap.OszUnpacker;
 import itdelatrisu.opsu.downloads.Updater;
 import itdelatrisu.opsu.replay.ReplayImporter;
 import itdelatrisu.opsu.states.*;
-import yugecin.opsudance.PreStartupInitializer;
 import yugecin.opsudance.core.DisplayContainer;
 import yugecin.opsudance.core.state.specialstates.BarNotificationState;
 import yugecin.opsudance.core.state.specialstates.BubbleNotificationState;
@@ -46,7 +45,7 @@ public class OpsuDanceInjector extends Injector {
 		bind(Updater.class).asLazySingleton();
 		bind(SkinService.class).asEagerSingleton();
 
-		bind(PreStartupInitializer.class).asEagerSingleton();
+		//bind(PreStartupInitializer.class).asEagerSingleton();
 		bind(DisplayContainer.class).asEagerSingleton();
 
 		bind(ErrorHandler.class).asEagerSingleton();

src/yugecin/opsudance/core/state/BaseOpsuState.java

@@ -21,30 +21,18 @@ import itdelatrisu.opsu.states.Game;
 import itdelatrisu.opsu.ui.UI;
 import org.newdawn.slick.Graphics;
 import org.newdawn.slick.Input;
-import yugecin.opsudance.core.DisplayContainer;
 import yugecin.opsudance.core.events.EventBus;
 import yugecin.opsudance.core.events.EventListener;
-import yugecin.opsudance.core.inject.Inject;
 import yugecin.opsudance.events.BarNotificationEvent;
 import yugecin.opsudance.events.ResolutionOrSkinChangedEvent;
-import yugecin.opsudance.options.Configuration;
-import yugecin.opsudance.skinning.SkinService;
 
 import java.io.StringWriter;
 
 import static yugecin.opsudance.options.Options.*;
+import static yugecin.opsudance.core.InstanceContainer.*;
 
 public abstract class BaseOpsuState implements OpsuState, EventListener<ResolutionOrSkinChangedEvent> {
 
-	@Inject
-	protected DisplayContainer displayContainer;
-
-	@Inject
-	protected Configuration config;
-
-	@Inject
-	protected SkinService skinService;
-
 	/**
 	 * state is dirty when resolution or skin changed but hasn't rendered yet
 	 */
@@ -120,7 +108,7 @@ public abstract class BaseOpsuState implements OpsuState, EventListener<Resoluti
 		}
 		Input input = displayContainer.input;
 		if (key == Input.KEY_S && input.isKeyDown(Input.KEY_LMENU) && input.isKeyDown(Input.KEY_LSHIFT) &&input.isKeyDown(Input.KEY_LCONTROL) && !displayContainer.isInState(Game.class)) {
-			skinService.reloadSkin();
+			skinservice.reloadSkin();
 		}
 		return false;
 	}

src/yugecin/opsudance/core/state/ComplexOpsuState.java

@@ -23,6 +23,8 @@ import yugecin.opsudance.core.components.Component;
 
 import java.util.LinkedList;
 
+import static yugecin.opsudance.core.InstanceContainer.*;
+
 public abstract class ComplexOpsuState extends BaseOpsuState {
 
 	protected final LinkedList<Component> components;

src/yugecin/opsudance/core/state/specialstates/BarNotificationState.java

@@ -21,7 +21,6 @@ import itdelatrisu.opsu.ui.Fonts;
 import itdelatrisu.opsu.ui.animations.AnimationEquation;
 import org.newdawn.slick.Color;
 import org.newdawn.slick.Graphics;
-import yugecin.opsudance.core.DisplayContainer;
 import yugecin.opsudance.core.events.EventBus;
 import yugecin.opsudance.core.events.EventListener;
 import yugecin.opsudance.events.BarNotificationEvent;
@@ -29,6 +28,8 @@ import yugecin.opsudance.events.ResolutionOrSkinChangedEvent;
 
 import java.util.List;
 
+import static yugecin.opsudance.core.InstanceContainer.displayContainer;
+
 public class BarNotificationState implements EventListener<BarNotificationEvent> {
 
 	private final int IN_TIME = 200;
@@ -36,7 +37,6 @@ public class BarNotificationState implements EventListener<BarNotificationEvent>
 	private final int OUT_TIME = 200;
 	private final int TOTAL_TIME = DISPLAY_TIME + OUT_TIME;
 
-	private final DisplayContainer displayContainer;
 	private final Color bgcol;
 	private final Color textCol;
 
@@ -49,8 +49,7 @@ public class BarNotificationState implements EventListener<BarNotificationEvent>
 	private int barHalfTargetHeight;
 	private int barHalfHeight;
 
-	public BarNotificationState(DisplayContainer displayContainer) {
-		this.displayContainer = displayContainer;
+	public BarNotificationState() {
 		this.bgcol = new Color(Color.black);
 		this.textCol = new Color(Color.white);
 		this.timeShown = TOTAL_TIME;

src/yugecin/opsudance/core/state/specialstates/BubbleNotificationState.java

@@ -21,7 +21,6 @@ import itdelatrisu.opsu.ui.Fonts;
 import itdelatrisu.opsu.ui.animations.AnimationEquation;
 import org.newdawn.slick.Color;
 import org.newdawn.slick.Graphics;
-import yugecin.opsudance.core.DisplayContainer;
 import yugecin.opsudance.core.events.EventBus;
 import yugecin.opsudance.core.events.EventListener;
 import yugecin.opsudance.events.BubbleNotificationEvent;
@@ -31,6 +30,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
+import static yugecin.opsudance.core.InstanceContainer.displayContainer;
+
 public class BubbleNotificationState implements EventListener<BubbleNotificationEvent> {
 
 	public static final int IN_TIME = 633;
@@ -38,14 +39,12 @@ public class BubbleNotificationState implements EventListener<BubbleNotification
 	public static final int OUT_TIME = 433;
 	public static final int TOTAL_TIME = DISPLAY_TIME + OUT_TIME;
 
-	private final DisplayContainer displayContainer;
 	private final LinkedList<Notification> bubbles;
 
 	private int addAnimationTime;
 	private int addAnimationHeight;
 
-	public BubbleNotificationState(DisplayContainer displayContainer) {
-		this.displayContainer = displayContainer;
+	public BubbleNotificationState() {
 		this.bubbles = new LinkedList<>();
 		this.addAnimationTime = IN_TIME;
 		EventBus.subscribe(BubbleNotificationEvent.class, this);

src/yugecin/opsudance/core/state/specialstates/FpsRenderState.java

@@ -20,13 +20,13 @@ package yugecin.opsudance.core.state.specialstates;
 import itdelatrisu.opsu.ui.Fonts;
 import org.newdawn.slick.Color;
 import org.newdawn.slick.Graphics;
-import yugecin.opsudance.core.DisplayContainer;
 import yugecin.opsudance.core.events.EventBus;
 import yugecin.opsudance.core.events.EventListener;
 import yugecin.opsudance.events.ResolutionOrSkinChangedEvent;
 import yugecin.opsudance.utils.FPSMeter;
 
 import static yugecin.opsudance.options.Options.*;
+import static yugecin.opsudance.core.InstanceContainer.displayContainer;
 
 public class FpsRenderState implements EventListener<ResolutionOrSkinChangedEvent> {
 
@@ -34,7 +34,6 @@ public class FpsRenderState implements EventListener<ResolutionOrSkinChangedEven
 	private final static Color ORANGE = new Color(255, 204, 34);
 	private final static Color DARKORANGE = new Color(255, 149, 24);
 
-	private final DisplayContainer displayContainer;
 	private final FPSMeter fpsMeter;
 	private final FPSMeter upsMeter;
 
@@ -42,8 +41,7 @@ public class FpsRenderState implements EventListener<ResolutionOrSkinChangedEven
 	private int y;
 	private int singleHeight;
 
-	public FpsRenderState(DisplayContainer displayContainer) {
-		this.displayContainer = displayContainer;
+	public FpsRenderState() {
 		fpsMeter = new FPSMeter(10);
 		upsMeter = new FPSMeter(10);
 		EventBus.subscribe(ResolutionOrSkinChangedEvent.class, this);