diff --git a/src/intents/CloseConnectionIntent.java b/src/intents/network/CloseConnectionIntent.java similarity index 99% rename from src/intents/CloseConnectionIntent.java rename to src/intents/network/CloseConnectionIntent.java index ab01aea6..93ca222b 100644 --- a/src/intents/CloseConnectionIntent.java +++ b/src/intents/network/CloseConnectionIntent.java @@ -25,7 +25,7 @@ * along with Holocore. If not, see . * * * ***********************************************************************************/ -package intents; +package intents.network; import network.packets.soe.Disconnect.DisconnectReason; import resources.control.Intent; diff --git a/src/intents/GalacticPacketIntent.java b/src/intents/network/GalacticPacketIntent.java similarity index 98% rename from src/intents/GalacticPacketIntent.java rename to src/intents/network/GalacticPacketIntent.java index 6b0e6710..c9de856a 100644 --- a/src/intents/GalacticPacketIntent.java +++ b/src/intents/network/GalacticPacketIntent.java @@ -25,8 +25,9 @@ * along with Holocore. If not, see . * * * ***********************************************************************************/ -package intents; +package intents.network; +import intents.GalacticIntent; import network.packets.Packet; import resources.network.ServerType; diff --git a/src/intents/InboundPacketIntent.java b/src/intents/network/InboundPacketIntent.java similarity index 99% rename from src/intents/InboundPacketIntent.java rename to src/intents/network/InboundPacketIntent.java index a8c07e66..cf24bbd5 100644 --- a/src/intents/InboundPacketIntent.java +++ b/src/intents/network/InboundPacketIntent.java @@ -25,7 +25,7 @@ * along with Holocore. If not, see . * * * ***********************************************************************************/ -package intents; +package intents.network; import network.packets.Packet; import resources.control.Intent; diff --git a/src/intents/InboundUdpPacketIntent.java b/src/intents/network/InboundUdpPacketIntent.java similarity index 99% rename from src/intents/InboundUdpPacketIntent.java rename to src/intents/network/InboundUdpPacketIntent.java index 1d61b723..a40121d9 100644 --- a/src/intents/InboundUdpPacketIntent.java +++ b/src/intents/network/InboundUdpPacketIntent.java @@ -25,7 +25,7 @@ * along with Holocore. If not, see . * * * ***********************************************************************************/ -package intents; +package intents.network; import resources.control.Intent; import resources.network.ServerType; diff --git a/src/intents/OutboundPacketIntent.java b/src/intents/network/OutboundPacketIntent.java similarity index 99% rename from src/intents/OutboundPacketIntent.java rename to src/intents/network/OutboundPacketIntent.java index 374b4681..fab4e69d 100644 --- a/src/intents/OutboundPacketIntent.java +++ b/src/intents/network/OutboundPacketIntent.java @@ -25,7 +25,7 @@ * along with Holocore. If not, see . * * * ***********************************************************************************/ -package intents; +package intents.network; import network.packets.Packet; import resources.control.Intent; diff --git a/src/intents/OutboundUdpPacketIntent.java b/src/intents/network/OutboundUdpPacketIntent.java similarity index 99% rename from src/intents/OutboundUdpPacketIntent.java rename to src/intents/network/OutboundUdpPacketIntent.java index 784435a2..d1a68377 100644 --- a/src/intents/OutboundUdpPacketIntent.java +++ b/src/intents/network/OutboundUdpPacketIntent.java @@ -25,7 +25,7 @@ * along with Holocore. If not, see . * * * ***********************************************************************************/ -package intents; +package intents.network; import resources.control.Intent; import resources.network.ServerType; diff --git a/src/intents/PingIntent.java b/src/intents/network/PingIntent.java similarity index 98% rename from src/intents/PingIntent.java rename to src/intents/network/PingIntent.java index f92269ea..5ea5a859 100644 --- a/src/intents/PingIntent.java +++ b/src/intents/network/PingIntent.java @@ -25,7 +25,7 @@ * along with Holocore. If not, see . * * * ***********************************************************************************/ -package intents; +package intents.network; import resources.control.Intent; diff --git a/src/intents/ServerManagementIntent.java b/src/intents/server/ServerManagementIntent.java similarity index 99% rename from src/intents/ServerManagementIntent.java rename to src/intents/server/ServerManagementIntent.java index 9a12c0e4..a9269bf5 100644 --- a/src/intents/ServerManagementIntent.java +++ b/src/intents/server/ServerManagementIntent.java @@ -25,7 +25,7 @@ * along with Holocore. If not, see . * * * ***********************************************************************************/ -package intents; +package intents.server; import java.util.concurrent.TimeUnit; diff --git a/src/intents/ServerStatusIntent.java b/src/intents/server/ServerStatusIntent.java similarity index 99% rename from src/intents/ServerStatusIntent.java rename to src/intents/server/ServerStatusIntent.java index 915b5e75..bf227ea2 100644 --- a/src/intents/ServerStatusIntent.java +++ b/src/intents/server/ServerStatusIntent.java @@ -25,7 +25,7 @@ * along with Holocore. If not, see . * * * ***********************************************************************************/ -package intents; +package intents.server; import java.util.concurrent.TimeUnit; diff --git a/src/intents/swgobject_events/SWGObjectEventIntent.java b/src/intents/swgobject_events/SWGObjectEventIntent.java deleted file mode 100644 index c1457a54..00000000 --- a/src/intents/swgobject_events/SWGObjectEventIntent.java +++ /dev/null @@ -1,66 +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 intents.swgobject_events; - -import resources.control.Intent; -import resources.objects.SWGObject; - -public class SWGObjectEventIntent extends Intent { - - public static final String TYPE = "SWGObjectEventType"; - - private SWGObject obj; - private Event event; - - public SWGObjectEventIntent(SWGObject obj, Event e) { - super(TYPE); - setObject(obj); - setEvent(e); - } - - public void setObject(SWGObject obj) { - this.obj = obj; - } - - public void setEvent(Event e) { - this.event = e; - } - - public SWGObject getObject() { - return obj; - } - - public Event getEvent() { - return event; - } - - public enum Event { - SOE_UPDATE_LOCATION - } - -} diff --git a/src/intents/swgobject_events/SWGObjectMovedIntent.java b/src/intents/swgobject_events/SWGObjectMovedIntent.java deleted file mode 100644 index be7f9580..00000000 --- a/src/intents/swgobject_events/SWGObjectMovedIntent.java +++ /dev/null @@ -1,50 +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 intents.swgobject_events; - -import resources.Location; -import resources.objects.SWGObject; - -public class SWGObjectMovedIntent extends SWGObjectEventIntent { - - private Location oldLocation; - - public SWGObjectMovedIntent(SWGObject object, Location oldLocation) { - super(object, SWGObjectEventIntent.Event.SOE_UPDATE_LOCATION); - this.oldLocation = oldLocation; - } - - public Location getOldLocation() { - return oldLocation; - } - - public Location getNewLocation() { - return getObject().getLocation(); - } - -} diff --git a/src/main/ProjectSWG.java b/src/main/ProjectSWG.java index dd6f1d30..9bae2ed9 100644 --- a/src/main/ProjectSWG.java +++ b/src/main/ProjectSWG.java @@ -27,7 +27,7 @@ ***********************************************************************************/ package main; -import intents.ServerStatusIntent; +import intents.server.ServerStatusIntent; import resources.Galaxy.GalaxyStatus; import resources.control.IntentManager; import resources.control.ServerStatus; diff --git a/src/network/NetworkClient.java b/src/network/NetworkClient.java index 9df909ba..e95c7e0a 100644 --- a/src/network/NetworkClient.java +++ b/src/network/NetworkClient.java @@ -27,7 +27,7 @@ ***********************************************************************************/ package network; -import intents.InboundPacketIntent; +import intents.network.InboundPacketIntent; import java.net.InetAddress; import java.util.List; diff --git a/src/network/NetworkProtocol.java b/src/network/NetworkProtocol.java index e6a6e354..7d2d88d7 100644 --- a/src/network/NetworkProtocol.java +++ b/src/network/NetworkProtocol.java @@ -27,7 +27,7 @@ ***********************************************************************************/ package network; -import intents.OutboundUdpPacketIntent; +import intents.network.OutboundUdpPacketIntent; import java.net.InetAddress; import java.util.LinkedList; diff --git a/src/network/OutboundPacketService.java b/src/network/OutboundPacketService.java index 44fce23b..c445b550 100644 --- a/src/network/OutboundPacketService.java +++ b/src/network/OutboundPacketService.java @@ -27,8 +27,8 @@ ***********************************************************************************/ package network; -import intents.CloseConnectionIntent; -import intents.OutboundPacketIntent; +import intents.network.CloseConnectionIntent; +import intents.network.OutboundPacketIntent; import java.util.HashMap; import java.util.LinkedList; diff --git a/src/resources/commands/callbacks/ServerCmdCallback.java b/src/resources/commands/callbacks/ServerCmdCallback.java index 63cb440c..0a86b250 100644 --- a/src/resources/commands/callbacks/ServerCmdCallback.java +++ b/src/resources/commands/callbacks/ServerCmdCallback.java @@ -27,8 +27,8 @@ ***********************************************************************************/ package resources.commands.callbacks; -import intents.ServerManagementIntent; -import intents.ServerManagementIntent.ServerManagementEvent; +import intents.server.ServerManagementIntent; +import intents.server.ServerManagementIntent.ServerManagementEvent; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/src/resources/control/IntentManager.java b/src/resources/control/IntentManager.java index 456bcbec..347e3f47 100644 --- a/src/resources/control/IntentManager.java +++ b/src/resources/control/IntentManager.java @@ -27,7 +27,7 @@ ***********************************************************************************/ package resources.control; -import intents.ServerStatusIntent; +import intents.server.ServerStatusIntent; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/resources/control/ServerManager.java b/src/resources/control/ServerManager.java index 3e390ba0..a1cb2041 100644 --- a/src/resources/control/ServerManager.java +++ b/src/resources/control/ServerManager.java @@ -27,7 +27,7 @@ ***********************************************************************************/ package resources.control; -import intents.ServerStatusIntent; +import intents.server.ServerStatusIntent; import java.nio.ByteBuffer; import java.nio.charset.Charset; diff --git a/src/services/CoreManager.java b/src/services/CoreManager.java index b449f6dd..483f1f70 100644 --- a/src/services/CoreManager.java +++ b/src/services/CoreManager.java @@ -44,10 +44,10 @@ import network.packets.soe.MultiPacket; import network.packets.swg.SWGPacket; import network.packets.swg.zone.baselines.Baseline; import network.packets.swg.zone.object_controller.ObjectController; -import intents.InboundPacketIntent; -import intents.OutboundPacketIntent; -import intents.ServerManagementIntent; -import intents.ServerStatusIntent; +import intents.network.InboundPacketIntent; +import intents.network.OutboundPacketIntent; +import intents.server.ServerManagementIntent; +import intents.server.ServerStatusIntent; import resources.Galaxy; import resources.Galaxy.GalaxyStatus; import resources.config.ConfigFile; diff --git a/src/services/ShutdownService.java b/src/services/ShutdownService.java index 54c8720b..8d6cf0f7 100644 --- a/src/services/ShutdownService.java +++ b/src/services/ShutdownService.java @@ -27,9 +27,9 @@ ***********************************************************************************/ package services; -import intents.ServerStatusIntent; import intents.chat.ChatBroadcastIntent; import intents.chat.ChatBroadcastIntent.BroadcastType; +import intents.server.ServerStatusIntent; import java.util.Locale; import java.util.concurrent.Executors; diff --git a/src/services/chat/ChatService.java b/src/services/chat/ChatService.java index 13fca107..3a5d15ce 100644 --- a/src/services/chat/ChatService.java +++ b/src/services/chat/ChatService.java @@ -32,13 +32,13 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; -import intents.GalacticPacketIntent; import intents.NotifyPlayersPacketIntent; import intents.PlayerEventIntent; -import intents.ServerStatusIntent; import intents.chat.ChatBroadcastIntent; import intents.chat.PersistentMessageIntent; import intents.chat.SpatialChatIntent; +import intents.network.GalacticPacketIntent; +import intents.server.ServerStatusIntent; import network.packets.Packet; import network.packets.swg.SWGPacket; import network.packets.swg.zone.ChatRequestRoomList; diff --git a/src/services/commands/CommandService.java b/src/services/commands/CommandService.java index 619774f6..6eb8984e 100644 --- a/src/services/commands/CommandService.java +++ b/src/services/commands/CommandService.java @@ -27,13 +27,14 @@ ***********************************************************************************/ package services.commands; +import intents.network.GalacticPacketIntent; + import java.util.Locale; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import network.packets.Packet; import network.packets.swg.zone.object_controller.CommandQueueEnqueue; -import intents.GalacticPacketIntent; import resources.client_info.ClientFactory; import resources.client_info.visitors.DatatableData; import resources.commands.Command; diff --git a/src/services/galaxy/ConnectionService.java b/src/services/galaxy/ConnectionService.java index d3c3a1b0..7cf35312 100644 --- a/src/services/galaxy/ConnectionService.java +++ b/src/services/galaxy/ConnectionService.java @@ -38,9 +38,9 @@ import java.util.concurrent.TimeUnit; import network.packets.soe.Disconnect; import network.packets.soe.Disconnect.DisconnectReason; import network.packets.swg.zone.HeartBeatMessage; -import intents.CloseConnectionIntent; -import intents.GalacticPacketIntent; import intents.PlayerEventIntent; +import intents.network.CloseConnectionIntent; +import intents.network.GalacticPacketIntent; import resources.control.Intent; import resources.control.Service; import resources.objects.player.PlayerObject; diff --git a/src/services/galaxy/GalacticManager.java b/src/services/galaxy/GalacticManager.java index afddfc6d..17689ef4 100644 --- a/src/services/galaxy/GalacticManager.java +++ b/src/services/galaxy/GalacticManager.java @@ -28,8 +28,8 @@ package services.galaxy; import intents.GalacticIntent; -import intents.GalacticPacketIntent; -import intents.InboundPacketIntent; +import intents.network.GalacticPacketIntent; +import intents.network.InboundPacketIntent; import resources.Galaxy; import resources.control.Intent; import resources.control.Manager; diff --git a/src/services/network/NetworkClientManager.java b/src/services/network/NetworkClientManager.java index 90171650..247e095c 100644 --- a/src/services/network/NetworkClientManager.java +++ b/src/services/network/NetworkClientManager.java @@ -27,10 +27,10 @@ ***********************************************************************************/ package services.network; -import intents.CloseConnectionIntent; -import intents.InboundPacketIntent; -import intents.InboundUdpPacketIntent; -import intents.OutboundPacketIntent; +import intents.network.CloseConnectionIntent; +import intents.network.InboundPacketIntent; +import intents.network.InboundUdpPacketIntent; +import intents.network.OutboundPacketIntent; import java.net.InetAddress; import java.nio.ByteBuffer; diff --git a/src/services/network/NetworkListenerService.java b/src/services/network/NetworkListenerService.java index fa782956..3b99fd7a 100644 --- a/src/services/network/NetworkListenerService.java +++ b/src/services/network/NetworkListenerService.java @@ -27,10 +27,11 @@ ***********************************************************************************/ package services.network; +import intents.network.InboundUdpPacketIntent; + import java.net.InetAddress; import java.net.UnknownHostException; -import intents.InboundUdpPacketIntent; import resources.Galaxy; import resources.config.ConfigFile; import resources.control.Intent; diff --git a/src/services/network/NetworkManager.java b/src/services/network/NetworkManager.java index e2c66cef..d722cdea 100644 --- a/src/services/network/NetworkManager.java +++ b/src/services/network/NetworkManager.java @@ -27,7 +27,7 @@ ***********************************************************************************/ package services.network; -import intents.OutboundUdpPacketIntent; +import intents.network.OutboundUdpPacketIntent; import resources.Galaxy; import resources.control.Intent; import resources.control.Manager; diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java index 2e4dd7cf..144b5550 100644 --- a/src/services/objects/ObjectManager.java +++ b/src/services/objects/ObjectManager.java @@ -27,10 +27,9 @@ ***********************************************************************************/ package services.objects; -import intents.GalacticPacketIntent; import intents.ObjectTeleportIntent; import intents.PlayerEventIntent; -import intents.swgobject_events.SWGObjectEventIntent; +import intents.network.GalacticPacketIntent; import java.util.ArrayList; import java.util.HashMap; @@ -90,7 +89,6 @@ public class ObjectManager extends Manager { @Override public boolean initialize() { - registerForIntent(SWGObjectEventIntent.TYPE); registerForIntent(GalacticPacketIntent.TYPE); registerForIntent(PlayerEventIntent.TYPE); registerForIntent(ObjectTeleportIntent.TYPE); diff --git a/src/services/player/PlayerManager.java b/src/services/player/PlayerManager.java index 322d669b..0f722511 100644 --- a/src/services/player/PlayerManager.java +++ b/src/services/player/PlayerManager.java @@ -37,10 +37,10 @@ import java.util.Map; import network.packets.Packet; import network.packets.swg.login.ClientIdMsg; import network.packets.swg.zone.insertion.SelectCharacter; -import intents.GalacticPacketIntent; import intents.NotifyPlayersPacketIntent; -import intents.InboundPacketIntent; import intents.PlayerEventIntent; +import intents.network.GalacticPacketIntent; +import intents.network.InboundPacketIntent; import resources.Terrain; import resources.control.Intent; import resources.control.Manager; diff --git a/src/services/sui/SuiService.java b/src/services/sui/SuiService.java index 4c68af4d..61cee76c 100644 --- a/src/services/sui/SuiService.java +++ b/src/services/sui/SuiService.java @@ -41,7 +41,7 @@ import network.packets.swg.zone.object_controller.ObjectMenuRequest; import network.packets.swg.zone.object_controller.ObjectMenuResponse; import network.packets.swg.zone.server_ui.SuiCreatePageMessage; import network.packets.swg.zone.server_ui.SuiEventNotification; -import intents.GalacticPacketIntent; +import intents.network.GalacticPacketIntent; import intents.sui.SuiWindowIntent; import intents.sui.SuiWindowIntent.SuiWindowEvent; import resources.control.Intent;