All merged into gamecore and reorganized

src/mightypork/gamecore/app/AppAccess.java

@@ -1,10 +1,10 @@
-package mightypork.gamecore.control;
+package mightypork.gamecore.app;
 
 
-import mightypork.gamecore.audio.SoundSystem;
+import mightypork.gamecore.eventbus.BusAccess;
 import mightypork.gamecore.input.InputSystem;
 import mightypork.gamecore.render.DisplaySystem;
-import mightypork.util.control.eventbus.BusAccess;
+import mightypork.gamecore.resources.audio.SoundSystem;
 
 
 /**

src/mightypork/gamecore/app/AppModule.java

@@ -1,10 +1,10 @@
-package mightypork.gamecore.control;
+package mightypork.gamecore.app;
 
 
-import mightypork.gamecore.audio.SoundSystem;
+import mightypork.gamecore.eventbus.clients.RootBusNode;
 import mightypork.gamecore.input.InputSystem;
 import mightypork.gamecore.render.DisplaySystem;
-import mightypork.util.control.eventbus.clients.RootBusNode;
+import mightypork.gamecore.resources.audio.SoundSystem;
 
 
 /**

src/mightypork/gamecore/app/AppSubModule.java

@@ -1,12 +1,12 @@
-package mightypork.gamecore.control;
+package mightypork.gamecore.app;
 
 
-import mightypork.gamecore.audio.SoundSystem;
+import mightypork.gamecore.eventbus.clients.BusNode;
+import mightypork.gamecore.eventbus.clients.DelegatingClient;
+import mightypork.gamecore.eventbus.clients.RootBusNode;
 import mightypork.gamecore.input.InputSystem;
 import mightypork.gamecore.render.DisplaySystem;
-import mightypork.util.control.eventbus.clients.BusNode;
+import mightypork.gamecore.resources.audio.SoundSystem;
-import mightypork.util.control.eventbus.clients.DelegatingClient;
-import mightypork.util.control.eventbus.clients.RootBusNode;
 
 
 /**

src/mightypork/gamecore/app/BaseApp.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.control;
+package mightypork.gamecore.app;
 
 
 import java.io.File;
@@ -7,16 +7,21 @@ import java.util.logging.Level;
 
 import javax.swing.JOptionPane;
 
-import mightypork.gamecore.audio.SoundSystem;
+import mightypork.gamecore.eventbus.EventBus;
-import mightypork.gamecore.control.events.core.DestroyEvent;
+import mightypork.gamecore.eventbus.events.DestroyEvent;
+import mightypork.gamecore.gui.screens.CrossfadeOverlay;
 import mightypork.gamecore.gui.screens.ScreenRegistry;
 import mightypork.gamecore.input.InputSystem;
+import mightypork.gamecore.logging.Log;
+import mightypork.gamecore.logging.SlickLogRedirector;
+import mightypork.gamecore.logging.writers.LogWriter;
 import mightypork.gamecore.render.DisplaySystem;
-import mightypork.util.annotations.DefaultImpl;
+import mightypork.gamecore.resources.audio.SoundSystem;
-import mightypork.util.control.eventbus.EventBus;
+import mightypork.gamecore.util.annot.DefaultImpl;
-import mightypork.util.files.InstanceLock;
+import mightypork.gamecore.util.files.InstanceLock;
-import mightypork.util.logging.Log;
+import mightypork.gamecore.util.ion.Ion;
-import mightypork.util.logging.writers.LogWriter;
+import mightypork.gamecore.util.math.algo.Coord;
+import mightypork.gamecore.util.math.algo.Step;
 
 
 /**
@@ -32,7 +37,7 @@ public abstract class BaseApp implements AppAccess, UncaughtExceptionHandler {
 	private DisplaySystem displaySystem;
 	private SoundSystem soundSystem;
 	private EventBus eventBus;
-	private GameLoop gameLoop;
+	private MainLoop gameLoop;
 	private ScreenRegistry screenRegistry;
 	
 	
@@ -77,6 +82,14 @@ public abstract class BaseApp implements AppAccess, UncaughtExceptionHandler {
 		// only here it makes sense to log.
 		Log.i("=== Commencing initialization sequence ===");
 		
+		
+		/*
+		 * Ionizables
+		 */
+		Log.f3("initializing ION...");
+		registerIonizables();
+		
+		
 		/*
 		 * Event bus
 		 */
