diff --git a/lib/PSWGCommon.jar b/lib/PSWGCommon.jar index 6a5ffb4b5..2b18b1b74 100644 Binary files a/lib/PSWGCommon.jar and b/lib/PSWGCommon.jar differ diff --git a/src/main/ProjectSWG.java b/src/main/ProjectSWG.java index 45d752f1b..ccf3d58ff 100644 --- a/src/main/ProjectSWG.java +++ b/src/main/ProjectSWG.java @@ -29,6 +29,8 @@ package main; import intents.server.ServerStatusIntent; +import java.io.File; +import java.io.IOException; import java.lang.Thread.State; import java.util.HashMap; import java.util.List; @@ -39,11 +41,14 @@ import java.util.stream.Collectors; import resources.Galaxy.GalaxyStatus; import resources.control.ServerStatus; import resources.server_info.DataManager; -import resources.server_info.Log; import services.CoreManager; import com.projectswg.common.concurrency.Delay; import com.projectswg.common.control.IntentManager; +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; public class ProjectSWG { @@ -55,7 +60,9 @@ public class ProjectSWG { private ServerInitStatus initStatus; private int adminServerPort; - public static final void main(String [] args) { + public static final void main(String [] args) throws IOException { + Log.addWrapper(new ConsoleLogWrapper(LogLevel.VERBOSE)); + Log.addWrapper(new FileLogWrapper(new File("log.txt"))); server = new ProjectSWG(); AtomicBoolean forcingShutdown = new AtomicBoolean(false); Runtime.getRuntime().addShutdownHook(new Thread(() -> { diff --git a/src/network/NetworkClient.java b/src/network/NetworkClient.java index ec57ee04c..8564795f6 100644 --- a/src/network/NetworkClient.java +++ b/src/network/NetworkClient.java @@ -41,7 +41,6 @@ import network.packets.swg.admin.AdminPacket; import network.packets.swg.holo.HoloConnectionStopped; import network.packets.swg.holo.HoloConnectionStopped.ConnectionStoppedReason; import resources.network.NetBufferStream; -import resources.server_info.Log; import services.network.HolocoreSessionManager; import services.network.HolocoreSessionManager.ResponseAction; import services.network.NetworkProtocol; @@ -49,6 +48,7 @@ import services.network.PacketSender; import com.projectswg.common.control.IntentChain; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; public class NetworkClient { diff --git a/src/network/PacketType.java b/src/network/PacketType.java index 2aefbcc37..69c55fcb8 100644 --- a/src/network/PacketType.java +++ b/src/network/PacketType.java @@ -27,27 +27,142 @@ ***********************************************************************************/ package network; -import network.packets.swg.*; -import network.packets.swg.admin.*; -import network.packets.swg.holo.*; -import network.packets.swg.login.*; -import network.packets.swg.login.creation.*; -import network.packets.swg.zone.*; -import network.packets.swg.zone.auction.*; -import network.packets.swg.zone.baselines.*; -import network.packets.swg.zone.building.*; -import network.packets.swg.zone.chat.*; -import network.packets.swg.zone.combat.*; -import network.packets.swg.zone.deltas.*; -import network.packets.swg.zone.insertion.*; -import network.packets.swg.zone.object_controller.*; -import network.packets.swg.zone.server_ui.*; -import network.packets.swg.zone.spatial.*; - import java.util.HashMap; import java.util.Map; -import resources.server_info.Log; +import network.packets.swg.ErrorMessage; +import network.packets.swg.SWGPacket; +import network.packets.swg.ServerUnixEpochTime; +import network.packets.swg.admin.AdminShutdownServer; +import network.packets.swg.holo.HoloConnectionStarted; +import network.packets.swg.holo.HoloConnectionStopped; +import network.packets.swg.holo.HoloSetProtocolVersion; +import network.packets.swg.login.AccountFeatureBits; +import network.packets.swg.login.CharacterCreationDisabled; +import network.packets.swg.login.ClientIdMsg; +import network.packets.swg.login.ClientPermissionsMessage; +import network.packets.swg.login.ConnectionServerLagResponse; +import network.packets.swg.login.EnumerateCharacterId; +import network.packets.swg.login.LoginClientId; +import network.packets.swg.login.LoginClientToken; +import network.packets.swg.login.LoginClusterStatus; +import network.packets.swg.login.LoginEnumCluster; +import network.packets.swg.login.LoginIncorrectClientId; +import network.packets.swg.login.OfflineServersMessage; +import network.packets.swg.login.RequestExtendedClusters; +import network.packets.swg.login.ServerId; +import network.packets.swg.login.ServerString; +import network.packets.swg.login.StationIdHasJediSlot; +import network.packets.swg.login.creation.ClientCreateCharacter; +import network.packets.swg.login.creation.ClientVerifyAndLockNameRequest; +import network.packets.swg.login.creation.ClientVerifyAndLockNameResponse; +import network.packets.swg.login.creation.CreateCharacterFailure; +import network.packets.swg.login.creation.CreateCharacterSuccess; +import network.packets.swg.login.creation.DeleteCharacterRequest; +import network.packets.swg.login.creation.DeleteCharacterResponse; +import network.packets.swg.login.creation.RandomNameRequest; +import network.packets.swg.login.creation.RandomNameResponse; +import network.packets.swg.zone.ClientOpenContainerMessage; +import network.packets.swg.zone.CmdSceneReady; +import network.packets.swg.zone.ConnectPlayerResponseMessage; +import network.packets.swg.zone.EnterTicketPurchaseModeMessage; +import network.packets.swg.zone.ExpertiseRequestMessage; +import network.packets.swg.zone.GalaxyLoopTimesResponse; +import network.packets.swg.zone.GameServerLagResponse; +import network.packets.swg.zone.HeartBeat; +import network.packets.swg.zone.LagRequest; +import network.packets.swg.zone.ObjectMenuSelect; +import network.packets.swg.zone.ParametersMessage; +import network.packets.swg.zone.PlanetTravelPointListRequest; +import network.packets.swg.zone.PlanetTravelPointListResponse; +import network.packets.swg.zone.PlayClientEffectObjectMessage; +import network.packets.swg.zone.PlayMusicMessage; +import network.packets.swg.zone.RequestGalaxyLoopTimes; +import network.packets.swg.zone.SceneCreateObjectByCrc; +import network.packets.swg.zone.SceneDestroyObject; +import network.packets.swg.zone.SceneEndBaselines; +import network.packets.swg.zone.ServerNowEpochTime; +import network.packets.swg.zone.ServerTimeMessage; +import network.packets.swg.zone.ServerWeatherMessage; +import network.packets.swg.zone.SetWaypointColor; +import network.packets.swg.zone.ShowBackpack; +import network.packets.swg.zone.ShowHelmet; +import network.packets.swg.zone.StopClientEffectObjectByLabelMessage; +import network.packets.swg.zone.UpdateContainmentMessage; +import network.packets.swg.zone.UpdatePostureMessage; +import network.packets.swg.zone.UpdatePvpStatusMessage; +import network.packets.swg.zone.UpdateTransformMessage; +import network.packets.swg.zone.UpdateTransformWithParentMessage; +import network.packets.swg.zone.auction.AuctionQueryHeadersMessage; +import network.packets.swg.zone.auction.AuctionQueryHeadersResponseMessage; +import network.packets.swg.zone.auction.CancelLiveAuctionMessage; +import network.packets.swg.zone.auction.CancelLiveAuctionResponseMessage; +import network.packets.swg.zone.auction.GetAuctionDetails; +import network.packets.swg.zone.auction.GetAuctionDetailsResponse; +import network.packets.swg.zone.auction.IsVendorOwnerResponseMessage; +import network.packets.swg.zone.auction.RetrieveAuctionItemMessage; +import network.packets.swg.zone.auction.RetrieveAuctionItemResponseMessage; +import network.packets.swg.zone.baselines.Baseline; +import network.packets.swg.zone.building.UpdateCellPermissionMessage; +import network.packets.swg.zone.chat.ChatAddModeratorToRoom; +import network.packets.swg.zone.chat.ChatBanAvatarFromRoom; +import network.packets.swg.zone.chat.ChatCreateRoom; +import network.packets.swg.zone.chat.ChatDeletePersistentMessage; +import network.packets.swg.zone.chat.ChatDestroyRoom; +import network.packets.swg.zone.chat.ChatEnterRoomById; +import network.packets.swg.zone.chat.ChatFriendsListUpdate; +import network.packets.swg.zone.chat.ChatIgnoreList; +import network.packets.swg.zone.chat.ChatInstantMessageToCharacter; +import network.packets.swg.zone.chat.ChatInstantMessageToClient; +import network.packets.swg.zone.chat.ChatInviteAvatarToRoom; +import network.packets.swg.zone.chat.ChatKickAvatarFromRoom; +import network.packets.swg.zone.chat.ChatOnConnectAvatar; +import network.packets.swg.zone.chat.ChatOnCreateRoom; +import network.packets.swg.zone.chat.ChatOnDestroyRoom; +import network.packets.swg.zone.chat.ChatOnEnteredRoom; +import network.packets.swg.zone.chat.ChatOnLeaveRoom; +import network.packets.swg.zone.chat.ChatOnReceiveRoomInvitation; +import network.packets.swg.zone.chat.ChatOnSendInstantMessage; +import network.packets.swg.zone.chat.ChatOnSendRoomMessage; +import network.packets.swg.zone.chat.ChatPersistentMessageToClient; +import network.packets.swg.zone.chat.ChatPersistentMessageToServer; +import network.packets.swg.zone.chat.ChatQueryRoom; +import network.packets.swg.zone.chat.ChatRemoveAvatarFromRoom; +import network.packets.swg.zone.chat.ChatRemoveModeratorFromRoom; +import network.packets.swg.zone.chat.ChatRequestPersistentMessage; +import network.packets.swg.zone.chat.ChatRequestRoomList; +import network.packets.swg.zone.chat.ChatRoomMessage; +import network.packets.swg.zone.chat.ChatSendToRoom; +import network.packets.swg.zone.chat.ChatSystemMessage; +import network.packets.swg.zone.chat.ChatUnbanAvatarFromRoom; +import network.packets.swg.zone.chat.ChatUninviteFromRoom; +import network.packets.swg.zone.chat.ConGenericMessage; +import network.packets.swg.zone.chat.VoiceChatStatus; +import network.packets.swg.zone.combat.GrantCommandMessage; +import network.packets.swg.zone.deltas.DeltasMessage; +import network.packets.swg.zone.insertion.ChatRoomList; +import network.packets.swg.zone.insertion.ChatServerStatus; +import network.packets.swg.zone.insertion.CmdStartScene; +import network.packets.swg.zone.insertion.ConnectPlayerMessage; +import network.packets.swg.zone.insertion.SelectCharacter; +import network.packets.swg.zone.object_controller.ChangeRoleIconChoice; +import network.packets.swg.zone.object_controller.CommandQueueEnqueue; +import network.packets.swg.zone.object_controller.DataTransform; +import network.packets.swg.zone.object_controller.DataTransformWithParent; +import network.packets.swg.zone.object_controller.ObjectController; +import network.packets.swg.zone.object_controller.ObjectMenuRequest; +import network.packets.swg.zone.object_controller.ObjectMenuResponse; +import network.packets.swg.zone.object_controller.ShowLootBox; +import network.packets.swg.zone.object_controller.SpatialChat; +import network.packets.swg.zone.server_ui.SuiCreatePageMessage; +import network.packets.swg.zone.server_ui.SuiEventNotification; +import network.packets.swg.zone.spatial.AttributeListMessage; +import network.packets.swg.zone.spatial.GetMapLocationsMessage; +import network.packets.swg.zone.spatial.GetMapLocationsResponseMessage; +import network.packets.swg.zone.spatial.NewTicketActivityResponseMessage; + +import com.projectswg.common.debug.Log; + public enum PacketType { diff --git a/src/network/encryption/MD5.java b/src/network/encryption/MD5.java index 76b023df4..5735bdf78 100644 --- a/src/network/encryption/MD5.java +++ b/src/network/encryption/MD5.java @@ -27,11 +27,12 @@ ***********************************************************************************/ package network.encryption; +import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.io.UnsupportedEncodingException; -import resources.server_info.Log; +import com.projectswg.common.debug.Log; + public class MD5 { diff --git a/src/network/packets/Packet.java b/src/network/packets/Packet.java index d81e96745..b79292867 100644 --- a/src/network/packets/Packet.java +++ b/src/network/packets/Packet.java @@ -27,11 +27,6 @@ ***********************************************************************************/ package network.packets; -import resources.common.CRC; -import resources.encodables.Encodable; -import resources.server_info.Log; -import utilities.Encoder; - import java.net.SocketAddress; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -40,6 +35,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import resources.common.CRC; +import resources.encodables.Encodable; +import utilities.Encoder; + +import com.projectswg.common.debug.Log; + public class Packet { diff --git a/src/network/packets/swg/SWGPacket.java b/src/network/packets/swg/SWGPacket.java index a552775a8..00c330125 100644 --- a/src/network/packets/swg/SWGPacket.java +++ b/src/network/packets/swg/SWGPacket.java @@ -27,12 +27,13 @@ ***********************************************************************************/ package network.packets.swg; +import java.nio.ByteBuffer; + import network.PacketType; import network.packets.Packet; import resources.common.CRC; -import resources.server_info.Log; -import java.nio.ByteBuffer; +import com.projectswg.common.debug.Log; public class SWGPacket extends Packet { diff --git a/src/network/packets/swg/zone/object_controller/ObjectController.java b/src/network/packets/swg/zone/object_controller/ObjectController.java index 8ab25e7ba..7e44621b7 100644 --- a/src/network/packets/swg/zone/object_controller/ObjectController.java +++ b/src/network/packets/swg/zone/object_controller/ObjectController.java @@ -29,9 +29,11 @@ package network.packets.swg.zone.object_controller; import java.nio.ByteBuffer; -import resources.server_info.Log; import network.packets.swg.SWGPacket; -import network.packets.swg.zone.object_controller.combat.*; +import network.packets.swg.zone.object_controller.combat.CombatAction; +import network.packets.swg.zone.object_controller.combat.CombatSpam; + +import com.projectswg.common.debug.Log; public abstract class ObjectController extends SWGPacket { diff --git a/src/resources/client_info/ClientFactory.java b/src/resources/client_info/ClientFactory.java index e0ee9789d..028cfe58c 100644 --- a/src/resources/client_info/ClientFactory.java +++ b/src/resources/client_info/ClientFactory.java @@ -51,7 +51,8 @@ import resources.client_info.visitors.appearance.SkeletalAppearanceData; import resources.client_info.visitors.appearance.SkeletalMeshGeneratorTemplateData; import resources.client_info.visitors.shader.CustomizableShaderData; import resources.client_info.visitors.shader.StaticShaderData; -import resources.server_info.Log; + +import com.projectswg.common.debug.Log; public class ClientFactory extends DataFactory { diff --git a/src/resources/client_info/DataFactory.java b/src/resources/client_info/DataFactory.java index a3529ecec..8d7e2e65b 100644 --- a/src/resources/client_info/DataFactory.java +++ b/src/resources/client_info/DataFactory.java @@ -31,7 +31,8 @@ import java.io.File; import java.io.IOException; import java.nio.channels.ClosedChannelException; -import resources.server_info.Log; +import com.projectswg.common.debug.Log; + /** * Created by Waverunner on 6/9/2015 diff --git a/src/resources/client_info/SWGFile.java b/src/resources/client_info/SWGFile.java index d9ae995f1..30b5b62ac 100644 --- a/src/resources/client_info/SWGFile.java +++ b/src/resources/client_info/SWGFile.java @@ -35,7 +35,8 @@ import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; import java.nio.charset.StandardCharsets; -import resources.server_info.Log; +import com.projectswg.common.debug.Log; + /** * Created by Waverunner on 6/4/2015 diff --git a/src/resources/client_info/ServerFactory.java b/src/resources/client_info/ServerFactory.java index d60da4cb7..5c818806c 100644 --- a/src/resources/client_info/ServerFactory.java +++ b/src/resources/client_info/ServerFactory.java @@ -27,10 +27,6 @@ package resources.client_info; -import resources.client_info.visitors.DatatableData; -import resources.client_info.visitors.DatatableData.ColumnType; -import resources.server_info.Log; - import java.io.File; import java.io.IOException; import java.nio.file.FileVisitResult; @@ -42,6 +38,11 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import resources.client_info.visitors.DatatableData; +import resources.client_info.visitors.DatatableData.ColumnType; + +import com.projectswg.common.debug.Log; + /** * Created by Waverunner on 6/9/2015 diff --git a/src/resources/client_info/visitors/DatatableData.java b/src/resources/client_info/visitors/DatatableData.java index 71e4b0289..62854b970 100644 --- a/src/resources/client_info/visitors/DatatableData.java +++ b/src/resources/client_info/visitors/DatatableData.java @@ -27,15 +27,16 @@ ***********************************************************************************/ package resources.client_info.visitors; -import resources.client_info.ClientData; -import resources.client_info.IffNode; -import resources.client_info.SWGFile; -import resources.server_info.Log; - import java.util.HashMap; import java.util.Locale; import java.util.Map; +import resources.client_info.ClientData; +import resources.client_info.IffNode; +import resources.client_info.SWGFile; + +import com.projectswg.common.debug.Log; + public class DatatableData extends ClientData { private final Map nameToIndex; diff --git a/src/resources/client_info/visitors/ObjectData.java b/src/resources/client_info/visitors/ObjectData.java index 58664c688..7821a4d92 100644 --- a/src/resources/client_info/visitors/ObjectData.java +++ b/src/resources/client_info/visitors/ObjectData.java @@ -33,11 +33,12 @@ import java.util.Hashtable; import java.util.List; import java.util.Map; -import resources.client_info.ClientFactory; import resources.client_info.ClientData; +import resources.client_info.ClientFactory; import resources.client_info.IffNode; import resources.client_info.SWGFile; -import resources.server_info.Log; + +import com.projectswg.common.debug.Log; public class ObjectData extends ClientData { diff --git a/src/resources/client_info/visitors/appearance/AppearanceTemplateList.java b/src/resources/client_info/visitors/appearance/AppearanceTemplateList.java index 99d1a3ea3..1d8a22724 100644 --- a/src/resources/client_info/visitors/appearance/AppearanceTemplateList.java +++ b/src/resources/client_info/visitors/appearance/AppearanceTemplateList.java @@ -35,7 +35,8 @@ import resources.client_info.IffNode; import resources.client_info.SWGFile; import resources.client_info.visitors.appearance.render.RenderData; import resources.client_info.visitors.appearance.render.RenderableData; -import resources.server_info.Log; + +import com.projectswg.common.debug.Log; public class AppearanceTemplateList extends ClientData implements RenderableData { diff --git a/src/resources/client_info/visitors/appearance/DetailedAppearanceTemplateData.java b/src/resources/client_info/visitors/appearance/DetailedAppearanceTemplateData.java index ed44596b4..6cec3eb13 100644 --- a/src/resources/client_info/visitors/appearance/DetailedAppearanceTemplateData.java +++ b/src/resources/client_info/visitors/appearance/DetailedAppearanceTemplateData.java @@ -37,7 +37,8 @@ import resources.client_info.SWGFile; import resources.client_info.visitors.appearance.render.RenderData; import resources.client_info.visitors.appearance.render.RenderableData; import resources.client_info.visitors.appearance.render.RenderableDataChild; -import resources.server_info.Log; + +import com.projectswg.common.debug.Log; public class DetailedAppearanceTemplateData extends ClientData implements RenderableData { diff --git a/src/resources/collections/SWGList.java b/src/resources/collections/SWGList.java index 5045eeed0..5a42e8694 100644 --- a/src/resources/collections/SWGList.java +++ b/src/resources/collections/SWGList.java @@ -27,15 +27,6 @@ ***********************************************************************************/ package resources.collections; -import network.packets.Packet; -import network.packets.swg.zone.baselines.Baseline.BaselineType; -import resources.encodables.Encodable; -import resources.network.NetBuffer; -import resources.objects.SWGObject; -import resources.server_info.Log; -import utilities.Encoder; -import utilities.Encoder.StringType; - import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.AbstractList; @@ -43,8 +34,17 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import network.packets.Packet; +import network.packets.swg.zone.baselines.Baseline.BaselineType; +import resources.encodables.Encodable; +import resources.network.NetBuffer; +import resources.objects.SWGObject; +import utilities.Encoder; +import utilities.Encoder.StringType; + import com.projectswg.common.concurrency.SynchronizedList; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; /** * Supports a list of elements which automatically sends data as a delta when changed for baselines. diff --git a/src/resources/collections/SWGMap.java b/src/resources/collections/SWGMap.java index fb41dc797..799a22cda 100644 --- a/src/resources/collections/SWGMap.java +++ b/src/resources/collections/SWGMap.java @@ -36,11 +36,11 @@ import network.packets.Packet; import resources.encodables.Encodable; import resources.network.NetBuffer; import resources.objects.SWGObject; -import resources.server_info.Log; import utilities.Encoder; import utilities.Encoder.StringType; import com.projectswg.common.concurrency.SynchronizedMap; +import com.projectswg.common.debug.Log; public class SWGMap extends SynchronizedMap implements Encodable { diff --git a/src/resources/collections/SWGSet.java b/src/resources/collections/SWGSet.java index cac052d7e..7dd539dc5 100644 --- a/src/resources/collections/SWGSet.java +++ b/src/resources/collections/SWGSet.java @@ -41,12 +41,12 @@ import network.packets.swg.zone.baselines.Baseline; import resources.encodables.Encodable; import resources.network.NetBuffer; import resources.objects.SWGObject; -import resources.server_info.Log; import utilities.Encoder; import utilities.Encoder.StringType; import com.projectswg.common.concurrency.SynchronizedList; import com.projectswg.common.concurrency.SynchronizedSet; +import com.projectswg.common.debug.Log; public class SWGSet extends SynchronizedSet implements Encodable { diff --git a/src/resources/commands/callbacks/AdminTeleportCallback.java b/src/resources/commands/callbacks/AdminTeleportCallback.java index 5a20474c5..ba7969581 100644 --- a/src/resources/commands/callbacks/AdminTeleportCallback.java +++ b/src/resources/commands/callbacks/AdminTeleportCallback.java @@ -33,9 +33,10 @@ import resources.Terrain; import resources.commands.ICmdCallback; import resources.objects.SWGObject; import resources.player.Player; -import resources.server_info.Log; import services.galaxy.GalacticManager; +import com.projectswg.common.debug.Log; + public class AdminTeleportCallback implements ICmdCallback { @Override diff --git a/src/resources/commands/callbacks/GotoCmdCallback.java b/src/resources/commands/callbacks/GotoCmdCallback.java index b21f015bc..2dca8c68b 100644 --- a/src/resources/commands/callbacks/GotoCmdCallback.java +++ b/src/resources/commands/callbacks/GotoCmdCallback.java @@ -40,10 +40,10 @@ import resources.objects.SWGObject; import resources.objects.building.BuildingObject; import resources.objects.cell.CellObject; import resources.player.Player; -import resources.server_info.Log; import services.galaxy.GalacticManager; import services.objects.ObjectManager; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalServerData; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/resources/commands/callbacks/QaToolCmdCallback.java b/src/resources/commands/callbacks/QaToolCmdCallback.java index f33d01d2a..80e9a36ec 100644 --- a/src/resources/commands/callbacks/QaToolCmdCallback.java +++ b/src/resources/commands/callbacks/QaToolCmdCallback.java @@ -49,7 +49,6 @@ import resources.objects.building.BuildingObject; import resources.objects.cell.CellObject; import resources.objects.creature.CreatureObject; import resources.player.Player; -import resources.server_info.Log; import resources.sui.ISuiCallback; import resources.sui.SuiButtons; import resources.sui.SuiEvent; @@ -62,6 +61,7 @@ import services.objects.StaticItemService.ObjectCreationHandler; import services.player.PlayerManager; import utilities.Scripts; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalServerData; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/resources/commands/callbacks/RequestBiographyCmdCallback.java b/src/resources/commands/callbacks/RequestBiographyCmdCallback.java index d23bf759a..54540df29 100644 --- a/src/resources/commands/callbacks/RequestBiographyCmdCallback.java +++ b/src/resources/commands/callbacks/RequestBiographyCmdCallback.java @@ -32,9 +32,10 @@ import resources.commands.ICmdCallback; import resources.objects.SWGObject; import resources.objects.creature.CreatureObject; import resources.player.Player; -import resources.server_info.Log; import services.galaxy.GalacticManager; +import com.projectswg.common.debug.Log; + /** * * @author mads diff --git a/src/resources/commands/callbacks/ServerCmdCallback.java b/src/resources/commands/callbacks/ServerCmdCallback.java index 9aa85c001..5c4b3b5e7 100644 --- a/src/resources/commands/callbacks/ServerCmdCallback.java +++ b/src/resources/commands/callbacks/ServerCmdCallback.java @@ -29,10 +29,14 @@ package resources.commands.callbacks; import intents.server.ServerManagementIntent; import intents.server.ServerManagementIntent.ServerManagementEvent; + +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; + import resources.commands.ICmdCallback; import resources.objects.SWGObject; import resources.player.Player; -import resources.server_info.Log; import resources.sui.ISuiCallback; import resources.sui.SuiButtons; import resources.sui.SuiEvent; @@ -41,9 +45,7 @@ import resources.sui.SuiListBox; import resources.sui.SuiMessageBox; import services.galaxy.GalacticManager; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; +import com.projectswg.common.debug.Log; public class ServerCmdCallback implements ICmdCallback { diff --git a/src/resources/encodables/OutOfBandPackage.java b/src/resources/encodables/OutOfBandPackage.java index 19d77b4d5..ab2af656e 100644 --- a/src/resources/encodables/OutOfBandPackage.java +++ b/src/resources/encodables/OutOfBandPackage.java @@ -27,12 +27,6 @@ ***********************************************************************************/ package resources.encodables; -import network.packets.Packet; -import resources.network.NetBufferStream; -import resources.objects.waypoint.WaypointObject; -import resources.persistable.Persistable; -import resources.server_info.Log; - import java.io.IOException; import java.io.ObjectInputStream; import java.nio.ByteBuffer; @@ -42,6 +36,13 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; +import network.packets.Packet; +import resources.network.NetBufferStream; +import resources.objects.waypoint.WaypointObject; +import resources.persistable.Persistable; + +import com.projectswg.common.debug.Log; + public class OutOfBandPackage implements Encodable, Persistable { private List packages; diff --git a/src/resources/encodables/ProsePackage.java b/src/resources/encodables/ProsePackage.java index 7b1004013..ec193676a 100644 --- a/src/resources/encodables/ProsePackage.java +++ b/src/resources/encodables/ProsePackage.java @@ -27,16 +27,16 @@ ***********************************************************************************/ package resources.encodables; -import network.packets.Packet; - import java.math.BigInteger; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.charset.Charset; +import network.packets.Packet; import resources.network.NetBufferStream; import resources.persistable.Persistable; -import resources.server_info.Log; + +import com.projectswg.common.debug.Log; public class ProsePackage implements OutOfBandData { diff --git a/src/resources/encodables/StringId.java b/src/resources/encodables/StringId.java index 0cf7a26ad..2fccfcd75 100644 --- a/src/resources/encodables/StringId.java +++ b/src/resources/encodables/StringId.java @@ -27,13 +27,13 @@ ***********************************************************************************/ package resources.encodables; -import network.packets.Packet; - import java.nio.ByteBuffer; +import network.packets.Packet; import resources.network.NetBufferStream; import resources.persistable.Persistable; -import resources.server_info.Log; + +import com.projectswg.common.debug.Log; public class StringId implements OutOfBandData, Persistable { diff --git a/src/resources/encodables/player/Equipment.java b/src/resources/encodables/player/Equipment.java index 697e42271..283948f5b 100644 --- a/src/resources/encodables/player/Equipment.java +++ b/src/resources/encodables/player/Equipment.java @@ -27,6 +27,8 @@ ***********************************************************************************/ package resources.encodables.player; +import java.nio.ByteBuffer; + import network.packets.swg.zone.baselines.Baseline; import resources.common.CRC; import resources.encodables.Encodable; @@ -38,10 +40,9 @@ import resources.objects.weapon.WeaponObject; import resources.persistable.Persistable; import resources.persistable.SWGObjectFactory; import resources.player.Player; -import resources.server_info.Log; import services.objects.ObjectCreator; -import java.nio.ByteBuffer; +import com.projectswg.common.debug.Log; public class Equipment implements Encodable, Persistable { diff --git a/src/resources/network/BaselineBuilder.java b/src/resources/network/BaselineBuilder.java index de44cc8f3..dc4d06120 100644 --- a/src/resources/network/BaselineBuilder.java +++ b/src/resources/network/BaselineBuilder.java @@ -27,16 +27,17 @@ ***********************************************************************************/ package resources.network; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.nio.charset.Charset; + import network.packets.swg.zone.baselines.Baseline; import network.packets.swg.zone.baselines.Baseline.BaselineType; import resources.encodables.Encodable; import resources.objects.SWGObject; import resources.player.Player; -import resources.server_info.Log; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.nio.charset.Charset; +import com.projectswg.common.debug.Log; public class BaselineBuilder { diff --git a/src/resources/network/NetBuffer.java b/src/resources/network/NetBuffer.java index 47a7ce4ce..6f31aa31e 100644 --- a/src/resources/network/NetBuffer.java +++ b/src/resources/network/NetBuffer.java @@ -36,9 +36,10 @@ import resources.collections.SWGList; import resources.collections.SWGMap; import resources.collections.SWGSet; import resources.encodables.Encodable; -import resources.server_info.Log; import utilities.Encoder.StringType; +import com.projectswg.common.debug.Log; + public class NetBuffer { diff --git a/src/resources/network/TCPServer.java b/src/resources/network/TCPServer.java index f2c4af0ea..292200429 100644 --- a/src/resources/network/TCPServer.java +++ b/src/resources/network/TCPServer.java @@ -47,9 +47,10 @@ import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import resources.server_info.Log; import utilities.ThreadUtilities; +import com.projectswg.common.debug.Log; + public class TCPServer { diff --git a/src/resources/network/UDPServer.java b/src/resources/network/UDPServer.java index 74e79f258..06f798175 100644 --- a/src/resources/network/UDPServer.java +++ b/src/resources/network/UDPServer.java @@ -37,7 +37,8 @@ import java.net.UnknownHostException; import java.util.Queue; import java.util.concurrent.LinkedBlockingQueue; -import resources.server_info.Log; +import com.projectswg.common.debug.Log; + /** * This class represents a UDP server that listens for packets and diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java index 4784c2559..0f0d1474f 100644 --- a/src/resources/objects/SWGObject.java +++ b/src/resources/objects/SWGObject.java @@ -64,7 +64,6 @@ import resources.objects.creature.CreatureObject; import resources.persistable.Persistable; import resources.persistable.SWGObjectFactory; import resources.player.Player; -import resources.server_info.Log; import services.CoreManager; import services.objects.ObjectCreator; import utilities.AwarenessUtilities; @@ -72,6 +71,7 @@ import utilities.AwarenessUtilities; import com.projectswg.common.concurrency.SynchronizedMap; import com.projectswg.common.concurrency.SynchronizedSet; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; public abstract class SWGObject extends BaselineObject implements Comparable, Persistable { diff --git a/src/resources/objects/awareness/AwarenessHandler.java b/src/resources/objects/awareness/AwarenessHandler.java index ff0b84815..f452801a7 100644 --- a/src/resources/objects/awareness/AwarenessHandler.java +++ b/src/resources/objects/awareness/AwarenessHandler.java @@ -34,9 +34,9 @@ import resources.Location; import resources.Terrain; import resources.objects.SWGObject; import resources.objects.awareness.TerrainMap.TerrainMapCallback; -import resources.server_info.Log; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; public class AwarenessHandler implements AutoCloseable { diff --git a/src/resources/objects/awareness/TerrainMap.java b/src/resources/objects/awareness/TerrainMap.java index f3bfd4736..9aab8c9b2 100644 --- a/src/resources/objects/awareness/TerrainMap.java +++ b/src/resources/objects/awareness/TerrainMap.java @@ -35,10 +35,10 @@ import resources.Terrain; import resources.objects.SWGObject; import resources.objects.creature.CreatureObject; import resources.objects.waypoint.WaypointObject; -import resources.server_info.Log; import com.projectswg.common.callback.CallbackManager; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; public class TerrainMap { diff --git a/src/resources/objects/buildouts/BuildoutLoader.java b/src/resources/objects/buildouts/BuildoutLoader.java index f1a71e131..cb4ea3479 100644 --- a/src/resources/objects/buildouts/BuildoutLoader.java +++ b/src/resources/objects/buildouts/BuildoutLoader.java @@ -39,7 +39,8 @@ import resources.client_info.ClientFactory; import resources.client_info.visitors.CrcStringTableData; import resources.client_info.visitors.DatatableData; import resources.objects.SWGObject; -import resources.server_info.Log; + +import com.projectswg.common.debug.Log; public class BuildoutLoader { diff --git a/src/resources/objects/buildouts/TerrainBuildoutLoader.java b/src/resources/objects/buildouts/TerrainBuildoutLoader.java index 6fa6fa939..41906ca00 100644 --- a/src/resources/objects/buildouts/TerrainBuildoutLoader.java +++ b/src/resources/objects/buildouts/TerrainBuildoutLoader.java @@ -40,9 +40,10 @@ import resources.client_info.visitors.DatatableData; import resources.objects.SWGObject; import resources.objects.SWGObject.ObjectClassification; import resources.objects.cell.CellObject; -import resources.server_info.Log; import services.objects.ObjectCreator; +import com.projectswg.common.debug.Log; + class TerrainBuildoutLoader { private static final String BASE_PATH = "datatables/buildout/"; diff --git a/src/resources/objects/buildouts/TerrainSnapshotLoader.java b/src/resources/objects/buildouts/TerrainSnapshotLoader.java index 1ab1a1ce7..f801b2572 100644 --- a/src/resources/objects/buildouts/TerrainSnapshotLoader.java +++ b/src/resources/objects/buildouts/TerrainSnapshotLoader.java @@ -41,9 +41,10 @@ import resources.objects.SWGObject; import resources.objects.SWGObject.ObjectClassification; import resources.objects.building.BuildingObject; import resources.objects.cell.CellObject; -import resources.server_info.Log; import services.objects.ObjectCreator; +import com.projectswg.common.debug.Log; + public class TerrainSnapshotLoader { private static final String BASE_PATH = "snapshot/"; diff --git a/src/resources/radial/RadialOptionList.java b/src/resources/radial/RadialOptionList.java index 28c7cce99..22fac5a9e 100644 --- a/src/resources/radial/RadialOptionList.java +++ b/src/resources/radial/RadialOptionList.java @@ -36,7 +36,8 @@ import java.util.Map; import network.packets.Packet; import resources.encodables.Encodable; -import resources.server_info.Log; + +import com.projectswg.common.debug.Log; public class RadialOptionList implements Encodable { diff --git a/src/resources/radial/Radials.java b/src/resources/radial/Radials.java index 9ddca9412..392c1f39e 100644 --- a/src/resources/radial/Radials.java +++ b/src/resources/radial/Radials.java @@ -30,11 +30,13 @@ package resources.radial; import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.List; + import resources.objects.SWGObject; import resources.player.Player; -import resources.server_info.Log; import utilities.Scripts; +import com.projectswg.common.debug.Log; + public class Radials { private static final String SCRIPT_PREFIX = "radial/"; diff --git a/src/resources/server_info/CachedObjectDatabase.java b/src/resources/server_info/CachedObjectDatabase.java index f773b24d6..6ec4455d4 100644 --- a/src/resources/server_info/CachedObjectDatabase.java +++ b/src/resources/server_info/CachedObjectDatabase.java @@ -39,6 +39,8 @@ import resources.persistable.OutputPersistenceStream; import resources.persistable.OutputPersistenceStream.PersistableSaver; import resources.persistable.Persistable; +import com.projectswg.common.debug.Log; + public class CachedObjectDatabase extends ObjectDatabase { private final PersistableCreator creator; diff --git a/src/resources/server_info/ConfigWatcher.java b/src/resources/server_info/ConfigWatcher.java index 7edd0cab3..72ea41c53 100644 --- a/src/resources/server_info/ConfigWatcher.java +++ b/src/resources/server_info/ConfigWatcher.java @@ -41,11 +41,12 @@ import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.atomic.AtomicBoolean; -import com.projectswg.common.concurrency.PswgBasicThread; -import com.projectswg.common.info.Config; - import resources.config.ConfigFile; +import com.projectswg.common.concurrency.PswgBasicThread; +import com.projectswg.common.debug.Log; +import com.projectswg.common.info.Config; + public final class ConfigWatcher { private static final String CFGPATH = "cfg/"; diff --git a/src/resources/server_info/CrcDatabase.java b/src/resources/server_info/CrcDatabase.java index 6482b98dd..2756d7e60 100644 --- a/src/resources/server_info/CrcDatabase.java +++ b/src/resources/server_info/CrcDatabase.java @@ -35,6 +35,7 @@ import java.util.Map; import resources.common.CRC; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalDatabase; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/resources/server_info/DataManager.java b/src/resources/server_info/DataManager.java index 1e755c7eb..2c743bfe5 100644 --- a/src/resources/server_info/DataManager.java +++ b/src/resources/server_info/DataManager.java @@ -32,13 +32,14 @@ import java.io.IOException; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; +import resources.config.ConfigFile; + import com.projectswg.common.concurrency.SynchronizedMap; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.Config; import com.projectswg.common.info.RelationalServerFactory; -import resources.config.ConfigFile; - public class DataManager { private static final Object instanceLock = new Object(); diff --git a/src/resources/server_info/Log.java b/src/resources/server_info/Log.java deleted file mode 100644 index df589ab95..000000000 --- a/src/resources/server_info/Log.java +++ /dev/null @@ -1,297 +0,0 @@ -/*********************************************************************************** -* Copyright (c) 2015 /// Project SWG /// www.projectswg.com * -* * -* ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on * -* July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. * -* Our goal is to create an emulator which will provide a server for players to * -* continue playing a game similar to the one they used to play. We are basing * -* it on the final publish of the game prior to end-game events. * -* * -* This file is part of Holocore. * -* * -* -------------------------------------------------------------------------------- * -* * -* Holocore is free software: you can redistribute it and/or modify * -* it under the terms of the GNU Affero General Public License as * -* published by the Free Software Foundation, either version 3 of the * -* License, or (at your option) any later version. * -* * -* Holocore is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU Affero General Public License for more details. * -* * -* You should have received a copy of the GNU Affero General Public License * -* along with Holocore. If not, see . * -* * -***********************************************************************************/ -package resources.server_info; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.PrintStream; -import java.nio.charset.StandardCharsets; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.concurrent.atomic.AtomicReference; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -public class Log { - - private static Log INSTANCE = null; - - private final Lock logLock; - private final DateFormat timeFormat; - private final File file; - private final AtomicReference level; - private BufferedWriter writer; - private boolean open; - - private Log(String filename, LogLevel level) { - this.logLock = new ReentrantLock(true); - this.timeFormat = new SimpleDateFormat("dd-MM-yy HH:mm:ss.SSS"); - this.file = new File(filename); - this.level = new AtomicReference<>(level); - open = false; - } - - private synchronized void open() throws IOException { - if (!open) - writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)); - open = true; - } - - private synchronized void close() throws IOException { - if (open) - writer.close(); - open = false; - } - - private synchronized void write(String str) throws IOException { - if (open) { - writer.write(str); - writer.newLine(); - writer.flush(); - } - } - - private synchronized void setLevel(LogLevel level) { - this.level.set(level); - } - - private synchronized LogLevel getLevel() { - return level.get(); - } - - private synchronized void logRaw(LogLevel level, String logStr) { - PrintStream stream; - if (level.compareTo(LogLevel.WARN) >= 0) - stream = System.err; - else - stream = System.out; - stream.println(logStr); - stream.flush(); - try { - write(logStr); - } catch (IOException e) { - e.printStackTrace(); - } - } - - private void logImplementation(LogLevel level, String str, Object ... args) { - if (getLevel().compareTo(level) > 0) - return; - String date; - synchronized (timeFormat) { - date = timeFormat.format(System.currentTimeMillis()); - } - if (args.length == 0) - logRaw(level, date + ' ' + level.getChar() + ": " + str); - else - logRaw(level, date + ' ' + level.getChar() + ": " + String.format(str, args)); - } - - private void lock() { - logLock.lock(); - } - - private void unlock() { - logLock.unlock(); - } - - private static synchronized final Log getInstance() { - if (INSTANCE == null) - INSTANCE = new Log("log.txt", LogLevel.VERBOSE); - return INSTANCE; - } - - protected static final void start() { - try { - getInstance().open(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - protected static final void stop() { - try { - getInstance().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - /** - * Sets the minimum level for logs to be reported. This is according to the - * following order: VERBOSE, DEBUG, INFO, WARNING, ERROR, then ASSERT. - * @param level the minimum log level, inclusively. Default is VERBOSE - */ - public static final void setLogLevel(LogLevel level) { - getInstance().setLevel(level); - } - - /** - * Logs the string to the server log file, formatted to display the log - * severity, time and message. - * @param level the log level of this message between VERBOSE and ASSERT - * @param tag the tag to use for the log - * @param str the format string for the log - * @param args the string format arguments, if specified - */ - public static final void log(LogLevel level, String str, Object ... args) { - try { - getInstance().lock(); - getInstance().logImplementation(level, str, args); - } finally { - getInstance().unlock(); - } - } - - /** - * Logs the string to the server log file, formatted to display the log - * severity as VERBOSE, as well as the time and message. - * @param message the format string for the log - * @param args the string format arguments, if specified - */ - public static final void v(String message, Object ... args) { - log(LogLevel.VERBOSE, message, args); - } - - /** - * Logs the string to the server log file, formatted to display the log - * severity as DEBUG, as well as the time and message. - * @param message the format string for the log - * @param args the string format arguments, if specified - */ - public static final void d(String message, Object ... args) { - log(LogLevel.DEBUG, message, args); - } - - /** - * Logs the string to the server log file, formatted to display the log - * severity as INFO, as well as the time and message. - * @param message the format string for the log - * @param args the string format arguments, if specified - */ - public static final void i(String message, Object ... args) { - log(LogLevel.INFO, message, args); - } - - /** - * Logs the string to the server log file, formatted to display the log - * severity as WARN, as well as the time and message. - * @param message the format string for the log - * @param args the string format arguments, if specified - */ - public static final void w(String message, Object ... args) { - log(LogLevel.WARN, message, args); - } - - - /** - * Logs the exception to the server log file, formatted to display the log - * severity as WARN, as well as the time, and tag. - * @param exception the exception to print - */ - public static final void w(Throwable exception) { - printException(LogLevel.WARN, exception); - } - - /** - * Logs the string to the server log file, formatted to display the log - * severity as ERROR, as well as the time and message. - * @param tag the tag to use for the log - * @param message the format string for the log - * @param args the string format arguments, if specified - */ - public static final void e(String message, Object ... args) { - log(LogLevel.ERROR, message, args); - } - - /** - * Logs the exception to the server log file, formatted to display the log - * severity as ERROR, as well as the time, and tag. - * @param exception the exception to print - */ - public static final void e(Throwable exception) { - printException(LogLevel.ERROR, exception); - } - - /** - * Logs the string to the server log file, formatted to display the log - * severity as ASSERT, as well as the time and message. - * @param message the format string for the log - * @param args the string format arguments, if specified - */ - public static final void a(String message, Object ... args) { - log(LogLevel.ASSERT, message, args); - } - - /** - * Logs the exception to the server log file, formatted to display the log - * severity as ASSERT, as well as the time, and tag. - * @param exception the exception to print - */ - public static final void a(Throwable exception) { - printException(LogLevel.ASSERT, exception); - } - - private static final void printException(LogLevel level, Throwable exception) { - Log instance = getInstance(); - try { - String header1 = String.format("Exception in thread \"%s\" %s: %s", Thread.currentThread().getName(), exception.getClass().getName(), exception.getMessage()); - String header2 = String.format("Caused by: %s: %s", exception.getClass().getCanonicalName(), exception.getMessage()); - StackTraceElement [] elements = exception.getStackTrace(); - instance.lock(); - instance.logImplementation(level, header1); - instance.logImplementation(level, header2); - for (StackTraceElement e : elements) { - instance.logImplementation(level, " " + e.toString()); - } - } finally { - instance.unlock(); - } - } - - public static enum LogLevel { - VERBOSE ('V'), - DEBUG ('D'), - INFO ('I'), - WARN ('W'), - ERROR ('E'), - ASSERT ('A'); - - private char c; - - LogLevel(char c) { - this.c = c; - } - - public char getChar() { return c; } - } - -} diff --git a/src/resources/server_info/ObjectDatabase.java b/src/resources/server_info/ObjectDatabase.java index ec62955e9..cfcda029e 100644 --- a/src/resources/server_info/ObjectDatabase.java +++ b/src/resources/server_info/ObjectDatabase.java @@ -34,6 +34,7 @@ import java.util.concurrent.TimeUnit; import resources.persistable.Persistable; import com.projectswg.common.concurrency.PswgBasicScheduledThread; +import com.projectswg.common.debug.Log; public abstract class ObjectDatabase { diff --git a/src/resources/server_info/StandardLog.java b/src/resources/server_info/StandardLog.java index 6fe990842..45c36188c 100644 --- a/src/resources/server_info/StandardLog.java +++ b/src/resources/server_info/StandardLog.java @@ -27,6 +27,8 @@ ***********************************************************************************/ package resources.server_info; +import com.projectswg.common.debug.Log; + public class StandardLog { public static long onStartLoad(String what) { diff --git a/src/resources/sui/SuiBaseWindow.java b/src/resources/sui/SuiBaseWindow.java index 91e741fac..733008897 100644 --- a/src/resources/sui/SuiBaseWindow.java +++ b/src/resources/sui/SuiBaseWindow.java @@ -27,10 +27,6 @@ ***********************************************************************************/ package resources.sui; -import network.packets.Packet; -import resources.encodables.Encodable; -import resources.server_info.Log; - import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -38,6 +34,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import network.packets.Packet; +import resources.encodables.Encodable; + +import com.projectswg.common.debug.Log; + public class SuiBaseWindow implements Encodable { private int id; diff --git a/src/resources/sui/SuiComponent.java b/src/resources/sui/SuiComponent.java index fe1bc9e66..92ed62564 100644 --- a/src/resources/sui/SuiComponent.java +++ b/src/resources/sui/SuiComponent.java @@ -27,16 +27,17 @@ package resources.sui; -import network.packets.Packet; -import resources.encodables.Encodable; -import resources.server_info.Log; -import utilities.Encoder; - import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; +import network.packets.Packet; +import resources.encodables.Encodable; +import utilities.Encoder; + +import com.projectswg.common.debug.Log; + /** * @author Waverunner */ diff --git a/src/resources/zone/NameFilter.java b/src/resources/zone/NameFilter.java index 2198d67fd..75c570910 100644 --- a/src/resources/zone/NameFilter.java +++ b/src/resources/zone/NameFilter.java @@ -30,7 +30,6 @@ package resources.zone; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; @@ -38,7 +37,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import resources.server_info.Log; +import com.projectswg.common.debug.Log; + public class NameFilter { @@ -86,9 +86,6 @@ public class NameFilter { } } return true; - } catch (FileNotFoundException e) { - Log.e(e); - return false; } catch (IOException e) { Log.e(e); return false; diff --git a/src/services/CoreManager.java b/src/services/CoreManager.java index 935fe53b6..eb300ae58 100644 --- a/src/services/CoreManager.java +++ b/src/services/CoreManager.java @@ -54,14 +54,13 @@ import resources.Galaxy.GalaxyStatus; import resources.config.ConfigFile; import resources.control.ServerStatus; import resources.server_info.DataManager; -import resources.server_info.Log; -import resources.server_info.Log.LogLevel; import services.galaxy.GalacticManager; import utilities.CrcDatabaseGenerator; import utilities.ScheduledUtilities; import utilities.ThreadUtilities; import com.projectswg.common.control.Manager; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.Config; public class CoreManager extends Manager { @@ -81,7 +80,6 @@ public class CoreManager extends Manager { public CoreManager(int adminServerPort) { Config c = DataManager.getConfig(ConfigFile.PRIMARY); - Log.setLogLevel(LogLevel.valueOf(c.getString("LOG-LEVEL", LogLevel.DEBUG.name()))); setupGalaxy(c); setupCrcDatabase(); if (adminServerPort <= 0) diff --git a/src/services/EngineManager.java b/src/services/EngineManager.java index 1cf52ab38..b8158c4d8 100644 --- a/src/services/EngineManager.java +++ b/src/services/EngineManager.java @@ -33,10 +33,10 @@ import java.io.IOException; import resources.client_info.ServerFactory; import resources.config.ConfigFile; import resources.server_info.DataManager; -import resources.server_info.Log; import services.network.NetworkManager; import com.projectswg.common.control.Manager; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.Config; import com.projectswg.common.info.RelationalDatabase; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/chat/ChatMailService.java b/src/services/chat/ChatMailService.java index 34b28b7a6..d05a90415 100644 --- a/src/services/chat/ChatMailService.java +++ b/src/services/chat/ChatMailService.java @@ -52,7 +52,6 @@ import resources.objects.SWGObject; import resources.objects.player.PlayerObject; import resources.player.Player; import resources.server_info.CachedObjectDatabase; -import resources.server_info.Log; import resources.server_info.ObjectDatabase; import services.CoreManager; import services.chat.ChatManager.ChatRange; @@ -60,6 +59,7 @@ import services.chat.ChatManager.ChatType; import services.player.PlayerManager; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalServerData; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/chat/ChatManager.java b/src/services/chat/ChatManager.java index a72fb93b0..55de30d0e 100644 --- a/src/services/chat/ChatManager.java +++ b/src/services/chat/ChatManager.java @@ -56,10 +56,10 @@ import resources.objects.SWGObject; import resources.objects.player.PlayerObject; import resources.player.Player; import resources.player.PlayerState; -import resources.server_info.Log; import com.projectswg.common.control.Manager; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalServerData; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/chat/ChatRoomContainer.java b/src/services/chat/ChatRoomContainer.java index 351ecf9b0..5814eb2c3 100644 --- a/src/services/chat/ChatRoomContainer.java +++ b/src/services/chat/ChatRoomContainer.java @@ -33,9 +33,9 @@ import java.util.List; import java.util.Map; import resources.chat.ChatRoom; -import resources.server_info.Log; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; public class ChatRoomContainer { diff --git a/src/services/chat/ChatRoomHandler.java b/src/services/chat/ChatRoomHandler.java index d9287ab35..eea162253 100644 --- a/src/services/chat/ChatRoomHandler.java +++ b/src/services/chat/ChatRoomHandler.java @@ -33,10 +33,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import com.projectswg.common.debug.Assert; -import com.projectswg.common.info.RelationalServerData; -import com.projectswg.common.info.RelationalServerFactory; - import network.packets.swg.zone.chat.ChatOnDestroyRoom; import network.packets.swg.zone.chat.ChatOnEnteredRoom; import network.packets.swg.zone.chat.ChatOnLeaveRoom; @@ -51,12 +47,16 @@ import resources.encodables.OutOfBandPackage; import resources.player.AccessLevel; import resources.player.Player; import resources.server_info.CachedObjectDatabase; -import resources.server_info.Log; import resources.server_info.ObjectDatabase; import services.CoreManager; import services.chat.ChatManager.ChatRange; import services.chat.ChatManager.ChatType; +import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; +import com.projectswg.common.info.RelationalServerData; +import com.projectswg.common.info.RelationalServerFactory; + public class ChatRoomHandler { private final ObjectDatabase database; diff --git a/src/services/collections/CollectionService.java b/src/services/collections/CollectionService.java index bf251be3d..5c9ff8169 100644 --- a/src/services/collections/CollectionService.java +++ b/src/services/collections/CollectionService.java @@ -42,9 +42,9 @@ import resources.objects.collections.ClickyCollectionItem; import resources.objects.collections.CollectionItem; import resources.radial.RadialOption; import resources.radial.Radials; -import resources.server_info.Log; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalServerData; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/collections/ExplorationBadgeService.java b/src/services/collections/ExplorationBadgeService.java index 7d337b4e0..c5c2e5445 100644 --- a/src/services/collections/ExplorationBadgeService.java +++ b/src/services/collections/ExplorationBadgeService.java @@ -40,9 +40,9 @@ import java.util.TreeMap; import resources.Point3D; import resources.objects.creature.CreatureObject; -import resources.server_info.Log; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalServerData; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/combat/CombatManager.java b/src/services/combat/CombatManager.java index d37607836..44d36ba08 100644 --- a/src/services/combat/CombatManager.java +++ b/src/services/combat/CombatManager.java @@ -71,11 +71,11 @@ import resources.objects.creature.CreatureObject; import resources.objects.staticobject.StaticObject; import resources.objects.tangible.TangibleObject; import resources.objects.weapon.WeaponObject; -import resources.server_info.Log; import services.objects.ObjectCreator; import utilities.ThreadUtilities; import com.projectswg.common.control.Manager; +import com.projectswg.common.debug.Log; public class CombatManager extends Manager { diff --git a/src/services/combat/CombatXpService.java b/src/services/combat/CombatXpService.java index f14783b4a..bafa5fed4 100644 --- a/src/services/combat/CombatXpService.java +++ b/src/services/combat/CombatXpService.java @@ -41,10 +41,10 @@ import resources.objects.SWGObject; import resources.objects.creature.CreatureDifficulty; import resources.objects.creature.CreatureObject; import resources.objects.group.GroupObject; -import resources.server_info.Log; import resources.server_info.StandardLog; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalDatabase; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/combat/CorpseService.java b/src/services/combat/CorpseService.java index 4f95ecf8c..9970dab83 100644 --- a/src/services/combat/CorpseService.java +++ b/src/services/combat/CorpseService.java @@ -63,7 +63,6 @@ import resources.objects.building.BuildingObject; import resources.objects.cell.CellObject; import resources.objects.creature.CreatureObject; import resources.player.Player; -import resources.server_info.Log; import resources.server_info.StandardLog; import resources.sui.SuiButtons; import resources.sui.SuiEvent; @@ -72,6 +71,7 @@ import resources.sui.SuiWindow; import utilities.ThreadUtilities; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalDatabase; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/commands/BuffService.java b/src/services/commands/BuffService.java index 650e655e1..c96a1a73f 100644 --- a/src/services/commands/BuffService.java +++ b/src/services/commands/BuffService.java @@ -45,7 +45,6 @@ import network.packets.swg.zone.PlayClientEffectObjectMessage; import resources.common.CRC; import resources.objects.creature.Buff; import resources.objects.creature.CreatureObject; -import resources.server_info.Log; import resources.server_info.StandardLog; import services.commands.buff.BuffData; import services.commands.buff.BuffMap; @@ -54,6 +53,7 @@ import utilities.Scripts; import com.projectswg.common.concurrency.PswgBasicScheduledThread; import com.projectswg.common.control.Service; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; public class BuffService extends Service { diff --git a/src/services/commands/CommandCooldownHandler.java b/src/services/commands/CommandCooldownHandler.java index 67b954592..41ebeb852 100644 --- a/src/services/commands/CommandCooldownHandler.java +++ b/src/services/commands/CommandCooldownHandler.java @@ -36,10 +36,10 @@ import network.packets.swg.zone.object_controller.CommandTimer; import resources.commands.Command; import resources.common.CRC; import resources.objects.creature.CreatureObject; -import resources.server_info.Log; import services.commands.CommandLauncher.EnqueuedCommand; import com.projectswg.common.concurrency.PswgScheduledThreadPool; +import com.projectswg.common.debug.Log; public class CommandCooldownHandler { diff --git a/src/services/commands/CommandLauncher.java b/src/services/commands/CommandLauncher.java index 0525b3dbd..9b3afb4c6 100644 --- a/src/services/commands/CommandLauncher.java +++ b/src/services/commands/CommandLauncher.java @@ -35,7 +35,7 @@ import java.util.HashMap; import java.util.Map; import java.util.PriorityQueue; import java.util.Queue; -import com.projectswg.common.concurrency.PswgScheduledThreadPool; + import network.packets.swg.zone.object_controller.CommandQueueDequeue; import network.packets.swg.zone.object_controller.CommandQueueEnqueue; import resources.commands.Command; @@ -45,10 +45,12 @@ import resources.objects.SWGObject; import resources.objects.creature.CreatureObject; import resources.player.AccessLevel; import resources.player.Player; -import resources.server_info.Log; import services.galaxy.GalacticManager; import utilities.Scripts; +import com.projectswg.common.concurrency.PswgScheduledThreadPool; +import com.projectswg.common.debug.Log; + public class CommandLauncher { private final Map> combatQueueMap; diff --git a/src/services/commands/CommandService.java b/src/services/commands/CommandService.java index 947ac4a2c..0722bddbe 100644 --- a/src/services/commands/CommandService.java +++ b/src/services/commands/CommandService.java @@ -31,33 +31,54 @@ import intents.PlayerEventIntent; import intents.network.GalacticPacketIntent; import intents.player.PlayerTransformedIntent; +import java.util.List; +import java.util.Locale; + import network.packets.Packet; import network.packets.swg.zone.object_controller.CommandQueueEnqueue; import resources.client_info.ClientFactory; import resources.client_info.visitors.DatatableData; import resources.combat.AttackType; import resources.combat.DamageType; +import resources.combat.DelayAttackEggPosition; +import resources.combat.HitType; import resources.combat.ValidTarget; import resources.commands.CombatCommand; import resources.commands.Command; +import resources.commands.DefaultPriority; import resources.commands.ICmdCallback; -import resources.commands.callbacks.*; +import resources.commands.callbacks.AdminTeleportCallback; +import resources.commands.callbacks.AttributesCmdCallback; +import resources.commands.callbacks.ChangeDanceCallback; +import resources.commands.callbacks.FindFriendCallback; +import resources.commands.callbacks.FlourishCmdCallback; +import resources.commands.callbacks.GotoCmdCallback; +import resources.commands.callbacks.JumpCmdCallback; +import resources.commands.callbacks.KneelCmdCallback; +import resources.commands.callbacks.PlayerAppearanceCallback; +import resources.commands.callbacks.ProneCmdCallback; +import resources.commands.callbacks.QaToolCmdCallback; +import resources.commands.callbacks.RequestBiographyCmdCallback; +import resources.commands.callbacks.RequestWaypointCmdCallback; +import resources.commands.callbacks.RevertAppearanceCallback; +import resources.commands.callbacks.ServerCmdCallback; +import resources.commands.callbacks.ServerDestroyObjectCmdCallback; +import resources.commands.callbacks.SitOnObjectCmdCallback; +import resources.commands.callbacks.SocialInternalCmdCallback; +import resources.commands.callbacks.StandCmdCallback; +import resources.commands.callbacks.StartDanceCallback; +import resources.commands.callbacks.TransferItemCallback; +import resources.commands.callbacks.WaypointCmdCallback; import resources.common.CRC; import resources.objects.SWGObject; +import resources.objects.creature.CreatureObject; import resources.objects.weapon.WeaponType; import resources.player.Player; -import resources.server_info.Log; import services.commands.CommandLauncher.EnqueuedCommand; import services.galaxy.GalacticManager; -import java.util.List; -import java.util.Locale; import com.projectswg.common.control.Service; - -import resources.combat.DelayAttackEggPosition; -import resources.combat.HitType; -import resources.commands.DefaultPriority; -import resources.objects.creature.CreatureObject; +import com.projectswg.common.debug.Log; public class CommandService extends Service { diff --git a/src/services/commands/EntertainmentService.java b/src/services/commands/EntertainmentService.java index 05d0cb2c3..8a7c82373 100644 --- a/src/services/commands/EntertainmentService.java +++ b/src/services/commands/EntertainmentService.java @@ -54,9 +54,9 @@ import resources.encodables.StringId; import resources.objects.SWGObject; import resources.objects.creature.CreatureObject; import resources.player.Player; -import resources.server_info.Log; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; /** * diff --git a/src/services/experience/ExperienceManager.java b/src/services/experience/ExperienceManager.java index b041389cc..d23d7db4b 100644 --- a/src/services/experience/ExperienceManager.java +++ b/src/services/experience/ExperienceManager.java @@ -46,9 +46,9 @@ import resources.encodables.StringId; import resources.objects.creature.CreatureObject; import resources.objects.player.PlayerObject; import resources.server_info.DataManager; -import resources.server_info.Log; import com.projectswg.common.control.Manager; +import com.projectswg.common.debug.Log; /** * The {@code ExperienceManager} listens for {@link ExperienceIntent} and diff --git a/src/services/experience/ExpertiseService.java b/src/services/experience/ExpertiseService.java index dc84a3ae7..f2ea7787d 100644 --- a/src/services/experience/ExpertiseService.java +++ b/src/services/experience/ExpertiseService.java @@ -44,13 +44,13 @@ import resources.client_info.ClientFactory; import resources.client_info.visitors.DatatableData; import resources.objects.creature.CreatureObject; import resources.objects.player.PlayerObject; -import resources.server_info.Log; import resources.server_info.StandardLog; import resources.sui.SuiButtons; import resources.sui.SuiMessageBox; import com.projectswg.common.control.Intent; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalDatabase; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/experience/SkillManager.java b/src/services/experience/SkillManager.java index f4de904f3..da2d2feaa 100644 --- a/src/services/experience/SkillManager.java +++ b/src/services/experience/SkillManager.java @@ -41,10 +41,10 @@ import network.packets.swg.zone.object_controller.ChangeRoleIconChoice; import resources.client_info.ClientFactory; import resources.client_info.visitors.DatatableData; import resources.objects.creature.CreatureObject; -import resources.server_info.Log; import com.projectswg.common.control.Manager; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; /** * diff --git a/src/services/experience/SkillTemplateService.java b/src/services/experience/SkillTemplateService.java index da12ab56e..40e95f6ec 100644 --- a/src/services/experience/SkillTemplateService.java +++ b/src/services/experience/SkillTemplateService.java @@ -53,11 +53,11 @@ import resources.objects.creature.CreatureObject; import resources.objects.player.PlayerObject; import resources.player.Player; import resources.rewards.RoadmapReward; -import resources.server_info.Log; import services.objects.ObjectCreator; import services.objects.StaticItemService; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; /** * This is a service that listens for {@link LevelChangedIntent} and grants diff --git a/src/services/galaxy/ConnectionService.java b/src/services/galaxy/ConnectionService.java index edc54bac7..49d7eaeab 100644 --- a/src/services/galaxy/ConnectionService.java +++ b/src/services/galaxy/ConnectionService.java @@ -43,7 +43,6 @@ import resources.objects.player.PlayerObject; import resources.player.Player; import resources.player.PlayerEvent; import resources.player.PlayerFlags; -import resources.server_info.Log; import services.CoreManager; import utilities.ThreadUtilities; @@ -51,6 +50,7 @@ import com.projectswg.common.concurrency.SynchronizedSet; import com.projectswg.common.control.Intent; import com.projectswg.common.control.Service; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; public class ConnectionService extends Service { diff --git a/src/services/galaxy/terminals/TerminalService.java b/src/services/galaxy/terminals/TerminalService.java index 5ee202de8..28581593c 100644 --- a/src/services/galaxy/terminals/TerminalService.java +++ b/src/services/galaxy/terminals/TerminalService.java @@ -42,9 +42,9 @@ import java.util.Set; import resources.radial.RadialOption; import resources.radial.Radials; -import resources.server_info.Log; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalServerData; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/galaxy/travel/TravelGroup.java b/src/services/galaxy/travel/TravelGroup.java index fb5cc7c86..427aa717e 100644 --- a/src/services/galaxy/travel/TravelGroup.java +++ b/src/services/galaxy/travel/TravelGroup.java @@ -39,7 +39,8 @@ import resources.Posture; import resources.Terrain; import resources.TravelPoint; import resources.objects.creature.CreatureObject; -import resources.server_info.Log; + +import com.projectswg.common.debug.Log; public class TravelGroup implements Runnable { diff --git a/src/services/galaxy/travel/TravelService.java b/src/services/galaxy/travel/TravelService.java index c63dfa98d..54e1b2c9d 100644 --- a/src/services/galaxy/travel/TravelService.java +++ b/src/services/galaxy/travel/TravelService.java @@ -67,7 +67,6 @@ import resources.objects.staticobject.StaticObject; import resources.objects.tangible.OptionFlag; import resources.player.Player; import resources.server_info.DataManager; -import resources.server_info.Log; import resources.sui.SuiButtons; import resources.sui.SuiListBox; import resources.sui.SuiMessageBox; @@ -76,6 +75,7 @@ import services.objects.ObjectCreator; import utilities.ThreadUtilities; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.Config; import com.projectswg.common.info.RelationalServerData; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/map/CityService.java b/src/services/map/CityService.java index 31c262102..4dacb9397 100644 --- a/src/services/map/CityService.java +++ b/src/services/map/CityService.java @@ -46,9 +46,9 @@ import resources.objects.creature.CreatureObject; import resources.objects.tangible.TangibleObject; import resources.player.Player; import resources.player.PlayerEvent; -import resources.server_info.Log; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalDatabase; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/network/HolocoreSessionManager.java b/src/services/network/HolocoreSessionManager.java index 4abe7d9c9..d4e8a9471 100644 --- a/src/services/network/HolocoreSessionManager.java +++ b/src/services/network/HolocoreSessionManager.java @@ -30,14 +30,15 @@ package services.network; import java.util.ArrayDeque; import java.util.Queue; -import resources.server_info.Log; import network.packets.Packet; import network.packets.swg.ErrorMessage; import network.packets.swg.holo.HoloConnectionStarted; import network.packets.swg.holo.HoloConnectionStopped; +import network.packets.swg.holo.HoloConnectionStopped.ConnectionStoppedReason; import network.packets.swg.holo.HoloPacket; import network.packets.swg.holo.HoloSetProtocolVersion; -import network.packets.swg.holo.HoloConnectionStopped.ConnectionStoppedReason; + +import com.projectswg.common.debug.Log; public class HolocoreSessionManager { diff --git a/src/services/network/InboundNetworkManager.java b/src/services/network/InboundNetworkManager.java index 8ea7a5974..ddb5be5a1 100644 --- a/src/services/network/InboundNetworkManager.java +++ b/src/services/network/InboundNetworkManager.java @@ -33,9 +33,9 @@ import java.net.SocketAddress; import java.util.Arrays; import network.NetworkClient; -import resources.server_info.Log; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; public class InboundNetworkManager extends Service { diff --git a/src/services/network/NetworkClientManager.java b/src/services/network/NetworkClientManager.java index c90d4c731..bbdf8a1eb 100644 --- a/src/services/network/NetworkClientManager.java +++ b/src/services/network/NetworkClientManager.java @@ -47,10 +47,10 @@ import resources.network.TCPServer; import resources.network.UDPServer; import resources.network.UDPServer.UDPPacket; import resources.server_info.DataManager; -import resources.server_info.Log; import services.CoreManager; import com.projectswg.common.control.Manager; +import com.projectswg.common.debug.Log; public class NetworkClientManager extends Manager { diff --git a/src/services/network/PacketSender.java b/src/services/network/PacketSender.java index 975b5eec2..02d0d0728 100644 --- a/src/services/network/PacketSender.java +++ b/src/services/network/PacketSender.java @@ -27,12 +27,13 @@ ***********************************************************************************/ package services.network; -import java.net.SocketAddress; import java.net.InetSocketAddress; +import java.net.SocketAddress; import java.nio.ByteBuffer; import resources.network.TCPServer; -import resources.server_info.Log; + +import com.projectswg.common.debug.Log; public class PacketSender { diff --git a/src/services/objects/ClientBuildoutService.java b/src/services/objects/ClientBuildoutService.java index afb1c8550..89683b200 100644 --- a/src/services/objects/ClientBuildoutService.java +++ b/src/services/objects/ClientBuildoutService.java @@ -57,10 +57,10 @@ import resources.objects.building.BuildingObject; import resources.objects.cell.CellObject; import resources.server_info.CrcDatabase; import resources.server_info.DataManager; -import resources.server_info.Log; import resources.server_info.StandardLog; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalServerData; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java index b9804a577..15b933082 100644 --- a/src/services/objects/ObjectAwareness.java +++ b/src/services/objects/ObjectAwareness.java @@ -62,11 +62,11 @@ import resources.player.Player; import resources.player.PlayerEvent; import resources.player.PlayerState; import resources.server_info.DataManager; -import resources.server_info.Log; import com.projectswg.common.control.Intent; import com.projectswg.common.control.Service; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; public class ObjectAwareness extends Service implements TerrainMapCallback { diff --git a/src/services/objects/ObjectCreator.java b/src/services/objects/ObjectCreator.java index 9d5d6dea8..c70c773b0 100644 --- a/src/services/objects/ObjectCreator.java +++ b/src/services/objects/ObjectCreator.java @@ -56,7 +56,8 @@ import resources.objects.staticobject.StaticObject; import resources.objects.tangible.TangibleObject; import resources.objects.waypoint.WaypointObject; import resources.objects.weapon.WeaponObject; -import resources.server_info.Log; + +import com.projectswg.common.debug.Log; public final class ObjectCreator { diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java index 2afd812c5..7252eff44 100644 --- a/src/services/objects/ObjectManager.java +++ b/src/services/objects/ObjectManager.java @@ -51,7 +51,6 @@ import resources.objects.custom.AIObject; import resources.persistable.SWGObjectFactory; import resources.player.Player; import resources.server_info.CachedObjectDatabase; -import resources.server_info.Log; import resources.server_info.ObjectDatabase; import resources.server_info.StandardLog; import services.map.MapManager; @@ -60,6 +59,7 @@ import services.spawn.SpawnerService; import services.spawn.StaticService; import com.projectswg.common.control.Manager; +import com.projectswg.common.debug.Log; public class ObjectManager extends Manager { diff --git a/src/services/objects/RadialService.java b/src/services/objects/RadialService.java index 5a5bfac86..02ef6d124 100644 --- a/src/services/objects/RadialService.java +++ b/src/services/objects/RadialService.java @@ -46,10 +46,10 @@ import resources.objects.creature.CreatureObject; import resources.player.Player; import resources.radial.RadialItem; import resources.radial.RadialOption; -import resources.server_info.Log; import services.galaxy.GalacticManager; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; public class RadialService extends Service { diff --git a/src/services/objects/StaticItemService.java b/src/services/objects/StaticItemService.java index 6f0b700b7..f427f01dc 100644 --- a/src/services/objects/StaticItemService.java +++ b/src/services/objects/StaticItemService.java @@ -47,10 +47,10 @@ import resources.objects.weapon.WeaponObject; import resources.objects.weapon.WeaponType; import resources.player.Player; import resources.server_info.DataManager; -import resources.server_info.Log; import resources.server_info.StandardLog; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalServerData; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/objects/UniformBoxService.java b/src/services/objects/UniformBoxService.java index fb2b00a5a..837c62d7c 100644 --- a/src/services/objects/UniformBoxService.java +++ b/src/services/objects/UniformBoxService.java @@ -41,9 +41,9 @@ import resources.objects.SWGObject; import resources.objects.creature.CreatureObject; import resources.player.Player; import resources.radial.RadialItem; -import resources.server_info.Log; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalServerData; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/player/CharacterCreationRestriction.java b/src/services/player/CharacterCreationRestriction.java index 1d7b76926..e23450d08 100644 --- a/src/services/player/CharacterCreationRestriction.java +++ b/src/services/player/CharacterCreationRestriction.java @@ -35,7 +35,8 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import resources.player.Player; -import resources.server_info.Log; + +import com.projectswg.common.debug.Log; public class CharacterCreationRestriction { diff --git a/src/services/player/CharacterCreationService.java b/src/services/player/CharacterCreationService.java index 0477ad07d..8e71ff048 100644 --- a/src/services/player/CharacterCreationService.java +++ b/src/services/player/CharacterCreationService.java @@ -60,7 +60,6 @@ import resources.player.Player; import resources.player.PlayerEvent; import resources.player.PlayerState; import resources.server_info.DataManager; -import resources.server_info.Log; import resources.zone.NameFilter; import services.objects.ObjectManager; import services.player.TerrainZoneInsertion.SpawnInformation; @@ -69,6 +68,7 @@ import utilities.namegen.SWGNameGenerator; import com.projectswg.common.control.Service; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalDatabase; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/player/LoginService.java b/src/services/player/LoginService.java index a3614c31f..ed6498216 100644 --- a/src/services/player/LoginService.java +++ b/src/services/player/LoginService.java @@ -67,11 +67,11 @@ import resources.player.Player; import resources.player.Player.PlayerServer; import resources.player.PlayerState; import resources.server_info.DataManager; -import resources.server_info.Log; import services.CoreManager; import com.projectswg.common.control.Service; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.Config; import com.projectswg.common.info.RelationalDatabase; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/player/TerrainZoneInsertion.java b/src/services/player/TerrainZoneInsertion.java index 1c7241f99..c723b1b47 100644 --- a/src/services/player/TerrainZoneInsertion.java +++ b/src/services/player/TerrainZoneInsertion.java @@ -32,8 +32,8 @@ import java.sql.SQLException; import resources.Location; import resources.Terrain; -import resources.server_info.Log; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalServerData; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/player/ZoneManager.java b/src/services/player/ZoneManager.java index a8f0b3eaf..093655a6f 100644 --- a/src/services/player/ZoneManager.java +++ b/src/services/player/ZoneManager.java @@ -62,9 +62,9 @@ import resources.player.Player; import resources.player.Player.PlayerServer; import resources.player.PlayerEvent; import resources.server_info.DataManager; -import resources.server_info.Log; import com.projectswg.common.control.Manager; +import com.projectswg.common.debug.Log; public class ZoneManager extends Manager { diff --git a/src/services/player/creation/CharacterCreation.java b/src/services/player/creation/CharacterCreation.java index b0390ff4c..a2a9b0a6d 100644 --- a/src/services/player/creation/CharacterCreation.java +++ b/src/services/player/creation/CharacterCreation.java @@ -47,12 +47,12 @@ import resources.objects.tangible.TangibleObject; import resources.objects.weapon.WeaponObject; import resources.objects.weapon.WeaponType; import resources.player.AccessLevel; -import resources.server_info.Log; import services.objects.ObjectCreator; import services.objects.ObjectManager; import services.player.TerrainZoneInsertion.SpawnInformation; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; public class CharacterCreation { diff --git a/src/services/spawn/SpawnerService.java b/src/services/spawn/SpawnerService.java index 8cbdfbb0f..6d4a71020 100644 --- a/src/services/spawn/SpawnerService.java +++ b/src/services/spawn/SpawnerService.java @@ -53,7 +53,6 @@ import resources.objects.custom.AIBehavior; import resources.objects.custom.DefaultAIObject; import resources.objects.tangible.OptionFlag; import resources.server_info.DataManager; -import resources.server_info.Log; import resources.server_info.StandardLog; import resources.spawn.Spawner; import resources.spawn.Spawner.SpawnerFlag; @@ -63,6 +62,7 @@ import services.objects.ObjectManager; import utilities.ThreadUtilities; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalDatabase; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/spawn/StaticService.java b/src/services/spawn/StaticService.java index 38a689f8f..9d769b5c0 100644 --- a/src/services/spawn/StaticService.java +++ b/src/services/spawn/StaticService.java @@ -41,11 +41,11 @@ import java.util.Map; import resources.Location; import resources.objects.SWGObject; import resources.objects.building.BuildingObject; -import resources.server_info.Log; import services.objects.ObjectCreator; import com.projectswg.common.control.Service; import com.projectswg.common.debug.Assert; +import com.projectswg.common.debug.Log; import com.projectswg.common.info.RelationalServerData; import com.projectswg.common.info.RelationalServerFactory; diff --git a/src/services/sui/SuiService.java b/src/services/sui/SuiService.java index 24dd90730..2a03d519b 100644 --- a/src/services/sui/SuiService.java +++ b/src/services/sui/SuiService.java @@ -43,7 +43,6 @@ import network.packets.swg.zone.server_ui.SuiCreatePageMessage; import network.packets.swg.zone.server_ui.SuiEventNotification; import network.packets.swg.zone.server_ui.SuiForceClosePage; import resources.player.Player; -import resources.server_info.Log; import resources.sui.ISuiCallback; import resources.sui.SuiBaseWindow; import resources.sui.SuiComponent; @@ -51,6 +50,7 @@ import resources.sui.SuiEvent; import utilities.Scripts; import com.projectswg.common.control.Service; +import com.projectswg.common.debug.Log; public class SuiService extends Service { diff --git a/src/utilities/CrcDatabaseGenerator.java b/src/utilities/CrcDatabaseGenerator.java index 8cc648109..af8dcfa40 100644 --- a/src/utilities/CrcDatabaseGenerator.java +++ b/src/utilities/CrcDatabaseGenerator.java @@ -41,7 +41,8 @@ import resources.client_info.ClientFactory; import resources.client_info.visitors.CrcStringTableData; import resources.client_info.visitors.DatatableData; import resources.server_info.CrcDatabase; -import resources.server_info.Log; + +import com.projectswg.common.debug.Log; public class CrcDatabaseGenerator { diff --git a/src/utilities/Encoder.java b/src/utilities/Encoder.java index 6d2dccad4..8a033930c 100644 --- a/src/utilities/Encoder.java +++ b/src/utilities/Encoder.java @@ -27,13 +27,14 @@ ***********************************************************************************/ package utilities; -import resources.encodables.Encodable; -import resources.server_info.Log; - import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.charset.Charset; +import resources.encodables.Encodable; + +import com.projectswg.common.debug.Log; + public class Encoder { public static byte[] encode(Object object) { diff --git a/src/utilities/IntentFactory.java b/src/utilities/IntentFactory.java index 4ced27797..a478040d9 100644 --- a/src/utilities/IntentFactory.java +++ b/src/utilities/IntentFactory.java @@ -39,9 +39,9 @@ import resources.encodables.player.Mail; import resources.objects.SWGObject; import resources.objects.waypoint.WaypointObject; import resources.player.Player; -import resources.server_info.Log; import com.projectswg.common.control.IntentChain; +import com.projectswg.common.debug.Log; /** * @author Mads diff --git a/src/utilities/Scripts.java b/src/utilities/Scripts.java index 4e65eb425..4dde887c0 100644 --- a/src/utilities/Scripts.java +++ b/src/utilities/Scripts.java @@ -38,7 +38,8 @@ import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; import javax.script.ScriptException; -import resources.server_info.Log; +import com.projectswg.common.debug.Log; + public class Scripts { diff --git a/src/utilities/namegen/SWGNameGenerator.java b/src/utilities/namegen/SWGNameGenerator.java index 626df03d6..4bd83edc8 100644 --- a/src/utilities/namegen/SWGNameGenerator.java +++ b/src/utilities/namegen/SWGNameGenerator.java @@ -27,10 +27,6 @@ ***********************************************************************************/ package utilities.namegen; -import resources.Race; -import resources.server_info.Log; -import resources.zone.NameFilter; - import java.io.BufferedReader; import java.io.FileInputStream; import java.io.IOException; @@ -41,6 +37,11 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import resources.Race; +import resources.zone.NameFilter; + +import com.projectswg.common.debug.Log; + public class SWGNameGenerator { private Map ruleMap = new HashMap<>(); diff --git a/test/resources/objects/awareness/MapCallback.java b/test/resources/objects/awareness/MapCallback.java index ae6c431a8..ad289bc17 100644 --- a/test/resources/objects/awareness/MapCallback.java +++ b/test/resources/objects/awareness/MapCallback.java @@ -33,7 +33,8 @@ import org.junit.Assert; import resources.objects.SWGObject; import resources.objects.awareness.TerrainMap.TerrainMapCallback; -import resources.server_info.Log; + +import com.projectswg.common.debug.Log; class MapCallback implements TerrainMapCallback { diff --git a/test/resources/objects/awareness/TestAwarenessHandler.java b/test/resources/objects/awareness/TestAwarenessHandler.java index c7c6641be..7e4f39ee0 100644 --- a/test/resources/objects/awareness/TestAwarenessHandler.java +++ b/test/resources/objects/awareness/TestAwarenessHandler.java @@ -41,9 +41,10 @@ import resources.Terrain; import resources.objects.SWGObject; import resources.objects.building.BuildingObject; import resources.objects.creature.CreatureObject; -import resources.server_info.Log; import services.objects.ClientBuildoutService; +import com.projectswg.common.debug.Log; + @RunWith(JUnit4.class) public class TestAwarenessHandler { diff --git a/test/resources/objects/awareness/TestTerrainMap.java b/test/resources/objects/awareness/TestTerrainMap.java index d7d26ffe7..f68c7dfd4 100644 --- a/test/resources/objects/awareness/TestTerrainMap.java +++ b/test/resources/objects/awareness/TestTerrainMap.java @@ -43,9 +43,10 @@ import resources.Terrain; import resources.objects.SWGObject; import resources.objects.cell.CellObject; import resources.objects.creature.CreatureObject; -import resources.server_info.Log; import services.objects.ClientBuildoutService; +import com.projectswg.common.debug.Log; + @RunWith(JUnit4.class) public class TestTerrainMap { diff --git a/test/resources/services/TestConfig.java b/test/resources/services/TestConfig.java index f9ba6999b..0d71663fe 100644 --- a/test/resources/services/TestConfig.java +++ b/test/resources/services/TestConfig.java @@ -35,8 +35,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import resources.server_info.Log; - +import com.projectswg.common.debug.Log; import com.projectswg.common.info.Config; @RunWith(JUnit4.class)