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.

2017-05-21 11:12:55 +02:00
parent 1ebf2c2dcb
commit ec53f531c8
72 changed files with 675 additions and 929 deletions
--- a/src/itdelatrisu/opsu/GameData.java
+++ b/src/itdelatrisu/opsu/GameData.java
@@ -24,7 +24,6 @@ import itdelatrisu.opsu.audio.SoundController;
 import itdelatrisu.opsu.audio.SoundEffect;
 import itdelatrisu.opsu.beatmap.Beatmap;
 import itdelatrisu.opsu.beatmap.HitObject;
-import itdelatrisu.opsu.downloads.Updater;
 import itdelatrisu.opsu.objects.curves.Curve;
 import itdelatrisu.opsu.replay.Replay;
 import itdelatrisu.opsu.replay.ReplayFrame;
@@ -42,25 +41,17 @@ import org.newdawn.slick.Animation;
 import org.newdawn.slick.Color;
 import org.newdawn.slick.Graphics;
 import org.newdawn.slick.Image;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;
-import yugecin.opsudance.options.Configuration;
 import yugecin.opsudance.skinning.SkinService;
 import yugecin.opsudance.utils.SlickUtil;

 import static yugecin.opsudance.options.Options.*;
+import static yugecin.opsudance.core.InstanceContainer.*;

 /**
 * Holds game data and renders all related elements.
 */
 public class GameData {

-	@Inject
-	private Configuration config;
-
-	@Inject
-	private InstanceContainer instanceContainer;
-
 	/** Delta multiplier for steady HP drain. */
 	public static final float HP_DRAIN_MULTIPLIER = 1 / 200f;

@@ -354,17 +345,10 @@ public class GameData {
 	/** Whether this object is used for gameplay (true) or score viewing (false). */
 	private boolean isGameplay;

-	/** Container dimensions. */
-	private int width, height;
-
 	/**
 	 * Constructor for gameplay.
-	 * @param width container width
-	 * @param height container height
 	 */
-	public GameData(int width, int height) {
-		this.width = width;
-		this.height = height;
+	public GameData() {
 		this.isGameplay = true;

 		clear();
@@ -375,12 +359,8 @@ public class GameData {
 	 * This will initialize all parameters and images needed for the
 	 * {@link #drawRankingElements(Graphics, Beatmap)} method.
 	 * @param s the ScoreData object
-	 * @param width container width
-	 * @param height container height
 	 */
-	public GameData(ScoreData s, int width, int height) {
-		this.width = width;
-		this.height = height;
+	public GameData(ScoreData s) {
 		this.isGameplay = false;

 		this.scoreData = s;
@@ -395,8 +375,9 @@ public class GameData {
 		hitResultCount[HIT_300K] = 0;
 		hitResultCount[HIT_100K] = s.katu;
 		hitResultCount[HIT_MISS] = s.miss;
-		this.replay = (s.replayString == null) ? null :
-			instanceContainer.injectFields(new Replay(new File(config.replayDir, String.format("%s.osr", s.replayString))));
+		if (s.replayString != null) {
+			this.replay = new Replay(new File(config.replayDir, s.replayString + ".osr"));
+		}

 		loadImages();
 	}
@@ -622,6 +603,8 @@ public class GameData {
 	 */
 	@SuppressWarnings("deprecation")
 	public void drawGameElements(Graphics g, boolean breakPeriod, boolean firstObject, float alpha) {
+		int width = displayContainer.width;
+		int height = displayContainer.height;
 		boolean relaxAutoPilot = (GameMod.RELAX.isActive() || GameMod.AUTOPILOT.isActive());
 		int margin = (int) (width * 0.008f);
 		float uiScale = GameImage.getUIscale();
@@ -813,6 +796,9 @@ public class GameData {
 	 * @param beatmap the beatmap
 	 */
 	public void drawRankingElements(Graphics g, Beatmap beatmap) {
+		int width = displayContainer.width;
+		int height = displayContainer.height;
+
 		// TODO Version 2 skins
 		float rankingHeight = 75;
 		float scoreTextScale = 1.0f;
@@ -925,7 +911,7 @@ public class GameData {
 				if (hitResult.hitResultType == HitObjectType.SPINNER && hitResult.result != HIT_MISS) {
 					Image spinnerOsu = GameImage.SPINNER_OSU.getImage();
 					spinnerOsu.setAlpha(hitResult.alpha);
-					spinnerOsu.drawCentered(width / 2, height / 4);
+					spinnerOsu.drawCentered(displayContainer.width / 2, displayContainer.height / 4);
 					spinnerOsu.setAlpha(1f);
 				} else if (OPTION_SHOW_HIT_LIGHTING.state && !hitResult.hideResult && hitResult.result != HIT_MISS &&
 					// hit lighting
@@ -1199,7 +1185,7 @@ public class GameData {
 		// combo burst
 		if (comboBurstIndex > -1 && OPTION_SHOW_COMBO_BURSTS.state) {
 			int leftX  = 0;
-			int rightX = width - comboBurstImages[comboBurstIndex].getWidth();
+			int rightX = displayContainer.width - comboBurstImages[comboBurstIndex].getWidth();
 			if (comboBurstX < leftX) {
 				comboBurstX += (delta / 2f) * GameImage.getUIscale();
 				if (comboBurstX > leftX)
@@ -1260,7 +1246,7 @@ public class GameData {
 			}
 			comboBurstAlpha = 0.8f;
 			if ((comboBurstIndex % 2) == 0) {
-				comboBurstX = width;
+				comboBurstX = displayContainer.width;
 			} else {
 				comboBurstX = comboBurstImages[0].getWidth() * -1;
 			}
@@ -1603,7 +1589,7 @@ public class GameData {

 		replay = new Replay();
 		replay.mode = Beatmap.MODE_OSU;
-		replay.version = Updater.get().getBuildDate();
+		replay.version = updater.getBuildDate();
 		replay.beatmapHash = (beatmap == null) ? "" : beatmap.md5Hash;
 		replay.playerName = "";  // TODO
 		replay.replayHash = Long.toString(System.currentTimeMillis());  // TODO
--- a/src/itdelatrisu/opsu/NativeLoader.java
+++ b/src/itdelatrisu/opsu/NativeLoader.java
@@ -18,14 +18,18 @@

 package itdelatrisu.opsu;

+import org.newdawn.slick.util.Log;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.reflect.Field;
 import java.util.Enumeration;
 import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
+
+import static yugecin.opsudance.core.InstanceContainer.*;

 /**
 * Native loader, based on the JarSplice launcher.
@@ -33,38 +37,55 @@ import java.util.jar.JarFile;
 * @author http://ninjacave.com
 */
 public class NativeLoader {
-	/** The directory to unpack natives to. */
-	private final File nativeDir;

-	/**
-	 * Constructor.
-	 * @param dir the directory to unpack natives to
-	 */
-	public NativeLoader(File dir) {
-		nativeDir = dir;
+	public static void loadNatives() {
+		try {
+			unpackNatives();
+		} catch (IOException e) {
+			String msg = String.format("Could not unpack native(s): %s", e.getMessage());
+			throw new RuntimeException(msg, e);
+		}
+
+		String nativepath = config.NATIVE_DIR.getAbsolutePath();
+		System.setProperty("org.lwjgl.librarypath", nativepath);
+		System.setProperty("java.library.path", nativepath);
+
+		try {
+			// Workaround for "java.library.path" property being read-only.
+			// http://stackoverflow.com/a/24988095
+			Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
+			fieldSysPath.setAccessible(true);
+			fieldSysPath.set(null, null);
+		} catch (Exception e) {
+			Log.warn("Failed to set 'sys_paths' field.", e);
+		}
 	}

 	/**
 	 * Unpacks natives for the current operating system to the natives directory.
 	 * @throws IOException if an I/O exception occurs
 	 */
-	public void loadNatives() throws IOException {
-		if (!nativeDir.exists())
-			nativeDir.mkdir();
-
-		JarFile jarFile = Utils.getJarFile();
-		if (jarFile == null)
+	public static void unpackNatives() throws IOException {
+		if (env.jarfile == null) {
 			return;
+		}

-		Enumeration<JarEntry> entries = jarFile.entries();
+		if (!config.NATIVE_DIR.exists() && !config.NATIVE_DIR.mkdir()) {
+			String msg = String.format("Could not create folder '%s'",
+				config.NATIVE_DIR.getAbsolutePath());
+			throw new RuntimeException(msg);
+		}
+
+
+		Enumeration<JarEntry> entries = env.jarfile.entries();
 		while (entries.hasMoreElements()) {
 			JarEntry e = entries.nextElement();
 			if (e == null)
 				break;

-			File f = new File(nativeDir, e.getName());
+			File f = new File(config.NATIVE_DIR, e.getName());
 			if (isNativeFile(e.getName()) && !e.isDirectory() && e.getName().indexOf('/') == -1 && !f.exists()) {
-				InputStream in = jarFile.getInputStream(jarFile.getEntry(e.getName()));
+				InputStream in = env.jarfile.getInputStream(env.jarfile.getEntry(e.getName()));
 				OutputStream out = new FileOutputStream(f);

 				byte[] buffer = new byte[65536];
@@ -77,7 +98,7 @@ public class NativeLoader {
 			}
 		}

-		jarFile.close();
+		env.jarfile.close();
 	}

 	/**
@@ -85,7 +106,7 @@ public class NativeLoader {
 	 * @param entryName the file name
 	 * @return true if the file is a native that should be loaded, false otherwise
 	 */
-	private boolean isNativeFile(String entryName) {
+	private static boolean isNativeFile(String entryName) {
 		String osName = System.getProperty("os.name");
 		String name = entryName.toLowerCase();

@@ -101,4 +122,5 @@ public class NativeLoader {
 		}
 		return false;
 	}
+
 }
--- a/src/itdelatrisu/opsu/Utils.java
+++ b/src/itdelatrisu/opsu/Utils.java
@@ -18,6 +18,7 @@

 package itdelatrisu.opsu;

+import com.sun.istack.internal.Nullable;
 import itdelatrisu.opsu.downloads.Download;

 import java.io.BufferedInputStream;
@@ -30,14 +31,12 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.SocketTimeoutException;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
 import java.util.Scanner;
-import java.util.jar.JarFile;

 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
@@ -55,7 +54,8 @@ import org.newdawn.slick.util.Log;
 import com.sun.jna.platform.FileUtils;
 import yugecin.opsudance.core.DisplayContainer;
 import yugecin.opsudance.core.errorhandling.ErrorHandler;
-import yugecin.opsudance.options.Options;
+
+import static yugecin.opsudance.core.InstanceContainer.*;

 /**
 * Contains miscellaneous utilities.
@@ -418,43 +418,6 @@ public class Utils {
 			return String.format("%02d:%02d:%02d", seconds / 3600, (seconds / 60) % 60, seconds % 60);
 	}

-	/**
-	 * Returns whether or not the application is running within a JAR.
-	 * @return true if JAR, false if file
-	 */
-	public static boolean isJarRunning() {
-		return Utils.class.getResource(String.format("%s.class", Utils.class.getSimpleName())).toString().startsWith("jar:");
-	}
-
-	/**
-	 * Returns the JarFile for the application.
-	 * @return the JAR file, or null if it could not be determined
-	 */
-	public static JarFile getJarFile() {
-		if (!isJarRunning())
-			return null;
-
-		try {
-			return new JarFile(new File(Utils.class.getProtectionDomain().getCodeSource().getLocation().toURI()), false);
-		} catch (URISyntaxException | IOException e) {
-			Log.error("Could not determine the JAR file.", e);
-			return null;
-		}
-	}
-
-	/**
-	 * Returns the directory where the application is being run.
-	 * @return the directory, or null if it could not be determined
-	 */
-	public static File getRunningDirectory() {
-		try {
-			return new File(Utils.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath());
-		} catch (URISyntaxException e) {
-			Log.error("Could not get the running directory.", e);
-			return null;
-		}
-	}
-
 	/**
 	 * Parses the integer string argument as a boolean:
 	 * {@code 1} is {@code true}, and all other values are {@code false}.
@@ -470,8 +433,9 @@ public class Utils {
 	 * most recent update to the working directory (e.g. fetch or successful push).
 	 * @return the 40-character SHA-1 hash, or null if it could not be determined
 	 */
+	@Nullable
 	public static String getGitHash() {
-		if (isJarRunning())
+		if (env.isJarRunning)
 			return null;
 		File f = new File(".git/refs/remotes/origin/master");
 		if (!f.isFile())
@@ -517,10 +481,10 @@ public class Utils {
 	}

 	public static int getQuadrant(double x, double y) {
-		if (x < Options.width / 2d) {
-			return y < Options.height / 2d ? 2 : 3;
+		if (x < displayContainer.width / 2d) {
+			return y < displayContainer.height / 2d ? 2 : 3;
 		}
-		return y < Options.height / 2d ? 1 : 4;
+		return y < displayContainer.height / 2d ? 1 : 4;
 	}

 	/*
@@ -537,24 +501,24 @@ public class Utils {
 	*/

 	public static float[] mirrorPoint(float x, float y) {
-		double dx = x - Options.width / 2d;
-		double dy = y - Options.height / 2d;
+		double dx = x - displayContainer.width / 2d;
+		double dy = y - displayContainer.height / 2d;
 		double ang = Math.atan2(dy, dx);
 		double d = -Math.sqrt(dx * dx + dy * dy);
 		return new float[]{
-			(float) (Options.width / 2d + Math.cos(ang) * d),
-			(float) (Options.height / 2d + Math.sin(ang) * d)
+			(float) (displayContainer.width / 2d + Math.cos(ang) * d),
+			(float) (displayContainer.height / 2d + Math.sin(ang) * d)
 		};
 	}

 	public static float[] mirrorPoint(float x, float y, float degrees) {
-		double dx = x - Options.width / 2d;
-		double dy = y - Options.height / 2d;
+		double dx = x - displayContainer.width / 2d;
+		double dy = y - displayContainer.height / 2d;
 		double ang = Math.atan2(dy, dx) + (degrees * Math.PI / 180d);
 		double d = Math.sqrt(dx * dx + dy * dy);
 		return new float[]{
-			(float) (Options.width / 2d + Math.cos(ang) * d),
-			(float) (Options.height / 2d + Math.sin(ang) * d)
+			(float) (displayContainer.width / 2d + Math.cos(ang) * d),
+			(float) (displayContainer.height / 2d + Math.sin(ang) * d)
 		};
 	}

--- a/src/itdelatrisu/opsu/beatmap/BeatmapParser.java
+++ b/src/itdelatrisu/opsu/beatmap/BeatmapParser.java
@@ -35,12 +35,10 @@ import org.newdawn.slick.Color;
 import org.newdawn.slick.util.Log;
 import yugecin.opsudance.core.errorhandling.ErrorHandler;
 import yugecin.opsudance.core.events.EventBus;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;
 import yugecin.opsudance.events.BubbleNotificationEvent;
-import yugecin.opsudance.options.Configuration;
 import yugecin.opsudance.skinning.SkinService;

+import static yugecin.opsudance.core.InstanceContainer.*;
 import static yugecin.opsudance.options.Options.*;

 /**
@@ -48,12 +46,6 @@ import static yugecin.opsudance.options.Options.*;
 */
 public class BeatmapParser {

-	@Inject
-	private InstanceContainer instanceContainer;
-
-	@Inject
-	private Configuration config;
-
 	/** The string lookup database. */
 	private static HashMap<String, String> stringdb = new HashMap<String, String>();

@@ -78,14 +70,9 @@ public class BeatmapParser {
 	/** If no Provider supports a MessageDigestSpi implementation for the MD5 algorithm. */
 	private boolean hasNoMD5Algorithm = false;

-	@Inject
-	public BeatmapParser() {
-	}
-
 	/**
 	 * Invokes parser for each OSU file in a root directory and
 	 * adds the beatmaps to a new BeatmapSetList.
-	 * @param root the root directory (search has depth 1)
 	 */
 	public void parseAll() {
 		// create a new BeatmapSetList
@@ -93,7 +80,7 @@ public class BeatmapParser {

 		// create a new watch service
 		if (OPTION_ENABLE_WATCH_SERVICE.state) {
-			BeatmapWatchService.create(instanceContainer);
+			BeatmapWatchService.create();
 		}

 		// parse all directories
--- a/src/itdelatrisu/opsu/beatmap/BeatmapWatchService.java
+++ b/src/itdelatrisu/opsu/beatmap/BeatmapWatchService.java
@@ -40,10 +40,9 @@ import java.util.concurrent.Executors;

 import org.newdawn.slick.util.Log;
 import yugecin.opsudance.core.events.EventBus;
-import yugecin.opsudance.core.inject.InstanceContainer;
 import yugecin.opsudance.events.BubbleNotificationEvent;
-import yugecin.opsudance.options.Configuration;

+import static yugecin.opsudance.core.InstanceContainer.*;
 import static yugecin.opsudance.options.Options.*;

 /*
@@ -83,6 +82,7 @@ import static yugecin.opsudance.options.Options.*;
 * @author The Java Tutorials (http://docs.oracle.com/javase/tutorial/essential/io/examples/WatchDir.java) (base)
 */
 public class BeatmapWatchService {
+
 	/** Beatmap watcher service instance. */
 	private static BeatmapWatchService ws;

@@ -90,14 +90,14 @@ public class BeatmapWatchService {
 	 * Creates a new watch service instance (overwriting any previous instance),
 	 * registers the beatmap directory, and starts processing events.
 	 */
-	public static void create(InstanceContainer instanceContainer) {
+	public static void create() {
 		// close the existing watch service
 		destroy();

 		// create a new watch service
 		try {
-			ws = instanceContainer.provide(BeatmapWatchService.class);
-			ws.register(instanceContainer.provide(Configuration.class).beatmapDir.toPath());
+			ws = new BeatmapWatchService();
+			ws.register(config.beatmapDir.toPath());
 		} catch (IOException e) {
 			Log.error("Could not create watch service", e);
 			EventBus.post(new BubbleNotificationEvent("Could not create watch service", BubbleNotificationEvent.COMMONCOLOR_RED));
--- a/src/itdelatrisu/opsu/beatmap/OszUnpacker.java
+++ b/src/itdelatrisu/opsu/beatmap/OszUnpacker.java
@@ -27,32 +27,23 @@ import net.lingala.zip4j.core.ZipFile;
 import net.lingala.zip4j.exception.ZipException;
 import org.newdawn.slick.util.Log;
 import yugecin.opsudance.core.events.EventBus;
-import yugecin.opsudance.core.inject.Inject;
 import yugecin.opsudance.events.BubbleNotificationEvent;
-import yugecin.opsudance.options.Configuration;
+
+import static yugecin.opsudance.core.InstanceContainer.*;

 /**
 * Unpacker for OSZ (ZIP) archives.
 */
 public class OszUnpacker {

-	@Inject
-	private Configuration config;
-
 	/** The index of the current file being unpacked. */
 	private int fileIndex = -1;

 	/** The total number of files to unpack. */
 	private File[] files;

-	@Inject
-	public OszUnpacker() {
-	}
-
 	/**
 	 * Invokes the unpacker for each OSZ archive in a root directory.
-	 * @param root the root directory
-	 * @param dest the destination directory
 	 * @return an array containing the new (unpacked) directories, or null
 	 *         if no OSZs found
 	 */
--- a/src/itdelatrisu/opsu/downloads/DownloadNode.java
+++ b/src/itdelatrisu/opsu/downloads/DownloadNode.java
@@ -34,11 +34,10 @@ import org.newdawn.slick.Color;
 import org.newdawn.slick.Graphics;
 import org.newdawn.slick.Image;
 import yugecin.opsudance.core.events.EventBus;
-import yugecin.opsudance.core.inject.Inject;
 import yugecin.opsudance.events.BarNotificationEvent;
 import yugecin.opsudance.events.BubbleNotificationEvent;
-import yugecin.opsudance.options.Configuration;

+import static yugecin.opsudance.core.InstanceContainer.*;
 import static yugecin.opsudance.options.Options.*;

 /**
@@ -46,9 +45,6 @@ import static yugecin.opsudance.options.Options.*;
 */
 public class DownloadNode {

-	@Inject
-	private Configuration config;
-
 	/** The associated Download object. */
 	private Download download;

--- a/src/itdelatrisu/opsu/downloads/Updater.java
+++ b/src/itdelatrisu/opsu/downloads/Updater.java
@@ -35,26 +35,18 @@ import java.util.Properties;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.newdawn.slick.util.Log;
 import org.newdawn.slick.util.ResourceLoader;
+import yugecin.opsudance.core.Constants;
 import yugecin.opsudance.core.errorhandling.ErrorHandler;
 import yugecin.opsudance.core.events.EventBus;
-import yugecin.opsudance.core.inject.Inject;
 import yugecin.opsudance.events.BarNotificationEvent;
-import yugecin.opsudance.options.Configuration;
+
+import static yugecin.opsudance.core.InstanceContainer.*;

 /**
 * Handles automatic program updates.
 */
 public class Updater {

-	@Inject
-	private Configuration config;
-
-	private static Updater updater;
-
-	public static Updater get() {
-		return updater;
-	}
-
 	/** The exit confirmation message. */
 	public static final String EXIT_CONFIRMATION = "An opsu! update is being downloaded.\nAre you sure you want to quit opsu!?";

@@ -95,7 +87,7 @@ public class Updater {
 		 * Returns the status description.
 		 */
 		public String getDescription() { return description; }
-	};
+	}

 	/** The current updater status. */
 	private Status status;
@@ -119,10 +111,8 @@ public class Updater {
 		return currentVersion.getMajorVersion() + "." + currentVersion.getMinorVersion() + "." + currentVersion.getIncrementalVersion();
 	}

-	@Inject
 	public Updater() {
 		status = Status.INITIAL;
-		updater = this;
 	}

 	/**
@@ -145,7 +135,7 @@ public class Updater {
 			Date date = null;
 			try {
 				Properties props = new Properties();
-				props.load(ResourceLoader.getResourceAsStream(config.VERSION_FILE));
+				props.load(ResourceLoader.getResourceAsStream(Constants.VERSION_FILE));
 				String build = props.getProperty("build.date");
 				if (build == null || build.equals("${timestamp}") || build.equals("${maven.build.timestamp}"))
 					date = new Date();
@@ -214,16 +204,16 @@ public class Updater {

 		// get current version
 		Properties props = new Properties();
-		props.load(ResourceLoader.getResourceAsStream(config.VERSION_FILE));
+		props.load(ResourceLoader.getResourceAsStream(Constants.VERSION_FILE));
 		if ((currentVersion = getVersion(props)) == null)
 			return;

 		// get latest version
 		String s = null;
 		try {
-			s = Utils.readDataFromUrl(new URL(config.VERSION_REMOTE));
+			s = Utils.readDataFromUrl(new URL(Constants.VERSION_REMOTE));
 		} catch (UnknownHostException e) {
-			Log.warn(String.format("Check for updates failed. Please check your internet connection, or your connection to %s.", config.VERSION_REMOTE));
+			Log.warn(String.format("Check for updates failed. Please check your internet connection, or your connection to %s.", Constants.VERSION_REMOTE));
 		}
 		if (s == null) {
 			status = Status.CONNECTION_ERROR;
--- a/src/itdelatrisu/opsu/downloads/servers/BloodcatServer.java
+++ b/src/itdelatrisu/opsu/downloads/servers/BloodcatServer.java
@@ -34,17 +34,12 @@ import java.util.Date;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import yugecin.opsudance.core.errorhandling.ErrorHandler;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;

 /**
 * Download server: http://bloodcat.com/osu/
 */
 public class BloodcatServer extends DownloadServer {

-	@Inject
-	public InstanceContainer instanceContainer;
-
 	/** Server name. */
 	private static final String SERVER_NAME = "Bloodcat";

@@ -60,10 +55,6 @@ public class BloodcatServer extends DownloadServer {
 	/** Total result count from the last query. */
 	private int totalResults = -1;

-	@Inject
-	public BloodcatServer() {
-	}
-
 	@Override
 	public String getName() { return SERVER_NAME; }

@@ -89,12 +80,12 @@ public class BloodcatServer extends DownloadServer {
 			nodes = new DownloadNode[arr.length()];
 			for (int i = 0; i < nodes.length; i++) {
 				JSONObject item = arr.getJSONObject(i);
-				nodes[i] = instanceContainer.injectFields(new DownloadNode(
+				nodes[i] = new DownloadNode(
 					item.getInt("id"), formatDate(item.getString("synced")),  //"date"
 					item.getString("title"), item.isNull("titleU") ? null : item.getString("titleU"),  //"titleUnicode"
 					item.getString("artist"), item.isNull("artistU") ? null : item.getString("artistU"),  //"artistUnicode"
 					item.getString("creator")
-				));
+				);
 			}

 			// store total result count
--- a/src/itdelatrisu/opsu/downloads/servers/HexideServer.java
+++ b/src/itdelatrisu/opsu/downloads/servers/HexideServer.java
@@ -30,8 +30,6 @@ import java.net.URLEncoder;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import yugecin.opsudance.core.errorhandling.ErrorHandler;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;

 /**
 * Download server: https://osu.hexide.com/
@@ -40,9 +38,6 @@ import yugecin.opsudance.core.inject.InstanceContainer;
 */
 public class HexideServer extends DownloadServer {

-	@Inject
-	private InstanceContainer instanceContainer;
-
 	/** Server name. */
 	private static final String SERVER_NAME = "Hexide";

@@ -64,10 +59,6 @@ public class HexideServer extends DownloadServer {
 	/** Total result count from the last query. */
 	private int totalResults = -1;

-	@Inject
-	public HexideServer() {
-	}
-
 	@Override
 	public String getName() { return SERVER_NAME; }

@@ -124,10 +115,10 @@ public class HexideServer extends DownloadServer {
 						artist = creator = "?";
 					}
 				}
-				nodes[i] = instanceContainer.injectFields(new DownloadNode(
+				nodes[i] = new DownloadNode(
 					item.getInt("ranked_id"), item.getString("date"),
 					title, null, artist, null, creator
-				));
+				);
 			}

 			// store total result count
--- a/src/itdelatrisu/opsu/downloads/servers/MengSkyServer.java
+++ b/src/itdelatrisu/opsu/downloads/servers/MengSkyServer.java
@@ -30,17 +30,12 @@ import java.net.URLEncoder;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import yugecin.opsudance.core.errorhandling.ErrorHandler;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;

 /**
 * Download server: http://osu.mengsky.net/
 */
 public class MengSkyServer extends DownloadServer {

-	@Inject
-	private InstanceContainer instanceContainer;
-
 	/** Server name. */
 	private static final String SERVER_NAME = "MengSky";

@@ -56,10 +51,6 @@ public class MengSkyServer extends DownloadServer {
 	/** Total result count from the last query. */
 	private int totalResults = -1;

-	@Inject
-	public MengSkyServer() {
-	}
-
 	@Override
 	public String getName() { return SERVER_NAME; }

@@ -93,10 +84,10 @@ public class MengSkyServer extends DownloadServer {
 				// sometimes titleU is artistU instead of the proper title
 				if (titleU.equals(artistU) && !titleU.equals(title))
 					titleU = title;
-				nodes[i] = instanceContainer.injectFields(new DownloadNode(
+				nodes[i] = new DownloadNode(
 					item.getInt("id"), item.getString("syncedDateTime"),
 					title, titleU, artist, artistU, creator
-				));
+				);
 			}

 			// store total result count
--- a/src/itdelatrisu/opsu/downloads/servers/MnetworkServer.java
+++ b/src/itdelatrisu/opsu/downloads/servers/MnetworkServer.java
@@ -21,8 +21,6 @@ package itdelatrisu.opsu.downloads.servers;
 import itdelatrisu.opsu.Utils;
 import itdelatrisu.opsu.downloads.DownloadNode;
 import yugecin.opsudance.core.errorhandling.ErrorHandler;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;

 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -39,9 +37,6 @@ import java.util.regex.Pattern;
 */
 public class MnetworkServer extends DownloadServer {

-	@Inject
-	private InstanceContainer instanceContainer;
-
 	/** Server name. */
 	private static final String SERVER_NAME = "Mnetwork";

@@ -57,10 +52,6 @@ public class MnetworkServer extends DownloadServer {
 	/** Beatmap pattern. */
 	private Pattern BEATMAP_PATTERN = Pattern.compile("^(\\d+) ([^-]+) - (.+)\\.osz$");

-	@Inject
-	public MnetworkServer() {
-	}
-
 	@Override
 	public String getName() { return SERVER_NAME; }

@@ -119,7 +110,7 @@ public class MnetworkServer extends DownloadServer {
 				if (!m.matches())
 					continue;

-				nodeList.add(instanceContainer.injectFields(new DownloadNode(Integer.parseInt(m.group(1)), date, m.group(3), null, m.group(2), null, "")));
+				nodeList.add(new DownloadNode(Integer.parseInt(m.group(1)), date, m.group(3), null, m.group(2), null, ""));
 			}

 			nodes = nodeList.toArray(new DownloadNode[nodeList.size()]);
--- a/src/itdelatrisu/opsu/downloads/servers/OsuMirrorServer.java
+++ b/src/itdelatrisu/opsu/downloads/servers/OsuMirrorServer.java
@@ -36,8 +36,6 @@ import java.util.TimeZone;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import yugecin.opsudance.core.errorhandling.ErrorHandler;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;

 /**
 * Download server: http://loli.al/
@@ -46,9 +44,6 @@ import yugecin.opsudance.core.inject.InstanceContainer;
 */
 public class OsuMirrorServer extends DownloadServer {

-	@Inject
-	private InstanceContainer instanceContainer;
-
 	/** Server name. */
 	private static final String SERVER_NAME = "osu!Mirror";

@@ -73,10 +68,6 @@ public class OsuMirrorServer extends DownloadServer {
 	/** Lookup table from beatmap set ID -> server download ID. */
 	private HashMap<Integer, Integer> idTable = new HashMap<Integer, Integer>();

-	@Inject
-	public OsuMirrorServer() {
-	}
-
 	@Override
 	public String getName() { return SERVER_NAME; }

@@ -113,12 +104,12 @@ public class OsuMirrorServer extends DownloadServer {
 				JSONObject item = arr.getJSONObject(i);
 				int beatmapSetID = item.getInt("OSUSetid");
 				int serverID = item.getInt("id");
-				nodes[i] = instanceContainer.injectFields(new DownloadNode(
+				nodes[i] = new DownloadNode(
 					beatmapSetID, formatDate(item.getString("ModifyDate")),
 					item.getString("Title"), null,
 					item.getString("Artist"), null,
 					item.getString("Mapper")
-				));
+				);
 				idTable.put(beatmapSetID, serverID);
 				if (serverID > maxServerID)
 					maxServerID = serverID;
--- a/src/itdelatrisu/opsu/downloads/servers/YaSOnlineServer.java
+++ b/src/itdelatrisu/opsu/downloads/servers/YaSOnlineServer.java
@@ -34,17 +34,12 @@ import java.util.List;

 import org.json.JSONObject;
 import yugecin.opsudance.core.errorhandling.ErrorHandler;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;

 /**
 * Download server: http://osu.yas-online.net/
 */
 public class YaSOnlineServer extends DownloadServer {

-	@Inject
-	public InstanceContainer instanceContainer;
-
 	/** Server name. */
 	private static final String SERVER_NAME = "YaS Online";

@@ -72,10 +67,6 @@ public class YaSOnlineServer extends DownloadServer {
 	/** Max server download ID seen (for approximating total pages). */
 	private int maxServerID = 0;

-	@Inject
-	public YaSOnlineServer() {
-	}
-
 	@Override
 	public String getName() { return SERVER_NAME; }

@@ -183,7 +174,7 @@ public class YaSOnlineServer extends DownloadServer {
 				if (serverID > maxServerID)
 					maxServerID = serverID;

-				nodeList.add(instanceContainer.injectFields(new DownloadNode(item.getInt("mapid"), date, title, null, artist, null, "")));
+				nodeList.add(new DownloadNode(item.getInt("mapid"), date, title, null, artist, null, ""));
 			}
 			nodes = nodeList.toArray(new DownloadNode[nodeList.size()]);

--- a/src/itdelatrisu/opsu/objects/Circle.java
+++ b/src/itdelatrisu/opsu/objects/Circle.java
@@ -30,9 +30,8 @@ import itdelatrisu.opsu.ui.Colors;
 import org.newdawn.slick.Color;
 import org.newdawn.slick.Graphics;
 import yugecin.opsudance.Dancer;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.render.GameObjectRenderer;

+import static yugecin.opsudance.core.InstanceContainer.*;
 import static yugecin.opsudance.options.Options.*;

 /**
@@ -40,9 +39,6 @@ import static yugecin.opsudance.options.Options.*;
 */
 public class Circle extends GameObject {

-	@Inject
-	private GameObjectRenderer gameObjectRenderer;
-
 	/** The associated HitObject. */
 	private HitObject hitObject;

@@ -156,7 +152,7 @@ public class Circle extends GameObject {
 	@Override
 	public boolean mousePressed(int x, int y, int trackPosition) {
 		double distance = Math.hypot(this.x - x, this.y - y);
-		if (distance < gameObjectRenderer.getCircleDiameter() / 2) {
+		if (distance < gameObjectRenderer.circleDiameter / 2) {
 			int timeDiff = trackPosition - hitObject.getTime();
 			int result = hitResult(timeDiff);

--- a/src/itdelatrisu/opsu/objects/Slider.java
+++ b/src/itdelatrisu/opsu/objects/Slider.java
@@ -35,11 +35,9 @@ import org.newdawn.slick.Color;
 import org.newdawn.slick.Graphics;
 import org.newdawn.slick.Image;
 import yugecin.opsudance.Dancer;
-import yugecin.opsudance.core.DisplayContainer;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.render.GameObjectRenderer;
 import yugecin.opsudance.skinning.SkinService;

+import static yugecin.opsudance.core.InstanceContainer.*;
 import static yugecin.opsudance.options.Options.*;

 /**
@@ -47,12 +45,6 @@ import static yugecin.opsudance.options.Options.*;
 */
 public class Slider extends GameObject {

-	@Inject
-	private DisplayContainer displayContainer;
-
-	@Inject
-	private GameObjectRenderer gameObjectRenderer;
-
 	/** Slider ball frames. */
 	private static Image[] sliderBallImages;

@@ -605,7 +597,7 @@ public class Slider extends GameObject {
 			return false;

 		double distance = Math.hypot(this.x - x, this.y - y);
-		if (distance < gameObjectRenderer.getCircleDiameter() / 2) {
+		if (distance < gameObjectRenderer.circleDiameter / 2) {
 			int timeDiff = Math.abs(trackPosition - hitObject.getTime());
 			int[] hitResultOffset = game.getHitResultOffsets();

--- a/src/itdelatrisu/opsu/render/CurveRenderState.java
+++ b/src/itdelatrisu/opsu/render/CurveRenderState.java
@@ -37,8 +37,8 @@ import org.lwjgl.opengl.GL20;
 import org.newdawn.slick.Color;
 import org.newdawn.slick.Image;
 import org.newdawn.slick.util.Log;
-import yugecin.opsudance.render.GameObjectRenderer;

+import static yugecin.opsudance.core.InstanceContainer.*;
 import static yugecin.opsudance.options.Options.*;

 /**
@@ -316,7 +316,7 @@ public class CurveRenderState {
 				double diff_x = x - last_x;
 				double diff_y = y - last_y;
 				float dist = Utils.distance(x, y, last_x, last_y);
-				if (dist < GameObjectRenderer.instance.getCircleDiameter() / 8) {
+				if (dist < gameObjectRenderer.circleDiameter / 8) {
 					x = (float) (x - diff_x / 2);
 					y = (float) (y - diff_y / 2);
 				} else {
--- a/src/itdelatrisu/opsu/replay/Replay.java
+++ b/src/itdelatrisu/opsu/replay/Replay.java
@@ -45,9 +45,9 @@ import org.newdawn.slick.util.Log;
 import lzma.streams.LzmaOutputStream;
 import yugecin.opsudance.core.errorhandling.ErrorHandler;
 import yugecin.opsudance.core.events.EventBus;
-import yugecin.opsudance.core.inject.Inject;
 import yugecin.opsudance.events.BubbleNotificationEvent;
-import yugecin.opsudance.options.Configuration;
+
+import static yugecin.opsudance.core.InstanceContainer.*;

 /**
 * Captures osu! replay data.
@@ -57,9 +57,6 @@ import yugecin.opsudance.options.Configuration;
 */
 public class Replay {

-	@Inject
-	public Configuration config;
-
 	/** The associated file. */
 	private File file;

--- a/src/itdelatrisu/opsu/replay/ReplayImporter.java
+++ b/src/itdelatrisu/opsu/replay/ReplayImporter.java
@@ -30,22 +30,15 @@ import java.nio.file.StandardCopyOption;

 import org.newdawn.slick.util.Log;
 import yugecin.opsudance.core.events.EventBus;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;
 import yugecin.opsudance.events.BubbleNotificationEvent;
-import yugecin.opsudance.options.Configuration;
+
+import static yugecin.opsudance.core.InstanceContainer.*;

 /**
 * Importer for replay files.
 */
 public class ReplayImporter {

-	@Inject
-	private InstanceContainer instanceContainer;
-
-	@Inject
-	private Configuration config;
-
 	/** The subdirectory (within the replay import directory) to move replays that could not be imported. */
 	private final String FAILED_IMPORT_DIR = "failed";

@@ -55,10 +48,6 @@ public class ReplayImporter {
 	/** The total number of replays to import. */
 	private File[] files;

-	@Inject
-	public ReplayImporter() {
-	}
-
 	/**
 	 * Invokes the importer for each OSR file in the replay import dir, adding the replay
 	 * to the score database and moving the file into the replay directory.
@@ -87,7 +76,7 @@ public class ReplayImporter {
 		// import OSRs
 		for (File file : files) {
 			fileIndex++;
-			Replay r = instanceContainer.injectFields(new Replay(file));
+			Replay r = new Replay(file);
 			try {
 				r.loadHeader();
 			} catch (IOException e) {
--- a/src/itdelatrisu/opsu/states/ButtonMenu.java
+++ b/src/itdelatrisu/opsu/states/ButtonMenu.java
@@ -39,10 +39,10 @@ import org.newdawn.slick.Color;
 import org.newdawn.slick.Graphics;
 import org.newdawn.slick.Image;
 import org.newdawn.slick.Input;
-import yugecin.opsudance.core.DisplayContainer;
-import yugecin.opsudance.core.inject.InstanceContainer;
 import yugecin.opsudance.core.state.BaseOpsuState;

+import static yugecin.opsudance.core.InstanceContainer.*;
+
 /**
 * Generic button menu state.
 * <p>
@@ -68,7 +68,7 @@ public class ButtonMenu extends BaseOpsuState {
 		BEATMAP (new Button[] { Button.CLEAR_SCORES, Button.FAVORITE_ADD, Button.DELETE, Button.CANCEL }) {
 			@Override
 			public String[] getTitle() {
-				BeatmapSetNode node = instanceContainer.provide(ButtonMenu.class).getNode();
+				BeatmapSetNode node = buttonState.getNode();
 				String beatmapString = (node != null) ? BeatmapSetList.get().getBaseNode(node.index).toString() : "";
 				return new String[] { beatmapString, "What do you want to do with this beatmap?" };
 			}
@@ -99,7 +99,7 @@ public class ButtonMenu extends BaseOpsuState {
 		BEATMAP_DELETE_SELECT (new Button[] { Button.DELETE_GROUP, Button.DELETE_SONG, Button.CANCEL_DELETE }) {
 			@Override
 			public String[] getTitle() {
-				BeatmapSetNode node = instanceContainer.provide(ButtonMenu.class).getNode();
+				BeatmapSetNode node = buttonState.getNode();
 				String beatmapString = (node != null) ? node.toString() : "";
 				return new String[] { String.format("Are you sure you wish to delete '%s' from disk?", beatmapString) };
 			}
@@ -179,7 +179,7 @@ public class ButtonMenu extends BaseOpsuState {
 			}

 			@Override
-			protected float getBaseY(DisplayContainer displayContainer) {
+			protected float getBaseY() {
 				return displayContainer.height * 2f / 3;
 			}

@@ -268,9 +268,6 @@ public class ButtonMenu extends BaseOpsuState {
 			}
 		};

-		public static DisplayContainer displayContainer;
-		public static InstanceContainer instanceContainer;
-
 		/** The buttons in the state. */
 		private final Button[] buttons;

@@ -299,7 +296,7 @@ public class ButtonMenu extends BaseOpsuState {
 		 */
 		public void revalidate(Image button, Image buttonL, Image buttonR) {
 			float center = displayContainer.width / 2;
-			float baseY = getBaseY(displayContainer);
+			float baseY = getBaseY();
 			float offsetY = button.getHeight() * 1.25f;

 			menuButtons = new MenuButton[buttons.length];
@@ -314,7 +311,7 @@ public class ButtonMenu extends BaseOpsuState {
 		/**
 		 * Returns the base Y coordinate for the buttons.
 		 */
-		protected float getBaseY(DisplayContainer displayContainer) {
+		protected float getBaseY() {
 			float baseY = displayContainer.height * 0.2f;
 			baseY += ((getTitle().length - 1) * Fonts.LARGE.getLineHeight());
 			return baseY;
@@ -437,62 +434,62 @@ public class ButtonMenu extends BaseOpsuState {
 			@Override
 			public void click() {
 				SoundController.playSound(SoundEffect.MENUBACK);
-				displayContainer.switchState(MainMenu.class);
+				displayContainer.switchState(mainmenuState);
 			}
 		},
 		CLEAR_SCORES ("Clear local scores", Color.magenta) {
 			@Override
 			public void click() {
 				SoundController.playSound(SoundEffect.MENUHIT);
-				BeatmapSetNode node = instanceContainer.provide(ButtonMenu.class).getNode();
-				instanceContainer.provide(SongMenu.class).doStateActionOnLoad(MenuState.BEATMAP, node);
-				displayContainer.switchState(SongMenu.class);
+				BeatmapSetNode node = buttonState.getNode();
+				songMenuState.doStateActionOnLoad(MenuState.BEATMAP, node);
+				displayContainer.switchState(songMenuState);
 			}
 		},
 		FAVORITE_ADD ("Add to Favorites", Color.blue) {
 			@Override
 			public void click() {
 				SoundController.playSound(SoundEffect.MENUHIT);
-				BeatmapSetNode node = instanceContainer.provide(ButtonMenu.class).getNode();
+				BeatmapSetNode node = buttonState.getNode();
 				node.getBeatmapSet().setFavorite(true);
-				displayContainer.switchState(SongMenu.class);
+				displayContainer.switchState(songMenuState);
 			}
 		},
 		FAVORITE_REMOVE ("Remove from Favorites", Color.blue) {
 			@Override
 			public void click() {
 				SoundController.playSound(SoundEffect.MENUHIT);
-				BeatmapSetNode node = instanceContainer.provide(ButtonMenu.class).getNode();
+				BeatmapSetNode node = buttonState.getNode();
 				node.getBeatmapSet().setFavorite(false);
-				instanceContainer.provide(SongMenu.class).doStateActionOnLoad(MenuState.BEATMAP_FAVORITE);
-				displayContainer.switchState(SongMenu.class);
+				songMenuState.doStateActionOnLoad(MenuState.BEATMAP_FAVORITE);
+				displayContainer.switchState(songMenuState);
 			}
 		},
 		DELETE ("Delete...", Color.red) {
 			@Override
 			public void click() {
 				SoundController.playSound(SoundEffect.MENUHIT);
-				BeatmapSetNode node = instanceContainer.provide(ButtonMenu.class).getNode();
+				BeatmapSetNode node = buttonState.getNode();
 				MenuState ms = (node.beatmapIndex == -1 || node.getBeatmapSet().size() == 1) ?
 						MenuState.BEATMAP_DELETE_CONFIRM : MenuState.BEATMAP_DELETE_SELECT;
-				instanceContainer.provide(ButtonMenu.class).setMenuState(ms, node);
-				displayContainer.switchState(ButtonMenu.class);
+				buttonState.setMenuState(ms, node);
+				displayContainer.switchState(buttonState);
 			}
 		},
 		CANCEL ("Cancel", Color.gray) {
 			@Override
 			public void click() {
 				SoundController.playSound(SoundEffect.MENUBACK);
-				displayContainer.switchState(SongMenu.class);
+				displayContainer.switchState(songMenuState);
 			}
 		},
 		DELETE_CONFIRM ("Yes, delete this beatmap!", Color.red) {
 			@Override
 			public void click() {
 				SoundController.playSound(SoundEffect.MENUHIT);
-				BeatmapSetNode node = instanceContainer.provide(ButtonMenu.class).getNode();
-				instanceContainer.provide(SongMenu.class).doStateActionOnLoad(MenuState.BEATMAP_DELETE_CONFIRM, node);
-				displayContainer.switchState(SongMenu.class);
+				BeatmapSetNode node = buttonState.getNode();
+				songMenuState.doStateActionOnLoad(MenuState.BEATMAP_DELETE_CONFIRM, node);
+				displayContainer.switchState(songMenuState);
 			}
 		},
 		DELETE_GROUP ("Yes, delete all difficulties!", Color.red) {
@@ -505,9 +502,9 @@ public class ButtonMenu extends BaseOpsuState {
 			@Override
 			public void click() {
 				SoundController.playSound(SoundEffect.MENUHIT);
-				BeatmapSetNode node = instanceContainer.provide(ButtonMenu.class).getNode();
-				instanceContainer.provide(SongMenu.class).doStateActionOnLoad(MenuState.BEATMAP_DELETE_SELECT, node);
-				displayContainer.switchState(SongMenu.class);
+				BeatmapSetNode node = buttonState.getNode();
+				songMenuState.doStateActionOnLoad(MenuState.BEATMAP_DELETE_SELECT, node);
+				displayContainer.switchState(songMenuState);
 			}
 		},
 		CANCEL_DELETE ("Nooooo! I didn't mean to!", Color.gray) {
@@ -520,8 +517,8 @@ public class ButtonMenu extends BaseOpsuState {
 			@Override
 			public void click() {
 				SoundController.playSound(SoundEffect.MENUHIT);
-				instanceContainer.provide(SongMenu.class).doStateActionOnLoad(MenuState.RELOAD);
-				displayContainer.switchState(SongMenu.class);
+				songMenuState.doStateActionOnLoad(MenuState.RELOAD);
+				displayContainer.switchState(songMenuState);
 			}
 		},
 		RELOAD_CANCEL ("Cancel", Color.red) {
@@ -534,9 +531,9 @@ public class ButtonMenu extends BaseOpsuState {
 			@Override
 			public void click() {
 				SoundController.playSound(SoundEffect.MENUHIT);
-				ScoreData scoreData = instanceContainer.provide(ButtonMenu.class).getScoreData();
-				instanceContainer.provide(SongMenu.class).doStateActionOnLoad(MenuState.SCORE, scoreData);
-				displayContainer.switchState(SongMenu.class);
+				ScoreData scoreData = buttonState.getScoreData();
+				songMenuState.doStateActionOnLoad(MenuState.SCORE, scoreData);
+				displayContainer.switchState(songMenuState);
 			}
 		},
 		CLOSE ("Close", Color.gray) {
@@ -556,9 +553,6 @@ public class ButtonMenu extends BaseOpsuState {
 			}
 		};

-		public static DisplayContainer displayContainer;
-		public static InstanceContainer instanceContainer;
-
 		/** The text to show on the button. */
 		private final String text;

@@ -600,12 +594,6 @@ public class ButtonMenu extends BaseOpsuState {
 	/** The score data to process in the state. */
 	private ScoreData scoreData;

-	public ButtonMenu(DisplayContainer displayContainer, InstanceContainer instanceContainer) {
-		super();
-		Button.displayContainer = MenuState.displayContainer = displayContainer;
-		Button.instanceContainer = MenuState.instanceContainer = instanceContainer;
-	}
-
 	@Override
 	public void revalidate() {
 		super.revalidate();
--- a/src/itdelatrisu/opsu/states/DownloadsMenu.java
+++ b/src/itdelatrisu/opsu/states/DownloadsMenu.java
@@ -22,10 +22,8 @@ import itdelatrisu.opsu.GameImage;
 import itdelatrisu.opsu.audio.MusicController;
 import itdelatrisu.opsu.audio.SoundController;
 import itdelatrisu.opsu.audio.SoundEffect;
-import itdelatrisu.opsu.beatmap.BeatmapParser;
 import itdelatrisu.opsu.beatmap.BeatmapSetList;
 import itdelatrisu.opsu.beatmap.BeatmapSetNode;
-import itdelatrisu.opsu.beatmap.OszUnpacker;
 import itdelatrisu.opsu.downloads.Download;
 import itdelatrisu.opsu.downloads.DownloadList;
 import itdelatrisu.opsu.downloads.DownloadNode;
@@ -55,11 +53,10 @@ import org.newdawn.slick.SlickException;
 import org.newdawn.slick.gui.TextField;
 import org.newdawn.slick.util.Log;
 import yugecin.opsudance.core.events.EventBus;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;
 import yugecin.opsudance.core.state.ComplexOpsuState;
 import yugecin.opsudance.events.BarNotificationEvent;
-import yugecin.opsudance.options.Configuration;
+
+import static yugecin.opsudance.core.InstanceContainer.*;

 /**
 * Downloads menu.
@@ -69,18 +66,6 @@ import yugecin.opsudance.options.Configuration;
 */
 public class DownloadsMenu extends ComplexOpsuState {

-	@Inject
-	private InstanceContainer instanceContainer;
-
-	@Inject
-	private Configuration config;
-
-	@Inject
-	private OszUnpacker oszUnpacker;
-
-	@Inject
-	private BeatmapParser beatmapParser;
-
 	/** Delay time, in milliseconds, between each search. */
 	private static final int SEARCH_DELAY = 700;

@@ -275,12 +260,12 @@ public class DownloadsMenu extends ComplexOpsuState {
 			} finally {
 				finished = true;
 			}
-		};
+		}

 		/** Imports all packed beatmaps. */
 		private void importBeatmaps() {
 			// invoke unpacker and parser
-			File[] dirs = oszUnpacker.unpackAll();
+			File[] dirs = oszunpacker.unpackAll();
 			if (dirs != null && dirs.length > 0) {
 				this.importedNode = beatmapParser.parseDirectories(dirs);
 				if (importedNode != null) {
@@ -294,13 +279,12 @@ public class DownloadsMenu extends ComplexOpsuState {
 		}
 	}

-	@Inject
-	public DownloadsMenu(InstanceContainer instanceContainer) {
+	public DownloadsMenu() {
 		SERVERS = new DownloadServer[] {
-			instanceContainer.provide(BloodcatServer.class),
-			instanceContainer.provide(YaSOnlineServer.class),
-			instanceContainer.provide(MnetworkServer.class),
-			instanceContainer.provide(MengSkyServer.class),
+			new BloodcatServer(),
+			new YaSOnlineServer(),
+			new MnetworkServer(),
+			new MengSkyServer(),
 		};
 	}

@@ -555,7 +539,7 @@ public class DownloadsMenu extends ComplexOpsuState {

 				// focus new beatmap
 				// NOTE: This can't be called in another thread because it makes OpenGL calls.
-				instanceContainer.provide(SongMenu.class).setFocus(importedNode, -1, true, true);
+				songMenuState.setFocus(importedNode, -1, true, true);
 			}
 			importThread = null;
 		}
@@ -633,7 +617,7 @@ public class DownloadsMenu extends ComplexOpsuState {
 		// back
 		if (UI.getBackButton().contains(x, y)) {
 			SoundController.playSound(SoundEffect.MENUBACK);
-			displayContainer.switchState(MainMenu.class);
+			displayContainer.switchState(mainmenuState);
 			return true;
 		}

@@ -918,7 +902,7 @@ public class DownloadsMenu extends ComplexOpsuState {
 			} else {
 				// return to main menu
 				SoundController.playSound(SoundEffect.MENUBACK);
-				displayContainer.switchState(MainMenu.class);
+				displayContainer.switchState(mainmenuState);
 			}
 			return true;
 		case Input.KEY_ENTER:
--- a/src/itdelatrisu/opsu/states/Game.java
+++ b/src/itdelatrisu/opsu/states/Game.java
@@ -57,17 +57,13 @@ import org.newdawn.slick.Input;
 import org.newdawn.slick.SlickException;
 import org.newdawn.slick.util.Log;
 import yugecin.opsudance.*;
-import yugecin.opsudance.core.DisplayContainer;
 import yugecin.opsudance.core.events.EventBus;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;
 import yugecin.opsudance.core.state.ComplexOpsuState;
 import yugecin.opsudance.events.BarNotificationEvent;
 import yugecin.opsudance.events.BubbleNotificationEvent;
 import yugecin.opsudance.objects.curves.FakeCombinedCurve;
 import yugecin.opsudance.options.OptionGroups;
 import yugecin.opsudance.options.Options;
-import yugecin.opsudance.render.GameObjectRenderer;
 import yugecin.opsudance.sbv2.MoveStoryboard;
 import yugecin.opsudance.skinning.SkinService;
 import yugecin.opsudance.ui.OptionsOverlay;
@@ -75,21 +71,13 @@ import yugecin.opsudance.ui.StoryboardOverlay;
 import yugecin.opsudance.utils.GLHelper;

 import static yugecin.opsudance.options.Options.*;
+import static yugecin.opsudance.core.InstanceContainer.*;

 /**
 * "Game" state.
 */
 public class Game extends ComplexOpsuState {

-	@Inject
-	private InstanceContainer instanceContainer;
-
-	@Inject
-	private GameObjectRenderer gameObjectRenderer;
-
-	@Inject
-	private BeatmapParser beatmapParser;
-
 	public static boolean isInGame; // TODO delete this when #79 is fixed
 	/** Game restart states. */
 	public enum Restart {
@@ -327,7 +315,7 @@ public class Game extends ComplexOpsuState {

 	private boolean skippedToCheckpoint;

-	public Game(DisplayContainer displayContainer) {
+	public Game() {
 		super();
 		mirrorCursor = new Cursor(true);
 		this.moveStoryboardOverlay = new MoveStoryboard(displayContainer);
@@ -365,8 +353,7 @@ public class Game extends ComplexOpsuState {
 		scoreboardStarStream.setDurationSpread(700, 100);

 		// create the associated GameData object
-		data = instanceContainer.injectFields(new GameData(displayContainer.width, displayContainer.height));
-		gameObjectRenderer.setGameData(data);
+		gameObjectRenderer.gameData = data = new GameData();
 	}


@@ -764,7 +751,7 @@ public class Game extends ComplexOpsuState {

 			// focus lost: go back to pause screen
 			else if (!Display.isActive()) {
-				displayContainer.switchState(GamePauseMenu.class);
+				displayContainer.switchState(pauseState);
 				pausePulse = 0f;
 			}

@@ -881,7 +868,7 @@ public class Game extends ComplexOpsuState {
 				onCloseRequest();
 			} else {
 				// go to ranking screen
-				displayContainer.switchState(GameRanking.class);
+				displayContainer.switchState(gameRankingState);
 			}
 		}
 	}
@@ -927,11 +914,11 @@ public class Game extends ComplexOpsuState {
 		} else if (GameMod.AUTO.isActive()) {
 			displayContainer.cursor.setCursorPosition(displayContainer.delta, (int) autoMousePosition.x, (int) autoMousePosition.y);
 			if (OPTION_DANCE_MIRROR.state && GameMod.AUTO.isActive()) {
-				double dx = autoMousePosition.x - Options.width / 2d;
-				double dy = autoMousePosition.y - Options.height / 2d;
+				double dx = autoMousePosition.x - displayContainer.width / 2d;
+				double dy = autoMousePosition.y - displayContainer.height / 2d;
 				double d = Math.sqrt(dx * dx + dy * dy);
 				double a = Math.atan2(dy, dx) + Math.PI;
-				mirrorCursor.setCursorPosition(displayContainer.delta, (int) (Math.cos(a) * d + Options.width / 2), (int) (Math.sin(a) * d + Options.height / 2));
+				mirrorCursor.setCursorPosition(displayContainer.delta, (int) (Math.cos(a) * d + displayContainer.width / 2), (int) (Math.sin(a) * d + displayContainer.height / 2));
 			}
 		} else if (GameMod.AUTOPILOT.isActive()) {
 			displayContainer.cursor.setCursorPosition(displayContainer.delta, (int) autoMousePosition.x, (int) autoMousePosition.y);
@@ -962,7 +949,7 @@ public class Game extends ComplexOpsuState {
 			// save score and replay
 			if (!checkpointLoaded) {
 				boolean unranked = (GameMod.AUTO.isActive() || GameMod.RELAX.isActive() || GameMod.AUTOPILOT.isActive());
-				instanceContainer.provide(GameRanking.class).setGameData(data);
+				gameRankingState.setGameData(data);
 				if (isReplay)
 					data.setReplay(replay);
 				else if (replayFrames != null) {
@@ -1048,7 +1035,7 @@ public class Game extends ComplexOpsuState {
 			if (MusicController.isPlaying() || isLeadIn()) {
 				pauseTime = trackPosition;
 			}
-			displayContainer.switchStateInstantly(GamePauseMenu.class);
+			displayContainer.switchStateInstantly(pauseState);
 		}

 		// drain health
@@ -1075,7 +1062,7 @@ public class Game extends ComplexOpsuState {
 					rotations = new IdentityHashMap<>();
 					SoundController.playSound(SoundEffect.FAIL);

-					displayContainer.switchState(GamePauseMenu.class, MUSIC_FADEOUT_TIME - LOSE_FADEOUT_TIME, 300);
+					displayContainer.switchState(pauseState, MUSIC_FADEOUT_TIME - LOSE_FADEOUT_TIME, 300);
 				}
 			}
 		}
@@ -1108,8 +1095,8 @@ public class Game extends ComplexOpsuState {

 	@Override
 	public boolean onCloseRequest() {
-		instanceContainer.provide(SongMenu.class).resetGameDataOnLoad();
-		displayContainer.switchState(SongMenu.class);
+		songMenuState.resetGameDataOnLoad();
+		displayContainer.switchState(songMenuState);
 		return false;
 	}

@@ -1156,7 +1143,7 @@ public class Game extends ComplexOpsuState {
 			if (MusicController.isPlaying() || isLeadIn()) {
 				pauseTime = trackPosition;
 			}
-			displayContainer.switchStateInstantly(GamePauseMenu.class);
+			displayContainer.switchStateInstantly(pauseState);
 			break;
 		case Input.KEY_SPACE:
 			// skip intro
@@ -1309,7 +1296,7 @@ public class Game extends ComplexOpsuState {
 			if (MusicController.isPlaying() || isLeadIn()) {
 				pauseTime = trackPosition;
 			}
-			displayContainer.switchStateInstantly(GamePauseMenu.class);
+			displayContainer.switchStateInstantly(pauseState);
 			return true;
 		}

@@ -1468,7 +1455,7 @@ public class Game extends ComplexOpsuState {

 		if (beatmap == null || beatmap.objects == null) {
 			EventBus.post(new BubbleNotificationEvent("Game was running without a beatmap", BubbleNotificationEvent.COMMONCOLOR_RED));
-			displayContainer.switchStateInstantly(SongMenu.class);
+			displayContainer.switchStateInstantly(songMenuState);
 		}

 		Dancer.instance.reset();
@@ -1565,9 +1552,9 @@ public class Game extends ComplexOpsuState {

 				try {
 					if (hitObject.isCircle()) {
-						gameObjects[i] = instanceContainer.injectFields(new Circle(hitObject, this, data, hitObject.getComboIndex(), comboEnd));
+						gameObjects[i] = new Circle(hitObject, this, data, hitObject.getComboIndex(), comboEnd);
 					} else if (hitObject.isSlider()) {
-						gameObjects[i] = instanceContainer.injectFields(new Slider(hitObject, this, data, hitObject.getComboIndex(), comboEnd));
+						gameObjects[i] = new Slider(hitObject, this, data, hitObject.getComboIndex(), comboEnd);
 					} else if (hitObject.isSpinner()) {
 						gameObjects[i] = new Spinner(hitObject, this, data);
 					}
@@ -1855,7 +1842,7 @@ public class Game extends ComplexOpsuState {
 					gameObj.draw(g, trackPosition, false);
 					if (OPTION_DANCE_MIRROR.state && GameMod.AUTO.isActive() && idx < mirrorTo && idx >= mirrorFrom) {
 						g.pushTransform();
-						g.rotate(Options.width / 2f, Options.height / 2f, 180f);
+						g.rotate(displayContainer.width / 2f, displayContainer.height / 2f, 180f);
 						gameObj.draw(g, trackPosition, true);
 						g.popTransform();
 					}
@@ -1999,7 +1986,7 @@ public class Game extends ComplexOpsuState {
 		skipButton.setHoverExpand(1.1f, MenuButton.Expand.UP_LEFT);

 		// load other images...
-		instanceContainer.provide(GamePauseMenu.class).loadImages();
+		pauseState.loadImages();
 		data.loadImages();
 	}

@@ -2036,7 +2023,7 @@ public class Game extends ComplexOpsuState {

 		// initialize objects
 		gameObjectRenderer.initForGame(data, diameter);
-		Slider.init(gameObjectRenderer.getCircleDiameter(), beatmap);
+		Slider.init(gameObjectRenderer.circleDiameter, beatmap);
 		Spinner.init(displayContainer, overallDifficulty);
 		Color sliderBorderColor = SkinService.skin.getSliderBorderColor();
 		if (!OPTION_IGNORE_BEATMAP_SKINS.state && beatmap.getSliderBorderColor() != null) {
--- a/src/itdelatrisu/opsu/states/GamePauseMenu.java
+++ b/src/itdelatrisu/opsu/states/GamePauseMenu.java
@@ -30,10 +30,9 @@ import org.lwjgl.input.Keyboard;
 import org.newdawn.slick.Color;
 import org.newdawn.slick.Graphics;
 import org.newdawn.slick.Input;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;
 import yugecin.opsudance.core.state.BaseOpsuState;

+import static yugecin.opsudance.core.InstanceContainer.*;
 import static yugecin.opsudance.options.Options.*;

 /**
@@ -44,12 +43,6 @@ import static yugecin.opsudance.options.Options.*;
 */
 public class GamePauseMenu extends BaseOpsuState {

-	@Inject
-	private InstanceContainer instanceContainer;
-
-	@Inject
-	private Game gameState;
-
 	private MenuButton continueButton, retryButton, backButton;

 	@Override
@@ -105,20 +98,20 @@ public class GamePauseMenu extends BaseOpsuState {
 			// 'esc' will normally unpause, but will return to song menu if health is zero
 			if (gameState.getRestart() == Game.Restart.LOSE) {
 				SoundController.playSound(SoundEffect.MENUBACK);
-				instanceContainer.provide(SongMenu.class).resetGameDataOnLoad();
+				songMenuState.resetGameDataOnLoad();
 				MusicController.playAt(MusicController.getBeatmap().previewTime, true);
-				displayContainer.switchState(SongMenu.class);
+				displayContainer.switchState(songMenuState);
 			} else {
 				SoundController.playSound(SoundEffect.MENUBACK);
 				gameState.setRestart(Game.Restart.FALSE);
-				displayContainer.switchState(Game.class);
+				displayContainer.switchState(gameState);
 			}
 			return true;
 		}

 		if (key == Input.KEY_R && (displayContainer.input.isKeyDown(Input.KEY_RCONTROL) || displayContainer.input.isKeyDown(Input.KEY_LCONTROL))) {
 			gameState.setRestart(Game.Restart.MANUAL);
-			displayContainer.switchState(Game.class);
+			displayContainer.switchState(gameState);
 			return true;
 		}

@@ -139,14 +132,14 @@ public class GamePauseMenu extends BaseOpsuState {
 		if (continueButton.contains(x, y) && !loseState) {
 			SoundController.playSound(SoundEffect.MENUBACK);
 			gameState.setRestart(Game.Restart.FALSE);
-			displayContainer.switchState(Game.class);
+			displayContainer.switchState(gameState);
 		} else if (retryButton.contains(x, y)) {
 			SoundController.playSound(SoundEffect.MENUHIT);
 			gameState.setRestart(Game.Restart.MANUAL);
-			displayContainer.switchState(Game.class);
+			displayContainer.switchState(gameState);
 		} else if (backButton.contains(x, y)) {
 			SoundController.playSound(SoundEffect.MENUBACK);
-			instanceContainer.provide(SongMenu.class).resetGameDataOnLoad();
+			songMenuState.resetGameDataOnLoad();
 			if (loseState)
 				MusicController.playAt(MusicController.getBeatmap().previewTime, true);
 			else
@@ -155,7 +148,7 @@ public class GamePauseMenu extends BaseOpsuState {
 				displayContainer.resetCursor();
 			}
 			MusicController.setPitch(1.0f);
-			displayContainer.switchState(SongMenu.class);
+			displayContainer.switchState(songMenuState);
 		}

 		return true;
@@ -188,10 +181,9 @@ public class GamePauseMenu extends BaseOpsuState {

 	@Override
 	public boolean onCloseRequest() {
-		SongMenu songmenu = instanceContainer.provide(SongMenu.class);
-		songmenu.resetTrackOnLoad();
-		songmenu.resetGameDataOnLoad();
-		displayContainer.switchState(SongMenu.class);
+		songMenuState.resetTrackOnLoad();
+		songMenuState.resetGameDataOnLoad();
+		displayContainer.switchState(songMenuState);
 		return false;
 	}

--- a/src/itdelatrisu/opsu/states/GameRanking.java
+++ b/src/itdelatrisu/opsu/states/GameRanking.java
@@ -37,11 +37,11 @@ import org.newdawn.slick.Image;
 import org.newdawn.slick.Input;
 import org.newdawn.slick.util.Log;
 import yugecin.opsudance.core.events.EventBus;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;
 import yugecin.opsudance.core.state.BaseOpsuState;
 import yugecin.opsudance.events.BarNotificationEvent;

+import static yugecin.opsudance.core.InstanceContainer.*;
+
 /**
 * "Game Ranking" (score card) state.
 * <p>
@@ -51,9 +51,6 @@ import yugecin.opsudance.events.BarNotificationEvent;
 */
 public class GameRanking extends BaseOpsuState {

-	@Inject
-	private InstanceContainer instanceContainer;
-
 	/** Associated GameData object. */
 	private GameData data;

@@ -149,7 +146,6 @@ public class GameRanking extends BaseOpsuState {
 		}

 		// replay
-		Game gameState = instanceContainer.provide(Game.class);
 		boolean returnToGame = false;
 		boolean replayButtonPressed = replayButton.contains(x, y);
 		if (replayButtonPressed && !(data.isGameplay() && GameMod.AUTO.isActive())) {
@@ -183,7 +179,7 @@ public class GameRanking extends BaseOpsuState {
 			Beatmap beatmap = MusicController.getBeatmap();
 			gameState.loadBeatmap(beatmap);
 			SoundController.playSound(SoundEffect.MENUHIT);
-			displayContainer.switchState(Game.class);
+			displayContainer.switchState(gameState);
 		}
 		return true;
 	}
@@ -217,12 +213,11 @@ public class GameRanking extends BaseOpsuState {

 	@Override
 	public boolean onCloseRequest() {
-		SongMenu songmenu = instanceContainer.provide(SongMenu.class);
 		if (data != null && data.isGameplay()) {
-			songmenu.resetTrackOnLoad();
+			songMenuState.resetTrackOnLoad();
 		}
-		songmenu.resetGameDataOnLoad();
-		displayContainer.switchState(SongMenu.class);
+		songMenuState.resetGameDataOnLoad();
+		displayContainer.switchState(songMenuState);
 		return false;
 	}

@@ -232,25 +227,24 @@ public class GameRanking extends BaseOpsuState {
 	private void returnToSongMenu() {
 		SoundController.muteSoundComponent();
 		SoundController.playSound(SoundEffect.MENUBACK);
-		SongMenu songMenu = instanceContainer.provide(SongMenu.class);
 		if (data.isGameplay()) {
-			songMenu.resetTrackOnLoad();
+			songMenuState.resetTrackOnLoad();
 		}
-		songMenu.resetGameDataOnLoad();
+		songMenuState.resetGameDataOnLoad();
 		if (displayContainer.cursor.isBeatmapSkinned()) {
 			displayContainer.resetCursor();
 		}
-		displayContainer.switchState(SongMenu.class);
+		displayContainer.switchState(songMenuState);
 	}

 	/**
 	 * Sets the associated GameData object.
 	 * @param data the GameData
 	 */
-	public void setGameData(GameData data) { this.data = data; }
+	public void setGameData(GameData data) { this.data = data; } // TODO why is this unused

 	/**
 	 * Returns the current GameData object (usually null unless state active).
 	 */
-	public GameData getGameData() { return data; }
+	public GameData getGameData() { return data; } // TODO why is this unused
 }
--- a/src/itdelatrisu/opsu/states/MainMenu.java
+++ b/src/itdelatrisu/opsu/states/MainMenu.java
@@ -45,14 +45,14 @@ import org.newdawn.slick.Graphics;
 import org.newdawn.slick.Image;
 import org.newdawn.slick.Input;
 import org.newdawn.slick.util.Log;
+import yugecin.opsudance.core.Constants;
 import yugecin.opsudance.core.events.EventBus;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;
 import yugecin.opsudance.core.state.BaseOpsuState;
 import yugecin.opsudance.core.state.OpsuState;
 import yugecin.opsudance.events.BarNotificationEvent;
 import yugecin.opsudance.events.BubbleNotificationEvent;

+import static yugecin.opsudance.core.InstanceContainer.*;
 import static yugecin.opsudance.options.Options.*;

 /**
@@ -62,12 +62,6 @@ import static yugecin.opsudance.options.Options.*;
 */
 public class MainMenu extends BaseOpsuState {

-	@Inject
-	private InstanceContainer instanceContainer;
-
-	@Inject
-	private Updater updater;
-
 	/** Idle time, in milliseconds, before returning the logo to its original position. */
 	private static final short LOGO_IDLE_DELAY = 10000;

@@ -551,7 +545,7 @@ public class MainMenu extends BaseOpsuState {
 		} else if (musicPrevious.contains(x, y)) {
 			lastMeasureProgress = 0f;
 			if (!previous.isEmpty()) {
-				instanceContainer.provide(SongMenu.class).setFocus(BeatmapSetList.get().getBaseNode(previous.pop()), -1, true, false);
+				songMenuState.setFocus(BeatmapSetList.get().getBaseNode(previous.pop()), -1, true, false);
 				if (OPTION_DYNAMIC_BACKGROUND.state) {
 					bgAlpha.setTime(0);
 				}
@@ -565,14 +559,14 @@ public class MainMenu extends BaseOpsuState {
 		// downloads button actions
 		if (downloadsButton.contains(x, y)) {
 			SoundController.playSound(SoundEffect.MENUHIT);
-			displayContainer.switchState(DownloadsMenu.class);
+			displayContainer.switchState(downloadState);
 			return true;
 		}

 		// repository button actions
 		if (repoButton != null && repoButton.contains(x, y)) {
 			try {
-				Desktop.getDesktop().browse(config.REPOSITORY_URI);
+				Desktop.getDesktop().browse(Constants.REPOSITORY_URI);
 			} catch (UnsupportedOperationException e) {
 				EventBus.post(new BarNotificationEvent("The repository web page could not be opened."));
 			} catch (IOException e) {
@@ -584,7 +578,7 @@ public class MainMenu extends BaseOpsuState {

 		if (danceRepoButton != null && danceRepoButton.contains(x, y)) {
 			try {
-				Desktop.getDesktop().browse(config.DANCE_REPOSITORY_URI);
+				Desktop.getDesktop().browse(Constants.DANCE_REPOSITORY_URI);
 			} catch (UnsupportedOperationException e) {
 				EventBus.post(new BarNotificationEvent("The repository web page could not be opened."));
 			} catch (IOException e) {
@@ -665,8 +659,8 @@ public class MainMenu extends BaseOpsuState {
 				logoTimer = 0;
 				break;
 			}
-			instanceContainer.provide(ButtonMenu.class).setMenuState(MenuState.EXIT);
-			displayContainer.switchState(ButtonMenu.class);
+			buttonState.setMenuState(MenuState.EXIT);
+			displayContainer.switchState(buttonState);
 			return true;
 		case Input.KEY_P:
 			SoundController.playSound(SoundEffect.MENUHIT);
@@ -681,7 +675,7 @@ public class MainMenu extends BaseOpsuState {
 			return true;
 		case Input.KEY_D:
 			SoundController.playSound(SoundEffect.MENUHIT);
-			displayContainer.switchState(DownloadsMenu.class);
+			displayContainer.switchState(downloadState);
 			return true;
 		case Input.KEY_R:
 			nextTrack(true);
@@ -719,7 +713,7 @@ public class MainMenu extends BaseOpsuState {
 			MusicController.playAt(0, false);
 			return;
 		}
-		BeatmapSetNode node = instanceContainer.provide(SongMenu.class).setFocus(BeatmapSetList.get().getRandomNode(), -1, true, false);
+		BeatmapSetNode node = songMenuState.setFocus(BeatmapSetList.get().getRandomNode(), -1, true, false);
 		boolean sameAudio = false;
 		if (node != null) {
 			sameAudio = MusicController.getBeatmap().audioFilename.equals(node.getBeatmapSet().get(0).audioFilename);
@@ -735,10 +729,10 @@ public class MainMenu extends BaseOpsuState {
 	 * Enters the song menu, or the downloads menu if no beatmaps are loaded.
 	 */
 	private void enterSongMenu() {
-		Class<? extends OpsuState> state = SongMenu.class;
+		OpsuState state = songMenuState;
 		if (BeatmapSetList.get().getMapSetCount() == 0) {
-			instanceContainer.provide(DownloadsMenu.class).notifyOnLoad("Download some beatmaps to get started!");
-			state = DownloadsMenu.class;
+			downloadState.notifyOnLoad("Download some beatmaps to get started!");
+			state = downloadState;
 		}
 		displayContainer.switchState(state);
 	}
--- a/src/itdelatrisu/opsu/states/SongMenu.java
+++ b/src/itdelatrisu/opsu/states/SongMenu.java
@@ -63,16 +63,13 @@ import org.newdawn.slick.Image;
 import org.newdawn.slick.Input;
 import org.newdawn.slick.SpriteSheet;
 import org.newdawn.slick.gui.TextField;
-import yugecin.opsudance.core.DisplayContainer;
 import yugecin.opsudance.core.events.EventBus;
-import yugecin.opsudance.core.inject.Inject;
-import yugecin.opsudance.core.inject.InstanceContainer;
 import yugecin.opsudance.core.state.ComplexOpsuState;
 import yugecin.opsudance.events.BarNotificationEvent;
-import yugecin.opsudance.options.Configuration;
 import yugecin.opsudance.options.OptionGroups;
 import yugecin.opsudance.ui.OptionsOverlay;

+import static yugecin.opsudance.core.InstanceContainer.*;
 import static yugecin.opsudance.options.Options.*;

 /**
@@ -83,18 +80,6 @@ import static yugecin.opsudance.options.Options.*;
 */
 public class SongMenu extends ComplexOpsuState {

-	@Inject
-	private InstanceContainer instanceContainer;
-
-	@Inject
-	private Configuration config;
-
-	@Inject
-	private OszUnpacker oszUnpacker;
-
-	@Inject
-	private BeatmapParser beatmapParser;
-
 	/** The max number of song buttons to be shown on each screen. */
 	public static final int MAX_SONG_BUTTONS = 6;

@@ -246,7 +231,7 @@ public class SongMenu extends ComplexOpsuState {
 		private void reloadBeatmaps() {
 			if (fullReload) {
 				BeatmapDB.clearDatabase();
-				oszUnpacker.unpackAll();
+				oszunpacker.unpackAll();
 			}
 			beatmapParser.parseAll();
 		}
@@ -328,7 +313,7 @@ public class SongMenu extends ComplexOpsuState {

 	private final OptionsOverlay optionsOverlay;

-	public SongMenu(DisplayContainer displayContainer) {
+	public SongMenu() {
 		super();
 		optionsOverlay = new OptionsOverlay(displayContainer, OptionGroups.normalOptions);
 		overlays.add(optionsOverlay);
@@ -761,8 +746,8 @@ public class SongMenu extends ComplexOpsuState {
 				if (focusNode != null) {
 					MenuState state = focusNode.getBeatmapSet().isFavorite() ?
 						MenuState.BEATMAP_FAVORITE : MenuState.BEATMAP;
-					instanceContainer.provide(ButtonMenu.class).setMenuState(state, focusNode);
-					displayContainer.switchState(ButtonMenu.class);
+					buttonState.setMenuState(state, focusNode);
+					displayContainer.switchState(buttonState);
 				}
 				return;
 			}
@@ -922,7 +907,7 @@ public class SongMenu extends ComplexOpsuState {

 		if (UI.getBackButton().contains(x, y)) {
 			SoundController.playSound(SoundEffect.MENUBACK);
-			displayContainer.switchState(MainMenu.class);
+			displayContainer.switchState(mainmenuState);
 			return true;
 		}

@@ -1029,12 +1014,12 @@ public class SongMenu extends ComplexOpsuState {
 					SoundController.playSound(SoundEffect.MENUHIT);
 					if (button != Input.MOUSE_RIGHT_BUTTON) {
 						// view score
-						instanceContainer.provide(GameRanking.class).setGameData(instanceContainer.injectFields(new GameData(focusScores[rank], displayContainer.width, displayContainer.height)));
-						displayContainer.switchState(GameRanking.class);
+						gameRankingState.setGameData(new GameData(focusScores[rank]));
+						displayContainer.switchState(gameRankingState);
 					} else {
 						// score management
-						instanceContainer.provide(ButtonMenu.class).setMenuState(MenuState.SCORE, focusScores[rank]);
-						displayContainer.switchState(ButtonMenu.class);
+						buttonState.setMenuState(MenuState.SCORE, focusScores[rank]);
+						displayContainer.switchState(buttonState);
 					}
 					return true;
 				}
@@ -1070,13 +1055,13 @@ public class SongMenu extends ComplexOpsuState {
 			} else {
 				// return to main menu
 				SoundController.playSound(SoundEffect.MENUBACK);
-				displayContainer.switchState(MainMenu.class);
+				displayContainer.switchState(mainmenuState);
 			}
 			return true;
 		case Input.KEY_F1:
 			SoundController.playSound(SoundEffect.MENUHIT);
-			instanceContainer.provide(ButtonMenu.class).setMenuState(MenuState.MODS);
-			displayContainer.switchState(ButtonMenu.class);
+			buttonState.setMenuState(MenuState.MODS);
+			displayContainer.switchState(buttonState);
 			return true;
 		case Input.KEY_F2:
 			if (focusNode == null)
@@ -1104,16 +1089,16 @@ public class SongMenu extends ComplexOpsuState {
 			SoundController.playSound(SoundEffect.MENUHIT);
 			MenuState state = focusNode.getBeatmapSet().isFavorite() ?
 				MenuState.BEATMAP_FAVORITE : MenuState.BEATMAP;
-			instanceContainer.provide(ButtonMenu.class).setMenuState(state, focusNode);
-			displayContainer.switchState(ButtonMenu.class);
+			buttonState.setMenuState(state, focusNode);
+			displayContainer.switchState(buttonState);
 			return true;
 		case Input.KEY_F5:
 			SoundController.playSound(SoundEffect.MENUHIT);
 			if (songFolderChanged)
 				reloadBeatmaps(false);
 			else {
-				instanceContainer.provide(ButtonMenu.class).setMenuState(MenuState.RELOAD);
-				displayContainer.switchState(ButtonMenu.class);
+				buttonState.setMenuState(MenuState.RELOAD);
+				displayContainer.switchState(buttonState);
 			}
 			return true;
 		case Input.KEY_DELETE:
@@ -1123,8 +1108,8 @@ public class SongMenu extends ComplexOpsuState {
 				SoundController.playSound(SoundEffect.MENUHIT);
 				MenuState ms = (focusNode.beatmapIndex == -1 || focusNode.getBeatmapSet().size() == 1) ?
 						MenuState.BEATMAP_DELETE_CONFIRM : MenuState.BEATMAP_DELETE_SELECT;
-				instanceContainer.provide(ButtonMenu.class).setMenuState(ms, focusNode);
-				displayContainer.switchState(ButtonMenu.class);
+				buttonState.setMenuState(ms, focusNode);
+				displayContainer.switchState(buttonState);
 			}
 			return true;
 		case Input.KEY_ENTER:
@@ -1310,7 +1295,7 @@ public class SongMenu extends ComplexOpsuState {

 		// reset game data
 		if (resetGame) {
-			instanceContainer.provide(Game.class).resetGameData();
+			gameState.resetGameData();

 			// destroy extra Clips
 			MultiClip.destroyExtraClips();
@@ -1787,10 +1772,9 @@ public class SongMenu extends ComplexOpsuState {

 		SoundController.playSound(SoundEffect.MENUHIT);
 		MultiClip.destroyExtraClips();
-		Game gameState = instanceContainer.provide(Game.class);
 		gameState.loadBeatmap(beatmap);
 		gameState.setRestart(Game.Restart.NEW);
 		gameState.setReplay(null);
-		displayContainer.switchState(Game.class);
+		displayContainer.switchState(gameState);
 	}
 }
--- a/src/itdelatrisu/opsu/states/Splash.java
+++ b/src/itdelatrisu/opsu/states/Splash.java
@@ -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
--- a/src/itdelatrisu/opsu/ui/Fonts.java
+++ b/src/itdelatrisu/opsu/ui/Fonts.java
@@ -34,7 +34,7 @@ import org.newdawn.slick.font.effects.ColorEffect;
 import org.newdawn.slick.font.effects.Effect;
 import org.newdawn.slick.util.Log;
 import org.newdawn.slick.util.ResourceLoader;
-import yugecin.opsudance.options.Configuration;
+import yugecin.opsudance.core.Constants;

 /**
 * Fonts used for drawing.
@@ -54,9 +54,9 @@ public class Fonts {
 	 * @throws FontFormatException if any font stream data does not contain the required font tables
 	 * @throws IOException if a font stream cannot be completely read
 	 */
-	public static void init(Configuration config) throws SlickException, FontFormatException, IOException {
+	public static void init() throws SlickException, FontFormatException, IOException {
 		float fontBase = 12f * GameImage.getUIscale();
-		Font javaFont = Font.createFont(Font.TRUETYPE_FONT, ResourceLoader.getResourceAsStream(config.FONT_NAME));
+		Font javaFont = Font.createFont(Font.TRUETYPE_FONT, ResourceLoader.getResourceAsStream(Constants.FONT_NAME));
 		Font font = javaFont.deriveFont(Font.PLAIN, (int) (fontBase * 4 / 3));
 		DEFAULT = new UnicodeFont(font);
 		BOLD = new UnicodeFont(font.deriveFont(Font.BOLD));