Moving even more stuff around

src/yugecin/opsudance/OpsuDance.java

@@ -24,7 +24,7 @@ import itdelatrisu.opsu.downloads.DownloadList;
 import itdelatrisu.opsu.downloads.Updater;
 import org.newdawn.slick.util.Log;
 import yugecin.opsudance.core.DisplayContainer;
-import yugecin.opsudance.errorhandling.ErrorHandler;
+import yugecin.opsudance.core.errorhandling.ErrorHandler;
 import yugecin.opsudance.states.EmptyState;
 
 import java.io.File;
@@ -33,7 +33,7 @@ import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.UnknownHostException;
 
-import static yugecin.opsudance.kernel.Entrypoint.sout;
+import static yugecin.opsudance.core.Entrypoint.sout;
 
 /*
  * loosely based on itdelatrisu.opsu.Opsu

src/yugecin/opsudance/core/Demux.java

@@ -23,8 +23,8 @@ import org.newdawn.slick.KeyListener;
 import org.newdawn.slick.MouseListener;
 import yugecin.opsudance.core.state.specialstates.FpsRenderState;
 import yugecin.opsudance.core.state.transitions.*;
-import yugecin.opsudance.errorhandling.ErrorDumpable;
-import yugecin.opsudance.kernel.InstanceContainer;
+import yugecin.opsudance.core.errorhandling.ErrorDumpable;
+import yugecin.opsudance.core.inject.InstanceContainer;
 import yugecin.opsudance.core.state.OpsuState;
 
 import java.io.StringWriter;

src/yugecin/opsudance/core/DisplayContainer.java

@@ -32,13 +32,13 @@ import org.newdawn.slick.opengl.renderer.Renderer;
 import org.newdawn.slick.opengl.renderer.SGL;
 import org.newdawn.slick.util.Log;
 import yugecin.opsudance.core.events.EventBus;
-import yugecin.opsudance.errorhandling.ErrorDumpable;
+import yugecin.opsudance.core.errorhandling.ErrorDumpable;
 import yugecin.opsudance.events.ResolutionChangedEvent;
 import yugecin.opsudance.utils.GLHelper;
 
 import java.io.StringWriter;
 
-import static yugecin.opsudance.kernel.Entrypoint.sout;
+import static yugecin.opsudance.core.Entrypoint.sout;
 
 /**
  * based on org.newdawn.slick.AppGameContainer

src/yugecin/opsudance/core/Entrypoint.java

@@ -15,10 +15,10 @@
  * 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.kernel;
+package yugecin.opsudance.core;
 
 import yugecin.opsudance.OpsuDance;
-import yugecin.opsudance.inject.OpsuDanceInjector;
+import yugecin.opsudance.core.inject.OpsuDanceInjector;
 
 public class Entrypoint {
 

src/yugecin/opsudance/core/errorhandling/ErrorDumpable.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.errorhandling;
+package yugecin.opsudance.core.errorhandling;
 
 import java.io.StringWriter;
 

src/yugecin/opsudance/core/errorhandling/ErrorHandler.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.errorhandling;
+package yugecin.opsudance.core.errorhandling;
 
 import itdelatrisu.opsu.Options;
 import itdelatrisu.opsu.Utils;

src/yugecin/opsudance/core/inject/Binder.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.inject;
+package yugecin.opsudance.core.inject;
 
 public interface Binder<T> {
 

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

@@ -15,9 +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.inject;
-
-import yugecin.opsudance.kernel.InstanceContainer;
+package yugecin.opsudance.core.inject;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

src/yugecin/opsudance/core/inject/InstanceContainer.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.kernel;
+package yugecin.opsudance.core.inject;
 
 public interface InstanceContainer {
 

src/yugecin/opsudance/core/inject/OpsuDanceInjector.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.inject;
+package yugecin.opsudance.core.inject;
 
 import yugecin.opsudance.PreStartupInitializer;
 import yugecin.opsudance.core.Demux;
@@ -25,7 +25,7 @@ import yugecin.opsudance.core.state.specialstates.FpsRenderState;
 import yugecin.opsudance.core.state.transitions.EmptyTransitionState;
 import yugecin.opsudance.core.state.transitions.FadeInTransitionState;
 import yugecin.opsudance.core.state.transitions.FadeOutTransitionState;
-import yugecin.opsudance.errorhandling.ErrorHandler;
+import yugecin.opsudance.core.errorhandling.ErrorHandler;
 import yugecin.opsudance.states.EmptyRedState;
 import yugecin.opsudance.states.EmptyState;
 

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

@@ -18,7 +18,7 @@
 package yugecin.opsudance.core.state;
 
 import org.newdawn.slick.Graphics;
-import yugecin.opsudance.errorhandling.ErrorDumpable;
+import yugecin.opsudance.core.errorhandling.ErrorDumpable;
 
 public interface OpsuState extends ErrorDumpable {