Moved general purpose stuff into util, renamed utils->util

src/mightypork/gamecore/audio/DeferredAudio.java

@@ -4,9 +4,9 @@ package mightypork.gamecore.audio;
 import java.io.IOException;
 
 import mightypork.gamecore.loading.DeferredResource;
-import mightypork.utils.annotations.Alias;
+import mightypork.util.files.FileUtils;
-import mightypork.utils.files.FileUtils;
+import mightypork.util.logging.LogAlias;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
 
 import org.newdawn.slick.openal.Audio;
 import org.newdawn.slick.openal.SoundStore;
@@ -17,7 +17,7 @@ import org.newdawn.slick.openal.SoundStore;
  * 
  * @author MightyPork
  */
-@Alias(name = "Audio")
+@LogAlias(name = "Audio")
 public class DeferredAudio extends DeferredResource {
 	
 	private enum PlayMode

src/mightypork/gamecore/audio/JointVolume.java

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

src/mightypork/gamecore/audio/NullAudio.java

@@ -2,7 +2,7 @@ package mightypork.gamecore.audio;
 
 
 import mightypork.gamecore.loading.NullResource;
-import mightypork.utils.annotations.Alias;
+import mightypork.util.logging.LogAlias;
 
 
 /**
@@ -11,7 +11,7 @@ import mightypork.utils.annotations.Alias;
  * 
  * @author MightyPork
  */
-@Alias(name = "NullAudio")
+@LogAlias(name = "NullAudio")
 public class NullAudio extends DeferredAudio implements NullResource {
 	
 	/**

src/mightypork/gamecore/audio/SoundBank.java

@@ -8,7 +8,7 @@ import mightypork.gamecore.audio.players.EffectPlayer;
 import mightypork.gamecore.audio.players.LoopPlayer;
 import mightypork.gamecore.control.AppAccess;
 import mightypork.gamecore.control.AppAdapter;
-import mightypork.utils.logging.Log;
+import mightypork.util.logging.Log;
 
 
 /**

src/mightypork/gamecore/audio/SoundSystem.java

@@ -8,12 +8,12 @@ import java.util.Set;
 import mightypork.gamecore.audio.players.EffectPlayer;
 import mightypork.gamecore.audio.players.LoopPlayer;
 import mightypork.gamecore.control.AppAccess;
-import mightypork.gamecore.control.bus.clients.RootBusNode;
+import mightypork.gamecore.control.events.ResourceLoadRequest;
-import mightypork.gamecore.control.bus.events.ResourceLoadRequest;
+import mightypork.util.control.eventbus.clients.RootBusNode;
-import mightypork.gamecore.control.timing.Updateable;
+import mightypork.util.control.timing.Updateable;
-import mightypork.utils.math.Calc.Buffers;
+import mightypork.util.math.Calc.Buffers;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
-import mightypork.utils.math.constraints.vect.mutable.VectVar;
+import mightypork.util.math.constraints.vect.mutable.VectVar;
 
 import org.lwjgl.openal.AL;
 import org.lwjgl.openal.AL10;

src/mightypork/gamecore/audio/Volume.java

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

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

@@ -3,7 +3,7 @@ package mightypork.gamecore.audio.players;
 
 import mightypork.gamecore.audio.DeferredAudio;
 import mightypork.gamecore.audio.Volume;
-import mightypork.gamecore.control.interf.Destroyable;
+import mightypork.util.control.Destroyable;
 
 
 /**

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

@@ -3,7 +3,7 @@ package mightypork.gamecore.audio.players;
 
 import mightypork.gamecore.audio.DeferredAudio;
 import mightypork.gamecore.audio.Volume;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
 
 
 /**

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

@@ -3,9 +3,9 @@ package mightypork.gamecore.audio.players;
 
 import mightypork.gamecore.audio.DeferredAudio;
 import mightypork.gamecore.audio.Volume;
-import mightypork.gamecore.control.timing.Pauseable;
+import mightypork.util.control.timing.Pauseable;
-import mightypork.gamecore.control.timing.Updateable;
+import mightypork.util.control.timing.Updateable;
-import mightypork.utils.math.constraints.num.mutable.NumAnimated;
+import mightypork.util.math.constraints.num.mutable.NumAnimated;
 
 import org.lwjgl.openal.AL10;
 

src/mightypork/gamecore/control/AppAccess.java

@@ -2,9 +2,9 @@ package mightypork.gamecore.control;
 
 
 import mightypork.gamecore.audio.SoundSystem;
-import mightypork.gamecore.control.bus.BusAccess;
 import mightypork.gamecore.input.InputSystem;
 import mightypork.gamecore.render.DisplaySystem;
+import mightypork.util.control.eventbus.BusAccess;
 
 
 /**

src/mightypork/gamecore/control/AppAdapter.java

@@ -2,9 +2,9 @@ package mightypork.gamecore.control;
 
 
 import mightypork.gamecore.audio.SoundSystem;
-import mightypork.gamecore.control.bus.EventBus;
 import mightypork.gamecore.input.InputSystem;
 import mightypork.gamecore.render.DisplaySystem;
+import mightypork.util.control.eventbus.EventBus;
 
 
 /**

src/mightypork/gamecore/control/AppModule.java

@@ -2,9 +2,9 @@ package mightypork.gamecore.control;
 
 
 import mightypork.gamecore.audio.SoundSystem;
-import mightypork.gamecore.control.bus.clients.RootBusNode;
 import mightypork.gamecore.input.InputSystem;
 import mightypork.gamecore.render.DisplaySystem;
+import mightypork.util.control.eventbus.clients.RootBusNode;
 
 
 /**

src/mightypork/gamecore/control/AppSubModule.java

@@ -2,11 +2,11 @@ package mightypork.gamecore.control;
 
 
 import mightypork.gamecore.audio.SoundSystem;
-import mightypork.gamecore.control.bus.clients.BusNode;
-import mightypork.gamecore.control.bus.clients.DelegatingClient;
-import mightypork.gamecore.control.bus.clients.RootBusNode;
 import mightypork.gamecore.input.InputSystem;
 import mightypork.gamecore.render.DisplaySystem;
+import mightypork.util.control.eventbus.clients.BusNode;
+import mightypork.util.control.eventbus.clients.DelegatingClient;
+import mightypork.util.control.eventbus.clients.RootBusNode;
 
 
 /**

src/mightypork/gamecore/control/BaseApp.java

@@ -8,18 +8,17 @@ import java.util.logging.Level;
 import javax.swing.JOptionPane;
 
 import mightypork.gamecore.audio.SoundSystem;
-import mightypork.gamecore.control.bus.EventBus;
+import mightypork.gamecore.control.events.*;
-import mightypork.gamecore.control.bus.events.*;
-import mightypork.gamecore.control.interf.Destroyable;
-import mightypork.gamecore.control.timing.Updateable;
 import mightypork.gamecore.gui.screens.ScreenRegistry;
 import mightypork.gamecore.input.InputSystem;
-import mightypork.gamecore.loading.AsyncResourceLoader;
 import mightypork.gamecore.render.DisplaySystem;
-import mightypork.utils.annotations.DefaultImpl;
+import mightypork.util.annotations.DefaultImpl;
-import mightypork.utils.files.InstanceLock;
+import mightypork.util.control.Destroyable;
-import mightypork.utils.logging.Log;
+import mightypork.util.control.eventbus.EventBus;
-import mightypork.utils.logging.LogWriter;
+import mightypork.util.control.timing.Updateable;
+import mightypork.util.files.InstanceLock;
+import mightypork.util.logging.Log;
+import mightypork.util.logging.writers.LogWriter;
 
 
 /**

src/mightypork/gamecore/control/GameLoop.java

@@ -4,12 +4,12 @@ package mightypork.gamecore.control;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import mightypork.gamecore.control.bus.events.MainLoopTaskRequest;
+import mightypork.gamecore.control.events.MainLoopTaskRequest;
-import mightypork.gamecore.control.bus.events.UpdateEvent;
+import mightypork.gamecore.control.events.UpdateEvent;
-import mightypork.gamecore.control.timing.TimerDelta;
 import mightypork.gamecore.gui.components.Renderable;
 import mightypork.gamecore.gui.screens.ScreenRegistry;
-import mightypork.utils.annotations.DefaultImpl;
+import mightypork.util.annotations.DefaultImpl;
+import mightypork.util.control.timing.TimerDelta;
 
 
 /**

src/mightypork/gamecore/control/SlickLogRedirector.java

@@ -3,7 +3,7 @@ package mightypork.gamecore.control;
 
 import java.util.logging.Level;
 
-import mightypork.utils.logging.LogWriter;
+import mightypork.util.logging.writers.LogWriter;
 
 import org.newdawn.slick.util.LogSystem;
 

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

@@ -1,8 +1,9 @@
-package mightypork.gamecore.control.bus.events;
+package mightypork.gamecore.control.events;
 
 
-import mightypork.gamecore.control.bus.events.types.ImmediateEvent;
+import mightypork.util.control.Destroyable;
-import mightypork.gamecore.control.interf.Destroyable;
+import mightypork.util.control.eventbus.events.Event;
+import mightypork.util.control.eventbus.events.flags.ImmediateEvent;
 
 
 /**

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

@@ -1,6 +1,8 @@
-package mightypork.gamecore.control.bus.events;
+package mightypork.gamecore.control.events;
 
 
+import mightypork.util.control.eventbus.events.Event;
+
 import org.lwjgl.input.Keyboard;
 
 

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

@@ -1,7 +1,8 @@
-package mightypork.gamecore.control.bus.events;
+package mightypork.gamecore.control.events;
 
 
-import mightypork.gamecore.control.bus.events.types.ImmediateEvent;
+import mightypork.util.control.eventbus.events.Event;
+import mightypork.util.control.eventbus.events.flags.ImmediateEvent;
 
 
 /**
@@ -24,6 +25,7 @@ public class LayoutChangeEvent implements Event<LayoutChangeEvent.Listener> {
 	}
 	
 	public interface Listener {
+		
 		public void onLayoutChanged();
 	}
 }

src/mightypork/gamecore/control/events/MainLoopTaskRequest.java

@@ -1,7 +1,8 @@
-package mightypork.gamecore.control.bus.events;
+package mightypork.gamecore.control.events;
 
 
-import mightypork.gamecore.control.bus.events.types.SingleReceiverEvent;
+import mightypork.util.control.eventbus.events.Event;
+import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent;
 
 
 /**

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

@@ -1,8 +1,9 @@
-package mightypork.gamecore.control.bus.events;
+package mightypork.gamecore.control.events;
 
 
-import mightypork.utils.math.constraints.rect.proxy.RectBound;
+import mightypork.util.control.eventbus.events.Event;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.rect.proxy.RectBound;
+import mightypork.util.math.constraints.vect.Vect;
 
 
 /**

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

@@ -1,9 +1,10 @@
-package mightypork.gamecore.control.bus.events;
+package mightypork.gamecore.control.events;
 
 
-import mightypork.gamecore.control.bus.events.types.UnloggedEvent;
+import mightypork.util.control.eventbus.events.Event;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.control.eventbus.events.flags.UnloggedEvent;
-import mightypork.utils.math.constraints.vect.VectConst;
+import mightypork.util.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.VectConst;
 
 
 /**

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

@@ -1,8 +1,9 @@
-package mightypork.gamecore.control.bus.events;
+package mightypork.gamecore.control.events;
 
 
-import mightypork.gamecore.control.bus.events.types.SingleReceiverEvent;
 import mightypork.gamecore.loading.Deferred;
+import mightypork.util.control.eventbus.events.Event;
+import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent;
 
 
 /**

src/mightypork/gamecore/control/events/ScreenChangeEvent.java

@@ -1,7 +1,8 @@
-package mightypork.gamecore.control.bus.events;
+package mightypork.gamecore.control.events;
 
 
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.control.eventbus.events.Event;
+import mightypork.util.math.constraints.vect.Vect;
 
 
 /**

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

@@ -1,7 +1,8 @@
-package mightypork.gamecore.control.bus.events;
+package mightypork.gamecore.control.events;
 
 
-import mightypork.gamecore.control.bus.events.types.SingleReceiverEvent;
+import mightypork.util.control.eventbus.events.Event;
+import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent;
 
 
 /**

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

@@ -1,9 +1,10 @@
-package mightypork.gamecore.control.bus.events;
+package mightypork.gamecore.control.events;
 
 
-import mightypork.gamecore.control.bus.events.types.ImmediateEvent;
+import mightypork.util.control.eventbus.events.Event;
-import mightypork.gamecore.control.bus.events.types.UnloggedEvent;
+import mightypork.util.control.eventbus.events.flags.ImmediateEvent;
-import mightypork.gamecore.control.timing.Updateable;
+import mightypork.util.control.eventbus.events.flags.UnloggedEvent;
+import mightypork.util.control.timing.Updateable;
 
 
 /**

src/mightypork/gamecore/gui/AlignX.java

@@ -1,5 +1,6 @@
 package mightypork.gamecore.gui;
 
+
 /**
  * Horizontal align sides
  * 
@@ -8,4 +9,4 @@ package mightypork.gamecore.gui;
 public enum AlignX
 {
 	LEFT, CENTER, RIGHT;
-}
+}

src/mightypork/gamecore/gui/AlignY.java

@@ -1,5 +1,6 @@
 package mightypork.gamecore.gui;
 
+
 /**
  * Vertical align sides
  * 
@@ -8,4 +9,4 @@ package mightypork.gamecore.gui;
 public enum AlignY
 {
 	TOP, CENTER, BOTTOM;
-}
+}

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

@@ -1,7 +1,7 @@
 package mightypork.gamecore.gui.components;
 
 
-import mightypork.gamecore.control.bus.events.MouseButtonEvent;
+import mightypork.gamecore.control.events.MouseButtonEvent;
 
 
 public abstract class ClickableComponent extends InputComponent {

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

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

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

@@ -1,10 +1,10 @@
 package mightypork.gamecore.gui.components;
 
 
-import mightypork.gamecore.control.bus.events.MouseButtonEvent;
+import mightypork.gamecore.control.events.MouseButtonEvent;
-import mightypork.gamecore.control.interf.Enableable;
+import mightypork.util.control.Action;
-import mightypork.gamecore.gui.Action;
+import mightypork.util.control.ActionTrigger;
-import mightypork.gamecore.gui.ActionTrigger;
+import mightypork.util.control.Enableable;
 
 
 public abstract class InputComponent extends VisualComponent implements Enableable, ActionTrigger, MouseButtonEvent.Listener {
@@ -33,7 +33,9 @@ public abstract class InputComponent extends VisualComponent implements Enableab
 		return enabled;
 	}
 	
-	protected void triggerAction() {
+	
-		if(action != null) action.run();
+	protected void triggerAction()
+	{
+		if (action != null) action.run();
 	}
 }

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

@@ -7,12 +7,12 @@ import java.util.LinkedList;
 import mightypork.gamecore.audio.SoundSystem;
 import mightypork.gamecore.control.AppAccess;
 import mightypork.gamecore.control.AppSubModule;
-import mightypork.gamecore.control.bus.EventBus;
-import mightypork.gamecore.control.bus.clients.ClientHub;
-import mightypork.gamecore.control.interf.Enableable;
 import mightypork.gamecore.input.InputSystem;
 import mightypork.gamecore.render.DisplaySystem;
-import mightypork.utils.math.constraints.rect.proxy.RectBound;
+import mightypork.util.control.Enableable;
+import mightypork.util.control.eventbus.EventBus;
+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

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

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

@@ -1,12 +1,12 @@
 package mightypork.gamecore.gui.components;
 
 
-import mightypork.gamecore.control.bus.events.LayoutChangeEvent;
+import mightypork.gamecore.control.events.LayoutChangeEvent;
-import mightypork.utils.annotations.DefaultImpl;
+import mightypork.util.annotations.DefaultImpl;
-import mightypork.utils.math.constraints.rect.Rect;
+import mightypork.util.math.constraints.rect.Rect;
-import mightypork.utils.math.constraints.rect.caching.AbstractRectCache;
+import mightypork.util.math.constraints.rect.caching.AbstractRectCache;
-import mightypork.utils.math.constraints.rect.proxy.RectBound;
+import mightypork.util.math.constraints.rect.proxy.RectBound;
-import mightypork.utils.math.constraints.rect.proxy.RectBoundAdapter;
+import mightypork.util.math.constraints.rect.proxy.RectBoundAdapter;
 
 
 /**

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

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

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

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

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

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

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

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

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

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

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.utils.annotations.FactoryMethod;
+import mightypork.util.annotations.FactoryMethod;
-import mightypork.utils.math.color.Color;
+import mightypork.util.math.color.Color;
 
 
 /**

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

@@ -5,11 +5,11 @@ import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.VisualComponent;
 import mightypork.gamecore.render.fonts.FontRenderer;
 import mightypork.gamecore.render.fonts.GLFont;
-import mightypork.utils.math.color.Color;
+import mightypork.util.math.color.Color;
-import mightypork.utils.math.constraints.rect.Rect;
+import mightypork.util.math.constraints.rect.Rect;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
-import mightypork.utils.string.StringProvider;
+import mightypork.util.string.StringProvider;
-import mightypork.utils.string.StringProvider.StringWrapper;
+import mightypork.util.string.StringProvider.StringWrapper;
 
 
 /**

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

@@ -5,7 +5,7 @@ import java.util.Collection;
 import java.util.TreeSet;
 
 import mightypork.gamecore.control.AppAccess;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
 
 
 /**

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

@@ -3,17 +3,17 @@ package mightypork.gamecore.gui.screens;
 
 import mightypork.gamecore.control.AppAccess;
 import mightypork.gamecore.control.AppSubModule;
-import mightypork.gamecore.control.bus.events.LayoutChangeEvent;
+import mightypork.gamecore.control.events.LayoutChangeEvent;
-import mightypork.gamecore.control.bus.events.ScreenChangeEvent;
+import mightypork.gamecore.control.events.ScreenChangeEvent;
 import mightypork.gamecore.gui.components.Renderable;
 import mightypork.gamecore.input.KeyBinder;
 import mightypork.gamecore.input.KeyBindingPool;
 import mightypork.gamecore.input.KeyStroke;
 import mightypork.gamecore.render.Render;
-import mightypork.utils.annotations.DefaultImpl;
+import mightypork.util.annotations.DefaultImpl;
-import mightypork.utils.math.constraints.rect.Rect;
+import mightypork.util.math.constraints.rect.Rect;
-import mightypork.utils.math.constraints.rect.proxy.RectBound;
+import mightypork.util.math.constraints.rect.proxy.RectBound;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
 
 
 /**

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

@@ -5,15 +5,15 @@ import java.util.Collection;
 import java.util.LinkedHashSet;
 
 import mightypork.gamecore.control.AppSubModule;
-import mightypork.gamecore.control.timing.Updateable;
 import mightypork.gamecore.gui.Hideable;
 import mightypork.gamecore.gui.components.Renderable;
 import mightypork.gamecore.gui.components.layout.ConstraintLayout;
 import mightypork.gamecore.input.KeyBinder;
 import mightypork.gamecore.input.KeyBindingPool;
 import mightypork.gamecore.input.KeyStroke;
-import mightypork.utils.annotations.DefaultImpl;
+import mightypork.util.annotations.DefaultImpl;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.control.timing.Updateable;
+import mightypork.util.math.constraints.vect.Vect;
 
 
 /**

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

@@ -5,10 +5,10 @@ import java.util.HashMap;
 
 import mightypork.gamecore.control.AppAccess;
 import mightypork.gamecore.control.AppModule;
-import mightypork.gamecore.control.bus.events.ScreenRequestEvent;
+import mightypork.gamecore.control.events.ScreenRequestEvent;
 import mightypork.gamecore.gui.components.Renderable;
-import mightypork.utils.annotations.DefaultImpl;
+import mightypork.util.annotations.DefaultImpl;
-import mightypork.utils.logging.Log;
+import mightypork.util.logging.Log;
 
 
 /**

src/mightypork/gamecore/input/InputSystem.java

@@ -2,15 +2,15 @@ package mightypork.gamecore.input;
 
 
 import mightypork.gamecore.control.AppAccess;
-import mightypork.gamecore.control.bus.clients.RootBusNode;
+import mightypork.gamecore.control.events.KeyEvent;
-import mightypork.gamecore.control.bus.events.KeyEvent;
+import mightypork.gamecore.control.events.MouseButtonEvent;
-import mightypork.gamecore.control.bus.events.MouseButtonEvent;
+import mightypork.gamecore.control.events.MouseMotionEvent;
-import mightypork.gamecore.control.bus.events.MouseMotionEvent;
-import mightypork.gamecore.control.timing.Updateable;
 import mightypork.rogue.events.ActionRequest;
 import mightypork.rogue.events.ActionRequest.RequestType;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.control.eventbus.clients.RootBusNode;
-import mightypork.utils.math.constraints.vect.mutable.VectVar;
+import mightypork.util.control.timing.Updateable;
+import mightypork.util.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.mutable.VectVar;
 
 import org.lwjgl.LWJGLException;
 import org.lwjgl.input.Keyboard;
@@ -174,7 +174,8 @@ public class InputSystem extends RootBusNode implements Updateable, KeyBinder {
 	
 	
 	/**
-	 * Get absolute mouse position. This vect is final and views at it can safely be made.
+	 * Get absolute mouse position. This vect is final and views at it can
+	 * safely be made.
 	 * 
 	 * @return mouse position
 	 */

src/mightypork/gamecore/input/KeyBinder.java

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

src/mightypork/gamecore/input/KeyBinding.java

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

src/mightypork/gamecore/input/KeyBindingPool.java

@@ -5,8 +5,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import mightypork.gamecore.control.bus.events.KeyEvent;
+import mightypork.gamecore.control.events.KeyEvent;
-import mightypork.utils.logging.Log;
+import mightypork.util.logging.Log;
 
 
 /**

src/mightypork/gamecore/loading/AsyncResourceLoader.java

@@ -5,12 +5,12 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import mightypork.gamecore.control.bus.BusAccess;
+import mightypork.gamecore.control.events.MainLoopTaskRequest;
-import mightypork.gamecore.control.bus.events.MainLoopTaskRequest;
+import mightypork.gamecore.control.events.ResourceLoadRequest;
-import mightypork.gamecore.control.bus.events.ResourceLoadRequest;
+import mightypork.util.annotations.FactoryMethod;
-import mightypork.gamecore.control.interf.Destroyable;
+import mightypork.util.control.Destroyable;
-import mightypork.utils.annotations.FactoryMethod;
+import mightypork.util.control.eventbus.BusAccess;
-import mightypork.utils.logging.Log;
+import mightypork.util.logging.Log;
 
 
 /**

src/mightypork/gamecore/loading/DeferredResource.java

@@ -1,9 +1,9 @@
 package mightypork.gamecore.loading;
 
 
-import mightypork.gamecore.control.interf.Destroyable;
+import mightypork.util.control.Destroyable;
-import mightypork.utils.annotations.Alias;
+import mightypork.util.logging.Log;
-import mightypork.utils.logging.Log;
+import mightypork.util.logging.LogAlias;
 
 
 /**
@@ -13,7 +13,7 @@ import mightypork.utils.logging.Log;
  * 
  * @author MightyPork
  */
-@Alias(name = "Resource")
+@LogAlias(name = "Resource")
 public abstract class DeferredResource implements Deferred, Destroyable {
 	
 	private final String resource;

src/mightypork/gamecore/render/DisplaySystem.java

@@ -7,12 +7,12 @@ import java.nio.ByteBuffer;
 
 import mightypork.gamecore.control.AppAccess;
 import mightypork.gamecore.control.AppModule;
-import mightypork.gamecore.control.bus.events.ScreenChangeEvent;
+import mightypork.gamecore.control.events.ScreenChangeEvent;
-import mightypork.gamecore.control.timing.FpsMeter;
+import mightypork.util.control.timing.FpsMeter;
-import mightypork.utils.logging.Log;
+import mightypork.util.logging.Log;
-import mightypork.utils.math.constraints.rect.Rect;
+import mightypork.util.math.constraints.rect.Rect;
-import mightypork.utils.math.constraints.rect.proxy.RectBound;
+import mightypork.util.math.constraints.rect.proxy.RectBound;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
 
 import org.lwjgl.BufferUtils;
 import org.lwjgl.LWJGLException;

src/mightypork/gamecore/render/Render.java

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

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

@@ -5,7 +5,7 @@ import java.util.HashMap;
 
 import mightypork.gamecore.control.AppAccess;
 import mightypork.gamecore.control.AppAdapter;
-import mightypork.gamecore.control.bus.events.ResourceLoadRequest;
+import mightypork.gamecore.control.events.ResourceLoadRequest;
 import mightypork.gamecore.render.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 AppAdapter {
 	
 	/**
 	 * @param app app access
@@ -53,7 +53,8 @@ public class FontBank extends AppAdapter {
 	{
 		fonts.put(key, font);
 	}
-
+	
+	
 	/**
 	 * Add a font alias.
 	 * 
@@ -76,9 +77,9 @@ public class FontBank extends AppAdapter {
 	{
 		GLFont f = fonts.get(key);
 		
-		if(f == null) f = fonts.get(aliases.get(key));
+		if (f == null) f = fonts.get(aliases.get(key));
 		
-		if (f == null) {			
+		if (f == null) {
 			throw new RuntimeException("There's no font called " + key + "!");
 		}
 		

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

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

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

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

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

@@ -20,10 +20,10 @@ import java.util.Map;
 
 import mightypork.gamecore.render.fonts.GLFont;
 import mightypork.gamecore.render.textures.FilterMode;
-import mightypork.utils.logging.Log;
+import mightypork.util.logging.Log;
-import mightypork.utils.math.color.Color;
+import mightypork.util.math.color.Color;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
-import mightypork.utils.math.constraints.vect.VectConst;
+import mightypork.util.math.constraints.vect.VectConst;
 
 import org.lwjgl.BufferUtils;
 import org.lwjgl.util.glu.GLU;
@@ -294,8 +294,7 @@ public class CachedFont implements GLFont {
 				
 				byteBuffer = ByteBuffer.allocateDirect(width * height * (bpp / 8)).order(ByteOrder.nativeOrder()).put(newI);
 			} else {
-				byteBuffer = ByteBuffer.allocateDirect(width * height * (bpp / 8)).order(ByteOrder.nativeOrder())
+				byteBuffer = ByteBuffer.allocateDirect(width * height * (bpp / 8)).order(ByteOrder.nativeOrder()).put(((DataBufferByte) (bufferedImage.getData().getDataBuffer())).getData());
-						.put(((DataBufferByte) (bufferedImage.getData().getDataBuffer())).getData());
 			}
 			
 			byteBuffer.flip();
@@ -413,8 +412,7 @@ public class CachedFont implements GLFont {
 			chtx = chars.get(charCurrent);
 			
 			if (chtx != null) {
-				drawQuad((totalwidth), 0, (totalwidth + chtx.width), (chtx.height), chtx.texPosX, chtx.texPosY, chtx.texPosX + chtx.width, chtx.texPosY
+				drawQuad((totalwidth), 0, (totalwidth + chtx.width), (chtx.height), chtx.texPosX, chtx.texPosY, chtx.texPosX + chtx.width, chtx.texPosY + chtx.height);
-						+ chtx.height);
 				totalwidth += chtx.width;
 			}
 		}

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

@@ -10,10 +10,10 @@ import mightypork.gamecore.loading.DeferredResource;
 import mightypork.gamecore.loading.MustLoadInMainThread;
 import mightypork.gamecore.render.fonts.GLFont;
 import mightypork.gamecore.render.textures.FilterMode;
-import mightypork.utils.annotations.Alias;
+import mightypork.util.files.FileUtils;
-import mightypork.utils.files.FileUtils;
+import mightypork.util.logging.LogAlias;
-import mightypork.utils.math.color.Color;
+import mightypork.util.math.color.Color;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
 
 
 /**
@@ -22,7 +22,7 @@ import mightypork.utils.math.constraints.vect.Vect;
  * @author MightyPork
  */
 @MustLoadInMainThread
-@Alias(name = "Font")
+@LogAlias(name = "Font")
 public class DeferredFont extends DeferredResource implements GLFont {
 	
 	public static enum FontStyle
@@ -129,7 +129,7 @@ public class DeferredFont extends DeferredResource implements GLFont {
 	 */
 	protected Font getAwtFont(String resource, float size, int style) throws FontFormatException, IOException
 	{
-		try(InputStream in = FileUtils.getResource(resource)) {
+		try (InputStream in = FileUtils.getResource(resource)) {
 			
 			Font awtFont = Font.createFont(Font.TRUETYPE_FONT, in);
 			

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

@@ -6,7 +6,7 @@ import java.awt.FontFormatException;
 import java.io.IOException;
 
 import mightypork.gamecore.render.textures.FilterMode;
-import mightypork.utils.annotations.Alias;
+import mightypork.util.logging.LogAlias;
 
 
 /**
@@ -14,7 +14,7 @@ import mightypork.utils.annotations.Alias;
  * 
  * @author MightyPork
  */
-@Alias(name = "FontNative")
+@LogAlias(name = "FontNative")
 public class DeferredFontNative extends DeferredFont {
 	
 	/**

src/mightypork/gamecore/render/textures/DeferredTexture.java

@@ -4,8 +4,8 @@ package mightypork.gamecore.render.textures;
 import mightypork.gamecore.loading.DeferredResource;
 import mightypork.gamecore.loading.MustLoadInMainThread;
 import mightypork.gamecore.render.Render;
-import mightypork.utils.annotations.Alias;
+import mightypork.util.logging.LogAlias;
-import mightypork.utils.math.constraints.rect.Rect;
+import mightypork.util.math.constraints.rect.Rect;
 
 import org.lwjgl.opengl.GL11;
 import org.newdawn.slick.opengl.Texture;
@@ -17,7 +17,7 @@ import org.newdawn.slick.opengl.Texture;
  * @author MightyPork
  */
 @MustLoadInMainThread
-@Alias(name = "Texture")
+@LogAlias(name = "Texture")
 public class DeferredTexture extends DeferredResource implements FilteredTexture {
 	
 	private Texture backingTexture;

src/mightypork/gamecore/render/textures/TextureBank.java

@@ -5,8 +5,8 @@ import java.util.HashMap;
 
 import mightypork.gamecore.control.AppAccess;
 import mightypork.gamecore.control.AppAdapter;
-import mightypork.gamecore.control.bus.events.ResourceLoadRequest;
+import mightypork.gamecore.control.events.ResourceLoadRequest;
-import mightypork.utils.math.constraints.rect.Rect;
+import mightypork.util.math.constraints.rect.Rect;
 
 import org.newdawn.slick.opengl.Texture;
 

src/mightypork/gamecore/render/textures/TxQuad.java

@@ -1,7 +1,7 @@
 package mightypork.gamecore.render.textures;
 
 
-import mightypork.utils.math.constraints.rect.Rect;
+import mightypork.util.math.constraints.rect.Rect;
 
 import org.newdawn.slick.opengl.Texture;
 

src/mightypork/rogue/App.java

@@ -6,7 +6,6 @@ import java.util.Locale;
 
 import mightypork.gamecore.control.BaseApp;
 import mightypork.gamecore.control.GameLoop;
-import mightypork.gamecore.control.bus.EventBus;
 import mightypork.gamecore.gui.screens.ScreenRegistry;
 import mightypork.gamecore.input.InputSystem;
 import mightypork.gamecore.input.KeyStroke;
@@ -19,8 +18,9 @@ import mightypork.rogue.screens.main_menu.ScreenMainMenu;
 import mightypork.rogue.screens.test_bouncyboxes.ScreenTestBouncy;
 import mightypork.rogue.screens.test_cat_sound.ScreenTestCat;
 import mightypork.rogue.screens.test_render.ScreenTestRender;
-import mightypork.utils.logging.Log;
+import mightypork.util.control.eventbus.EventBus;
-import mightypork.utils.logging.LogWriter;
+import mightypork.util.logging.Log;
+import mightypork.util.logging.writers.LogWriter;
 
 
 /**

src/mightypork/rogue/Config.java

@@ -1,8 +1,8 @@
 package mightypork.rogue;
 
 
-import mightypork.utils.config.PropertyManager;
+import mightypork.util.config.PropertyManager;
-import mightypork.utils.logging.Log;
+import mightypork.util.logging.Log;
 
 
 /**

src/mightypork/rogue/MainLoop.java

@@ -9,12 +9,12 @@ import java.util.Date;
 
 import mightypork.gamecore.control.BaseApp;
 import mightypork.gamecore.control.GameLoop;
-import mightypork.gamecore.gui.Action;
 import mightypork.gamecore.render.Screenshot;
 import mightypork.rogue.events.ActionRequest;
 import mightypork.rogue.events.ActionRequest.RequestType;
 import mightypork.rogue.util.Utils;
-import mightypork.utils.logging.Log;
+import mightypork.util.control.Action;
+import mightypork.util.logging.Log;
 
 
 public class MainLoop extends GameLoop implements ActionRequest.Listener {

src/mightypork/rogue/Paths.java

@@ -3,7 +3,7 @@ package mightypork.rogue;
 
 import java.io.File;
 
-import mightypork.utils.files.OsUtils;
+import mightypork.util.files.OsUtils;
 
 
 public class Paths {

src/mightypork/rogue/Res.java

@@ -59,7 +59,7 @@ public class Res {
 		
 		font = new DeferredFont("/res/font/PolygonPixel5x7Standard.ttf", Glyphs.basic, 16);
 		fonts.loadFont("polygon_pixel", font);
-
+		
 		font = new DeferredFont("/res/font/PressStart2P.ttf", Glyphs.basic, 16);
 		fonts.loadFont("press_start", font);
 		

src/mightypork/rogue/events/ActionRequest.java

@@ -1,8 +1,8 @@
 package mightypork.rogue.events;
 
 
-import mightypork.gamecore.control.bus.events.Event;
+import mightypork.util.control.eventbus.events.Event;
-import mightypork.gamecore.control.bus.events.types.SingleReceiverEvent;
+import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent;
 
 
 /**

src/mightypork/rogue/screens/LayerFps.java

@@ -1,7 +1,6 @@
 package mightypork.rogue.screens;
 
 
-import mightypork.gamecore.gui.Action;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.painters.TextPainter;
 import mightypork.gamecore.gui.screens.Screen;
@@ -10,11 +9,11 @@ import mightypork.gamecore.input.KeyStroke;
 import mightypork.gamecore.input.Keys;
 import mightypork.gamecore.render.fonts.GLFont;
 import mightypork.rogue.Res;
-import mightypork.utils.math.color.Color;
+import mightypork.util.control.Action;
-import mightypork.utils.math.constraints.num.Num;
+import mightypork.util.math.color.Color;
-import mightypork.utils.math.constraints.rect.proxy.RectBound;
+import mightypork.util.math.constraints.rect.proxy.RectBound;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
-import mightypork.utils.string.StringProvider;
+import mightypork.util.string.StringProvider;
 
 
 public class LayerFps extends ScreenLayer {
@@ -50,12 +49,13 @@ public class LayerFps extends ScreenLayer {
 			}
 		});
 		
-		tp.setRect(constraint);		
+		tp.setRect(constraint);
 		tp.setShadow(Color.BLACK, Vect.make(tp.height().div(16)));
 		
 		root.add(tp);
 	}
 	
+	
 	@Override
 	protected void renderLayer()
 	{

src/mightypork/rogue/screens/main_menu/MenuButton.java

@@ -1,11 +1,12 @@
 package mightypork.rogue.screens.main_menu;
 
+
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.ClickableComponent;
 import mightypork.gamecore.gui.components.painters.TextPainter;
 import mightypork.gamecore.render.fonts.GLFont;
 import mightypork.rogue.Res;
-import mightypork.utils.math.color.Color;
+import mightypork.util.math.color.Color;
 
 
 class MenuButton extends ClickableComponent {
@@ -13,6 +14,7 @@ class MenuButton extends ClickableComponent {
 	private static GLFont font = Res.getFont("main_menu_button");
 	private TextPainter painter;
 	
+	
 	public MenuButton(String text, Color color) {
 		this.painter = new TextPainter(font, AlignX.CENTER, color, text);
 		painter.setRect(this.shrink(this.height().perc(5)));

src/mightypork/rogue/screens/main_menu/MenuLayer.java

@@ -1,35 +1,33 @@
 package mightypork.rogue.screens.main_menu;
 
-import java.net.Authenticator.RequestorType;
 
-import mightypork.gamecore.control.bus.events.ScreenRequestEvent;
+import mightypork.gamecore.control.events.ScreenRequestEvent;
-import mightypork.gamecore.gui.Action;
-import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.AlignY;
 import mightypork.gamecore.gui.components.layout.VerticalFixedFlowLayout;
-import mightypork.gamecore.gui.components.painters.TextPainter;
 import mightypork.gamecore.gui.screens.Screen;
 import mightypork.gamecore.gui.screens.ScreenLayer;
 import mightypork.gamecore.render.fonts.GLFont;
 import mightypork.rogue.Res;
 import mightypork.rogue.events.ActionRequest;
 import mightypork.rogue.events.ActionRequest.RequestType;
-import mightypork.utils.math.color.Color;
+import mightypork.util.control.Action;
-import mightypork.utils.math.constraints.num.Num;
+import mightypork.util.math.color.Color;
-import mightypork.utils.math.constraints.rect.Rect;
+import mightypork.util.math.constraints.num.Num;
+import mightypork.util.math.constraints.rect.Rect;
 
 
 class MenuLayer extends ScreenLayer {
-
+	
 	public MenuLayer(Screen screen) {
 		super(screen);
 		
 		init();
 	}
-
+	
+	
 	private void init()
 	{
-		Rect menuBox = root.shrink(root.height().min(root.width()).mul(0.1));		
+		Rect menuBox = root.shrink(root.height().min(root.width()).mul(0.1));
 		
 		Num lineHeight = menuBox.height().min(menuBox.width()).mul(0.1);
 		
@@ -37,10 +35,10 @@ class MenuLayer extends ScreenLayer {
 		root.add(layout);
 		
 		GLFont f = Res.getFont("press_start");
-		MenuButton b1,b2,b3,b4;
+		MenuButton b1, b2, b3, b4;
 		layout.add(b1 = new MenuButton("Render test", Color.WHITE));
 		layout.add(b2 = new MenuButton("Bouncy Cubes", Color.CYAN));
-		layout.add(b3 = new MenuButton("Flying Cat",Color.MAGENTA));
+		layout.add(b3 = new MenuButton("Flying Cat", Color.MAGENTA));
 		layout.add(b4 = new MenuButton("Bye!", Color.GREEN));
 		
 		b1.setAction(new Action() {
@@ -80,7 +78,8 @@ class MenuLayer extends ScreenLayer {
 			}
 		});
 	}
-
+	
+	
 	@Override
 	public int getPriority()
 	{

src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java

@@ -3,15 +3,15 @@ package mightypork.rogue.screens.test_bouncyboxes;
 
 import java.util.Random;
 
-import mightypork.gamecore.control.timing.Updateable;
 import mightypork.gamecore.gui.components.VisualComponent;
 import mightypork.gamecore.render.Render;
-import mightypork.utils.math.Easing;
+import mightypork.util.control.timing.Updateable;
-import mightypork.utils.math.color.Color;
+import mightypork.util.math.Easing;
-import mightypork.utils.math.constraints.num.Num;
+import mightypork.util.math.color.Color;
-import mightypork.utils.math.constraints.num.mutable.NumAnimated;
+import mightypork.util.math.constraints.num.Num;
-import mightypork.utils.math.constraints.rect.Rect;
+import mightypork.util.math.constraints.num.mutable.NumAnimated;
-import mightypork.utils.math.constraints.rect.caching.RectCache;
+import mightypork.util.math.constraints.rect.Rect;
+import mightypork.util.math.constraints.rect.caching.RectCache;
 
 
 public class BouncyBox extends VisualComponent implements Updateable {

src/mightypork/rogue/screens/test_bouncyboxes/LayerBouncyBoxes.java

@@ -12,9 +12,9 @@ import mightypork.gamecore.gui.screens.ScreenLayer;
 import mightypork.gamecore.input.KeyStroke;
 import mightypork.gamecore.input.Keys;
 import mightypork.rogue.Res;
-import mightypork.utils.math.color.Color;
+import mightypork.util.math.color.Color;
-import mightypork.utils.math.constraints.num.Num;
+import mightypork.util.math.constraints.num.Num;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
 
 
 public class LayerBouncyBoxes extends ScreenLayer {

src/mightypork/rogue/screens/test_bouncyboxes/ScreenTestBouncy.java

@@ -2,7 +2,7 @@ package mightypork.rogue.screens.test_bouncyboxes;
 
 
 import mightypork.gamecore.control.AppAccess;
-import mightypork.gamecore.control.bus.events.ScreenRequestEvent;
+import mightypork.gamecore.control.events.ScreenRequestEvent;
 import mightypork.gamecore.gui.screens.LayeredScreen;
 import mightypork.gamecore.input.KeyStroke;
 import mightypork.gamecore.input.Keys;

src/mightypork/rogue/screens/test_cat_sound/LayerColor.java

@@ -1,19 +1,21 @@
 package mightypork.rogue.screens.test_cat_sound;
 
+
 import mightypork.gamecore.gui.components.painters.QuadPainter;
 import mightypork.gamecore.gui.screens.Screen;
 import mightypork.gamecore.gui.screens.ScreenLayer;
-import mightypork.utils.math.color.Color;
+import mightypork.util.math.color.Color;
 
 
-public class LayerColor extends ScreenLayer{
+public class LayerColor extends ScreenLayer {
 	
 	public LayerColor(Screen screen, Color color) {
 		super(screen);
 		
 		root.add(new QuadPainter(color));
 	}
-
+	
+	
 	@Override
 	public int getPriority()
 	{

src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java

@@ -3,8 +3,7 @@ package mightypork.rogue.screens.test_cat_sound;
 
 import java.util.Random;
 
-import mightypork.gamecore.control.bus.events.MouseButtonEvent;
+import mightypork.gamecore.control.events.MouseButtonEvent;
-import mightypork.gamecore.control.timing.Updateable;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.painters.ImagePainter;
 import mightypork.gamecore.gui.components.painters.QuadPainter;
@@ -14,13 +13,12 @@ import mightypork.gamecore.gui.screens.ScreenLayer;
 import mightypork.gamecore.input.KeyStroke;
 import mightypork.gamecore.input.Keys;
 import mightypork.rogue.Res;
-import mightypork.utils.math.Easing;
+import mightypork.util.math.Easing;
-import mightypork.utils.math.color.Color;
+import mightypork.util.math.color.Color;
-import mightypork.utils.math.constraints.num.Num;
+import mightypork.util.math.constraints.num.mutable.NumAnimated;
-import mightypork.utils.math.constraints.num.mutable.NumAnimated;
+import mightypork.util.math.constraints.rect.Rect;
-import mightypork.utils.math.constraints.rect.Rect;
+import mightypork.util.math.constraints.vect.Vect;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.mutable.VectAnimated;
-import mightypork.utils.math.constraints.vect.mutable.VectAnimated;
 
 
 public class LayerFlyingCat extends ScreenLayer implements MouseButtonEvent.Listener {
@@ -51,18 +49,17 @@ public class LayerFlyingCat extends ScreenLayer implements MouseButtonEvent.List
 		QuadPainter cat_frame = QuadPainter.gradV(Color.YELLOW, Color.RED);
 		cat_frame.setRect(cat.grow(cat.height().mul(0.05)));
 		cat_frame.enableCaching(false);
-
+		
 		// frame shadow
 		QuadPainter cat_shadow = new QuadPainter(Color.dark(0.4));
 		cat_shadow.setRect(cat_frame.move(Vect.make(cat.height().mul(0.05))));
 		cat_shadow.enableCaching(false);
-
+		
 		// add to root layout
 		root.add(cat_shadow);
 		root.add(cat_frame);
 		root.add(cat);
 		
-		
 		// Meow
 		TextPainter tp = new TextPainter(Res.getFont("press_start"));
 		tp.setAlign(AlignX.CENTER);

src/mightypork/rogue/screens/test_cat_sound/ScreenTestCat.java

@@ -2,7 +2,7 @@ package mightypork.rogue.screens.test_cat_sound;
 
 
 import mightypork.gamecore.control.AppAccess;
-import mightypork.gamecore.control.bus.events.ScreenRequestEvent;
+import mightypork.gamecore.control.events.ScreenRequestEvent;
 import mightypork.gamecore.gui.screens.LayeredScreen;
 import mightypork.gamecore.input.KeyStroke;
 import mightypork.gamecore.input.Keys;

src/mightypork/rogue/screens/test_render/LayerTestGradient.java

@@ -4,8 +4,8 @@ package mightypork.rogue.screens.test_render;
 import mightypork.gamecore.gui.screens.Screen;
 import mightypork.gamecore.gui.screens.ScreenLayer;
 import mightypork.gamecore.render.Render;
-import mightypork.utils.math.color.Color;
+import mightypork.util.math.color.Color;
-import mightypork.utils.math.constraints.rect.proxy.RectBound;
+import mightypork.util.math.constraints.rect.proxy.RectBound;
 
 
 public class LayerTestGradient extends ScreenLayer {

src/mightypork/rogue/screens/test_render/ScreenTestRender.java

@@ -4,7 +4,6 @@ package mightypork.rogue.screens.test_render;
 import mightypork.gamecore.control.AppAccess;
 import mightypork.gamecore.gui.screens.LayeredScreen;
 import mightypork.rogue.screens.LayerFps;
-import mightypork.rogue.screens.test_cat_sound.LayerFlyingCat;
 
 
 public class ScreenTestRender extends LayeredScreen {

src/mightypork/test/TestConstCaching.java

@@ -1,9 +1,9 @@
 package mightypork.test;
 
 
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
-import mightypork.utils.math.constraints.vect.caching.VectCache;
+import mightypork.util.math.constraints.vect.caching.VectCache;
-import mightypork.utils.math.constraints.vect.mutable.VectVar;
+import mightypork.util.math.constraints.vect.mutable.VectVar;
 
 
 public class TestConstCaching {

src/mightypork/test/TestConstr.java

@@ -3,13 +3,13 @@ package mightypork.test;
 
 import java.util.Locale;
 
-import mightypork.utils.math.constraints.num.Num;
+import mightypork.util.math.constraints.num.Num;
-import mightypork.utils.math.constraints.num.mutable.NumVar;
+import mightypork.util.math.constraints.num.mutable.NumVar;
-import mightypork.utils.math.constraints.rect.Rect;
+import mightypork.util.math.constraints.rect.Rect;
-import mightypork.utils.math.constraints.rect.RectConst;
+import mightypork.util.math.constraints.rect.RectConst;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
-import mightypork.utils.math.constraints.vect.VectConst;
+import mightypork.util.math.constraints.vect.VectConst;
-import mightypork.utils.math.constraints.vect.mutable.VectVar;
+import mightypork.util.math.constraints.vect.mutable.VectVar;
 
 
 public class TestConstr {

src/mightypork/test/TestConvert.java

@@ -3,7 +3,7 @@ package mightypork.test;
 
 import java.util.Locale;
 
-import mightypork.utils.objects.Convert;
+import mightypork.util.objects.Convert;
 
 
 public class TestConvert {

src/mightypork/test/TestCoords.java

@@ -1,10 +1,10 @@
 package mightypork.test;
 
 
-import mightypork.utils.math.constraints.num.Num;
+import mightypork.util.math.constraints.num.Num;
-import mightypork.utils.math.constraints.num.mutable.NumVar;
+import mightypork.util.math.constraints.num.mutable.NumVar;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
-import mightypork.utils.math.constraints.vect.mutable.VectVar;
+import mightypork.util.math.constraints.vect.mutable.VectVar;
 
 
 public class TestCoords {

src/mightypork/test/TestTiled.java

@@ -1,9 +1,9 @@
 package mightypork.test;
 
 
-import mightypork.utils.math.constraints.num.Num;
+import mightypork.util.math.constraints.num.Num;
-import mightypork.utils.math.constraints.num.mutable.NumVar;
+import mightypork.util.math.constraints.num.mutable.NumVar;
-import mightypork.utils.math.constraints.rect.Rect;
+import mightypork.util.math.constraints.rect.Rect;
 
 
 public class TestTiled {

src/mightypork/test/TestVec.java

@@ -1,9 +1,9 @@
 package mightypork.test;
 
 
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
-import mightypork.utils.math.constraints.vect.VectConst;
+import mightypork.util.math.constraints.vect.VectConst;
-import mightypork.utils.math.constraints.vect.mutable.VectVar;
+import mightypork.util.math.constraints.vect.mutable.VectVar;
 
 
 public class TestVec {

src/mightypork/util/annotations/DefaultImpl.java

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

src/mightypork/util/annotations/FactoryMethod.java

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

src/mightypork/util/config/PropertyManager.java

@@ -1,4 +1,4 @@
-package mightypork.utils.config;
+package mightypork.util.config;
 
 
 import java.io.File;
@@ -9,10 +9,10 @@ import java.util.ArrayList;
 import java.util.Map.Entry;
 import java.util.TreeMap;
 
-import mightypork.utils.math.Range;
+import mightypork.util.math.Range;
-import mightypork.utils.math.constraints.vect.Vect;
+import mightypork.util.math.constraints.vect.Vect;
-import mightypork.utils.math.constraints.vect.VectConst;
+import mightypork.util.math.constraints.vect.VectConst;
-import mightypork.utils.objects.Convert;
+import mightypork.util.objects.Convert;
 
 
 /**
@@ -179,7 +179,7 @@ public class PropertyManager {
 			}
 		}
 		
-		try(FileInputStream fis = new FileInputStream(file)) {
+		try (FileInputStream fis = new FileInputStream(file)) {
 			props.load(fis);
 		} catch (final IOException e) {
 			needsSave = true;

src/mightypork/util/config/SimpleConfig.java

@@ -1,4 +1,4 @@
-package mightypork.utils.config;
+package mightypork.util.config;
 
 
 import java.io.File;
@@ -9,8 +9,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import mightypork.utils.files.FileUtils;
+import mightypork.util.files.FileUtils;
-import mightypork.utils.logging.Log;
+import mightypork.util.logging.Log;
 
 
 /**

src/mightypork/util/config/SortedProperties.java

@@ -1,4 +1,4 @@
-package mightypork.utils.config;
+package mightypork.util.config;
 
 
 import java.io.*;

src/mightypork/util/control/Action.java

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

src/mightypork/util/control/ActionTrigger.java

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

src/mightypork/util/control/Destroyable.java

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

src/mightypork/util/control/Enableable.java

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

src/mightypork/util/control/eventbus/BufferedHashSet.java

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

src/mightypork/util/control/eventbus/BusAccess.java

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

src/mightypork/util/control/eventbus/EventBus.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.control.bus;
+package mightypork.util.control.eventbus;
 
 
 import java.util.Collection;
@@ -6,15 +6,15 @@ import java.util.concurrent.DelayQueue;
 import java.util.concurrent.Delayed;
 import java.util.concurrent.TimeUnit;
 
-import mightypork.gamecore.control.bus.clients.DelegatingClient;
+import mightypork.util.annotations.FactoryMethod;
-import mightypork.gamecore.control.bus.events.Event;
+import mightypork.util.control.Destroyable;
-import mightypork.gamecore.control.bus.events.types.DelayedEvent;
+import mightypork.util.control.eventbus.clients.DelegatingClient;
-import mightypork.gamecore.control.bus.events.types.ImmediateEvent;
+import mightypork.util.control.eventbus.events.Event;
-import mightypork.gamecore.control.bus.events.types.SingleReceiverEvent;
+import mightypork.util.control.eventbus.events.flags.DelayedEvent;
-import mightypork.gamecore.control.bus.events.types.UnloggedEvent;
+import mightypork.util.control.eventbus.events.flags.ImmediateEvent;
-import mightypork.gamecore.control.interf.Destroyable;
+import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent;
-import mightypork.utils.annotations.FactoryMethod;
+import mightypork.util.control.eventbus.events.flags.UnloggedEvent;
-import mightypork.utils.logging.Log;
+import mightypork.util.logging.Log;
 
 
 /**

src/mightypork/util/control/eventbus/EventChannel.java

@@ -1,14 +1,14 @@
-package mightypork.gamecore.control.bus;
+package mightypork.util.control.eventbus;
 
 
 import java.util.Collection;
 import java.util.HashSet;
 
-import mightypork.gamecore.control.bus.clients.DelegatingClient;
+import mightypork.util.control.eventbus.clients.DelegatingClient;
-import mightypork.gamecore.control.bus.clients.ToggleableClient;
+import mightypork.util.control.eventbus.clients.ToggleableClient;
-import mightypork.gamecore.control.bus.events.Event;
+import mightypork.util.control.eventbus.events.Event;
-import mightypork.gamecore.control.bus.events.types.SingleReceiverEvent;
+import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent;
-import mightypork.utils.logging.Log;
+import mightypork.util.logging.Log;
 
 
 /**

src/mightypork/util/control/eventbus/clients/BusNode.java

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

src/mightypork/util/control/eventbus/clients/ClientHub.java

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