diff --git a/pom.xml b/pom.xml
index a513be66..9a5a4cd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,28 +144,6 @@
-
- com.google.inject
- guice
- 4.1.0
-
-
- org.ow2.asm
- asm
-
-
- cglib
- cglib
-
-
-
-
org.jcraft
jorbis
diff --git a/src/yugecin/opsudance/OpsuDance.java b/src/yugecin/opsudance/OpsuDance.java
index c3eda1c8..e53fe306 100644
--- a/src/yugecin/opsudance/OpsuDance.java
+++ b/src/yugecin/opsudance/OpsuDance.java
@@ -17,7 +17,6 @@
*/
package yugecin.opsudance;
-import com.google.inject.Inject;
import itdelatrisu.opsu.Options;
import itdelatrisu.opsu.Utils;
import itdelatrisu.opsu.db.DBController;
@@ -45,7 +44,6 @@ public class OpsuDance {
private ServerSocket singleInstanceSocket;
- @Inject
public OpsuDance(DisplayContainer container) {
this.container = container;
}
diff --git a/src/yugecin/opsudance/PreStartupInitializer.java b/src/yugecin/opsudance/PreStartupInitializer.java
index d54bdc51..b7b671bf 100644
--- a/src/yugecin/opsudance/PreStartupInitializer.java
+++ b/src/yugecin/opsudance/PreStartupInitializer.java
@@ -17,7 +17,6 @@
*/
package yugecin.opsudance;
-import com.google.inject.Inject;
import itdelatrisu.opsu.NativeLoader;
import itdelatrisu.opsu.Options;
import org.newdawn.slick.util.FileSystemLocation;
@@ -30,7 +29,6 @@ import java.lang.reflect.Field;
public class PreStartupInitializer {
- @Inject
public PreStartupInitializer() {
loadNatives();
setResourcePath();
diff --git a/src/yugecin/opsudance/core/Demux.java b/src/yugecin/opsudance/core/Demux.java
index 07c9b037..8d1f095d 100644
--- a/src/yugecin/opsudance/core/Demux.java
+++ b/src/yugecin/opsudance/core/Demux.java
@@ -17,7 +17,6 @@
*/
package yugecin.opsudance.core;
-import com.google.inject.Inject;
import org.newdawn.slick.Graphics;
import org.newdawn.slick.Input;
import org.newdawn.slick.KeyListener;
@@ -47,7 +46,6 @@ public class Demux implements ErrorDumpable, KeyListener, MouseListener {
private OpsuState state;
- @Inject
public Demux(final InstanceContainer instanceContainer) {
this.instanceContainer = instanceContainer;
diff --git a/src/yugecin/opsudance/core/DisplayContainer.java b/src/yugecin/opsudance/core/DisplayContainer.java
index bbfa9c0b..fbb13391 100644
--- a/src/yugecin/opsudance/core/DisplayContainer.java
+++ b/src/yugecin/opsudance/core/DisplayContainer.java
@@ -17,7 +17,6 @@
*/
package yugecin.opsudance.core;
-import com.google.inject.Inject;
import itdelatrisu.opsu.GameImage;
import itdelatrisu.opsu.ui.Fonts;
import org.lwjgl.LWJGLException;
@@ -72,7 +71,6 @@ public class DisplayContainer implements ErrorDumpable {
private String glVersion;
private String glVendor;
- @Inject
public DisplayContainer(Demux demux, EventBus eventBus) {
this.demux = demux;
this.eventBus = eventBus;
diff --git a/src/yugecin/opsudance/core/events/EventBus.java b/src/yugecin/opsudance/core/events/EventBus.java
index 4b203b73..51f142a3 100644
--- a/src/yugecin/opsudance/core/events/EventBus.java
+++ b/src/yugecin/opsudance/core/events/EventBus.java
@@ -17,8 +17,6 @@
*/
package yugecin.opsudance.core.events;
-import com.google.inject.Inject;
-
import java.util.*;
@SuppressWarnings("unchecked")
@@ -26,7 +24,6 @@ public class EventBus {
private final List subscribers;
- @Inject
public EventBus() {
subscribers = new LinkedList<>();
}
diff --git a/src/yugecin/opsudance/core/state/specialstates/FpsRenderState.java b/src/yugecin/opsudance/core/state/specialstates/FpsRenderState.java
index 5f8eaabf..bdcc84b5 100644
--- a/src/yugecin/opsudance/core/state/specialstates/FpsRenderState.java
+++ b/src/yugecin/opsudance/core/state/specialstates/FpsRenderState.java
@@ -17,7 +17,6 @@
*/
package yugecin.opsudance.core.state.specialstates;
-import com.google.inject.Inject;
import itdelatrisu.opsu.ui.Fonts;
import org.newdawn.slick.Color;
import org.newdawn.slick.Graphics;
@@ -33,7 +32,6 @@ public class FpsRenderState implements EventListener {
private int y;
private int singleHeight;
- @Inject
public FpsRenderState(DisplayContainer displayContainer) {
this.displayContainer = displayContainer;
displayContainer.eventBus.subscribe(ResolutionChangedEvent.class, this);
diff --git a/src/yugecin/opsudance/core/state/transitions/EmptyTransitionState.java b/src/yugecin/opsudance/core/state/transitions/EmptyTransitionState.java
index 8153e8f6..9119c60c 100644
--- a/src/yugecin/opsudance/core/state/transitions/EmptyTransitionState.java
+++ b/src/yugecin/opsudance/core/state/transitions/EmptyTransitionState.java
@@ -17,12 +17,10 @@
*/
package yugecin.opsudance.core.state.transitions;
-import com.google.inject.Inject;
import yugecin.opsudance.core.DisplayContainer;
public class EmptyTransitionState extends TransitionState {
- @Inject
public EmptyTransitionState(DisplayContainer displayContainer) {
super(displayContainer);
}
diff --git a/src/yugecin/opsudance/core/state/transitions/FadeInTransitionState.java b/src/yugecin/opsudance/core/state/transitions/FadeInTransitionState.java
index aa78f646..11c471e3 100644
--- a/src/yugecin/opsudance/core/state/transitions/FadeInTransitionState.java
+++ b/src/yugecin/opsudance/core/state/transitions/FadeInTransitionState.java
@@ -17,12 +17,10 @@
*/
package yugecin.opsudance.core.state.transitions;
-import com.google.inject.Inject;
import yugecin.opsudance.core.DisplayContainer;
public class FadeInTransitionState extends FadeTransitionState {
- @Inject
public FadeInTransitionState(DisplayContainer container) {
super(container);
}
diff --git a/src/yugecin/opsudance/core/state/transitions/FadeOutTransitionState.java b/src/yugecin/opsudance/core/state/transitions/FadeOutTransitionState.java
index 95cde1d7..3a5944ab 100644
--- a/src/yugecin/opsudance/core/state/transitions/FadeOutTransitionState.java
+++ b/src/yugecin/opsudance/core/state/transitions/FadeOutTransitionState.java
@@ -17,12 +17,10 @@
*/
package yugecin.opsudance.core.state.transitions;
-import com.google.inject.Inject;
import yugecin.opsudance.core.DisplayContainer;
public class FadeOutTransitionState extends FadeTransitionState {
- @Inject
public FadeOutTransitionState(DisplayContainer container) {
super(container);
}
diff --git a/src/yugecin/opsudance/errorhandling/ErrorHandler.java b/src/yugecin/opsudance/errorhandling/ErrorHandler.java
index 9592de0c..46f7dc93 100644
--- a/src/yugecin/opsudance/errorhandling/ErrorHandler.java
+++ b/src/yugecin/opsudance/errorhandling/ErrorHandler.java
@@ -17,7 +17,6 @@
*/
package yugecin.opsudance.errorhandling;
-import com.google.inject.Inject;
import itdelatrisu.opsu.Options;
import itdelatrisu.opsu.Utils;
import org.newdawn.slick.util.Log;
@@ -54,7 +53,6 @@ public class ErrorHandler {
private boolean preventReport;
private boolean ignoreAndContinue;
- @Inject
public ErrorHandler(DisplayContainer displayContainer) {
this.displayContainer = displayContainer;
instance = this;
diff --git a/src/yugecin/opsudance/kernel/InstanceContainerImpl.java b/src/yugecin/opsudance/kernel/InstanceContainerImpl.java
deleted file mode 100644
index ed1f7dcc..00000000
--- a/src/yugecin/opsudance/kernel/InstanceContainerImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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 .
- */
-package yugecin.opsudance.kernel;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-public class InstanceContainerImpl implements InstanceContainer {
-
- private static InstanceContainer instance;
-
- private Injector injector;
-
- private InstanceContainerImpl() {
- injector = Guice.createInjector(new OpsuDanceModule());
- }
-
- public static InstanceContainer initialize() {
- return instance = new InstanceContainerImpl();
- }
-
- @Deprecated
- public static InstanceContainer get() {
- return instance;
- }
-
- @Override
- public T provide(Class type) {
- return injector.getInstance(type);
- }
-
-}
diff --git a/src/yugecin/opsudance/kernel/InstanceResolver.java b/src/yugecin/opsudance/kernel/InstanceResolver.java
deleted file mode 100644
index ed6780cd..00000000
--- a/src/yugecin/opsudance/kernel/InstanceResolver.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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 .
- */
-package yugecin.opsudance.kernel;
-
-@SuppressWarnings("deprecation")
-public class InstanceResolver implements InstanceContainer {
-
- @Override
- public T provide(Class type) {
- return InstanceContainerImpl.get().provide(type);
- }
-
-}
diff --git a/src/yugecin/opsudance/kernel/OpsuDanceModule.java b/src/yugecin/opsudance/kernel/OpsuDanceModule.java
deleted file mode 100644
index ff61f773..00000000
--- a/src/yugecin/opsudance/kernel/OpsuDanceModule.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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 .
- */
-package yugecin.opsudance.kernel;
-
-import com.google.inject.AbstractModule;
-import yugecin.opsudance.PreStartupInitializer;
-import yugecin.opsudance.core.DisplayContainer;
-import yugecin.opsudance.core.Demux;
-import yugecin.opsudance.core.events.EventBus;
-import yugecin.opsudance.core.state.specialstates.FpsRenderState;
-import yugecin.opsudance.core.state.transitions.EmptyTransitionState;
-import yugecin.opsudance.errorhandling.ErrorHandler;
-import yugecin.opsudance.states.EmptyRedState;
-import yugecin.opsudance.states.EmptyState;
-import yugecin.opsudance.core.state.transitions.FadeInTransitionState;
-import yugecin.opsudance.core.state.transitions.FadeOutTransitionState;
-
-public class OpsuDanceModule extends AbstractModule {
-
- protected void configure() {
- bind(EventBus.class).asEagerSingleton();
-
- bind(InstanceContainer.class).to(InstanceResolver.class);
- bind(PreStartupInitializer.class).asEagerSingleton();
- bind(Demux.class).asEagerSingleton();
- bind(DisplayContainer.class).asEagerSingleton();
-
- bind(ErrorHandler.class).asEagerSingleton();
-
- bind(FpsRenderState.class).asEagerSingleton();
-
- bind(EmptyTransitionState.class).asEagerSingleton();
- bind(FadeInTransitionState.class).asEagerSingleton();
- bind(FadeOutTransitionState.class).asEagerSingleton();
-
- bind(EmptyRedState.class).asEagerSingleton();
- bind(EmptyState.class).asEagerSingleton();
- }
-
-}
diff --git a/src/yugecin/opsudance/states/EmptyRedState.java b/src/yugecin/opsudance/states/EmptyRedState.java
index 5f98b8f3..18b92963 100644
--- a/src/yugecin/opsudance/states/EmptyRedState.java
+++ b/src/yugecin/opsudance/states/EmptyRedState.java
@@ -17,7 +17,6 @@
*/
package yugecin.opsudance.states;
-import com.google.inject.Inject;
import org.newdawn.slick.Color;
import org.newdawn.slick.Graphics;
import yugecin.opsudance.core.DisplayContainer;
@@ -32,7 +31,6 @@ public class EmptyRedState implements OpsuState {
private final DisplayContainer displayContainer;
- @Inject
public EmptyRedState(DisplayContainer displayContainer) {
this.displayContainer = displayContainer;
}
diff --git a/src/yugecin/opsudance/states/EmptyState.java b/src/yugecin/opsudance/states/EmptyState.java
index faf95e5c..b0f30507 100644
--- a/src/yugecin/opsudance/states/EmptyState.java
+++ b/src/yugecin/opsudance/states/EmptyState.java
@@ -17,7 +17,6 @@
*/
package yugecin.opsudance.states;
-import com.google.inject.Inject;
import org.newdawn.slick.Color;
import org.newdawn.slick.Graphics;
import yugecin.opsudance.core.DisplayContainer;
@@ -31,7 +30,6 @@ public class EmptyState implements OpsuState {
private final DisplayContainer displayContainer;
- @Inject
public EmptyState(DisplayContainer displayContainer) {
this.displayContainer = displayContainer;
}