@@ -112,7 +125,7 @@ public abstract class BaseApp implements AppAccess, UncaughtExceptionHandler {
 		 */
 		Log.f1("Creating Screen Registry and Game Loop...");
 		screenRegistry = new ScreenRegistry(this);
-		gameLoop = createLoop();
+		gameLoop = createMainLoop();
 		gameLoop.setRootRenderable(screenRegistry);
 		
 		/*
@@ -135,7 +148,14 @@ public abstract class BaseApp implements AppAccess, UncaughtExceptionHandler {
 		Log.i("=== Initialized sequence completed ===");
 	}
 	
-	
+	@DefaultImpl
+	protected void registerIonizables()
+	{
+		Ion.registerType(Coord.ION_MARK, Coord.class);
+		Ion.registerType(Step.ION_MARK, Step.class);
+	}
+
+
 	/**
 	 * Called at the beginning of the initialization sequence, right after lock
 	 * was obtained.
@@ -221,6 +241,7 @@ public abstract class BaseApp implements AppAccess, UncaughtExceptionHandler {
 	@DefaultImpl
 	protected void initScreens(ScreenRegistry screens)
 	{
+		screens.addOverlay(new CrossfadeOverlay(this));
 	}
 	
 	
@@ -229,7 +250,7 @@ public abstract class BaseApp implements AppAccess, UncaughtExceptionHandler {
 	 * 
 	 * @return the game loop.
 	 */
-	protected abstract GameLoop createLoop();
+	protected abstract MainLoop createMainLoop();
 	
 	
 	/**

src/mightypork/gamecore/app/LightAppModule.java

@@ -1,10 +1,10 @@
-package mightypork.gamecore.control;
+package mightypork.gamecore.app;
 
 
-import mightypork.gamecore.audio.SoundSystem;
+import mightypork.gamecore.eventbus.EventBus;
 import mightypork.gamecore.input.InputSystem;
 import mightypork.gamecore.render.DisplaySystem;
-import mightypork.util.control.eventbus.EventBus;
+import mightypork.gamecore.resources.audio.SoundSystem;
 
 
 /**
@@ -12,7 +12,7 @@ import mightypork.util.control.eventbus.EventBus;
  * 
  * @author MightyPork
  */
-public class AppAdapter implements AppAccess {
+public class LightAppModule implements AppAccess {
 	
 	private final AppAccess app;
 	
@@ -20,7 +20,7 @@ public class AppAdapter implements AppAccess {
 	/**
 	 * @param app app access
 	 */
-	public AppAdapter(AppAccess app)
+	public LightAppModule(AppAccess app)
 	{
 		if (app == null) throw new NullPointerException("AppAccess instance cannot be null.");
 		

src/mightypork/gamecore/app/MainLoop.java

@@ -1,15 +1,14 @@
-package mightypork.gamecore.control;
+package mightypork.gamecore.app;
 
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import mightypork.gamecore.control.events.core.UpdateEvent;
+import mightypork.gamecore.eventbus.events.UpdateEvent;
-import mightypork.gamecore.control.events.requests.MainLoopRequestListener;
 import mightypork.gamecore.gui.screens.ScreenRegistry;
 import mightypork.gamecore.render.Renderable;
-import mightypork.util.annotations.DefaultImpl;
+import mightypork.gamecore.util.annot.DefaultImpl;
-import mightypork.util.timing.TimerDelta;
+import mightypork.gamecore.util.math.timing.TimerDelta;
 
 
 /**
@@ -17,7 +16,7 @@ import mightypork.util.timing.TimerDelta;
  * 
  * @author MightyPork
  */
-public abstract class GameLoop extends AppModule implements MainLoopRequestListener {
+public abstract class MainLoop extends AppModule implements MainLoopRequestListener {
 	
 	private final Queue<Runnable> taskQueue = new ConcurrentLinkedQueue<>();
 	private TimerDelta timer;
@@ -28,7 +27,7 @@ public abstract class GameLoop extends AppModule implements MainLoopRequestListe
 	/**
 	 * @param app {@link AppAccess} instance
 	 */
-	public GameLoop(AppAccess app)
+	public MainLoop(AppAccess app)
 	{
 		super(app);
 	}

src/mightypork/gamecore/app/MainLoopRequest.java

@@ -1,8 +1,8 @@
-package mightypork.gamecore.control.events.requests;
+package mightypork.gamecore.app;
 
 
-import mightypork.util.control.eventbus.BusEvent;
+import mightypork.gamecore.eventbus.BusEvent;
-import mightypork.util.control.eventbus.event_flags.SingleReceiverEvent;
+import mightypork.gamecore.eventbus.event_flags.SingleReceiverEvent;
 
 
 /**

src/mightypork/gamecore/app/MainLoopRequestListener.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.control.events.requests;
+package mightypork.gamecore.app;
 
 
 /**

src/mightypork/gamecore/eventbus/BufferedHashSet.java

@@ -1,4 +1,4 @@
-package mightypork.util.control.eventbus;
+package mightypork.gamecore.eventbus;
 
 
 import java.util.Collection;

src/mightypork/gamecore/eventbus/BusAccess.java

@@ -1,4 +1,4 @@
-package mightypork.util.control.eventbus;
+package mightypork.gamecore.eventbus;
 
 
 /**

src/mightypork/gamecore/eventbus/BusEvent.java

@@ -1,11 +1,11 @@
-package mightypork.util.control.eventbus;
+package mightypork.gamecore.eventbus;
 
 
-import mightypork.util.control.eventbus.event_flags.DelayedEvent;
+import mightypork.gamecore.eventbus.event_flags.DelayedEvent;
-import mightypork.util.control.eventbus.event_flags.ImmediateEvent;
+import mightypork.gamecore.eventbus.event_flags.ImmediateEvent;
-import mightypork.util.control.eventbus.event_flags.NonConsumableEvent;
+import mightypork.gamecore.eventbus.event_flags.NonConsumableEvent;
-import mightypork.util.control.eventbus.event_flags.SingleReceiverEvent;
+import mightypork.gamecore.eventbus.event_flags.SingleReceiverEvent;
-import mightypork.util.control.eventbus.event_flags.UnloggedEvent;
+import mightypork.gamecore.eventbus.event_flags.UnloggedEvent;
 
 
 /**

src/mightypork/gamecore/eventbus/EventBus.java

@@ -1,4 +1,4 @@
-package mightypork.util.control.eventbus;
+package mightypork.gamecore.eventbus;
 
 
 import java.lang.reflect.ParameterizedType;
@@ -8,12 +8,12 @@ import java.util.concurrent.DelayQueue;
 import java.util.concurrent.Delayed;
 import java.util.concurrent.TimeUnit;
 
-import mightypork.util.control.Destroyable;
+import mightypork.gamecore.eventbus.clients.DelegatingClient;
-import mightypork.util.control.eventbus.clients.DelegatingClient;
+import mightypork.gamecore.eventbus.event_flags.DelayedEvent;
-import mightypork.util.control.eventbus.event_flags.DelayedEvent;
+import mightypork.gamecore.eventbus.event_flags.ImmediateEvent;
-import mightypork.util.control.eventbus.event_flags.ImmediateEvent;
+import mightypork.gamecore.eventbus.event_flags.UnloggedEvent;
-import mightypork.util.control.eventbus.event_flags.UnloggedEvent;
+import mightypork.gamecore.eventbus.events.Destroyable;
-import mightypork.util.logging.Log;
+import mightypork.gamecore.logging.Log;
 
 
 /**

src/mightypork/gamecore/eventbus/EventChannel.java

@@ -1,12 +1,12 @@
-package mightypork.util.control.eventbus;
+package mightypork.gamecore.eventbus;
 
 
 import java.util.Collection;
 import java.util.HashSet;
 
-import mightypork.util.control.eventbus.clients.DelegatingClient;
+import mightypork.gamecore.eventbus.clients.DelegatingClient;
-import mightypork.util.control.eventbus.clients.ToggleableClient;
+import mightypork.gamecore.eventbus.clients.ToggleableClient;
-import mightypork.util.logging.Log;
+import mightypork.gamecore.logging.Log;
 
 
 /**

src/mightypork/gamecore/eventbus/clients/BusNode.java

@@ -1,12 +1,12 @@
-package mightypork.util.control.eventbus.clients;
+package mightypork.gamecore.eventbus.clients;
 
 
 import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import mightypork.util.control.eventbus.BusAccess;
+import mightypork.gamecore.eventbus.BusAccess;
-import mightypork.util.control.eventbus.EventBus;
+import mightypork.gamecore.eventbus.EventBus;
 
 
 /**

src/mightypork/gamecore/eventbus/clients/ClientHub.java

@@ -1,9 +1,9 @@
-package mightypork.util.control.eventbus.clients;
+package mightypork.gamecore.eventbus.clients;
 
 
 import java.util.Collection;
 
-import mightypork.util.control.eventbus.EventBus;
+import mightypork.gamecore.eventbus.EventBus;
 
 
 /**

src/mightypork/gamecore/eventbus/clients/DelegatingClient.java

@@ -1,4 +1,4 @@
-package mightypork.util.control.eventbus.clients;
+package mightypork.gamecore.eventbus.clients;
 
 
 import java.util.Collection;

src/mightypork/gamecore/eventbus/clients/RootBusNode.java

@@ -1,8 +1,8 @@
-package mightypork.util.control.eventbus.clients;
+package mightypork.gamecore.eventbus.clients;
 
 
-import mightypork.util.control.Destroyable;
+import mightypork.gamecore.eventbus.BusAccess;
-import mightypork.util.control.eventbus.BusAccess;
+import mightypork.gamecore.eventbus.events.Destroyable;
 
 
 /**

src/mightypork/gamecore/eventbus/clients/ToggleableClient.java

@@ -1,4 +1,4 @@
-package mightypork.util.control.eventbus.clients;
+package mightypork.gamecore.eventbus.clients;
 
 
 /**

src/mightypork/gamecore/eventbus/event_flags/DelayedEvent.java

@@ -1,4 +1,4 @@
-package mightypork.util.control.eventbus.event_flags;
+package mightypork.gamecore.eventbus.event_flags;
 
 
 import java.lang.annotation.*;

src/mightypork/gamecore/eventbus/event_flags/ImmediateEvent.java

@@ -1,4 +1,4 @@
-package mightypork.util.control.eventbus.event_flags;
+package mightypork.gamecore.eventbus.event_flags;
 
 
 import java.lang.annotation.*;

src/mightypork/gamecore/eventbus/event_flags/NonConsumableEvent.java

@@ -1,4 +1,4 @@
-package mightypork.util.control.eventbus.event_flags;
+package mightypork.gamecore.eventbus.event_flags;
 
 
 import java.lang.annotation.Documented;

src/mightypork/gamecore/eventbus/event_flags/SingleReceiverEvent.java

@@ -1,4 +1,4 @@
-package mightypork.util.control.eventbus.event_flags;
+package mightypork.gamecore.eventbus.event_flags;
 
 
 import java.lang.annotation.*;

src/mightypork/gamecore/eventbus/event_flags/UnloggedEvent.java

@@ -1,4 +1,4 @@
-package mightypork.util.control.eventbus.event_flags;
+package mightypork.gamecore.eventbus.event_flags;
 
 
 import java.lang.annotation.*;

src/mightypork/gamecore/eventbus/events/DestroyEvent.java

@@ -1,10 +1,9 @@
-package mightypork.gamecore.control.events.core;
+package mightypork.gamecore.eventbus.events;
 
 
-import mightypork.util.control.Destroyable;
+import mightypork.gamecore.eventbus.BusEvent;
-import mightypork.util.control.eventbus.BusEvent;
+import mightypork.gamecore.eventbus.event_flags.ImmediateEvent;
-import mightypork.util.control.eventbus.event_flags.ImmediateEvent;
+import mightypork.gamecore.eventbus.event_flags.NonConsumableEvent;
-import mightypork.util.control.eventbus.event_flags.NonConsumableEvent;
 
 
 /**

src/mightypork/gamecore/eventbus/events/Destroyable.java

@@ -1,4 +1,4 @@
-package mightypork.util.control;
+package mightypork.gamecore.eventbus.events;
 
 
 /**

src/mightypork/gamecore/eventbus/events/UpdateEvent.java

@@ -1,11 +1,10 @@
-package mightypork.gamecore.control.events.core;
+package mightypork.gamecore.eventbus.events;
 
 
-import mightypork.util.control.eventbus.BusEvent;
+import mightypork.gamecore.eventbus.BusEvent;
-import mightypork.util.control.eventbus.event_flags.ImmediateEvent;
+import mightypork.gamecore.eventbus.event_flags.ImmediateEvent;
-import mightypork.util.control.eventbus.event_flags.NonConsumableEvent;
+import mightypork.gamecore.eventbus.event_flags.NonConsumableEvent;
-import mightypork.util.control.eventbus.event_flags.UnloggedEvent;
+import mightypork.gamecore.eventbus.event_flags.UnloggedEvent;
-import mightypork.util.timing.Updateable;
 
 
 /**

src/mightypork/gamecore/eventbus/events/Updateable.java

@@ -1,4 +1,4 @@
-package mightypork.util.timing;
+package mightypork.gamecore.eventbus.events;
 
 
 /**

src/mightypork/gamecore/gui/Action.java

@@ -1,4 +1,5 @@
-package mightypork.util.control;
+package mightypork.gamecore.gui;
+
 
 
 /**

src/mightypork/gamecore/gui/ActionTrigger.java

@@ -1,4 +1,4 @@
-package mightypork.util.control;
+package mightypork.gamecore.gui;
 
 
 /**

src/mightypork/gamecore/gui/Enableable.java

@@ -1,4 +1,4 @@
-package mightypork.util.control;
+package mightypork.gamecore.gui;
 
 
 /**

src/mightypork/gamecore/gui/components/ClickableComponent.java

@@ -1,10 +1,10 @@
 package mightypork.gamecore.gui.components;
 
 
-import mightypork.gamecore.control.events.input.MouseButtonEvent;
+import mightypork.gamecore.gui.Action;
-import mightypork.gamecore.control.events.input.MouseButtonListener;
+import mightypork.gamecore.gui.ActionTrigger;
-import mightypork.util.control.Action;
+import mightypork.gamecore.input.events.MouseButtonEvent;
-import mightypork.util.control.ActionTrigger;
+import mightypork.gamecore.input.events.MouseButtonListener;
 
 
 public abstract class ClickableComponent extends InputComponent implements ActionTrigger, MouseButtonListener {

src/mightypork/gamecore/gui/components/Component.java

@@ -2,8 +2,8 @@ package mightypork.gamecore.gui.components;
 
 
 import mightypork.gamecore.gui.Hideable;
-import mightypork.util.math.constraints.rect.Rect;
+import mightypork.gamecore.util.math.constraints.rect.Rect;
-import mightypork.util.math.constraints.rect.proxy.RectBound;
+import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;
 
 
 /**

src/mightypork/gamecore/gui/components/InputComponent.java

@@ -1,8 +1,8 @@
 package mightypork.gamecore.gui.components;
 
 
-import mightypork.util.control.Enableable;
+import mightypork.gamecore.eventbus.clients.ToggleableClient;
-import mightypork.util.control.eventbus.clients.ToggleableClient;
+import mightypork.gamecore.gui.Enableable;
 
 
 public abstract class InputComponent extends VisualComponent implements Enableable, ToggleableClient {

src/mightypork/gamecore/gui/components/LayoutComponent.java

@@ -4,15 +4,15 @@ package mightypork.gamecore.gui.components;
 import java.util.Collection;
 import java.util.LinkedList;
 
-import mightypork.gamecore.audio.SoundSystem;
+import mightypork.gamecore.app.AppAccess;
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppSubModule;
-import mightypork.gamecore.control.AppSubModule;
+import mightypork.gamecore.eventbus.EventBus;
+import mightypork.gamecore.eventbus.clients.ClientHub;
+import mightypork.gamecore.gui.Enableable;
 import mightypork.gamecore.input.InputSystem;
 import mightypork.gamecore.render.DisplaySystem;
-import mightypork.util.control.Enableable;
+import mightypork.gamecore.resources.audio.SoundSystem;
-import mightypork.util.control.eventbus.EventBus;
+import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;
-import mightypork.util.control.eventbus.clients.ClientHub;
-import mightypork.util.math.constraints.rect.proxy.RectBound;
 
 
 public abstract class LayoutComponent extends VisualComponent implements Enableable, ClientHub, AppAccess {

src/mightypork/gamecore/gui/components/PluggableRenderable.java

@@ -2,9 +2,9 @@ package mightypork.gamecore.gui.components;
 
 
 import mightypork.gamecore.render.Renderable;
-import mightypork.util.math.constraints.rect.Rect;
+import mightypork.gamecore.util.math.constraints.rect.Rect;
-import mightypork.util.math.constraints.rect.proxy.PluggableRectBound;
+import mightypork.gamecore.util.math.constraints.rect.proxy.PluggableRectBound;
-import mightypork.util.math.constraints.rect.proxy.RectBound;
+import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;
 
 
 /**

src/mightypork/gamecore/gui/components/VisualComponent.java

@@ -1,15 +1,15 @@
 package mightypork.gamecore.gui.components;
 
 
-import mightypork.gamecore.control.events.gui.LayoutChangeEvent;
+import mightypork.gamecore.gui.events.LayoutChangeEvent;
-import mightypork.gamecore.control.events.gui.LayoutChangeListener;
+import mightypork.gamecore.gui.events.LayoutChangeListener;
 import mightypork.gamecore.input.InputSystem;
 import mightypork.gamecore.render.Renderable;
-import mightypork.util.annotations.DefaultImpl;
+import mightypork.gamecore.util.annot.DefaultImpl;
-import mightypork.util.math.constraints.rect.Rect;
+import mightypork.gamecore.util.math.constraints.rect.Rect;
-import mightypork.util.math.constraints.rect.caching.AbstractRectCache;
+import mightypork.gamecore.util.math.constraints.rect.caching.AbstractRectCache;
-import mightypork.util.math.constraints.rect.proxy.RectBound;
+import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;
-import mightypork.util.math.constraints.rect.proxy.RectBoundAdapter;
+import mightypork.gamecore.util.math.constraints.rect.proxy.RectBoundAdapter;
 
 
 /**

src/mightypork/gamecore/gui/components/layout/ColumnHolder.java

@@ -1,11 +1,11 @@
 package mightypork.gamecore.gui.components.layout;
 
 
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppAccess;
 import mightypork.gamecore.gui.components.Component;
 import mightypork.gamecore.gui.components.LayoutComponent;
-import mightypork.util.math.constraints.rect.builders.TiledRect;
+import mightypork.gamecore.util.math.constraints.rect.builders.TiledRect;
-import mightypork.util.math.constraints.rect.proxy.RectBound;
+import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;
 
 
 /**

src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java

@@ -1,10 +1,10 @@
 package mightypork.gamecore.gui.components.layout;
 
 
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppAccess;
 import mightypork.gamecore.gui.components.Component;
 import mightypork.gamecore.gui.components.LayoutComponent;
-import mightypork.util.math.constraints.rect.proxy.RectBound;
+import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;
 
 
 /**

src/mightypork/gamecore/gui/components/layout/GridLayout.java

@@ -1,11 +1,11 @@
 package mightypork.gamecore.gui.components.layout;
 
 
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppAccess;
 import mightypork.gamecore.gui.components.Component;
 import mightypork.gamecore.gui.components.LayoutComponent;
-import mightypork.util.math.constraints.rect.builders.TiledRect;
+import mightypork.gamecore.util.math.constraints.rect.builders.TiledRect;
-import mightypork.util.math.constraints.rect.proxy.RectBound;
+import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;
 
 
 /**

src/mightypork/gamecore/gui/components/layout/HorizontalFixedFlowLayout.java

@@ -1,13 +1,13 @@
 package mightypork.gamecore.gui.components.layout;
 
 
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppAccess;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.Component;
 import mightypork.gamecore.gui.components.LayoutComponent;
-import mightypork.util.math.constraints.num.Num;
+import mightypork.gamecore.util.math.constraints.num.Num;
-import mightypork.util.math.constraints.rect.Rect;
+import mightypork.gamecore.util.math.constraints.rect.Rect;
-import mightypork.util.math.constraints.rect.proxy.RectBound;
+import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;
 
 
 /**

src/mightypork/gamecore/gui/components/layout/RowHolder.java

@@ -1,11 +1,11 @@
 package mightypork.gamecore.gui.components.layout;
 
 
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppAccess;
 import mightypork.gamecore.gui.components.Component;
 import mightypork.gamecore.gui.components.LayoutComponent;
-import mightypork.util.math.constraints.rect.builders.TiledRect;
+import mightypork.gamecore.util.math.constraints.rect.builders.TiledRect;
-import mightypork.util.math.constraints.rect.proxy.RectBound;
+import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;
 
 
 /**

src/mightypork/gamecore/gui/components/layout/VerticalFixedFlowLayout.java

@@ -1,13 +1,13 @@
 package mightypork.gamecore.gui.components.layout;
 
 
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppAccess;
 import mightypork.gamecore.gui.AlignY;
 import mightypork.gamecore.gui.components.Component;
 import mightypork.gamecore.gui.components.LayoutComponent;
-import mightypork.util.math.constraints.num.Num;
+import mightypork.gamecore.util.math.constraints.num.Num;
-import mightypork.util.math.constraints.rect.Rect;
+import mightypork.gamecore.util.math.constraints.rect.Rect;
-import mightypork.util.math.constraints.rect.proxy.RectBound;
+import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;
 
 
 /**

src/mightypork/gamecore/gui/components/painters/ImagePainter.java

@@ -3,7 +3,7 @@ package mightypork.gamecore.gui.components.painters;
 
 import mightypork.gamecore.gui.components.VisualComponent;
 import mightypork.gamecore.render.Render;
-import mightypork.gamecore.render.textures.TxQuad;
+import mightypork.gamecore.resources.textures.TxQuad;
 
 
 /**

src/mightypork/gamecore/gui/components/painters/QuadPainter.java

@@ -3,8 +3,8 @@ package mightypork.gamecore.gui.components.painters;
 
 import mightypork.gamecore.gui.components.VisualComponent;
 import mightypork.gamecore.render.Render;
-import mightypork.util.annotations.FactoryMethod;
+import mightypork.gamecore.util.annot.FactoryMethod;
-import mightypork.util.math.color.Color;
+import mightypork.gamecore.util.math.color.Color;
 
 
 /**

src/mightypork/gamecore/gui/components/painters/TextPainter.java

@@ -3,13 +3,13 @@ package mightypork.gamecore.gui.components.painters;
 
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.VisualComponent;
-import mightypork.gamecore.render.fonts.FontRenderer;
+import mightypork.gamecore.resources.fonts.FontRenderer;
-import mightypork.gamecore.render.fonts.GLFont;
+import mightypork.gamecore.resources.fonts.GLFont;
-import mightypork.util.math.color.Color;
+import mightypork.gamecore.util.math.color.Color;
-import mightypork.util.math.constraints.rect.Rect;
+import mightypork.gamecore.util.math.constraints.rect.Rect;
-import mightypork.util.math.constraints.vect.Vect;
+import mightypork.gamecore.util.math.constraints.vect.Vect;
-import mightypork.util.string.StringProvider;
+import mightypork.gamecore.util.strings.StringProvider;
-import mightypork.util.string.StringProvider.StringWrapper;
+import mightypork.gamecore.util.strings.StringWrapper;
 
 
 /**

src/mightypork/gamecore/gui/events/LayoutChangeEvent.java

@@ -1,9 +1,9 @@
-package mightypork.gamecore.control.events.gui;
+package mightypork.gamecore.gui.events;
 
 
-import mightypork.util.control.eventbus.BusEvent;
+import mightypork.gamecore.eventbus.BusEvent;
-import mightypork.util.control.eventbus.event_flags.ImmediateEvent;
+import mightypork.gamecore.eventbus.event_flags.ImmediateEvent;
-import mightypork.util.control.eventbus.event_flags.NonConsumableEvent;
+import mightypork.gamecore.eventbus.event_flags.NonConsumableEvent;
 
 
 /**

src/mightypork/gamecore/gui/events/LayoutChangeListener.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.control.events.gui;
+package mightypork.gamecore.gui.events;
 
 
 public interface LayoutChangeListener {

src/mightypork/gamecore/gui/events/ScreenRequestEvent.java

@@ -1,8 +1,8 @@
-package mightypork.gamecore.control.events.requests;
+package mightypork.gamecore.gui.events;
 
 
-import mightypork.util.control.eventbus.BusEvent;
+import mightypork.gamecore.eventbus.BusEvent;
-import mightypork.util.control.eventbus.event_flags.SingleReceiverEvent;
+import mightypork.gamecore.eventbus.event_flags.SingleReceiverEvent;
 
 
 /**

src/mightypork/gamecore/gui/events/ScreenRequestListener.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.control.events.requests;
+package mightypork.gamecore.gui.events;
 
 
 /**

src/mightypork/gamecore/gui/events/ViewportChangeEvent.java

@@ -1,9 +1,9 @@
-package mightypork.gamecore.control.events.gui;
+package mightypork.gamecore.gui.events;
 
 
-import mightypork.util.control.eventbus.BusEvent;
+import mightypork.gamecore.eventbus.BusEvent;
-import mightypork.util.control.eventbus.event_flags.NonConsumableEvent;
+import mightypork.gamecore.eventbus.event_flags.NonConsumableEvent;
-import mightypork.util.math.constraints.vect.Vect;
+import mightypork.gamecore.util.math.constraints.vect.Vect;
 
 
 /**

src/mightypork/gamecore/gui/events/ViewportChangeListener.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.control.events.gui;
+package mightypork.gamecore.gui.events;
 
 
 /**

src/mightypork/gamecore/gui/screens/BaseScreen.java

@@ -1,16 +1,16 @@
 package mightypork.gamecore.gui.screens;
 
 
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppAccess;
-import mightypork.gamecore.control.AppSubModule;
+import mightypork.gamecore.app.AppSubModule;
-import mightypork.gamecore.control.events.gui.LayoutChangeEvent;
+import mightypork.gamecore.gui.events.LayoutChangeEvent;
-import mightypork.gamecore.control.events.gui.LayoutChangeListener;
+import mightypork.gamecore.gui.events.LayoutChangeListener;
 import mightypork.gamecore.input.KeyBinder;
 import mightypork.gamecore.input.KeyBindingPool;
 import mightypork.gamecore.input.KeyStroke;
 import mightypork.gamecore.render.Render;
-import mightypork.util.annotations.DefaultImpl;
+import mightypork.gamecore.util.annot.DefaultImpl;
-import mightypork.util.math.constraints.rect.Rect;
+import mightypork.gamecore.util.math.constraints.rect.Rect;
 
 
 /**

src/mightypork/gamecore/gui/screens/CrossfadeOverlay.java

@@ -1,16 +1,15 @@
-package mightypork.rogue.screens;
+package mightypork.gamecore.gui.screens;
 
 
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppAccess;
-import mightypork.gamecore.control.events.requests.ScreenRequestEvent;
 import mightypork.gamecore.gui.components.painters.QuadPainter;
-import mightypork.gamecore.gui.screens.Overlay;
+import mightypork.gamecore.gui.events.ScreenRequestEvent;
+import mightypork.gamecore.util.math.Easing;
+import mightypork.gamecore.util.math.color.Color;
+import mightypork.gamecore.util.math.constraints.num.mutable.NumAnimated;
+import mightypork.gamecore.util.math.timing.TimedTask;
 import mightypork.rogue.events.ActionRequest;
 import mightypork.rogue.events.ActionRequest.RequestType;
-import mightypork.util.math.Easing;
-import mightypork.util.math.color.Color;
-import mightypork.util.math.constraints.num.mutable.NumAnimated;
-import mightypork.util.timing.TimedTask;
 
 
 public class CrossfadeOverlay extends Overlay implements CrossfadeRequest.Listener {

src/mightypork/gamecore/gui/screens/CrossfadeRequest.java

@@ -1,7 +1,7 @@
-package mightypork.rogue.screens;
+package mightypork.gamecore.gui.screens;
 
 
-import mightypork.util.control.eventbus.BusEvent;
+import mightypork.gamecore.eventbus.BusEvent;
 
 
 /**

src/mightypork/gamecore/gui/screens/LayeredScreen.java

@@ -5,8 +5,8 @@ import java.util.Collection;
 import java.util.Comparator;
 import java.util.TreeSet;
 
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppAccess;
-import mightypork.util.control.eventbus.clients.DelegatingClient;
+import mightypork.gamecore.eventbus.clients.DelegatingClient;
 
 
 /**

src/mightypork/gamecore/gui/screens/Overlay.java

@@ -4,18 +4,18 @@ package mightypork.gamecore.gui.screens;
 import java.util.Collection;
 import java.util.LinkedHashSet;
 
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppAccess;
-import mightypork.gamecore.control.AppSubModule;
+import mightypork.gamecore.app.AppSubModule;
-import mightypork.gamecore.control.events.gui.LayoutChangeListener;
+import mightypork.gamecore.eventbus.events.Updateable;
 import mightypork.gamecore.gui.Hideable;
 import mightypork.gamecore.gui.components.layout.ConstraintLayout;
+import mightypork.gamecore.gui.events.LayoutChangeListener;
 import mightypork.gamecore.input.KeyBinder;
 import mightypork.gamecore.input.KeyBindingPool;
 import mightypork.gamecore.input.KeyStroke;
 import mightypork.gamecore.render.Renderable;
-import mightypork.util.annotations.DefaultImpl;
+import mightypork.gamecore.util.annot.DefaultImpl;
-import mightypork.util.math.constraints.vect.Vect;
+import mightypork.gamecore.util.math.constraints.vect.Vect;
-import mightypork.util.timing.Updateable;
 
 
 /**

src/mightypork/gamecore/gui/screens/Screen.java

@@ -1,9 +1,9 @@
 package mightypork.gamecore.gui.screens;
 
 
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppAccess;
 import mightypork.gamecore.render.Renderable;
-import mightypork.util.math.constraints.rect.proxy.RectBound;
+import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;
 
 
 /**

src/mightypork/gamecore/gui/screens/ScreenLayer.java

@@ -1,7 +1,7 @@
 package mightypork.gamecore.gui.screens;
 
 
-import mightypork.util.annotations.DefaultImpl;
+import mightypork.gamecore.util.annot.DefaultImpl;
 
 
 /**

src/mightypork/gamecore/gui/screens/ScreenRegistry.java

@@ -6,15 +6,15 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeSet;
 
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppAccess;
-import mightypork.gamecore.control.AppModule;
+import mightypork.gamecore.app.AppModule;
-import mightypork.gamecore.control.events.gui.LayoutChangeEvent;
+import mightypork.gamecore.gui.events.LayoutChangeEvent;
-import mightypork.gamecore.control.events.gui.ViewportChangeEvent;
+import mightypork.gamecore.gui.events.ScreenRequestListener;
-import mightypork.gamecore.control.events.gui.ViewportChangeListener;
+import mightypork.gamecore.gui.events.ViewportChangeEvent;
-import mightypork.gamecore.control.events.requests.ScreenRequestListener;
+import mightypork.gamecore.gui.events.ViewportChangeListener;
+import mightypork.gamecore.logging.Log;
 import mightypork.gamecore.render.Renderable;
-import mightypork.util.annotations.DefaultImpl;
+import mightypork.gamecore.util.annot.DefaultImpl;
-import mightypork.util.logging.Log;
 
 
 /**

src/mightypork/gamecore/input/InputSystem.java

@@ -1,16 +1,16 @@
 package mightypork.gamecore.input;
 
 
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppAccess;
-import mightypork.gamecore.control.events.input.KeyEvent;
+import mightypork.gamecore.eventbus.clients.RootBusNode;
-import mightypork.gamecore.control.events.input.MouseButtonEvent;
+import mightypork.gamecore.eventbus.events.Updateable;
-import mightypork.gamecore.control.events.input.MouseMotionEvent;
+import mightypork.gamecore.input.events.KeyEvent;
+import mightypork.gamecore.input.events.MouseButtonEvent;
+import mightypork.gamecore.input.events.MouseMotionEvent;
+import mightypork.gamecore.util.math.constraints.vect.Vect;
+import mightypork.gamecore.util.math.constraints.vect.mutable.VectVar;
 import mightypork.rogue.events.ActionRequest;
 import mightypork.rogue.events.ActionRequest.RequestType;
-import mightypork.util.control.eventbus.clients.RootBusNode;
-import mightypork.util.math.constraints.vect.Vect;
-import mightypork.util.math.constraints.vect.mutable.VectVar;
-import mightypork.util.timing.Updateable;
 
 import org.lwjgl.LWJGLException;
 import org.lwjgl.input.Keyboard;

src/mightypork/gamecore/input/KeyBinder.java

@@ -1,7 +1,7 @@
 package mightypork.gamecore.input;
 
 
-import mightypork.util.control.Action;
+import mightypork.gamecore.gui.Action;
 
 
 /**

src/mightypork/gamecore/input/KeyBinding.java

@@ -1,8 +1,8 @@
 package mightypork.gamecore.input;
 
 
-import mightypork.gamecore.control.events.input.KeyEvent;
+import mightypork.gamecore.input.events.KeyEvent;
-import mightypork.gamecore.control.events.input.KeyListener;
+import mightypork.gamecore.input.events.KeyListener;
 
 
 /**

src/mightypork/gamecore/input/KeyBindingPool.java

@@ -5,9 +5,9 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import mightypork.gamecore.control.events.input.KeyEvent;
+import mightypork.gamecore.input.events.KeyEvent;
-import mightypork.gamecore.control.events.input.KeyListener;
+import mightypork.gamecore.input.events.KeyListener;
-import mightypork.util.logging.Log;
+import mightypork.gamecore.logging.Log;
 
 
 /**

src/mightypork/gamecore/input/events/KeyEvent.java

@@ -1,8 +1,8 @@
-package mightypork.gamecore.control.events.input;
+package mightypork.gamecore.input.events;
 
 
-import mightypork.util.control.eventbus.BusEvent;
+import mightypork.gamecore.eventbus.BusEvent;
-import mightypork.util.control.eventbus.event_flags.UnloggedEvent;
+import mightypork.gamecore.eventbus.event_flags.UnloggedEvent;
 
 import org.lwjgl.input.Keyboard;
 

src/mightypork/gamecore/input/events/KeyListener.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.control.events.input;
+package mightypork.gamecore.input.events;
 
 
 /**

src/mightypork/gamecore/input/events/MouseButtonEvent.java

@@ -1,11 +1,11 @@
-package mightypork.gamecore.control.events.input;
+package mightypork.gamecore.input.events;
 
 
-import mightypork.util.control.eventbus.BusEvent;
+import mightypork.gamecore.eventbus.BusEvent;
-import mightypork.util.control.eventbus.event_flags.UnloggedEvent;
+import mightypork.gamecore.eventbus.event_flags.UnloggedEvent;
-import mightypork.util.math.constraints.rect.proxy.RectBound;
+import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;
-import mightypork.util.math.constraints.vect.Vect;
+import mightypork.gamecore.util.math.constraints.vect.Vect;
-import mightypork.util.math.constraints.vect.VectConst;
+import mightypork.gamecore.util.math.constraints.vect.VectConst;
 
 
 /**

src/mightypork/gamecore/input/events/MouseButtonListener.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.control.events.input;
+package mightypork.gamecore.input.events;
 
 
 /**

src/mightypork/gamecore/input/events/MouseMotionEvent.java

@@ -1,10 +1,10 @@
-package mightypork.gamecore.control.events.input;
+package mightypork.gamecore.input.events;
 
 
-import mightypork.util.control.eventbus.BusEvent;
+import mightypork.gamecore.eventbus.BusEvent;
-import mightypork.util.control.eventbus.event_flags.UnloggedEvent;
+import mightypork.gamecore.eventbus.event_flags.UnloggedEvent;
-import mightypork.util.math.constraints.vect.Vect;
+import mightypork.gamecore.util.math.constraints.vect.Vect;
-import mightypork.util.math.constraints.vect.VectConst;
+import mightypork.gamecore.util.math.constraints.vect.VectConst;
 
 
 /**

src/mightypork/gamecore/input/events/MouseMotionListener.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.control.events.input;
+package mightypork.gamecore.input.events;
 
 
 /**

src/mightypork/gamecore/logging/Log.java

@@ -1,4 +1,4 @@
-package mightypork.util.logging;
+package mightypork.gamecore.logging;
 
 
 import java.io.File;
@@ -7,13 +7,13 @@ import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.logging.Level;
 
-import mightypork.util.annotations.FactoryMethod;
+import mightypork.gamecore.logging.monitors.LogMonitor;
-import mightypork.util.logging.monitors.LogMonitor;
+import mightypork.gamecore.logging.monitors.LogToSysoutMonitor;
-import mightypork.util.logging.monitors.LogToSysoutMonitor;
+import mightypork.gamecore.logging.writers.ArchivingLog;
-import mightypork.util.logging.writers.ArchivingLog;
+import mightypork.gamecore.logging.writers.LogWriter;
-import mightypork.util.logging.writers.LogWriter;
+import mightypork.gamecore.logging.writers.SimpleLog;
-import mightypork.util.logging.writers.SimpleLog;
+import mightypork.gamecore.util.annot.FactoryMethod;
-import mightypork.util.string.StringUtils;
+import mightypork.gamecore.util.strings.StringUtils;
 
 
 /**

src/mightypork/gamecore/logging/LogAlias.java

@@ -1,4 +1,4 @@
-package mightypork.util.logging;
+package mightypork.gamecore.logging;
 
 
 import java.lang.annotation.Documented;

src/mightypork/gamecore/logging/SlickLogRedirector.java

@@ -1,21 +1,18 @@
-package mightypork.gamecore.control;
+package mightypork.gamecore.logging;
 
 
 import java.util.logging.Level;
 
-import mightypork.util.logging.writers.LogWriter;
+import mightypork.gamecore.logging.writers.LogWriter;
-
-import org.newdawn.slick.util.LogSystem;
-
 
 /**
  * Used to redirect slick log into main logger.
  * 
  * @author MightyPork
  */
-public class SlickLogRedirector implements LogSystem {
+public class SlickLogRedirector implements org.newdawn.slick.util.LogSystem {
 	
-	LogWriter l;
+	LogWriter writer;
 	
 	
 	/**
@@ -23,56 +20,56 @@ public class SlickLogRedirector implements LogSystem {
 	 */
 	public SlickLogRedirector(LogWriter log)
 	{
-		this.l = log;
+		this.writer = log;
 	}
 	
 	
 	@Override
 	public void error(String msg, Throwable e)
 	{
-		l.log(Level.SEVERE, msg, e);
+		writer.log(Level.SEVERE, msg, e);
 	}
 	
 	
 	@Override
 	public void error(Throwable e)
 	{
-		l.log(Level.SEVERE, null, e);
+		writer.log(Level.SEVERE, null, e);
 	}
 	
 	
 	@Override
 	public void error(String msg)
 	{
-		l.log(Level.SEVERE, msg);
+		writer.log(Level.SEVERE, msg);
 	}
 	
 	
 	@Override
 	public void warn(String msg)
 	{
-		l.log(Level.WARNING, msg);
+		writer.log(Level.WARNING, msg);
 	}
 	
 	
 	@Override
 	public void warn(String msg, Throwable e)
 	{
-		l.log(Level.WARNING, msg, e);
+		writer.log(Level.WARNING, msg, e);
 	}
 	
 	
 	@Override
 	public void info(String msg)
 	{
-		l.log(Level.INFO, msg);
+		writer.log(Level.INFO, msg);
 	}
 	
 	
 	@Override
 	public void debug(String msg)
 	{
-		l.log(Level.FINEST, msg);
+		writer.log(Level.FINEST, msg);
 	}
 	
 }

src/mightypork/gamecore/logging/monitors/BaseLogMonitor.java

@@ -1,4 +1,4 @@
-package mightypork.util.logging.monitors;
+package mightypork.gamecore.logging.monitors;
 
 
 import java.util.logging.Level;

src/mightypork/gamecore/logging/monitors/LogMonitor.java

@@ -1,4 +1,4 @@
-package mightypork.util.logging.monitors;
+package mightypork.gamecore.logging.monitors;
 
 
 import java.util.logging.Level;

src/mightypork/gamecore/logging/monitors/LogToSysoutMonitor.java

@@ -1,4 +1,4 @@
-package mightypork.util.logging.monitors;
+package mightypork.gamecore.logging.monitors;
 
 
 import java.util.logging.Level;

src/mightypork/gamecore/logging/writers/ArchivingLog.java

@@ -1,4 +1,4 @@
-package mightypork.util.logging.writers;
+package mightypork.gamecore.logging.writers;
 
 
 import java.io.File;
@@ -9,7 +9,7 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 
-import mightypork.util.files.FileUtils;
+import mightypork.gamecore.util.files.FileUtils;
 
 
 /**

src/mightypork/gamecore/logging/writers/LogWriter.java

@@ -1,9 +1,9 @@
-package mightypork.util.logging.writers;
+package mightypork.gamecore.logging.writers;
 
 
 import java.util.logging.Level;
 
-import mightypork.util.logging.monitors.LogMonitor;
+import mightypork.gamecore.logging.monitors.LogMonitor;
 
 
 /**

src/mightypork/gamecore/logging/writers/SimpleLog.java

@@ -1,4 +1,4 @@
-package mightypork.util.logging.writers;
+package mightypork.gamecore.logging.writers;
 
 
 import java.io.File;
@@ -11,8 +11,8 @@ import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
-import mightypork.util.logging.Log;
+import mightypork.gamecore.logging.Log;
-import mightypork.util.logging.monitors.LogMonitor;
+import mightypork.gamecore.logging.monitors.LogMonitor;
 
 
 /**

src/mightypork/gamecore/render/DisplaySystem.java

@@ -5,14 +5,14 @@ import static org.lwjgl.opengl.GL11.*;
 
 import java.nio.ByteBuffer;
 
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppAccess;
-import mightypork.gamecore.control.AppModule;
+import mightypork.gamecore.app.AppModule;
-import mightypork.gamecore.control.events.gui.ViewportChangeEvent;
+import mightypork.gamecore.gui.events.ViewportChangeEvent;
-import mightypork.util.logging.Log;
+import mightypork.gamecore.logging.Log;
-import mightypork.util.math.constraints.rect.Rect;
+import mightypork.gamecore.util.math.constraints.rect.Rect;
-import mightypork.util.math.constraints.rect.proxy.RectBound;
+import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;
-import mightypork.util.math.constraints.vect.Vect;
+import mightypork.gamecore.util.math.constraints.vect.Vect;
-import mightypork.util.timing.FpsMeter;
+import mightypork.gamecore.util.math.timing.FpsMeter;
 
 import org.lwjgl.BufferUtils;
 import org.lwjgl.LWJGLException;

src/mightypork/gamecore/render/Render.java

@@ -5,16 +5,16 @@ import static org.lwjgl.opengl.GL11.*;
 
 import java.io.IOException;
 
-import mightypork.gamecore.render.textures.FilterMode;
+import mightypork.gamecore.logging.Log;
-import mightypork.gamecore.render.textures.GLTexture;
+import mightypork.gamecore.resources.textures.FilterMode;
-import mightypork.gamecore.render.textures.TxQuad;
+import mightypork.gamecore.resources.textures.GLTexture;
-import mightypork.util.files.FileUtils;
+import mightypork.gamecore.resources.textures.TxQuad;
-import mightypork.util.logging.Log;
+import mightypork.gamecore.util.files.FileUtils;
-import mightypork.util.math.color.Color;
+import mightypork.gamecore.util.math.color.Color;
-import mightypork.util.math.constraints.rect.Rect;
+import mightypork.gamecore.util.math.constraints.rect.Rect;
-import mightypork.util.math.constraints.rect.caching.RectDigest;
+import mightypork.gamecore.util.math.constraints.rect.caching.RectDigest;
-import mightypork.util.math.constraints.vect.Vect;
+import mightypork.gamecore.util.math.constraints.vect.Vect;
-import mightypork.util.math.constraints.vect.VectConst;
+import mightypork.gamecore.util.math.constraints.vect.VectConst;
 
 import org.lwjgl.opengl.GL11;
 import org.newdawn.slick.opengl.Texture;

src/mightypork/gamecore/resources/audio/DeferredAudio.java

@@ -1,12 +1,12 @@
-package mightypork.gamecore.audio;
+package mightypork.gamecore.resources.audio;
 
 
 import java.io.IOException;
 
-import mightypork.gamecore.loading.DeferredResource;
+import mightypork.gamecore.logging.LogAlias;
-import mightypork.util.files.FileUtils;
+import mightypork.gamecore.resources.loading.DeferredResource;
-import mightypork.util.logging.LogAlias;
+import mightypork.gamecore.util.files.FileUtils;
-import mightypork.util.math.constraints.vect.Vect;
+import mightypork.gamecore.util.math.constraints.vect.Vect;
 
 import org.newdawn.slick.openal.Audio;
 import org.newdawn.slick.openal.SoundStore;

src/mightypork/gamecore/resources/audio/JointVolume.java

@@ -1,7 +1,7 @@
-package mightypork.gamecore.audio;
+package mightypork.gamecore.resources.audio;
 
 
-import mightypork.util.math.Calc;
+import mightypork.gamecore.util.math.Calc;
 
 
 /**

src/mightypork/gamecore/resources/audio/SoundBank.java

@@ -1,13 +1,13 @@
-package mightypork.gamecore.audio;
+package mightypork.gamecore.resources.audio;
 
 
 import java.util.HashMap;
 import java.util.Map;
 
-import mightypork.gamecore.audio.players.EffectPlayer;
+import mightypork.gamecore.app.AppAccess;
-import mightypork.gamecore.audio.players.LoopPlayer;
+import mightypork.gamecore.app.LightAppModule;
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.resources.audio.players.EffectPlayer;
-import mightypork.gamecore.control.AppAdapter;
+import mightypork.gamecore.resources.audio.players.LoopPlayer;
 
 
 /**
@@ -15,7 +15,7 @@ import mightypork.gamecore.control.AppAdapter;
  * 
  * @author MightyPork
  */
-public class SoundBank extends AppAdapter {
+public class SoundBank extends LightAppModule {
 	
 	private final Map<String, EffectPlayer> effects = new HashMap<>();
 	private final Map<String, LoopPlayer> loops = new HashMap<>();

src/mightypork/gamecore/resources/audio/SoundSystem.java

@@ -1,19 +1,19 @@
-package mightypork.gamecore.audio;
+package mightypork.gamecore.resources.audio;
 
 
 import java.nio.FloatBuffer;
 import java.util.HashSet;
 import java.util.Set;
 
-import mightypork.gamecore.audio.players.EffectPlayer;
+import mightypork.gamecore.app.AppAccess;
-import mightypork.gamecore.audio.players.LoopPlayer;
+import mightypork.gamecore.eventbus.clients.RootBusNode;
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.eventbus.events.Updateable;
-import mightypork.gamecore.control.events.requests.ResourceLoadRequest;
+import mightypork.gamecore.resources.audio.players.EffectPlayer;
-import mightypork.util.control.eventbus.clients.RootBusNode;
+import mightypork.gamecore.resources.audio.players.LoopPlayer;
-import mightypork.util.math.Calc.Buffers;
+import mightypork.gamecore.resources.events.ResourceLoadRequest;
-import mightypork.util.math.constraints.vect.Vect;
+import mightypork.gamecore.util.math.Calc.Buffers;
-import mightypork.util.math.constraints.vect.mutable.VectVar;
+import mightypork.gamecore.util.math.constraints.vect.Vect;
-import mightypork.util.timing.Updateable;
+import mightypork.gamecore.util.math.constraints.vect.mutable.VectVar;
 
 import org.lwjgl.openal.AL;
 import org.lwjgl.openal.AL10;

src/mightypork/gamecore/resources/audio/Volume.java

@@ -1,8 +1,8 @@
-package mightypork.gamecore.audio;
+package mightypork.gamecore.resources.audio;
 
 
-import mightypork.util.math.Calc;
+import mightypork.gamecore.util.math.Calc;
-import mightypork.util.objects.Mutable;
+import mightypork.gamecore.util.objects.Mutable;
 
 
 /**

src/mightypork/gamecore/resources/audio/players/BaseAudioPlayer.java

@@ -1,9 +1,9 @@
-package mightypork.gamecore.audio.players;
+package mightypork.gamecore.resources.audio.players;
 
 
-import mightypork.gamecore.audio.DeferredAudio;
+import mightypork.gamecore.eventbus.events.Destroyable;
-import mightypork.gamecore.audio.Volume;
+import mightypork.gamecore.resources.audio.DeferredAudio;
-import mightypork.util.control.Destroyable;
+import mightypork.gamecore.resources.audio.Volume;
 
 
 /**

src/mightypork/gamecore/resources/audio/players/EffectPlayer.java

@@ -1,9 +1,9 @@
-package mightypork.gamecore.audio.players;
+package mightypork.gamecore.resources.audio.players;
 
 
-import mightypork.gamecore.audio.DeferredAudio;
+import mightypork.gamecore.resources.audio.DeferredAudio;
-import mightypork.gamecore.audio.Volume;
+import mightypork.gamecore.resources.audio.Volume;
-import mightypork.util.math.constraints.vect.Vect;
+import mightypork.gamecore.util.math.constraints.vect.Vect;
 
 
 /**

src/mightypork/gamecore/resources/audio/players/LoopPlayer.java

@@ -1,11 +1,11 @@
-package mightypork.gamecore.audio.players;
+package mightypork.gamecore.resources.audio.players;
 
 
-import mightypork.gamecore.audio.DeferredAudio;
+import mightypork.gamecore.eventbus.events.Updateable;
-import mightypork.gamecore.audio.Volume;
+import mightypork.gamecore.resources.audio.DeferredAudio;
-import mightypork.util.math.constraints.num.mutable.NumAnimated;
+import mightypork.gamecore.resources.audio.Volume;
-import mightypork.util.timing.Pauseable;
+import mightypork.gamecore.util.math.constraints.num.mutable.NumAnimated;
-import mightypork.util.timing.Updateable;
+import mightypork.gamecore.util.math.timing.Pauseable;
 
 import org.lwjgl.openal.AL10;
 

src/mightypork/gamecore/resources/events/ResourceLoadRequest.java

@@ -1,9 +1,9 @@
-package mightypork.gamecore.control.events.requests;
+package mightypork.gamecore.resources.events;
 
 
-import mightypork.gamecore.loading.Deferred;
+import mightypork.gamecore.eventbus.BusEvent;
-import mightypork.util.control.eventbus.BusEvent;
+import mightypork.gamecore.eventbus.event_flags.SingleReceiverEvent;
-import mightypork.util.control.eventbus.event_flags.SingleReceiverEvent;
+import mightypork.gamecore.resources.loading.Deferred;
 
 
 /**

src/mightypork/gamecore/resources/events/ResourceLoadRequestListener.java

@@ -1,7 +1,7 @@
-package mightypork.gamecore.control.events.requests;
+package mightypork.gamecore.resources.events;
 
 
-import mightypork.gamecore.loading.Deferred;
+import mightypork.gamecore.resources.loading.Deferred;
 
 
 /**

src/mightypork/gamecore/resources/fonts/FontBank.java

@@ -1,12 +1,12 @@
-package mightypork.gamecore.render.fonts;
+package mightypork.gamecore.resources.fonts;
 
 
 import java.util.HashMap;
 
-import mightypork.gamecore.control.AppAccess;
+import mightypork.gamecore.app.AppAccess;
-import mightypork.gamecore.control.AppAdapter;
+import mightypork.gamecore.app.LightAppModule;
-import mightypork.gamecore.control.events.requests.ResourceLoadRequest;
+import mightypork.gamecore.resources.events.ResourceLoadRequest;
-import mightypork.gamecore.render.fonts.impl.DeferredFont;
+import mightypork.gamecore.resources.fonts.impl.DeferredFont;
 
 import org.newdawn.slick.opengl.Texture;
 
@@ -16,7 +16,7 @@ import org.newdawn.slick.opengl.Texture;
  * 
  * @author MightyPork
  */
-public class FontBank extends AppAdapter {
+public class FontBank extends LightAppModule {
 	
 	/**
 	 * @param app app access

src/mightypork/gamecore/resources/fonts/FontRenderer.java

@@ -1,11 +1,11 @@
-package mightypork.gamecore.render.fonts;
+package mightypork.gamecore.resources.fonts;
 
 
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.render.Render;
-import mightypork.util.math.color.Color;
+import mightypork.gamecore.util.math.color.Color;
-import mightypork.util.math.constraints.rect.Rect;
+import mightypork.gamecore.util.math.constraints.rect.Rect;
-import mightypork.util.math.constraints.vect.Vect;
+import mightypork.gamecore.util.math.constraints.vect.Vect;
 
 
 /**

src/mightypork/gamecore/resources/fonts/GLFont.java

@@ -1,8 +1,8 @@
-package mightypork.gamecore.render.fonts;
+package mightypork.gamecore.resources.fonts;
 
 
-import mightypork.util.math.color.Color;
+import mightypork.gamecore.util.math.color.Color;
-import mightypork.util.math.constraints.vect.Vect;
+import mightypork.gamecore.util.math.constraints.vect.Vect;
 
 
 /**

src/mightypork/gamecore/resources/fonts/Glyphs.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.render.fonts;
+package mightypork.gamecore.resources.fonts;
 
 
 /**

src/mightypork/gamecore/resources/fonts/impl/CachedFont.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.render.fonts.impl;
+package mightypork.gamecore.resources.fonts.impl;
 
 
 import static org.lwjgl.opengl.GL11.*;
@@ -18,13 +18,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import mightypork.gamecore.render.fonts.GLFont;
+import mightypork.gamecore.logging.Log;
-import mightypork.gamecore.render.textures.DeferredTexture;
+import mightypork.gamecore.resources.fonts.GLFont;
-import mightypork.gamecore.render.textures.FilterMode;
+import mightypork.gamecore.resources.textures.DeferredTexture;
-import mightypork.util.logging.Log;
+import mightypork.gamecore.resources.textures.FilterMode;
-import mightypork.util.math.color.Color;
+import mightypork.gamecore.util.math.color.Color;
-import mightypork.util.math.constraints.vect.Vect;
+import mightypork.gamecore.util.math.constraints.vect.Vect;
-import mightypork.util.math.constraints.vect.VectConst;
+import mightypork.gamecore.util.math.constraints.vect.VectConst;
 
 import org.lwjgl.BufferUtils;
 import org.lwjgl.util.glu.GLU;

src/mightypork/gamecore/resources/fonts/impl/DeferredFont.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.render.fonts.impl;
+package mightypork.gamecore.resources.fonts.impl;
 
 
 import java.awt.Font;
@@ -6,14 +6,14 @@ import java.awt.FontFormatException;
 import java.io.IOException;
 import java.io.InputStream;
 
-import mightypork.gamecore.loading.DeferredResource;
+import mightypork.gamecore.logging.LogAlias;
-import mightypork.gamecore.loading.MustLoadInMainThread;
+import mightypork.gamecore.resources.fonts.GLFont;
-import mightypork.gamecore.render.fonts.GLFont;
+import mightypork.gamecore.resources.loading.DeferredResource;
-import mightypork.gamecore.render.textures.FilterMode;
+import mightypork.gamecore.resources.loading.MustLoadInMainThread;
-import mightypork.util.files.FileUtils;
+import mightypork.gamecore.resources.textures.FilterMode;
-import mightypork.util.logging.LogAlias;
+import mightypork.gamecore.util.files.FileUtils;
-import mightypork.util.math.color.Color;
+import mightypork.gamecore.util.math.color.Color;
-import mightypork.util.math.constraints.vect.Vect;
+import mightypork.gamecore.util.math.constraints.vect.Vect;
 
 
 /**

src/mightypork/gamecore/resources/fonts/impl/DeferredFontNative.java

@@ -1,12 +1,12 @@
-package mightypork.gamecore.render.fonts.impl;
+package mightypork.gamecore.resources.fonts.impl;
 
 
 import java.awt.Font;
 import java.awt.FontFormatException;
 import java.io.IOException;
 
-import mightypork.gamecore.render.textures.FilterMode;
+import mightypork.gamecore.logging.LogAlias;
-import mightypork.util.logging.LogAlias;
+import mightypork.gamecore.resources.textures.FilterMode;
 
 
 /**

src/mightypork/gamecore/resources/loading/AsyncResourceLoader.java

@@ -1,16 +1,16 @@
-package mightypork.gamecore.loading;
+package mightypork.gamecore.resources.loading;
 
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import mightypork.gamecore.control.events.requests.MainLoopRequest;
+import mightypork.gamecore.app.MainLoopRequest;
-import mightypork.gamecore.control.events.requests.ResourceLoadRequestListener;
+import mightypork.gamecore.eventbus.BusAccess;
-import mightypork.util.annotations.FactoryMethod;
+import mightypork.gamecore.eventbus.events.Destroyable;
-import mightypork.util.control.Destroyable;
+import mightypork.gamecore.logging.Log;
-import mightypork.util.control.eventbus.BusAccess;
+import mightypork.gamecore.resources.events.ResourceLoadRequestListener;
-import mightypork.util.logging.Log;
+import mightypork.gamecore.util.annot.FactoryMethod;
 
 
 /**

src/mightypork/gamecore/resources/loading/Deferred.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.loading;
+package mightypork.gamecore.resources.loading;
 
 
 /**

src/mightypork/gamecore/resources/loading/DeferredResource.java

@@ -1,9 +1,9 @@
-package mightypork.gamecore.loading;
+package mightypork.gamecore.resources.loading;
 
 
-import mightypork.util.control.Destroyable;
+import mightypork.gamecore.eventbus.events.Destroyable;
-import mightypork.util.logging.Log;
+import mightypork.gamecore.logging.Log;
-import mightypork.util.logging.LogAlias;
+import mightypork.gamecore.logging.LogAlias;
 
 
 /**