Cleanup of annotations, fixed some bus logic.

src/mightypork/rogue/App.java

@@ -4,14 +4,13 @@ package mightypork.rogue;
 import java.io.File;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileLock;
-import java.util.ArrayList;
 import java.util.logging.Level;
 
 import javax.swing.JOptionPane;
 
 import mightypork.rogue.bus.events.*;
 import mightypork.rogue.bus.events.ActionRequest.RequestType;
-import mightypork.rogue.gui.ScreenRegistry;
+import mightypork.rogue.gui.screens.ScreenRegistry;
 import mightypork.rogue.gui.screens.test_bouncyboxes.ScreenTestBouncy;
 import mightypork.rogue.gui.screens.test_cat_sound.ScreenTestCat;
 import mightypork.rogue.gui.screens.test_font.ScreenTestFont;
@@ -105,7 +104,7 @@ public class App implements AppAccess {
 	{
 		Log.i("Shutting down subsystems...");
 		
-		if(bus() != null) {
+		if (bus() != null) {
 			bus().send(new DestroyEvent());
 			bus().destroy();
 		}
@@ -181,18 +180,7 @@ public class App implements AppAccess {
 		 * Prepare main loop
 		 */
 		Log.f1("Preparing main loop...");
-		final ArrayList<Runnable> loopTasks = new ArrayList<Runnable>();
-		
-		loopTasks.add(new Runnable() {
-			
-			@Override
-			public void run()
-			{
-				screens.render();
-			}
-		});
-		
-		mainLoop = new MainLoop(this, loopTasks);
+		mainLoop = new MainLoop(this, screens);
 	}
 	
 	

src/mightypork/rogue/MainLoop.java

@@ -1,16 +1,15 @@
 package mightypork.rogue;
 
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import mightypork.rogue.bus.Subsystem;
 import mightypork.rogue.bus.events.ActionRequest;
-import mightypork.rogue.bus.events.UpdateEvent;
 import mightypork.rogue.bus.events.ActionRequest.RequestType;
 import mightypork.rogue.bus.events.MainLoopTaskRequest;
+import mightypork.rogue.bus.events.UpdateEvent;
+import mightypork.rogue.render.Renderable;
 import mightypork.rogue.tasks.TaskTakeScreenshot;
 import mightypork.rogue.util.Utils;
 import mightypork.utils.control.timing.TimerDelta;
@@ -19,13 +18,17 @@ import mightypork.utils.control.timing.TimerDelta;
 public class MainLoop extends Subsystem implements ActionRequest.Listener, MainLoopTaskRequest.Listener {
 	
 	private final Queue<Runnable> taskQueue = new ConcurrentLinkedQueue<Runnable>();
-	private final List<Runnable> regularTasks;
+	private final Renderable renderable;
 	
 	
-	public MainLoop(App app, ArrayList<Runnable> loopTasks) {
+	public MainLoop(App app, Renderable masterRenderable) {
 		super(app);
 		
-		this.regularTasks = loopTasks;
+		if (masterRenderable == null) {
+			throw new NullPointerException("Master renderable must not be null.");
+		}
+		
+		this.renderable = masterRenderable;
 	}
 	
 	/** timer */
@@ -37,20 +40,18 @@ public class MainLoop extends Subsystem implements ActionRequest.Listener, MainL
 	{
 		timer = new TimerDelta();
 		
-		while (running) {			
-			Runnable r;
-			while ((r = taskQueue.poll()) != null) {				
-				r.run();
-			}
-			
+		while (running) {
 			disp().beginFrame();
 			
 			bus().send(new UpdateEvent(timer.getDelta()));
 			
-			for (final Runnable r2 : regularTasks) {
-				r2.run();
+			Runnable r;
+			while ((r = taskQueue.poll()) != null) {
+				r.run();
 			}
 			
+			renderable.render();
+			
 			disp().endFrame();
 		}
 	}

src/mightypork/rogue/Res.java

@@ -9,10 +9,10 @@ import mightypork.rogue.loading.AsyncResourceLoader;
 import mightypork.rogue.sound.SoundBank;
 import mightypork.rogue.sound.players.EffectPlayer;
 import mightypork.rogue.sound.players.LoopPlayer;
-import mightypork.rogue.textures.TextureBank;
-import mightypork.rogue.textures.TxQuad;
 import mightypork.rogue.textures.FilteredTexture.Filter;
 import mightypork.rogue.textures.FilteredTexture.Wrap;
+import mightypork.rogue.textures.TextureBank;
+import mightypork.rogue.textures.TxQuad;
 
 import org.newdawn.slick.opengl.Texture;
 

src/mightypork/rogue/bus/events/ActionRequest.java

@@ -2,8 +2,7 @@ package mightypork.rogue.bus.events;
 
 
 import mightypork.utils.control.bus.events.Event;
-import mightypork.utils.control.bus.events.types.QueuedEvent;
-import mightypork.utils.control.bus.events.types.SingularEvent;
+import mightypork.utils.control.bus.events.types.SingleReceiverEvent;
 
 
 /**
@@ -11,8 +10,7 @@ import mightypork.utils.control.bus.events.types.SingularEvent;
  * 
  * @author MightyPork
  */
-@SingularEvent
-@QueuedEvent
+@SingleReceiverEvent
 public class ActionRequest implements Event<ActionRequest.Listener> {
 	
 	private final RequestType type;

src/mightypork/rogue/bus/events/KeyboardEvent.java

@@ -2,7 +2,6 @@ package mightypork.rogue.bus.events;
 
 
 import mightypork.utils.control.bus.events.Event;
-import mightypork.utils.control.bus.events.types.QueuedEvent;
 
 import org.lwjgl.input.Keyboard;
 
@@ -12,7 +11,6 @@ import org.lwjgl.input.Keyboard;
  * 
  * @author MightyPork
  */
-@QueuedEvent
 public class KeyboardEvent implements Event<KeyboardEvent.Listener> {
 	
 	private final int key;

src/mightypork/rogue/bus/events/MainLoopTaskRequest.java

@@ -2,8 +2,7 @@ package mightypork.rogue.bus.events;
 
 
 import mightypork.utils.control.bus.events.Event;
-import mightypork.utils.control.bus.events.types.QueuedEvent;
-import mightypork.utils.control.bus.events.types.SingularEvent;
+import mightypork.utils.control.bus.events.types.SingleReceiverEvent;
 
 
 /**
@@ -11,8 +10,7 @@ import mightypork.utils.control.bus.events.types.SingularEvent;
  * 
  * @author MightyPork
  */
-@SingularEvent
-@QueuedEvent
+@SingleReceiverEvent
 public class MainLoopTaskRequest implements Event<MainLoopTaskRequest.Listener> {
 	
 	private final Runnable task;

src/mightypork/rogue/bus/events/MouseButtonEvent.java

@@ -2,7 +2,6 @@ package mightypork.rogue.bus.events;
 
 
 import mightypork.utils.control.bus.events.Event;
-import mightypork.utils.control.bus.events.types.QueuedEvent;
 import mightypork.utils.math.coord.Coord;
 
 
@@ -11,7 +10,6 @@ import mightypork.utils.math.coord.Coord;
  * 
  * @author MightyPork
  */
-@QueuedEvent
 public class MouseButtonEvent implements Event<MouseButtonEvent.Listener> {
 	
 	public static final int BUTTON_LEFT = 0;

src/mightypork/rogue/bus/events/MouseMotionEvent.java

@@ -2,7 +2,6 @@ package mightypork.rogue.bus.events;
 
 
 import mightypork.utils.control.bus.events.Event;
-import mightypork.utils.control.bus.events.types.QueuedEvent;
 import mightypork.utils.math.coord.Coord;
 
 
@@ -11,7 +10,6 @@ import mightypork.utils.math.coord.Coord;
  * 
  * @author MightyPork
  */
-@QueuedEvent
 public class MouseMotionEvent implements Event<MouseMotionEvent.Listener> {
 	
 	private final Coord move;

src/mightypork/rogue/bus/events/ResourceLoadRequest.java

@@ -3,8 +3,7 @@ package mightypork.rogue.bus.events;
 
 import mightypork.rogue.loading.DeferredResource;
 import mightypork.utils.control.bus.events.Event;
-import mightypork.utils.control.bus.events.types.QueuedEvent;
-import mightypork.utils.control.bus.events.types.SingularEvent;
+import mightypork.utils.control.bus.events.types.SingleReceiverEvent;
 
 
 /**
@@ -12,8 +11,7 @@ import mightypork.utils.control.bus.events.types.SingularEvent;
  * 
  * @author MightyPork
  */
-@SingularEvent
-@QueuedEvent
+@SingleReceiverEvent
 public class ResourceLoadRequest implements Event<ResourceLoadRequest.Listener> {
 	
 	private final DeferredResource resource;

src/mightypork/rogue/bus/events/ScreenChangeEvent.java

@@ -2,7 +2,6 @@ package mightypork.rogue.bus.events;
 
 
 import mightypork.utils.control.bus.events.Event;
-import mightypork.utils.control.bus.events.types.QueuedEvent;
 import mightypork.utils.math.coord.Coord;
 
 
@@ -11,7 +10,6 @@ import mightypork.utils.math.coord.Coord;
  * 
  * @author MightyPork
  */
-@QueuedEvent
 public class ScreenChangeEvent implements Event<ScreenChangeEvent.Listener> {
 	
 	private final boolean fullscreen;

src/mightypork/rogue/bus/events/ScreenRequestEvent.java

@@ -2,8 +2,7 @@ package mightypork.rogue.bus.events;
 
 
 import mightypork.utils.control.bus.events.Event;
-import mightypork.utils.control.bus.events.types.QueuedEvent;
-import mightypork.utils.control.bus.events.types.SingularEvent;
+import mightypork.utils.control.bus.events.types.SingleReceiverEvent;
 
 
 /**
@@ -11,8 +10,7 @@ import mightypork.utils.control.bus.events.types.SingularEvent;
  * 
  * @author MightyPork
  */
-@SingularEvent
-@QueuedEvent
+@SingleReceiverEvent
 public class ScreenRequestEvent implements Event<ScreenRequestEvent.Listener> {
 	
 	private final String scrName;

src/mightypork/rogue/gui/constraints/ColumnHolder.java

@@ -29,7 +29,7 @@ public class ColumnHolder extends ElementHolder {
 	 * 
 	 * @param elem
 	 */
-	public void addRow(RenderableWithContext elem)
+	public void addRow(PluggableRenderable elem)
 	{
 		if (elem == null) return;
 		add(elem, c_column(null, cols, col++));
@@ -37,7 +37,7 @@ public class ColumnHolder extends ElementHolder {
 	
 	
 	@Override
-	public void remove(RenderableWithContext elem)
+	public void remove(PluggableRenderable elem)
 	{
 		throw new UnsupportedOperationException("Can't remove from ColumnHolder.");
 	}

src/mightypork/rogue/gui/constraints/ElementHolder.java

@@ -13,14 +13,14 @@ import mightypork.utils.math.coord.Rect;
 
 
 /**
- * Bag for {@link RenderableWithContext} elements with constraints.<br>
+ * Bag for {@link PluggableRenderable} elements with constraints.<br>
  * Elements are exposed to {@link EventBus}.
  * 
  * @author MightyPork
  */
-public class ElementHolder extends ChildClient implements ConstraintContext, RenderableWithContext {
+public class ElementHolder extends ChildClient implements ConstraintContext, PluggableRenderable {
 	
-	private final LinkedList<RenderableWithContext> elements = new LinkedList<RenderableWithContext>();
+	private final LinkedList<PluggableRenderable> elements = new LinkedList<PluggableRenderable>();
 	private ConstraintContext context;
 	
 	
@@ -65,7 +65,7 @@ public class ElementHolder extends ChildClient implements ConstraintContext, Ren
 	 * @param constraint Constraint to be used for the element. It's context
 	 *            will be set to this {@link ElementHolder}
 	 */
-	public void add(RenderableWithContext elem, RectConstraint constraint)
+	public void add(PluggableRenderable elem, RectConstraint constraint)
 	{
 		if (elem == null) return;
 		
@@ -82,7 +82,7 @@ public class ElementHolder extends ChildClient implements ConstraintContext, Ren
 	 * 
 	 * @param elem
 	 */
-	public void remove(RenderableWithContext elem)
+	public void remove(PluggableRenderable elem)
 	{
 		if (elem == null) return;
 		elements.remove(elem);

src/mightypork/rogue/gui/constraints/PluggableRenderable.java

@@ -2,7 +2,6 @@ package mightypork.rogue.gui.constraints;
 
 
 import mightypork.rogue.render.Renderable;
-import mightypork.utils.math.constraints.ConstraintContext;
 import mightypork.utils.math.constraints.SettableContext;
 
 
@@ -11,8 +10,6 @@ import mightypork.utils.math.constraints.SettableContext;
  * 
  * @author MightyPork
  */
-public interface RenderableWithContext extends Renderable, SettableContext {
-	
-	@Override
-	void setContext(ConstraintContext context);
+public interface PluggableRenderable extends Renderable, SettableContext {
+	// methods from both interfaces
 }

src/mightypork/rogue/gui/constraints/RowHolder.java

@@ -29,7 +29,7 @@ public class RowHolder extends ElementHolder {
 	 * 
 	 * @param elem
 	 */
-	public void addRow(RenderableWithContext elem)
+	public void addRow(PluggableRenderable elem)
 	{
 		if (elem == null) return;
 		add(elem, c_row(null, rows, row++));
@@ -37,7 +37,7 @@ public class RowHolder extends ElementHolder {
 	
 	
 	@Override
-	public void remove(RenderableWithContext elem)
+	public void remove(PluggableRenderable elem)
 	{
 		throw new UnsupportedOperationException("Can't remove from RowHolder.");
 	}

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

@@ -1,4 +1,4 @@
-package mightypork.rogue.gui;
+package mightypork.rogue.gui.screens;
 
 
 import java.util.Collection;

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

@@ -1,4 +1,4 @@
-package mightypork.rogue.gui;
+package mightypork.rogue.gui.screens;
 
 
 import static org.lwjgl.opengl.GL11.*;

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

@@ -1,4 +1,4 @@
-package mightypork.rogue.gui;
+package mightypork.rogue.gui.screens;
 
 
 import mightypork.rogue.bus.ChildClient;

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

@@ -1,4 +1,4 @@
-package mightypork.rogue.gui;
+package mightypork.rogue.gui.screens;
 
 
 import java.util.HashMap;
@@ -6,10 +6,11 @@ import java.util.HashMap;
 import mightypork.rogue.AppAccess;
 import mightypork.rogue.bus.Subsystem;
 import mightypork.rogue.bus.events.ScreenRequestEvent;
+import mightypork.rogue.render.Renderable;
 import mightypork.utils.logging.Log;
 
 
-public class ScreenRegistry extends Subsystem implements ScreenRequestEvent.Listener {
+public class ScreenRegistry extends Subsystem implements ScreenRequestEvent.Listener, Renderable {
 	
 	private final HashMap<String, Screen> screens = new HashMap<String, Screen>();
 	private Screen active = null;
@@ -43,6 +44,7 @@ public class ScreenRegistry extends Subsystem implements ScreenRequestEvent.List
 	}
 	
 	
+	@Override
 	public void render()
 	{
 		if (active != null) active.render();

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

@@ -5,7 +5,7 @@ import static mightypork.utils.math.constraints.ConstraintFactory.*;
 
 import java.util.Random;
 
-import mightypork.rogue.gui.constraints.RenderableWithContext;
+import mightypork.rogue.gui.constraints.PluggableRenderable;
 import mightypork.rogue.render.Render;
 import mightypork.utils.control.interf.Updateable;
 import mightypork.utils.math.animation.AnimDouble;
@@ -17,7 +17,7 @@ import mightypork.utils.math.constraints.RectConstraint;
 import mightypork.utils.math.coord.Rect;
 
 
-public class BouncyBox implements RenderableWithContext, Updateable, ConstraintContext {
+public class BouncyBox implements PluggableRenderable, Updateable, ConstraintContext {
 	
 	private final Random rand = new Random();
 	

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

@@ -6,9 +6,9 @@ import static mightypork.utils.math.constraints.ConstraintFactory.*;
 import java.util.ArrayList;
 import java.util.List;
 
-import mightypork.rogue.gui.Screen;
-import mightypork.rogue.gui.ScreenLayer;
 import mightypork.rogue.gui.constraints.RowHolder;
+import mightypork.rogue.gui.screens.Screen;
+import mightypork.rogue.gui.screens.ScreenLayer;
 import mightypork.utils.math.constraints.RectConstraint;
 
 

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

@@ -3,7 +3,7 @@ package mightypork.rogue.gui.screens.test_bouncyboxes;
 
 import mightypork.rogue.AppAccess;
 import mightypork.rogue.bus.events.ScreenRequestEvent;
-import mightypork.rogue.gui.LayeredScreen;
+import mightypork.rogue.gui.screens.LayeredScreen;
 import mightypork.rogue.input.KeyStroke;
 
 import org.lwjgl.input.Keyboard;

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

@@ -7,8 +7,8 @@ import java.util.Random;
 
 import mightypork.rogue.Res;
 import mightypork.rogue.bus.events.MouseButtonEvent;
-import mightypork.rogue.gui.Screen;
-import mightypork.rogue.gui.ScreenLayer;
+import mightypork.rogue.gui.screens.Screen;
+import mightypork.rogue.gui.screens.ScreenLayer;
 import mightypork.rogue.input.KeyStroke;
 import mightypork.rogue.render.Render;
 import mightypork.utils.control.interf.Updateable;

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

@@ -6,7 +6,7 @@ import mightypork.rogue.Res;
 import mightypork.rogue.bus.events.ActionRequest;
 import mightypork.rogue.bus.events.ActionRequest.RequestType;
 import mightypork.rogue.bus.events.ScreenRequestEvent;
-import mightypork.rogue.gui.LayeredScreen;
+import mightypork.rogue.gui.screens.LayeredScreen;
 import mightypork.rogue.input.KeyStroke;
 
 import org.lwjgl.input.Keyboard;

src/mightypork/rogue/gui/screens/test_font/ScreenTestFont.java

@@ -4,7 +4,7 @@ package mightypork.rogue.gui.screens.test_font;
 import mightypork.rogue.AppAccess;
 import mightypork.rogue.Res;
 import mightypork.rogue.fonts.GLFont;
-import mightypork.rogue.gui.Screen;
+import mightypork.rogue.gui.screens.Screen;
 import mightypork.rogue.render.Render;
 import mightypork.utils.math.coord.Coord;
 

src/mightypork/rogue/util/SlickLogRedirector.java

@@ -0,0 +1,58 @@
+package mightypork.rogue.util;
+
+import mightypork.utils.logging.LogInstance;
+
+import org.newdawn.slick.util.LogSystem;
+
+
+public class SlickLogRedirector implements LogSystem {
+	LogInstance l;
+
+	public SlickLogRedirector(LogInstance log) {
+		this.l = log;
+	}
+
+	@Override
+	public void error(String msg, Throwable e)
+	{
+		l.e(msg, e);
+	}
+
+	@Override
+	public void error(Throwable e)
+	{
+		l.e(e);
+	}
+
+	@Override
+	public void error(String msg)
+	{
+		l.e(msg);
+	}
+
+	@Override
+	public void warn(String msg)
+	{
+		l.w(msg);
+	}
+
+	@Override
+	public void warn(String msg, Throwable e)
+	{
+		l.e(msg, e);
+	}
+
+	@Override
+	public void info(String msg)
+	{
+		l.i(msg);
+	}
+
+	@Override
+	public void debug(String msg)
+	{
+		l.f3(msg);
+	}
+	
+	
+}

src/mightypork/utils/control/bus/EventBus.java

@@ -6,9 +6,9 @@ import java.util.concurrent.Delayed;
 import java.util.concurrent.TimeUnit;
 
 import mightypork.utils.control.bus.events.Event;
+import mightypork.utils.control.bus.events.types.DelayedEvent;
 import mightypork.utils.control.bus.events.types.ImmediateEvent;
-import mightypork.utils.control.bus.events.types.QueuedEvent;
-import mightypork.utils.control.bus.events.types.SingularEvent;
+import mightypork.utils.control.bus.events.types.SingleReceiverEvent;
 import mightypork.utils.control.interf.Destroyable;
 import mightypork.utils.logging.Log;
 
@@ -27,11 +27,11 @@ final public class EventBus implements Destroyable {
 	private final BufferedHashSet<Object> clients = new BufferedHashSet<Object>();
 	
 	/** Messages queued for delivery */
-	private final DelayQueue<DelayedEvent> sendQueue = new DelayQueue<DelayedEvent>();
+	private final DelayQueue<DelayQueueEntry> sendQueue = new DelayQueue<DelayQueueEntry>();
 	
 	/** Queue polling thread */
 	private final QueuePollingThread busThread;
-		
+	
 	/** Whether the bus was destroyed */
 	private boolean dead = false;
 	
@@ -110,17 +110,18 @@ final public class EventBus implements Destroyable {
 	{
 		assertLive();
 		
-		if(event.getClass().isAnnotationPresent(QueuedEvent.class)) {
-			sendQueued(event);
+		DelayedEvent adelay = event.getClass().getAnnotation(DelayedEvent.class);
+		if (adelay != null) {
+			sendDelayed(event, adelay.delay());
 			return;
 		}
 		
-		if(event.getClass().isAnnotationPresent(ImmediateEvent.class)) {
+		if (event.getClass().isAnnotationPresent(ImmediateEvent.class)) {
 			sendDirect(event);
 			return;
 		}
 		
-		dispatch(event);
+		sendQueued(event);
 	}
 	
 	
@@ -147,9 +148,9 @@ final public class EventBus implements Destroyable {
 	{
 		assertLive();
 		
-		final DelayedEvent dm = new DelayedEvent(delay, event);
+		final DelayQueueEntry dm = new DelayQueueEntry(delay, event);
 		
-		if(logSending) Log.f3("<bus> Q "+Log.str(event)+", t = +"+delay+"s");
+		if (logSending) Log.f3("<bus> Q " + Log.str(event) + ", t = +" + delay + "s");
 		
 		sendQueue.add(dm);
 	}
@@ -166,7 +167,7 @@ final public class EventBus implements Destroyable {
 	{
 		assertLive();
 		
-		if(logSending) Log.f3("<bus> D "+Log.str(event));
+		if (logSending) Log.f3("<bus> D " + Log.str(event));
 		
 		dispatch(event);
 	}
@@ -190,7 +191,7 @@ final public class EventBus implements Destroyable {
 			boolean sent = false;
 			boolean accepted = false;
 			
-			final boolean singular = event.getClass().isAnnotationPresent(SingularEvent.class);
+			final boolean singular = event.getClass().isAnnotationPresent(SingleReceiverEvent.class);
 			
 			for (final EventChannel<?, ?> b : channels) {
 				if (b.canBroadcast(event)) {
@@ -201,7 +202,7 @@ final public class EventBus implements Destroyable {
 				if (sent && singular) break;
 			}
 			
-			if(!accepted) Log.e("<bus> Not accepted by any channel: " + Log.str(event));
+			if (!accepted) Log.e("<bus> Not accepted by any channel: " + Log.str(event));
 			
 			channels.setBuffering(false);
 			clients.setBuffering(false);
@@ -234,7 +235,7 @@ final public class EventBus implements Destroyable {
 	{
 		assertLive();
 		
-		clients.remove(client);		
+		clients.remove(client);
 	}
 	
 	
@@ -253,13 +254,13 @@ final public class EventBus implements Destroyable {
 		return false;
 	}
 	
-	private class DelayedEvent implements Delayed {
+	private class DelayQueueEntry implements Delayed {
 		
 		private final long due;
 		private Event<?> evt = null;
 		
 		
-		public DelayedEvent(double seconds, Event<?> event) {
+		public DelayQueueEntry(double seconds, Event<?> event) {
 			super();
 			this.due = System.currentTimeMillis() + (long) (seconds * 1000);
 			this.evt = event;
@@ -300,7 +301,7 @@ final public class EventBus implements Destroyable {
 		@Override
 		public void run()
 		{
-			DelayedEvent evt;
+			DelayQueueEntry evt;
 			
 			while (!stopped) {
 				evt = null;

src/mightypork/utils/control/bus/EventChannel.java

@@ -7,7 +7,7 @@ import java.util.HashSet;
 import mightypork.utils.control.bus.clients.DelegatingClient;
 import mightypork.utils.control.bus.clients.ToggleableClient;
 import mightypork.utils.control.bus.events.Event;
-import mightypork.utils.control.bus.events.types.SingularEvent;
+import mightypork.utils.control.bus.events.types.SingleReceiverEvent;
 import mightypork.utils.logging.Log;
 
 
@@ -68,7 +68,7 @@ final public class EventChannel<EVENT extends Event<CLIENT>, CLIENT> {
 	private boolean doBroadcast(final EVENT event, final Collection<Object> clients, final Collection<Object> processed)
 	{
 		boolean sent = false;
-		final boolean singular = event.getClass().isAnnotationPresent(SingularEvent.class);
+		final boolean singular = event.getClass().isAnnotationPresent(SingleReceiverEvent.class);
 		
 		for (final Object client : clients) {
 			

src/mightypork/utils/control/bus/events/Event.java

@@ -1,8 +1,24 @@
 package mightypork.utils.control.bus.events;
 
 
+import mightypork.utils.control.bus.events.types.DelayedEvent;
+import mightypork.utils.control.bus.events.types.ImmediateEvent;
+import mightypork.utils.control.bus.events.types.SingleReceiverEvent;
+
+
 /**
+ * <p>
  * Something that can be handled by HANDLER.
+ * </p>
+ * <p>
+ * Can be annotated as {@link SingleReceiverEvent} to be delivered once only,
+ * and {@link DelayedEvent} or {@link ImmediateEvent} to specify default sending
+ * mode.
+ * </p>
+ * <p>
+ * Default sending mode (if not changed by annotations) is <i>queued</i> with
+ * zero delay.
+ * </p>
  * 
  * @author MightyPork
  * @param <HANDLER> handler type

src/mightypork/utils/control/bus/events/types/DelayedEvent.java

@@ -0,0 +1,22 @@
+package mightypork.utils.control.bus.events.types;
+
+
+import java.lang.annotation.*;
+
+
+/**
+ * Event that should be queued with given delay (default: 0);
+ * 
+ * @author MightyPork
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+public @interface DelayedEvent {
+	
+	/**
+	 * @return event dispatch delay [seconds]
+	 */
+	double delay() default 0;
+}

src/mightypork/utils/control/bus/events/types/ImmediateEvent.java

@@ -5,8 +5,7 @@ import java.lang.annotation.*;
 
 
 /**
- * Event that is handled by only single client, and then discarded (ie. only one
- * client receives it when it's broadcasted).
+ * Event that should not be queued.
  * 
  * @author MightyPork
  */
@@ -14,4 +13,4 @@ import java.lang.annotation.*;
 @Target(ElementType.TYPE)
 @Inherited
 @Documented
-public @interface SingularEvent {}
+public @interface ImmediateEvent {}

src/mightypork/utils/control/bus/events/types/SingleReceiverEvent.java

@@ -0,0 +1,16 @@
+package mightypork.utils.control.bus.events.types;
+
+
+import java.lang.annotation.*;
+
+
+/**
+ * Handled only by the first client, then discarded.
+ * 
+ * @author MightyPork
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+public @interface SingleReceiverEvent {}

src/mightypork/utils/math/constraints/SettableContext.java

@@ -13,5 +13,5 @@ public interface SettableContext {
 	 * 
 	 * @param context context
 	 */
-	public void setContext(ConstraintContext context);
+	void setContext(ConstraintContext context);
 }