Partially completed refactor

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "PSWGCommon"]
-	path = PSWGCommon
-	url = https://Obique@bitbucket.org/projectswg/pswgcommon.git
+[submodule "pswgcommon"]
+	path = pswgcommon
+	url = git@bitbucket.org:projectswg/pswgcommon.git

build.gradle

@@ -3,12 +3,12 @@ buildscript {
 		jcenter()
 	}
 	dependencies {
-		classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
+		classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.3'
 	}
 }
 
 plugins {
-	id 'com.github.johnrengelman.shadow' version '2.0.2'
+	id 'com.github.johnrengelman.shadow' version '2.0.3'
 	id 'application'
 	id 'java'
 	id 'groovy'
@@ -18,8 +18,8 @@ plugins {
 }
 
 mainClassName = 'com.projectswg.holocore.ProjectSWG'
-sourceCompatibility = 9
-targetCompatibility = 9
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 sourceSets {
 	// https://stackoverflow.com/questions/22159699/gradle-groovy-and-java-class-dependency-compile
@@ -62,20 +62,19 @@ repositories {
 }
 
 dependencies {
-	compile project(':PSWGCommon')
+	compile project(':pswgcommon')
 	
 	compile group: 'org.codehaus.groovy', name: 'groovy', version: '3.0.0-alpha-1'
 	compile group: 'org.xerial', name: 'sqlite-jdbc', version: '3.21.0.1'
-	compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 	
 	testCompile 'junit:junit:4.12'
 	
-	displayCompile project(':PSWGCommon')
+	displayCompile project(':pswgcommon')
 	displayCompile sourceSets.main.output
 }
 
 task wrapper(type: Wrapper) {
-	gradleVersion = "4.4.1"
+	gradleVersion = "4.7"
 }
 
 tasks.withType(FindBugs) {

settings.gradle

@@ -1,2 +1,2 @@
-rootProject.name = 'Holocore'
-include 'PSWGCommon'
+rootProject.name = 'holocore'
+include 'pswgcommon'

src/main/groovy/com/projectswg/holocore/scripts/radial/RadialHandler.groovy

@@ -89,7 +89,7 @@ class RadialHandler {
 		getHandler(target).handleSelection(player, target, selection)
 	}
 	
-	@Nonnull
+	@NotNull
 	private static def getHandler(SWGObject target) {
 		def type = target.getTemplate()
 		RadialHandlerInterface handler = handlers.get(type)

src/main/java/com/projectswg/holocore/ProjectSWG.java

@@ -26,19 +26,18 @@
  ***********************************************************************************/
 package com.projectswg.holocore;
 
-import com.projectswg.common.concurrency.Delay;
-import com.projectswg.common.control.IntentManager;
-import com.projectswg.common.control.IntentManager.IntentSpeedRecord;
 import com.projectswg.common.data.encodables.galaxy.Galaxy.GalaxyStatus;
 import com.projectswg.common.data.swgfile.ClientFactory;
-import com.projectswg.common.debug.Log;
-import com.projectswg.common.debug.Log.LogLevel;
-import com.projectswg.common.debug.log_wrapper.ConsoleLogWrapper;
-import com.projectswg.common.debug.log_wrapper.FileLogWrapper;
 import com.projectswg.holocore.intents.server.ServerStatusIntent;
 import com.projectswg.holocore.resources.control.ServerStatus;
 import com.projectswg.holocore.resources.server_info.DataManager;
 import com.projectswg.holocore.services.CoreManager;
+import me.joshlarson.jlcommon.concurrency.Delay;
+import me.joshlarson.jlcommon.control.IntentManager;
+import me.joshlarson.jlcommon.control.IntentManager.IntentSpeedRecord;
+import me.joshlarson.jlcommon.log.Log;
+import me.joshlarson.jlcommon.log.log_wrapper.ConsoleLogWrapper;
+import me.joshlarson.jlcommon.log.log_wrapper.FileLogWrapper;
 
 import java.io.File;
 import java.lang.Thread.State;
@@ -93,7 +92,7 @@ public class ProjectSWG {
 		File logDirectory = new File("log");
 		if (!logDirectory.isDirectory() && !logDirectory.mkdir())
 			Log.w("Failed to make log directory!");
-		Log.addWrapper(new ConsoleLogWrapper(LogLevel.VERBOSE));
+		Log.addWrapper(new ConsoleLogWrapper());
 		Log.addWrapper(new FileLogWrapper(new File("log/log.txt")));
 		
 		Log.i("Holocore version: %s", VERSION);
@@ -156,7 +155,7 @@ public class ProjectSWG {
 		List<IntentSpeedRecord> intentTimes = IntentManager.getInstance().getSpeedRecorder().getAllTimes();
 		Collections.sort(intentTimes);
 		Log.i("    Intent Times: [%d]", intentTimes.size());
-		Log.i("        %-30s%-40s%-10s%-20s%-10s", "Intent", "Receiver", "Count", "Time", "Priority");
+		Log.i("        %-30s%-40s%-10s%-20s", "Intent", "Receiver", "Count", "Time");
 		for (IntentSpeedRecord record : intentTimes) {
 			String receiverName = record.getConsumer().getClass().getName();
 			if (receiverName.indexOf('$') != -1)
@@ -165,8 +164,7 @@ public class ProjectSWG {
 			String intentName = record.getIntent().getSimpleName();
 			String recordCount = Long.toString(record.getCount());
 			String recordTime = String.format("%.6fms", record.getTime() / 1E6);
-			String priority = Integer.toString(record.getPriority());
-			Log.i("        %-30s%-40s%-10s%-20s%-10s", intentName, receiverName, recordCount, recordTime, priority);
+			Log.i("        %-30s%-40s%-10s%-20s", intentName, receiverName, recordCount, recordTime);
 		}
 	}
 	

src/main/java/com/projectswg/holocore/intents/BuffIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class BuffIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/CivilWarPointIntent.java

@@ -26,22 +26,20 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import com.projectswg.common.control.Intent;
 import com.projectswg.holocore.resources.objects.player.PlayerObject;
-
-import javax.annotation.Nonnull;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class CivilWarPointIntent extends Intent {
 	
 	private final PlayerObject receiver;
 	private final int points;
 	
-	private CivilWarPointIntent(@Nonnull PlayerObject receiver, int points) {
+	private CivilWarPointIntent(@NotNull PlayerObject receiver, int points) {
 		this.receiver = receiver;
 		this.points = points;
 	}
 	
-	@Nonnull
+	@NotNull
 	public PlayerObject getReceiver() {
 		return receiver;
 	}
@@ -50,7 +48,7 @@ public class CivilWarPointIntent extends Intent {
 		return points;
 	}
 	
-	public static void broadcast(@Nonnull PlayerObject receiver, int points) {
+	public static void broadcast(@NotNull PlayerObject receiver, int points) {
 		new CivilWarPointIntent(receiver, points).broadcast();
 	}
 	

src/main/java/com/projectswg/holocore/intents/DanceIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class DanceIntent extends Intent {
 	private final String danceName;

src/main/java/com/projectswg/holocore/intents/FactionIntent.java

@@ -26,11 +26,10 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import com.projectswg.common.control.Intent;
 import com.projectswg.common.data.encodables.tangible.PvpFaction;
 import com.projectswg.common.data.encodables.tangible.PvpStatus;
-
 import com.projectswg.holocore.resources.objects.tangible.TangibleObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class FactionIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/FlourishIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.player.Player;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class FlourishIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/GalacticIntent.java

@@ -26,11 +26,10 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.services.galaxy.GalacticManager;
 import com.projectswg.holocore.services.objects.ObjectManager;
 import com.projectswg.holocore.services.player.PlayerManager;
+import me.joshlarson.jlcommon.control.Intent;
 
 public abstract class GalacticIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/GrantBadgeIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class GrantBadgeIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/GrantClickyCollectionIntent.java

@@ -26,11 +26,10 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.objects.collections.CollectionItem;
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class GrantClickyCollectionIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/GroupEventIntent.java

@@ -26,10 +26,9 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
 import com.projectswg.holocore.resources.player.Player;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class GroupEventIntent extends Intent {
 	private GroupEventType eventType;

src/main/java/com/projectswg/holocore/intents/LoginEventIntent.java

@@ -26,7 +26,7 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import com.projectswg.common.control.Intent;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class LoginEventIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/NotifyPlayersPacketIntent.java

@@ -26,13 +26,12 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import java.util.List;
-
-import com.projectswg.common.control.Intent;
 import com.projectswg.common.data.location.Terrain;
 import com.projectswg.common.network.packets.SWGPacket;
-
 import com.projectswg.holocore.resources.player.Player;
+import me.joshlarson.jlcommon.control.Intent;
+
+import java.util.List;
 
 public class NotifyPlayersPacketIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/PlayerEventIntent.java

@@ -26,10 +26,9 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.player.Player;
 import com.projectswg.holocore.resources.player.PlayerEvent;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class PlayerEventIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/RequestZoneInIntent.java

@@ -26,10 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
-import com.projectswg.holocore.resources.player.Player;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class RequestZoneInIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/SetTitleIntent.java

@@ -26,33 +26,30 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import com.projectswg.common.control.Intent;
-import com.projectswg.holocore.resources.objects.creature.CreatureObject;
 import com.projectswg.holocore.resources.objects.player.PlayerObject;
-
-import javax.annotation.Nonnull;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class SetTitleIntent extends Intent {
 	
 	private final String title;
 	private final PlayerObject requester;
 	
-	private SetTitleIntent(@Nonnull String title, @Nonnull PlayerObject requester) {
+	private SetTitleIntent(@NotNull String title, @NotNull PlayerObject requester) {
 		this.title = title;
 		this.requester = requester;
 	}
 	
-	@Nonnull
+	@NotNull
 	public String getTitle() {
 		return title;
 	}
 	
-	@Nonnull
+	@NotNull
 	public PlayerObject getRequester() {
 		return requester;
 	}
 	
-	public static void broadcast(@Nonnull String title, @Nonnull PlayerObject requester) {
+	public static void broadcast(@NotNull String title, @NotNull PlayerObject requester) {
 		new SetTitleIntent(title, requester).broadcast();
 	}
 	

src/main/java/com/projectswg/holocore/intents/SkillModIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class SkillModIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/WatchIntent.java

@@ -26,10 +26,9 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class WatchIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/chat/ChatAvatarRequestIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.chat;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.player.Player;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class ChatAvatarRequestIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/chat/ChatCommandIntent.java

@@ -26,11 +26,10 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.chat;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.commands.Command;
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class ChatCommandIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/chat/ChatRoomUpdateIntent.java

@@ -26,10 +26,9 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.chat;
 
-import com.projectswg.common.control.Intent;
 import com.projectswg.common.data.encodables.chat.ChatAvatar;
-
 import com.projectswg.holocore.resources.player.Player;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class ChatRoomUpdateIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/chat/PersistentMessageIntent.java

@@ -26,10 +26,9 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.chat;
 
-import com.projectswg.common.control.Intent;
 import com.projectswg.common.data.encodables.player.Mail;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class PersistentMessageIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/chat/SpatialChatIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.chat;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.player.Player;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class SpatialChatIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/chat/SystemMessageIntent.java

@@ -26,11 +26,10 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.chat;
 
-import com.projectswg.common.control.Intent;
 import com.projectswg.common.data.encodables.oob.ProsePackage;
 import com.projectswg.common.data.location.Terrain;
-
 import com.projectswg.holocore.resources.player.Player;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class SystemMessageIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/combat/CorpseLootedIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.combat;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class CorpseLootedIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/combat/CreatureIncapacitatedIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.combat;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class CreatureIncapacitatedIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/combat/CreatureKilledIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.combat;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class CreatureKilledIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/combat/DeathblowIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.combat;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class DeathblowIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/combat/DuelPlayerIntent.java

@@ -27,9 +27,8 @@
 
 package com.projectswg.holocore.intents.combat;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class DuelPlayerIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/combat/IncapacitateCreatureIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.combat;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class IncapacitateCreatureIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/combat/KillCreatureIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.combat;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class KillCreatureIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/combat/LootItemIntent.java

@@ -26,10 +26,9 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.combat;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.player.Player;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class LootItemIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/combat/loot/LootRequestIntent.java

@@ -27,9 +27,9 @@
 
 package com.projectswg.holocore.intents.combat.loot;
 
-import com.projectswg.common.control.Intent;
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.player.Player;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class LootRequestIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/connection/ForceLogoutIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.connection;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.player.Player;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class ForceLogoutIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/crafting/survey/SampleResourceIntent.java

@@ -26,10 +26,9 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.crafting.survey;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
 import com.projectswg.holocore.services.crafting.resource.galactic.GalacticResource;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class SampleResourceIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/crafting/survey/StartSurveyToolIntent.java

@@ -26,10 +26,9 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.crafting.survey;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class StartSurveyToolIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/crafting/survey/StartSurveyingIntent.java

@@ -26,10 +26,9 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.crafting.survey;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
 import com.projectswg.holocore.services.crafting.resource.galactic.GalacticResource;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class StartSurveyingIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/experience/ExperienceIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.experience;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public final class ExperienceIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/experience/GrantSkillIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.experience;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public final class GrantSkillIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/experience/LevelChangedIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.experience;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public final class LevelChangedIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/network/CloseConnectionIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.network;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.network.DisconnectReason;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class CloseConnectionIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/network/ConnectionClosedIntent.java

@@ -26,8 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.network;
 
-import com.projectswg.common.control.Intent;
 import com.projectswg.common.network.packets.swg.holo.HoloConnectionStopped.ConnectionStoppedReason;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class ConnectionClosedIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/network/ConnectionOpenedIntent.java

@@ -26,7 +26,7 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.network;
 
-import com.projectswg.common.control.Intent;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class ConnectionOpenedIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/network/GalacticPacketIntent.java

@@ -27,28 +27,25 @@
 package com.projectswg.holocore.intents.network;
 
 import com.projectswg.common.network.packets.SWGPacket;
-
 import com.projectswg.holocore.intents.GalacticIntent;
 import com.projectswg.holocore.resources.player.Player;
 
-import javax.annotation.Nonnull;
-
 public class GalacticPacketIntent extends GalacticIntent {
 	
 	private final SWGPacket packet;
 	private final Player player;
 	
-	public GalacticPacketIntent(@Nonnull SWGPacket packet, @Nonnull Player player) {
+	public GalacticPacketIntent(@NotNull SWGPacket packet, @NotNull Player player) {
 		this.packet = packet;
 		this.player = player;
 	}
 	
-	@Nonnull
+	@NotNull
 	public SWGPacket getPacket() {
 		return packet;
 	}
 	
-	@Nonnull
+	@NotNull
 	public Player getPlayer() {
 		return player;
 	}

src/main/java/com/projectswg/holocore/intents/network/InboundPacketIntent.java

@@ -26,8 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.network;
 
-import com.projectswg.common.control.Intent;
 import com.projectswg.common.network.packets.SWGPacket;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class InboundPacketIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/network/InboundPacketPendingIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.network;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.services.network.NetworkClient;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class InboundPacketPendingIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/network/OutboundPacketIntent.java

@@ -26,8 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.network;
 
-import com.projectswg.common.control.Intent;
 import com.projectswg.common.network.packets.SWGPacket;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class OutboundPacketIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/object/ContainerTransferIntent.java

@@ -26,12 +26,10 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.object;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
 
 public class ContainerTransferIntent extends Intent {
 	
@@ -39,28 +37,28 @@ public class ContainerTransferIntent extends Intent {
 	private SWGObject container;
 	private SWGObject oldContainer;
 	
-	public ContainerTransferIntent(@Nonnull SWGObject obj, @CheckForNull SWGObject oldContainer, @CheckForNull SWGObject container) {
+	public ContainerTransferIntent(@NotNull SWGObject obj, @Nullable SWGObject oldContainer, @Nullable SWGObject container) {
 		this.obj = obj;
 		this.oldContainer = oldContainer;
 		this.container = container;
 	}
 	
-	@Nonnull
+	@NotNull
 	public SWGObject getObject() {
 		return obj;
 	}
 	
-	@CheckForNull
+	@Nullable
 	public SWGObject getContainer() {
 		return container;
 	}
 	
-	@CheckForNull
+	@Nullable
 	public SWGObject getOldContainer() {
 		return oldContainer;
 	}
 	
-	public static void broadcast(@Nonnull SWGObject obj, @CheckForNull SWGObject oldContainer, @CheckForNull SWGObject newContainer) {
+	public static void broadcast(@NotNull SWGObject obj, @Nullable SWGObject oldContainer, @Nullable SWGObject newContainer) {
 		new ContainerTransferIntent(obj, oldContainer, newContainer).broadcast();
 	}
 	

src/main/java/com/projectswg/holocore/intents/object/CreateStaticItemIntent.java

@@ -26,11 +26,10 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.object;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.containers.ContainerPermissionsType;
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.services.objects.StaticItemService.ObjectCreationHandler;
+import me.joshlarson.jlcommon.control.Intent;
 
 public final class CreateStaticItemIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/object/DestroyObjectIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.object;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class DestroyObjectIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/object/ForceAwarenessUpdateIntent.java

@@ -26,26 +26,23 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.object;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
-
-import javax.annotation.Nonnull;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class ForceAwarenessUpdateIntent extends Intent {
 	
 	private final SWGObject obj;
 	
-	public ForceAwarenessUpdateIntent(@Nonnull SWGObject obj) {
+	public ForceAwarenessUpdateIntent(@NotNull SWGObject obj) {
 		this.obj = obj;
 	}
 	
-	@Nonnull
+	@NotNull
 	public SWGObject getObject() {
 		return obj;
 	}
 	
-	public static void broadcast(@Nonnull SWGObject obj) {
+	public static void broadcast(@NotNull SWGObject obj) {
 		new ForceAwarenessUpdateIntent(obj).broadcast();
 	}
 	

src/main/java/com/projectswg/holocore/intents/object/MoveObjectIntent.java

@@ -26,10 +26,9 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.object;
 
-import com.projectswg.common.control.Intent;
 import com.projectswg.common.data.location.Location;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class MoveObjectIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/object/ObjectCreatedIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.object;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class ObjectCreatedIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/object/ObjectTeleportIntent.java

@@ -26,10 +26,9 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.object;
 
-import com.projectswg.common.control.Intent;
 import com.projectswg.common.data.location.Location;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class ObjectTeleportIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/player/CreatedCharacterIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.player;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class CreatedCharacterIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/player/DeleteCharacterIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.player;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class DeleteCharacterIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/player/PlayerTransformedIntent.java

@@ -26,12 +26,11 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.player;
 
-import com.projectswg.common.control.Intent;
 import com.projectswg.common.data.location.Location;
 import com.projectswg.common.data.location.Terrain;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class PlayerTransformedIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/player/uniform/OpenUniformBoxIntent.java

@@ -27,8 +27,8 @@
 
 package com.projectswg.holocore.intents.player.uniform;
 
-import com.projectswg.common.control.Intent;
 import com.projectswg.holocore.resources.player.Player;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class OpenUniformBoxIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/server/ConfigChangedIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.server;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.config.ConfigFile;
+import me.joshlarson.jlcommon.control.Intent;
 
 public final class ConfigChangedIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/server/ServerManagementIntent.java

@@ -26,11 +26,10 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.server;
 
-import java.util.concurrent.TimeUnit;
-
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.player.Player;
+import me.joshlarson.jlcommon.control.Intent;
+
+import java.util.concurrent.TimeUnit;
 
 public class ServerManagementIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/server/ServerStatusIntent.java

@@ -26,11 +26,10 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.server;
 
-import java.util.concurrent.TimeUnit;
-
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.control.ServerStatus;
+import me.joshlarson.jlcommon.control.Intent;
+
+import java.util.concurrent.TimeUnit;
 
 public class ServerStatusIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/sui/SuiWindowIntent.java

@@ -26,10 +26,9 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.sui;
 
-import com.projectswg.common.control.Intent;
 import com.projectswg.common.data.sui.SuiBaseWindow;
-
 import com.projectswg.holocore.resources.player.Player;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class SuiWindowIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/travel/TicketPurchaseIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.travel;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public final class TicketPurchaseIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/travel/TicketUseIntent.java

@@ -26,10 +26,9 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.travel;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.player.Player;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class TicketUseIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/intents/travel/TravelPointSelectionIntent.java

@@ -26,9 +26,8 @@
  ***********************************************************************************/
 package com.projectswg.holocore.intents.travel;
 
-import com.projectswg.common.control.Intent;
-
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import me.joshlarson.jlcommon.control.Intent;
 
 public class TravelPointSelectionIntent extends Intent {
 	

src/main/java/com/projectswg/holocore/resources/buildout/BuildoutAreaGrid.java

@@ -26,12 +26,12 @@
  ***********************************************************************************/
 package com.projectswg.holocore.resources.buildout;
 
+import com.projectswg.common.data.location.Terrain;
+
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
-import com.projectswg.common.data.location.Terrain;
-
 
 public class BuildoutAreaGrid {
 	

src/main/java/com/projectswg/holocore/resources/chat/ChatRange.java

@@ -0,0 +1,9 @@
+package com.projectswg.holocore.resources.chat;
+
+public enum ChatRange {
+	PERSONAL,
+	ROOM,
+	LOCAL,
+	TERRAIN,
+	GALAXY
+}

src/main/java/com/projectswg/holocore/resources/chat/ChatType.java

@@ -0,0 +1,9 @@
+package com.projectswg.holocore.resources.chat;
+
+public enum ChatType {
+	MAIL,
+	TELL,
+	SYSTEM,
+	SPATIAL,
+	CHAT
+}

src/main/java/com/projectswg/holocore/resources/client_info/ServerFactory.java

@@ -27,6 +27,13 @@
 
 package com.projectswg.holocore.resources.client_info;
 
+import com.projectswg.common.data.swgfile.ClientData;
+import com.projectswg.common.data.swgfile.DataFactory;
+import com.projectswg.common.data.swgfile.SWGFile;
+import com.projectswg.common.data.swgfile.visitors.DatatableData;
+import com.projectswg.common.data.swgfile.visitors.DatatableData.ColumnType;
+import me.joshlarson.jlcommon.log.Log;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -39,13 +46,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.projectswg.common.data.swgfile.ClientData;
-import com.projectswg.common.data.swgfile.DataFactory;
-import com.projectswg.common.data.swgfile.SWGFile;
-import com.projectswg.common.data.swgfile.visitors.DatatableData;
-import com.projectswg.common.data.swgfile.visitors.DatatableData.ColumnType;
-import com.projectswg.common.debug.Log;
-
 
 /**
  * Created by Waverunner on 6/9/2015

src/main/java/com/projectswg/holocore/resources/collections/SWGBitSet.java

@@ -26,15 +26,14 @@
  ***********************************************************************************/
 package com.projectswg.holocore.resources.collections;
 
-import java.util.BitSet;
-
 import com.projectswg.common.encoding.Encodable;
 import com.projectswg.common.network.NetBuffer;
 import com.projectswg.common.network.NetBufferStream;
 import com.projectswg.common.persistable.Persistable;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
 
+import java.util.BitSet;
+
 public class SWGBitSet extends BitSet implements Encodable, Persistable {
 	
 	private static final long serialVersionUID = 1L;

src/main/java/com/projectswg/holocore/resources/collections/SWGFlag.java

@@ -26,19 +26,18 @@
  ***********************************************************************************/
 package com.projectswg.holocore.resources.collections;
 
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.Arrays;
-import java.util.BitSet;
-
 import com.projectswg.common.encoding.Encodable;
 import com.projectswg.common.network.NetBuffer;
 import com.projectswg.common.network.NetBufferStream;
 import com.projectswg.common.network.packets.swg.zone.baselines.Baseline;
 import com.projectswg.common.persistable.Persistable;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
 
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import java.util.BitSet;
+
 public class SWGFlag extends BitSet implements Encodable, Persistable {
 	
 	private static final long serialVersionUID = 2L;

src/main/java/com/projectswg/holocore/resources/collections/SWGList.java

@@ -26,13 +26,13 @@
  ***********************************************************************************/
 package com.projectswg.holocore.resources.collections;
 
-import com.projectswg.common.concurrency.SynchronizedList;
-import com.projectswg.common.debug.Log;
 import com.projectswg.common.encoding.Encodable;
 import com.projectswg.common.encoding.Encoder;
 import com.projectswg.common.encoding.StringType;
 import com.projectswg.common.network.NetBuffer;
 import com.projectswg.holocore.resources.objects.SWGObject;
+import me.joshlarson.jlcommon.concurrency.SynchronizedList;
+import me.joshlarson.jlcommon.log.Log;
 
 import java.lang.reflect.InvocationTargetException;
 import java.nio.ByteBuffer;

src/main/java/com/projectswg/holocore/resources/collections/SWGMap.java

@@ -26,13 +26,13 @@
  ***********************************************************************************/
 package com.projectswg.holocore.resources.collections;
 
-import com.projectswg.common.concurrency.SynchronizedMap;
-import com.projectswg.common.debug.Log;
 import com.projectswg.common.encoding.Encodable;
 import com.projectswg.common.encoding.Encoder;
 import com.projectswg.common.encoding.StringType;
 import com.projectswg.common.network.NetBuffer;
 import com.projectswg.holocore.resources.objects.SWGObject;
+import me.joshlarson.jlcommon.concurrency.SynchronizedMap;
+import me.joshlarson.jlcommon.log.Log;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

src/main/java/com/projectswg/holocore/resources/collections/SWGSet.java

@@ -26,14 +26,14 @@
  ***********************************************************************************/
 package com.projectswg.holocore.resources.collections;
 
-import com.projectswg.common.concurrency.SynchronizedList;
-import com.projectswg.common.concurrency.SynchronizedSet;
-import com.projectswg.common.debug.Log;
 import com.projectswg.common.encoding.Encodable;
 import com.projectswg.common.encoding.Encoder;
 import com.projectswg.common.encoding.StringType;
 import com.projectswg.common.network.NetBuffer;
 import com.projectswg.holocore.resources.objects.SWGObject;
+import me.joshlarson.jlcommon.concurrency.SynchronizedList;
+import me.joshlarson.jlcommon.concurrency.SynchronizedSet;
+import me.joshlarson.jlcommon.log.Log;
 
 import java.lang.reflect.InvocationTargetException;
 import java.nio.ByteBuffer;

src/main/java/com/projectswg/holocore/resources/commands/CombatCommand.java

@@ -26,13 +26,12 @@
  ***********************************************************************************/
 package com.projectswg.holocore.resources.commands;
 
+import com.projectswg.common.data.combat.*;
+import com.projectswg.holocore.resources.objects.weapon.WeaponType;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import com.projectswg.common.data.combat.*;
-
-import com.projectswg.holocore.resources.objects.weapon.WeaponType;
-
 public class CombatCommand extends Command {
 	
 	private ValidTarget validTarget;

src/main/java/com/projectswg/holocore/resources/commands/callbacks/AdminTeleportCallback.java

@@ -28,7 +28,6 @@ package com.projectswg.holocore.resources.commands.callbacks;
 
 import com.projectswg.common.data.location.Location;
 import com.projectswg.common.data.location.Terrain;
-
 import com.projectswg.holocore.intents.chat.SystemMessageIntent;
 import com.projectswg.holocore.intents.object.ObjectTeleportIntent;
 import com.projectswg.holocore.resources.commands.ICmdCallback;

src/main/java/com/projectswg/holocore/resources/commands/callbacks/AttributesCmdCallback.java

@@ -27,7 +27,6 @@
 package com.projectswg.holocore.resources.commands.callbacks;
 
 import com.projectswg.common.network.packets.swg.zone.spatial.AttributeListMessage;
-
 import com.projectswg.holocore.resources.commands.ICmdCallback;
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.player.Player;

src/main/java/com/projectswg/holocore/resources/commands/callbacks/FindFriendCallback.java

@@ -27,14 +27,10 @@
 
 package com.projectswg.holocore.resources.commands.callbacks;
 
-import java.util.Locale;
-import java.util.Map;
-
 import com.projectswg.common.data.encodables.oob.ProsePackage;
 import com.projectswg.common.data.encodables.oob.StringId;
 import com.projectswg.common.data.encodables.oob.waypoint.WaypointColor;
 import com.projectswg.common.data.location.Location;
-
 import com.projectswg.holocore.intents.chat.SystemMessageIntent;
 import com.projectswg.holocore.intents.object.ObjectCreatedIntent;
 import com.projectswg.holocore.resources.commands.ICmdCallback;
@@ -47,6 +43,9 @@ import com.projectswg.holocore.services.galaxy.GalacticManager;
 import com.projectswg.holocore.services.objects.ObjectCreator;
 import com.projectswg.holocore.services.player.PlayerManager.PlayerLookup;
 
+import java.util.Locale;
+import java.util.Map;
+
 /**
  * @author Waverunner
  */

src/main/java/com/projectswg/holocore/resources/commands/callbacks/GotoCmdCallback.java

@@ -26,15 +26,10 @@
  ***********************************************************************************/
 package com.projectswg.holocore.resources.commands.callbacks;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
 import com.projectswg.common.data.info.RelationalServerData;
 import com.projectswg.common.data.info.RelationalServerFactory;
 import com.projectswg.common.data.location.Location;
 import com.projectswg.common.data.location.Terrain;
-import com.projectswg.common.debug.Log;
-
 import com.projectswg.holocore.intents.chat.SystemMessageIntent;
 import com.projectswg.holocore.intents.object.ObjectTeleportIntent;
 import com.projectswg.holocore.resources.commands.ICmdCallback;
@@ -44,6 +39,10 @@ import com.projectswg.holocore.resources.objects.cell.CellObject;
 import com.projectswg.holocore.resources.player.Player;
 import com.projectswg.holocore.services.galaxy.GalacticManager;
 import com.projectswg.holocore.services.objects.ObjectManager;
+import me.joshlarson.jlcommon.log.Log;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class GotoCmdCallback implements ICmdCallback  {
 	

src/main/java/com/projectswg/holocore/resources/commands/callbacks/JumpCmdCallback.java

@@ -27,7 +27,6 @@
 package com.projectswg.holocore.resources.commands.callbacks;
 
 import com.projectswg.common.network.packets.swg.zone.object_controller.JumpUpdate;
-
 import com.projectswg.holocore.resources.commands.ICmdCallback;
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;

src/main/java/com/projectswg/holocore/resources/commands/callbacks/KneelCmdCallback.java

@@ -28,7 +28,6 @@ package com.projectswg.holocore.resources.commands.callbacks;
 
 import com.projectswg.common.data.encodables.tangible.Posture;
 import com.projectswg.common.network.packets.swg.zone.object_controller.PostureUpdate;
-
 import com.projectswg.holocore.resources.commands.ICmdCallback;
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;

src/main/java/com/projectswg/holocore/resources/commands/callbacks/LogoutCmdCallback.java

@@ -26,15 +26,9 @@
  ***********************************************************************************/
 package com.projectswg.holocore.resources.commands.callbacks;
 
-import java.util.concurrent.TimeUnit;
-
-import com.projectswg.common.control.IntentChain;
 import com.projectswg.common.data.encodables.oob.ProsePackage;
 import com.projectswg.common.data.encodables.oob.StringId;
 import com.projectswg.common.data.encodables.tangible.Posture;
-import com.projectswg.common.debug.Assert;
-import com.projectswg.common.debug.Log;
-
 import com.projectswg.holocore.intents.chat.SystemMessageIntent;
 import com.projectswg.holocore.intents.connection.ForceLogoutIntent;
 import com.projectswg.holocore.resources.commands.ICmdCallback;
@@ -44,6 +38,10 @@ import com.projectswg.holocore.resources.player.Player;
 import com.projectswg.holocore.resources.player.PlayerState;
 import com.projectswg.holocore.services.galaxy.GalacticManager;
 import com.projectswg.holocore.utilities.ScheduledUtilities;
+import me.joshlarson.jlcommon.control.IntentChain;
+import me.joshlarson.jlcommon.log.Log;
+
+import java.util.concurrent.TimeUnit;
 
 public class LogoutCmdCallback implements ICmdCallback {
 	

src/main/java/com/projectswg/holocore/resources/commands/callbacks/ProneCmdCallback.java

@@ -28,7 +28,6 @@ package com.projectswg.holocore.resources.commands.callbacks;
 
 import com.projectswg.common.data.encodables.tangible.Posture;
 import com.projectswg.common.network.packets.swg.zone.object_controller.PostureUpdate;
-
 import com.projectswg.holocore.resources.commands.ICmdCallback;
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;

src/main/java/com/projectswg/holocore/resources/commands/callbacks/QaToolCmdCallback.java

@@ -29,11 +29,7 @@ package com.projectswg.holocore.resources.commands.callbacks;
 
 import com.projectswg.common.data.location.Location;
 import com.projectswg.common.data.location.Terrain;
-import com.projectswg.common.debug.Log;
-
 import com.projectswg.holocore.intents.CivilWarPointIntent;
-import com.projectswg.holocore.resources.objects.player.PlayerObject;
-import com.projectswg.holocore.scripts.commands.admin.qatool.QaToolDetails;
 import com.projectswg.holocore.intents.chat.SystemMessageIntent;
 import com.projectswg.holocore.intents.experience.ExperienceIntent;
 import com.projectswg.holocore.intents.network.CloseConnectionIntent;
@@ -46,12 +42,15 @@ import com.projectswg.holocore.resources.commands.ICmdCallback;
 import com.projectswg.holocore.resources.network.DisconnectReason;
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
+import com.projectswg.holocore.resources.objects.player.PlayerObject;
 import com.projectswg.holocore.resources.player.Player;
 import com.projectswg.holocore.resources.sui.SuiButtons;
 import com.projectswg.holocore.resources.sui.SuiMessageBox;
+import com.projectswg.holocore.scripts.commands.admin.qatool.QaToolDetails;
 import com.projectswg.holocore.services.galaxy.GalacticManager;
 import com.projectswg.holocore.services.objects.ObjectManager;
 import com.projectswg.holocore.services.player.PlayerManager.PlayerLookup;
+import me.joshlarson.jlcommon.log.Log;
 
 /**
  * Created by Waverunner on 8/19/2015

src/main/java/com/projectswg/holocore/resources/commands/callbacks/RequestBiographyCmdCallback.java

@@ -26,14 +26,13 @@
  ***********************************************************************************/
 package com.projectswg.holocore.resources.commands.callbacks;
 
-import com.projectswg.common.debug.Log;
 import com.projectswg.common.network.packets.swg.zone.object_controller.BiographyUpdate;
-
 import com.projectswg.holocore.resources.commands.ICmdCallback;
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
 import com.projectswg.holocore.resources.player.Player;
 import com.projectswg.holocore.services.galaxy.GalacticManager;
+import me.joshlarson.jlcommon.log.Log;
 
 /**
  *

src/main/java/com/projectswg/holocore/resources/commands/callbacks/RequestDraftSlotsCallback.java

@@ -28,7 +28,6 @@ package com.projectswg.holocore.resources.commands.callbacks;
 
 import com.projectswg.common.data.schematic.DraftSchematic;
 import com.projectswg.common.network.packets.swg.zone.object_controller.DraftSlotsQueryResponse;
-
 import com.projectswg.holocore.resources.commands.ICmdCallback;
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.player.Player;

src/main/java/com/projectswg/holocore/resources/commands/callbacks/RequestWaypointCmdCallback.java

@@ -29,7 +29,6 @@ package com.projectswg.holocore.resources.commands.callbacks;
 import com.projectswg.common.data.encodables.oob.waypoint.WaypointColor;
 import com.projectswg.common.data.location.Point3D;
 import com.projectswg.common.data.location.Terrain;
-
 import com.projectswg.holocore.intents.chat.SystemMessageIntent;
 import com.projectswg.holocore.intents.object.ObjectCreatedIntent;
 import com.projectswg.holocore.resources.commands.ICmdCallback;

src/main/java/com/projectswg/holocore/resources/commands/callbacks/ServerCmdCallback.java

@@ -26,11 +26,6 @@
  ***********************************************************************************/
 package com.projectswg.holocore.resources.commands.callbacks;
 
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-
-import com.projectswg.common.debug.Log;
-
 import com.projectswg.holocore.intents.server.ServerManagementIntent;
 import com.projectswg.holocore.intents.server.ServerManagementIntent.ServerManagementEvent;
 import com.projectswg.holocore.resources.commands.ICmdCallback;
@@ -41,6 +36,10 @@ import com.projectswg.holocore.resources.sui.SuiInputBox;
 import com.projectswg.holocore.resources.sui.SuiListBox;
 import com.projectswg.holocore.resources.sui.SuiMessageBox;
 import com.projectswg.holocore.services.galaxy.GalacticManager;
+import me.joshlarson.jlcommon.log.Log;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class ServerCmdCallback implements ICmdCallback {
 

src/main/java/com/projectswg/holocore/resources/commands/callbacks/SitOnObjectCmdCallback.java

@@ -29,7 +29,6 @@ package com.projectswg.holocore.resources.commands.callbacks;
 import com.projectswg.common.data.encodables.tangible.Posture;
 import com.projectswg.common.data.location.Location;
 import com.projectswg.common.network.packets.swg.zone.object_controller.SitOnObject;
-
 import com.projectswg.holocore.resources.commands.ICmdCallback;
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;

src/main/java/com/projectswg/holocore/resources/commands/callbacks/SocialInternalCmdCallback.java

@@ -27,7 +27,6 @@
 package com.projectswg.holocore.resources.commands.callbacks;
 
 import com.projectswg.common.network.packets.swg.zone.object_controller.PlayerEmote;
-
 import com.projectswg.holocore.resources.commands.ICmdCallback;
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.player.Player;

src/main/java/com/projectswg/holocore/resources/commands/callbacks/StandCmdCallback.java

@@ -28,7 +28,6 @@ package com.projectswg.holocore.resources.commands.callbacks;
 
 import com.projectswg.common.data.encodables.tangible.Posture;
 import com.projectswg.common.network.packets.swg.zone.object_controller.PostureUpdate;
-
 import com.projectswg.holocore.resources.commands.ICmdCallback;
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;

src/main/java/com/projectswg/holocore/resources/commands/callbacks/StartDanceCallback.java

@@ -26,9 +26,6 @@
  ***********************************************************************************/
 package com.projectswg.holocore.resources.commands.callbacks;
 
-import java.util.Locale;
-import java.util.Set;
-
 import com.projectswg.holocore.resources.commands.ICmdCallback;
 import com.projectswg.holocore.resources.objects.SWGObject;
 import com.projectswg.holocore.resources.objects.creature.CreatureObject;
@@ -37,6 +34,9 @@ import com.projectswg.holocore.resources.sui.SuiButtons;
 import com.projectswg.holocore.resources.sui.SuiListBox;
 import com.projectswg.holocore.services.galaxy.GalacticManager;
 
+import java.util.Locale;
+import java.util.Set;
+
 public class StartDanceCallback implements ICmdCallback {
 	
 	private static final String ABILITY_NAME_PREFIX = "startDance+";

src/main/java/com/projectswg/holocore/resources/commands/callbacks/TransferItemCallback.java

@@ -26,9 +26,7 @@
  ***********************************************************************************/
 package com.projectswg.holocore.resources.commands.callbacks;
 
-import com.projectswg.common.debug.Assert;
 import com.projectswg.common.network.packets.swg.zone.PlayMusicMessage;
-
 import com.projectswg.holocore.intents.BuffIntent;
 import com.projectswg.holocore.intents.chat.SystemMessageIntent;
 import com.projectswg.holocore.intents.combat.LootItemIntent;

src/main/java/com/projectswg/holocore/resources/commands/callbacks/WaypointCmdCallback.java

@@ -30,7 +30,6 @@ import com.projectswg.common.data.encodables.oob.waypoint.WaypointColor;
 import com.projectswg.common.data.location.Location;
 import com.projectswg.common.data.location.Location.LocationBuilder;
 import com.projectswg.common.data.location.Terrain;
-
 import com.projectswg.holocore.intents.chat.SystemMessageIntent;
 import com.projectswg.holocore.intents.object.ObjectCreatedIntent;
 import com.projectswg.holocore.resources.commands.ICmdCallback;

src/main/java/com/projectswg/holocore/resources/location/InstanceLocation.java

@@ -26,8 +26,6 @@
  ***********************************************************************************/
 package com.projectswg.holocore.resources.location;
 
-import java.util.concurrent.atomic.AtomicReference;
-
 import com.projectswg.common.data.location.Location;
 import com.projectswg.common.data.location.Location.LocationBuilder;
 import com.projectswg.common.data.location.Point3D;
@@ -35,10 +33,9 @@ import com.projectswg.common.data.location.Quaternion;
 import com.projectswg.common.data.location.Terrain;
 import com.projectswg.common.network.NetBufferStream;
 import com.projectswg.common.persistable.Persistable;
-
 import com.projectswg.holocore.resources.objects.SWGObject;
 
-import javax.annotation.Nonnull;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class InstanceLocation implements Persistable {
 	
@@ -106,17 +103,17 @@ public class InstanceLocation implements Persistable {
 		setInstance(InstanceType.NONE, 0);
 	}
 	
-	@Nonnull
+	@NotNull
 	public Location getLocation() {
 		return location.get();
 	}
 	
-	@Nonnull
+	@NotNull
 	public Point3D getPosition() {
 		return getLocation().getPosition();
 	}
 	
-	@Nonnull
+	@NotNull
 	public Terrain getTerrain() {
 		return getLocation().getTerrain();
 	}