From a62024e17e4de4c4438cba431118acc7671c76b2 Mon Sep 17 00:00:00 2001 From: Treeku Date: Thu, 11 Jul 2013 19:03:07 +0100 Subject: [PATCH 1/2] More checks for duplicate names in char creation --- src/services/CharacterService.java | 43 ++++++++++++++++++++---------- src/services/LoginService.java | 2 +- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/services/CharacterService.java b/src/services/CharacterService.java index 486b26ab..6c4a9f2d 100644 --- a/src/services/CharacterService.java +++ b/src/services/CharacterService.java @@ -92,19 +92,34 @@ public class CharacterService implements INetworkDispatch { swgOpcodes.put(Opcodes.ClientRandomNameRequest, new INetworkRemoteEvent() { public void handlePacket(IoSession session, IoBuffer data) throws Exception { - data = data.order(ByteOrder.LITTLE_ENDIAN); ClientRandomNameRequest randomNameRequest = new ClientRandomNameRequest(); + ClientRandomNameResponse response; + String name = null; + + data = data.order(ByteOrder.LITTLE_ENDIAN); data.position(0); randomNameRequest.deserialize(data); - String name; - if(randomNameRequest.getSharedRaceTemplate().contains("wookie")) { - name = nameGenerator.compose(4); - } else { - name = nameGenerator.compose(2) + " " + nameGenerator.compose(3); + + while (name == null) { + if (randomNameRequest.getSharedRaceTemplate().contains("wookie")) { + name = nameGenerator.compose(4); + } else { + name = nameGenerator.compose(2) + " " + nameGenerator.compose(3); + } + + try { + if (checkForDuplicateName(getfirstName(name, randomNameRequest.getSharedRaceTemplate()))) { + name = null; + } + } catch (SQLException e2) { + e2.printStackTrace(); + } } - ClientRandomNameResponse response = new ClientRandomNameResponse(randomNameRequest.getSharedRaceTemplate(), name); + + response = new ClientRandomNameResponse(randomNameRequest.getSharedRaceTemplate(), name); session.write(response.serialize()); } + }); swgOpcodes.put(Opcodes.ClientVerifyAndLockNameRequest, new INetworkRemoteEvent() { @@ -184,14 +199,14 @@ public class CharacterService implements INetworkDispatch { int galaxyId = config.getInt("GALAXY_ID"); - // FIXME: this is just a hack for issue where something goes tits up - // between verify and create and client resends - /*try { - //if (checkForDuplicateName(getfirstName(clientCreateCharacter.getName(), clientCreateCharacter.getRaceTemplate()))) return; - } - catch (SQLException e2) { + try { + if (checkForDuplicateName(getfirstName(clientCreateCharacter.getName(), clientCreateCharacter.getRaceTemplate()))) { + return; + } + } catch (SQLException e2) { e2.printStackTrace(); - }*/ + } + Client client = core.getClient((Integer) session.getAttribute("connectionId")); // TODO: Add starting location and items in a script diff --git a/src/services/LoginService.java b/src/services/LoginService.java index e837b614..75f7729d 100644 --- a/src/services/LoginService.java +++ b/src/services/LoginService.java @@ -344,7 +344,7 @@ public class LoginService implements INetworkDispatch{ } else { return "Invalid Password"; }*/ - + try { PreparedStatement ps = databaseConnection.preparedStatement("SELECT * FROM accounts WHERE id=" + id + " AND \"pass\"='" + pass + "'"); ResultSet resultSet = ps.executeQuery(); From 8a227689423f91936799a3a60b24bea9784219ee Mon Sep 17 00:00:00 2001 From: Treeku Date: Thu, 11 Jul 2013 19:43:54 +0100 Subject: [PATCH 2/2] Fixed warnings --- .../swg/ChatInstantMessageToCharacter.java | 2 ++ src/protocol/swg/ChatInstantMessagetoClient.java | 1 - src/protocol/swg/ChatOnSendInstantMessage.java | 2 -- src/protocol/swg/ChatSystemMessage.java | 2 -- src/protocol/swg/ClientCreateCharacter.java | 3 --- src/protocol/swg/ClientRandomNameRequest.java | 3 --- src/protocol/swg/ClientRandomNameResponse.java | 2 -- .../swg/ClientVerifyAndLockNameRequest.java | 3 --- .../swg/ClientVerifyAndLockNameResponse.java | 2 -- src/protocol/swg/CmdStartScene.java | 2 -- src/protocol/swg/DeleteCharacterMessage.java | 4 ---- .../swg/GetMapLocationsResponseMessage.java | 2 -- src/protocol/swg/LoginClientId.java | 4 ---- src/protocol/swg/LoginClientToken.java | 2 -- src/protocol/swg/LoginClusterStatus.java | 2 -- src/protocol/swg/LoginEnumCluster.java | 2 -- src/protocol/swg/SUICreatePageMessage.java | 4 ---- .../objectControllerObjects/CommandEnqueue.java | 2 ++ .../objectControllerObjects/ObjectMenuRequest.java | 2 -- .../ObjectMenuResponse.java | 2 -- .../swg/objectControllerObjects/SpatialChat.java | 3 +++ src/resources/objects/ObjectMessageBuilder.java | 4 ---- src/resources/objects/player/PlayerObject.java | 3 --- src/resources/objects/weapon/WeaponObject.java | 1 - src/services/AttributeService.java | 2 ++ src/services/CharacterService.java | 14 ++------------ src/services/ConnectionService.java | 6 +----- src/services/LoginService.java | 11 +++++------ src/services/PlayerService.java | 4 ++-- src/services/ScriptService.java | 5 ++--- src/services/SimulationService.java | 12 ++---------- src/services/chat/ChatService.java | 5 ----- src/services/command/CommandService.java | 2 -- src/services/object/ObjectService.java | 12 +----------- src/services/sui/SUIWindow.java | 2 -- 35 files changed, 24 insertions(+), 110 deletions(-) diff --git a/src/protocol/swg/ChatInstantMessageToCharacter.java b/src/protocol/swg/ChatInstantMessageToCharacter.java index 0e75b83f..1d0efccd 100644 --- a/src/protocol/swg/ChatInstantMessageToCharacter.java +++ b/src/protocol/swg/ChatInstantMessageToCharacter.java @@ -26,6 +26,7 @@ import java.nio.ByteBuffer; import org.apache.mina.core.buffer.IoBuffer; +@SuppressWarnings("unused") public class ChatInstantMessageToCharacter extends SWGMessage { @@ -86,4 +87,5 @@ public class ChatInstantMessageToCharacter extends SWGMessage { public String getMessage() { return message; } public String getRecipient() { return recipient; } public int getSequence() { return sequence; } + } diff --git a/src/protocol/swg/ChatInstantMessagetoClient.java b/src/protocol/swg/ChatInstantMessagetoClient.java index 000ae869..f87c0da8 100644 --- a/src/protocol/swg/ChatInstantMessagetoClient.java +++ b/src/protocol/swg/ChatInstantMessagetoClient.java @@ -21,7 +21,6 @@ ******************************************************************************/ package protocol.swg; -import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; diff --git a/src/protocol/swg/ChatOnSendInstantMessage.java b/src/protocol/swg/ChatOnSendInstantMessage.java index 66520690..9bcb41da 100644 --- a/src/protocol/swg/ChatOnSendInstantMessage.java +++ b/src/protocol/swg/ChatOnSendInstantMessage.java @@ -21,12 +21,10 @@ ******************************************************************************/ package protocol.swg; -import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; - public class ChatOnSendInstantMessage extends SWGMessage { private int errorType; diff --git a/src/protocol/swg/ChatSystemMessage.java b/src/protocol/swg/ChatSystemMessage.java index 0184f00b..0c973ad4 100644 --- a/src/protocol/swg/ChatSystemMessage.java +++ b/src/protocol/swg/ChatSystemMessage.java @@ -21,12 +21,10 @@ ******************************************************************************/ package protocol.swg; -import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; - public class ChatSystemMessage extends SWGMessage{ private String message; diff --git a/src/protocol/swg/ClientCreateCharacter.java b/src/protocol/swg/ClientCreateCharacter.java index 491a8540..3acde5b6 100644 --- a/src/protocol/swg/ClientCreateCharacter.java +++ b/src/protocol/swg/ClientCreateCharacter.java @@ -26,9 +26,6 @@ import java.nio.ByteBuffer; import org.apache.mina.core.buffer.IoBuffer; -import engine.resources.common.Utilities; - - public class ClientCreateCharacter extends SWGMessage { private String raceTemplate; diff --git a/src/protocol/swg/ClientRandomNameRequest.java b/src/protocol/swg/ClientRandomNameRequest.java index 170a115f..838e0b35 100644 --- a/src/protocol/swg/ClientRandomNameRequest.java +++ b/src/protocol/swg/ClientRandomNameRequest.java @@ -21,9 +21,6 @@ ******************************************************************************/ package protocol.swg; -import java.io.UnsupportedEncodingException; -import java.nio.ByteBuffer; - import org.apache.mina.core.buffer.IoBuffer; diff --git a/src/protocol/swg/ClientRandomNameResponse.java b/src/protocol/swg/ClientRandomNameResponse.java index fb26ad88..922b5ef7 100644 --- a/src/protocol/swg/ClientRandomNameResponse.java +++ b/src/protocol/swg/ClientRandomNameResponse.java @@ -21,12 +21,10 @@ ******************************************************************************/ package protocol.swg; -import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; - public class ClientRandomNameResponse extends SWGMessage { private String raceTemplate; diff --git a/src/protocol/swg/ClientVerifyAndLockNameRequest.java b/src/protocol/swg/ClientVerifyAndLockNameRequest.java index 8b775bb9..7d9c9722 100644 --- a/src/protocol/swg/ClientVerifyAndLockNameRequest.java +++ b/src/protocol/swg/ClientVerifyAndLockNameRequest.java @@ -21,9 +21,6 @@ ******************************************************************************/ package protocol.swg; -import java.io.UnsupportedEncodingException; -import java.nio.ByteBuffer; - import org.apache.mina.core.buffer.IoBuffer; diff --git a/src/protocol/swg/ClientVerifyAndLockNameResponse.java b/src/protocol/swg/ClientVerifyAndLockNameResponse.java index 117d933b..717e3373 100644 --- a/src/protocol/swg/ClientVerifyAndLockNameResponse.java +++ b/src/protocol/swg/ClientVerifyAndLockNameResponse.java @@ -21,12 +21,10 @@ ******************************************************************************/ package protocol.swg; -import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; - public class ClientVerifyAndLockNameResponse extends SWGMessage { private String firstName; diff --git a/src/protocol/swg/CmdStartScene.java b/src/protocol/swg/CmdStartScene.java index 23df186a..0e8ec8b5 100644 --- a/src/protocol/swg/CmdStartScene.java +++ b/src/protocol/swg/CmdStartScene.java @@ -21,12 +21,10 @@ ******************************************************************************/ package protocol.swg; -import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; - public class CmdStartScene extends SWGMessage { private byte ignoreLayoutFiles; diff --git a/src/protocol/swg/DeleteCharacterMessage.java b/src/protocol/swg/DeleteCharacterMessage.java index cb5ecc93..e698e728 100644 --- a/src/protocol/swg/DeleteCharacterMessage.java +++ b/src/protocol/swg/DeleteCharacterMessage.java @@ -21,12 +21,8 @@ ******************************************************************************/ package protocol.swg; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; - import org.apache.mina.core.buffer.IoBuffer; - public class DeleteCharacterMessage extends SWGMessage { diff --git a/src/protocol/swg/GetMapLocationsResponseMessage.java b/src/protocol/swg/GetMapLocationsResponseMessage.java index 7366a034..35a5fa70 100644 --- a/src/protocol/swg/GetMapLocationsResponseMessage.java +++ b/src/protocol/swg/GetMapLocationsResponseMessage.java @@ -21,7 +21,6 @@ ******************************************************************************/ package protocol.swg; -import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Vector; @@ -29,7 +28,6 @@ import org.apache.mina.core.buffer.IoBuffer; import services.map.MapLocation; - public class GetMapLocationsResponseMessage extends SWGMessage { private String planet; diff --git a/src/protocol/swg/LoginClientId.java b/src/protocol/swg/LoginClientId.java index e1e49325..aefca6ef 100644 --- a/src/protocol/swg/LoginClientId.java +++ b/src/protocol/swg/LoginClientId.java @@ -21,12 +21,8 @@ ******************************************************************************/ package protocol.swg; -import java.io.UnsupportedEncodingException; -import java.nio.ByteBuffer; - import org.apache.mina.core.buffer.IoBuffer; - public class LoginClientId extends SWGMessage { private String accountName; diff --git a/src/protocol/swg/LoginClientToken.java b/src/protocol/swg/LoginClientToken.java index f4ce4865..025dedef 100644 --- a/src/protocol/swg/LoginClientToken.java +++ b/src/protocol/swg/LoginClientToken.java @@ -21,12 +21,10 @@ ******************************************************************************/ package protocol.swg; -import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; - public class LoginClientToken extends SWGMessage { private byte[] sessionKey; diff --git a/src/protocol/swg/LoginClusterStatus.java b/src/protocol/swg/LoginClusterStatus.java index aaf45fbb..588d3f00 100644 --- a/src/protocol/swg/LoginClusterStatus.java +++ b/src/protocol/swg/LoginClusterStatus.java @@ -21,13 +21,11 @@ ******************************************************************************/ package protocol.swg; -import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.TimeZone; import org.apache.mina.core.buffer.IoBuffer; - public class LoginClusterStatus extends SWGMessage { private byte[] servers; diff --git a/src/protocol/swg/LoginEnumCluster.java b/src/protocol/swg/LoginEnumCluster.java index 8a006548..c21fc8ee 100644 --- a/src/protocol/swg/LoginEnumCluster.java +++ b/src/protocol/swg/LoginEnumCluster.java @@ -21,13 +21,11 @@ ******************************************************************************/ package protocol.swg; -import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.TimeZone; import org.apache.mina.core.buffer.IoBuffer; - public class LoginEnumCluster extends SWGMessage { private byte[] servers; diff --git a/src/protocol/swg/SUICreatePageMessage.java b/src/protocol/swg/SUICreatePageMessage.java index 4bbfe4eb..33046ada 100644 --- a/src/protocol/swg/SUICreatePageMessage.java +++ b/src/protocol/swg/SUICreatePageMessage.java @@ -21,17 +21,13 @@ ******************************************************************************/ package protocol.swg; -import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Vector; import org.apache.mina.core.buffer.IoBuffer; -import engine.resources.common.Utilities; - import services.sui.SUIWindowComponent; - public class SUICreatePageMessage extends SWGMessage{ private String script; diff --git a/src/protocol/swg/objectControllerObjects/CommandEnqueue.java b/src/protocol/swg/objectControllerObjects/CommandEnqueue.java index d94c5ad3..40b228a6 100644 --- a/src/protocol/swg/objectControllerObjects/CommandEnqueue.java +++ b/src/protocol/swg/objectControllerObjects/CommandEnqueue.java @@ -26,6 +26,7 @@ import java.nio.ByteBuffer; import org.apache.mina.core.buffer.IoBuffer; +@SuppressWarnings("unused") public class CommandEnqueue extends ObjControllerObject { @@ -85,4 +86,5 @@ public class CommandEnqueue extends ObjControllerObject { public ObjControllerObject getCommandObject() { return commandObject; } public String getCommandArguments() { return commandArguments; } + } diff --git a/src/protocol/swg/objectControllerObjects/ObjectMenuRequest.java b/src/protocol/swg/objectControllerObjects/ObjectMenuRequest.java index 24396109..85a2d464 100644 --- a/src/protocol/swg/objectControllerObjects/ObjectMenuRequest.java +++ b/src/protocol/swg/objectControllerObjects/ObjectMenuRequest.java @@ -27,8 +27,6 @@ import java.util.Vector; import org.apache.mina.core.buffer.IoBuffer; -import engine.resources.common.Utilities; - import resources.common.RadialOptions; public class ObjectMenuRequest extends ObjControllerObject { diff --git a/src/protocol/swg/objectControllerObjects/ObjectMenuResponse.java b/src/protocol/swg/objectControllerObjects/ObjectMenuResponse.java index e4847406..90eb1938 100644 --- a/src/protocol/swg/objectControllerObjects/ObjectMenuResponse.java +++ b/src/protocol/swg/objectControllerObjects/ObjectMenuResponse.java @@ -26,8 +26,6 @@ import java.util.Vector; import org.apache.mina.core.buffer.IoBuffer; -import engine.resources.common.Utilities; - import protocol.swg.ObjControllerMessage; import resources.common.RadialOptions; diff --git a/src/protocol/swg/objectControllerObjects/SpatialChat.java b/src/protocol/swg/objectControllerObjects/SpatialChat.java index 82e46da0..1d2ac34e 100644 --- a/src/protocol/swg/objectControllerObjects/SpatialChat.java +++ b/src/protocol/swg/objectControllerObjects/SpatialChat.java @@ -27,6 +27,8 @@ import org.apache.mina.core.buffer.IoBuffer; import protocol.swg.ObjControllerMessage; +@SuppressWarnings("unused") + public class SpatialChat extends ObjControllerObject { private long audienceId; @@ -88,4 +90,5 @@ public class SpatialChat extends ObjControllerObject { return result.flip(); } + } diff --git a/src/resources/objects/ObjectMessageBuilder.java b/src/resources/objects/ObjectMessageBuilder.java index ffc12f18..05fd207a 100644 --- a/src/resources/objects/ObjectMessageBuilder.java +++ b/src/resources/objects/ObjectMessageBuilder.java @@ -25,15 +25,11 @@ import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.apache.mina.core.buffer.CachedBufferAllocator; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.buffer.SimpleBufferAllocator; -import engine.resources.common.Utilities; import engine.resources.objects.SWGObject; -import protocol.swg.SceneEndBaselines; - public abstract class ObjectMessageBuilder { public SWGObject object; diff --git a/src/resources/objects/player/PlayerObject.java b/src/resources/objects/player/PlayerObject.java index 45e2e9a0..d41823d3 100644 --- a/src/resources/objects/player/PlayerObject.java +++ b/src/resources/objects/player/PlayerObject.java @@ -22,15 +22,12 @@ package resources.objects.player; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import resources.objects.waypoint.WaypointObject; - import com.sleepycat.persist.model.NotPersistent; import com.sleepycat.persist.model.Persistent; diff --git a/src/resources/objects/weapon/WeaponObject.java b/src/resources/objects/weapon/WeaponObject.java index 6d893727..ed3a3c48 100644 --- a/src/resources/objects/weapon/WeaponObject.java +++ b/src/resources/objects/weapon/WeaponObject.java @@ -32,7 +32,6 @@ import engine.resources.objects.SWGObject; import engine.resources.scene.Planet; import engine.resources.scene.Point3D; import engine.resources.scene.Quaternion; -import resources.objects.tangible.TangibleMessageBuilder; @Persistent public class WeaponObject extends SWGObject { diff --git a/src/services/AttributeService.java b/src/services/AttributeService.java index 74cadf7f..09739173 100644 --- a/src/services/AttributeService.java +++ b/src/services/AttributeService.java @@ -34,6 +34,8 @@ import engine.resources.objects.SWGObject; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; +@SuppressWarnings("unused") + public class AttributeService implements INetworkDispatch { private NGECore core; diff --git a/src/services/CharacterService.java b/src/services/CharacterService.java index 6c4a9f2d..ace0a2b7 100644 --- a/src/services/CharacterService.java +++ b/src/services/CharacterService.java @@ -26,9 +26,7 @@ import java.nio.ByteOrder; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.List; import java.util.Map; -import java.util.concurrent.ScheduledExecutorService; import main.NGECore; @@ -37,10 +35,7 @@ import org.apache.mina.core.session.IoSession; import engine.clients.Client; import engine.resources.common.CRC; -import engine.resources.common.Utilities; -import engine.resources.container.NullPermissions; import engine.resources.database.DatabaseConnection; -import engine.resources.objects.SWGObject; import engine.resources.scene.Point3D; import engine.resources.scene.Quaternion; import engine.resources.service.INetworkDispatch; @@ -53,23 +48,18 @@ import protocol.swg.ClientRandomNameResponse; import protocol.swg.ClientVerifyAndLockNameRequest; import protocol.swg.ClientVerifyAndLockNameResponse; import protocol.swg.CreateCharacterSuccess; -import protocol.swg.HeartBeatMessage; -import protocol.swg.LoginClusterStatus; -import protocol.swg.LoginEnumCluster; - import resources.objects.creature.CreatureObject; import resources.objects.player.PlayerObject; import resources.objects.tangible.TangibleObject; import resources.objects.weapon.WeaponObject; +@SuppressWarnings("unused") + public class CharacterService implements INetworkDispatch { - @SuppressWarnings("unused") private NGECore core; - @SuppressWarnings("unused") private DatabaseConnection databaseConnection; - @SuppressWarnings("unused") private DatabaseConnection databaseConnection2; private engine.resources.common.NameGen nameGenerator; private static final String allowedCharsRegex = "['-]?[A-Za-z]('[a-zA-Z]|-[a-zA-Z]|[a-zA-Z])*['-]?$"; diff --git a/src/services/ConnectionService.java b/src/services/ConnectionService.java index 3bc7510f..a19de6a0 100644 --- a/src/services/ConnectionService.java +++ b/src/services/ConnectionService.java @@ -26,7 +26,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Map; -import java.util.concurrent.ScheduledExecutorService; import main.NGECore; @@ -39,22 +38,19 @@ import protocol.swg.ClientPermissionsMessage; import protocol.swg.ConnectionServerLagResponse; import protocol.swg.GalaxyLoopTimesResponse; import protocol.swg.GameServerLagResponse; -import protocol.swg.LoginClientId; import engine.clients.Client; -import engine.resources.common.Utilities; import engine.resources.database.DatabaseConnection; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; import resources.common.*; - +@SuppressWarnings("unused") public class ConnectionService implements INetworkDispatch { private NGECore core; private DatabaseConnection databaseConnection; - @SuppressWarnings("unused") private DatabaseConnection databaseConnection2; public ConnectionService(NGECore core) { diff --git a/src/services/LoginService.java b/src/services/LoginService.java index 75f7729d..9f634be6 100644 --- a/src/services/LoginService.java +++ b/src/services/LoginService.java @@ -36,8 +36,6 @@ import org.apache.mina.core.session.IoSession; import engine.clients.Client; import engine.protocol.soe.Disconnect; -import engine.resources.common.PHPBB3Auth; -import engine.resources.common.Utilities; import engine.resources.database.DatabaseConnection; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; @@ -57,6 +55,8 @@ import resources.common.*; import resources.objects.creature.CreatureObject; +@SuppressWarnings("unused") + public class LoginService implements INetworkDispatch{ private int sessionKeyLength = 0; @@ -77,7 +77,6 @@ public class LoginService implements INetworkDispatch{ } - public void insertOpcodes(Map swgOpcodes, Map objControllerOpcodes) { swgOpcodes.put(Opcodes.LoginClientId, new INetworkRemoteEvent() { @@ -181,10 +180,10 @@ public class LoginService implements INetworkDispatch{ } - public void shutdown() { } + /** * Saves session data to DB so Zone Server can link sessions to accounts. * @param client Client that needs a session save. @@ -306,6 +305,7 @@ public class LoginService implements INetworkDispatch{ } return false; } + /** * Saves forum account to game DB if the account does not exist in the game DB already. * @param id Account ID. @@ -326,6 +326,7 @@ public class LoginService implements INetworkDispatch{ e.printStackTrace(); } } + /** * Checks if user is allowed to login. * @param id Account ID. @@ -392,8 +393,6 @@ public class LoginService implements INetworkDispatch{ return false; } - - @SuppressWarnings("unused") /** * Checks if User has correct client version. * @param version Client Version String diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java index 1470d87d..8fbc152f 100644 --- a/src/services/PlayerService.java +++ b/src/services/PlayerService.java @@ -36,6 +36,8 @@ import engine.clients.Client; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; +@SuppressWarnings("unused") + public class PlayerService implements INetworkDispatch { private NGECore core; @@ -74,6 +76,4 @@ public class PlayerService implements INetworkDispatch { } - - } diff --git a/src/services/ScriptService.java b/src/services/ScriptService.java index e1ff664b..6277904a 100644 --- a/src/services/ScriptService.java +++ b/src/services/ScriptService.java @@ -22,13 +22,13 @@ package services; import org.python.core.Py; -import org.python.core.PyCode; import org.python.core.PyObject; -import org.python.core.PySystemState; import org.python.util.PythonInterpreter; import main.NGECore; +@SuppressWarnings("unused") + public class ScriptService { private NGECore core; @@ -86,5 +86,4 @@ public class ScriptService { return func; } - } diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java index 27438623..bfc7b48f 100644 --- a/src/services/SimulationService.java +++ b/src/services/SimulationService.java @@ -29,26 +29,20 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledExecutorService; import main.NGECore; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; -import org.apache.commons.math3.linear.MatrixUtils; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession; -import com.vividsolutions.jts.math.Matrix; - - import engine.clientdata.ClientFileManager; import engine.clientdata.visitors.MeshVisitor; import engine.clientdata.visitors.PortalVisitor; import engine.clientdata.visitors.PortalVisitor.Cell; import engine.clients.Client; import engine.resources.objects.SWGObject; -import engine.resources.scene.Grid2D; import engine.resources.scene.Planet; import engine.resources.scene.Point3D; import engine.resources.scene.Quaternion; @@ -56,7 +50,6 @@ import engine.resources.scene.quadtree.QuadTree; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; -import protocol.swg.ClientIdMsg; import protocol.swg.ObjControllerMessage; import protocol.swg.OpenedContainerMessage; import protocol.swg.UpdateTransformMessage; @@ -68,16 +61,15 @@ import protocol.swg.objectControllerObjects.TargetUpdate; import resources.objects.cell.CellObject; import resources.objects.creature.CreatureObject; import resources.common.*; -import toxi.geom.Matrix4x4; import wblut.geom.WB_AABBNode; import wblut.geom.WB_AABBTree; import wblut.geom.WB_Intersection; import wblut.geom.WB_Point3d; import wblut.geom.WB_Ray; import wblut.geom.WB_Transform; -import wblut.geom.WB_Vector3d; import wblut.hemesh.HE_Mesh; -import wblut.math.WB_M44; + +@SuppressWarnings("unused") public class SimulationService implements INetworkDispatch { diff --git a/src/services/chat/ChatService.java b/src/services/chat/ChatService.java index 14805415..52e68333 100644 --- a/src/services/chat/ChatService.java +++ b/src/services/chat/ChatService.java @@ -22,15 +22,11 @@ package services.chat; import java.nio.ByteOrder; -import java.sql.Timestamp; import java.util.Date; -import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.Map.Entry; import java.util.Random; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledExecutorService; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession; @@ -61,7 +57,6 @@ import protocol.swg.objectControllerObjects.PlayerEmote; import protocol.swg.objectControllerObjects.SpatialChat; import main.NGECore; - public class ChatService implements INetworkDispatch { private NGECore core; diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java index 2739184b..872f7ff2 100644 --- a/src/services/command/CommandService.java +++ b/src/services/command/CommandService.java @@ -24,7 +24,6 @@ package services.command; import java.nio.ByteOrder; import java.util.Map; import java.util.Vector; -import java.util.concurrent.ScheduledExecutorService; import main.NGECore; @@ -32,7 +31,6 @@ import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession; import engine.clients.Client; -import engine.resources.common.CRC; import engine.resources.objects.SWGObject; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index fb810551..ca5c5cb4 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -21,15 +21,8 @@ ******************************************************************************/ package services.object; -import java.io.Console; -import java.io.FileNotFoundException; -import java.io.FileReader; import java.io.IOException; -import java.io.LineNumberReader; import java.nio.ByteOrder; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -39,8 +32,6 @@ import java.util.Random; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantReadWriteLock; import resources.common.*; import org.apache.mina.core.buffer.IoBuffer; @@ -51,7 +42,6 @@ import org.python.core.PyObject; import com.sleepycat.persist.EntityCursor; import protocol.swg.CmdStartScene; -import protocol.swg.CreateCharacterFailed; import protocol.swg.HeartBeatMessage; import protocol.swg.ParametersMessage; import protocol.swg.SelectCharacter; @@ -81,8 +71,8 @@ import resources.objects.player.PlayerObject; import resources.objects.staticobject.StaticObject; import resources.objects.tangible.TangibleObject; import resources.objects.weapon.WeaponObject; -import wblut.geom.WB_Ray; +@SuppressWarnings("unused") public class ObjectService implements INetworkDispatch { diff --git a/src/services/sui/SUIWindow.java b/src/services/sui/SUIWindow.java index fcfea8c6..1c547b47 100644 --- a/src/services/sui/SUIWindow.java +++ b/src/services/sui/SUIWindow.java @@ -27,8 +27,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.python.core.PyObject; -import engine.clients.Client; -import engine.clients.GameClient; import engine.resources.objects.SWGObject; public class SUIWindow {