moving stuff around again

src/yugecin/opsudance/core/Demux.java

@@ -21,10 +21,10 @@ import com.google.inject.Inject;
 import org.newdawn.slick.Graphics;
 import yugecin.opsudance.kernel.InstanceContainer;
 import yugecin.opsudance.states.EmptyState;
-import yugecin.opsudance.states.GameState;
-import yugecin.opsudance.states.transitions.FadeInTransitionState;
-import yugecin.opsudance.states.transitions.FadeOutTransitionState;
-import yugecin.opsudance.states.transitions.TransitionState;
+import yugecin.opsudance.core.state.OpsuState;
+import yugecin.opsudance.core.state.transitions.FadeInTransitionState;
+import yugecin.opsudance.core.state.transitions.FadeOutTransitionState;
+import yugecin.opsudance.core.state.transitions.TransitionState;
 
 /**
  * state demultiplexer, sends events to current state
@@ -36,7 +36,7 @@ public class Demux {
 	private TransitionState fadeOutTransitionState;
 	private TransitionState fadeInTransitionState;
 
-	private GameState state;
+	private OpsuState state;
 
 	@Inject
 	public Demux(InstanceContainer instanceContainer) {
@@ -66,7 +66,7 @@ public class Demux {
 		return state == fadeInTransitionState || state == fadeOutTransitionState;
 	}
 
-	public void switchState(GameState newState) {
+	public void switchState(OpsuState newState) {
 		if (isTransitioning()) {
 			return;
 		}
@@ -76,7 +76,7 @@ public class Demux {
 		state.enter();
 	}
 
-	public void switchStateNow(GameState newState) {
+	public void switchStateNow(OpsuState newState) {
 		if (!isTransitioning()) {
 			return;
 		}

src/yugecin/opsudance/core/DisplayContainer.java

@@ -143,8 +143,6 @@ public class DisplayContainer {
 		if (displayMode.getBitsPerPixel() == 16) {
 			InternalTextureLoader.get().set16BitMode();
 		}
-
-		getDelta();
 	}
 
 	private void initGL() {

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

@@ -15,11 +15,11 @@
  * 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.states;
+package yugecin.opsudance.core.state;
 
 import org.newdawn.slick.Graphics;
 
-public interface GameState {
+public interface OpsuState {
 
 	void update(int delta);
 	void render(Graphics g);

src/yugecin/opsudance/core/state/transitions/FadeInTransitionState.java

@@ -15,7 +15,7 @@
  * 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.states.transitions;
+package yugecin.opsudance.core.state.transitions;
 
 import com.google.inject.Inject;
 import yugecin.opsudance.core.Demux;

src/yugecin/opsudance/core/state/transitions/FadeOutTransitionState.java

@@ -15,7 +15,7 @@
  * 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.states.transitions;
+package yugecin.opsudance.core.state.transitions;
 
 import com.google.inject.Inject;
 import yugecin.opsudance.core.Demux;

src/yugecin/opsudance/core/state/transitions/FadeTransitionState.java

@@ -15,16 +15,16 @@
  * 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.states.transitions;
+package yugecin.opsudance.core.state.transitions;
 
 import org.newdawn.slick.Color;
 import org.newdawn.slick.Graphics;
 import yugecin.opsudance.core.DisplayContainer;
-import yugecin.opsudance.states.GameState;
+import yugecin.opsudance.core.state.OpsuState;
 
 public abstract class FadeTransitionState extends TransitionState {
 
-	protected GameState applicableState;
+	protected OpsuState applicableState;
 
 	private final DisplayContainer container;
 
@@ -40,7 +40,7 @@ public abstract class FadeTransitionState extends TransitionState {
 		black = new Color(Color.black);
 	}
 
-	public void setApplicableState(GameState applicableState) {
+	public void setApplicableState(OpsuState applicableState) {
 		this.applicableState = applicableState;
 	}
 

src/yugecin/opsudance/core/state/transitions/TransitionState.java

@@ -15,14 +15,14 @@
  * 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.states.transitions;
+package yugecin.opsudance.core.state.transitions;
 
 import org.newdawn.slick.Graphics;
-import yugecin.opsudance.states.GameState;
+import yugecin.opsudance.core.state.OpsuState;
 
-public abstract class TransitionState implements GameState {
+public abstract class TransitionState implements OpsuState {
 
-	protected GameState applicableState;
+	protected OpsuState applicableState;
 
 	protected final int transitionTargetTime;
 	protected int transitionTime;
@@ -31,7 +31,7 @@ public abstract class TransitionState implements GameState {
 		this.transitionTargetTime = transitionTargetTime;
 	}
 
-	public void setApplicableState(GameState applicableState) {
+	public void setApplicableState(OpsuState applicableState) {
 		this.applicableState = applicableState;
 	}
 

src/yugecin/opsudance/kernel/Entrypoint.java

@@ -22,7 +22,6 @@ import yugecin.opsudance.OpsuDance;
 public class Entrypoint {
 
 	public static final long startTime = System.currentTimeMillis();
-	public static final boolean isJarRunning = Entrypoint.class.getResource(String.format("%s.class", Entrypoint.class.getSimpleName())).toString().startsWith("jar:");
 
 	public static void main(String[] args) {
 		log("launched");

src/yugecin/opsudance/kernel/OpsuDanceModule.java

@@ -23,8 +23,8 @@ import yugecin.opsudance.core.DisplayContainer;
 import yugecin.opsudance.core.Demux;
 import yugecin.opsudance.states.EmptyRedState;
 import yugecin.opsudance.states.EmptyState;
-import yugecin.opsudance.states.transitions.FadeInTransitionState;
-import yugecin.opsudance.states.transitions.FadeOutTransitionState;
+import yugecin.opsudance.core.state.transitions.FadeInTransitionState;
+import yugecin.opsudance.core.state.transitions.FadeOutTransitionState;
 
 public class OpsuDanceModule extends AbstractModule {
 

src/yugecin/opsudance/states/EmptyRedState.java

@@ -21,9 +21,10 @@ import com.google.inject.Inject;
 import org.newdawn.slick.Color;
 import org.newdawn.slick.Graphics;
 import yugecin.opsudance.core.Demux;
+import yugecin.opsudance.core.state.OpsuState;
 import yugecin.opsudance.kernel.InstanceContainer;
 
-public class EmptyRedState implements GameState {
+public class EmptyRedState implements OpsuState {
 
 	private int counter;
 

src/yugecin/opsudance/states/EmptyState.java

@@ -21,9 +21,10 @@ import com.google.inject.Inject;
 import org.newdawn.slick.Color;
 import org.newdawn.slick.Graphics;
 import yugecin.opsudance.core.Demux;
+import yugecin.opsudance.core.state.OpsuState;
 import yugecin.opsudance.kernel.InstanceContainer;
 
-public class EmptyState implements GameState {
+public class EmptyState implements OpsuState {
 
 	private int counter;