format

Author: ArtifactForms

core/src/main/java/engine/application/BasicApplication.java

@@ -46,6 +46,8 @@ public abstract class BasicApplication implements Application {
   private DebugContext debugContext;
 
   private CollisionSystem collisionSystem;
+  
+  private Font font = new Font("Lucida Sans", 12, Font.PLAIN);
 
   public BasicApplication() {
     this.timer = new Time();
@@ -57,8 +59,6 @@ public BasicApplication() {
   public abstract void onUpdate(float tpf);
 
   public abstract void onRender(Graphics g);
-  
-  private Font font = new Font("Lucida Sans", 12, Font.PLAIN);
 
   public void onRenderUI(Graphics g) {
     // Do nothing

core/src/main/java/engine/runtime/debug/core/render/DebugRenderer.java

@@ -10,37 +10,6 @@
 
 public final class DebugRenderer {
 
-  private static final class BatchKey {
-
-    final Class<? extends DebugCommand> type;
-
-    final DebugDepthMode depthMode;
-
-    BatchKey(Class<? extends DebugCommand> type, DebugDepthMode depthMode) {
-      this.type = type;
-      this.depthMode = depthMode;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) {
-        return true;
-      }
-      if (!(o instanceof BatchKey)) {
-        return false;
-      }
-      BatchKey other = (BatchKey) o;
-      return type == other.type && depthMode == other.depthMode;
-    }
-
-    @Override
-    public int hashCode() {
-      int result = type.hashCode();
-      result = 31 * result + depthMode.hashCode();
-      return result;
-    }
-  }
-
   private final Map<Class<? extends DebugCommand>, DebugCommandRenderer<?>> renderers =
       new HashMap<>();
 
@@ -101,4 +70,35 @@ private void applyDepthMode(Graphics g, DebugDepthMode mode) {
         break;
     }
   }
+
+  private static final class BatchKey {
+
+    final Class<? extends DebugCommand> type;
+
+    final DebugDepthMode depthMode;
+
+    BatchKey(Class<? extends DebugCommand> type, DebugDepthMode depthMode) {
+      this.type = type;
+      this.depthMode = depthMode;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (!(o instanceof BatchKey)) {
+        return false;
+      }
+      BatchKey other = (BatchKey) o;
+      return type == other.type && depthMode == other.depthMode;
+    }
+
+    @Override
+    public int hashCode() {
+      int result = type.hashCode();
+      result = 31 * result + depthMode.hashCode();
+      return result;
+    }
+  }
 }

demos/src/main/java/demos/jam26/core/DungeonCrawlerGame.java

@@ -43,13 +43,6 @@
 
 public class DungeonCrawlerGame extends BasicApplication {
 
-  public static void main(String[] args) {
-    ApplicationSettings settings = ApplicationSettings.defaultSettings();
-    settings.setFullscreen(true);
-    DungeonCrawlerGame game = new DungeonCrawlerGame();
-    game.launch(settings);
-  }
-
   private boolean debug = true;
 
   private boolean drawDebugNormals = false;
@@ -70,6 +63,13 @@ public static void main(String[] args) {
 
   private SceneNode uiRoot;
 
+  public static void main(String[] args) {
+    ApplicationSettings settings = ApplicationSettings.defaultSettings();
+    settings.setFullscreen(true);
+    DungeonCrawlerGame game = new DungeonCrawlerGame();
+    game.launch(settings);
+  }
+
   @Override
   public void onInitialize() {
     setupDebug();

demos/src/main/java/sandbox/MultiCameraIntegrationApp.java

@@ -55,11 +55,6 @@
  */
 public class MultiCameraIntegrationApp extends BasicApplication {
 
-  public static void main(String[] args) {
-    MultiCameraIntegrationApp app = new MultiCameraIntegrationApp();
-    app.launch(ApplicationSettings.defaultSettings().setFullscreen(true));
-  }
-
   private Scene scene;
 
   private OrbitCamera orbitCamera;
@@ -70,6 +65,11 @@ public static void main(String[] args) {
 
   private SceneNode perspectiveCameraNode;
 
+  public static void main(String[] args) {
+    MultiCameraIntegrationApp app = new MultiCameraIntegrationApp();
+    app.launch(ApplicationSettings.defaultSettings().setFullscreen(true));
+  }
+
   @Override
   public void onInitialize() {
     setupScene();

voxels-server/src/main/java/server/scheduler/ServerScheduler.java

@@ -6,6 +6,10 @@
 
 public class ServerScheduler {
 
+  private final PriorityQueue<ScheduledTask> queue = new PriorityQueue<>();
+
+  private final Set<Task> activeTasks = ConcurrentHashMap.newKeySet();
+
   public static class Task {
     private boolean cancelled = false;
 
@@ -41,10 +45,6 @@ public int compareTo(ScheduledTask other) {
     }
   }
 
-  private final PriorityQueue<ScheduledTask> queue = new PriorityQueue<>();
-
-  private final Set<Task> activeTasks = ConcurrentHashMap.newKeySet();
-
   public Task schedule(long currentTick, long delay, Runnable runnable) {
     Task handle = new Task();
     activeTasks.add(handle);