Additional tools cleanup (#22)

* Remove unused exception

* Move EmptyMovementException to net

* Move EventInstanceInProgressException to scripting

* Move WeddingPackets

* Move WeddingPackets to net.packet

scripts/event/WeddingCathedral.js

@@ -129,7 +129,7 @@ function stopBlessings(eim) {
 
 function sendWeddingAction(eim, type) {
     var chr = eim.getLeader();
-    const Wedding = Java.type('tools.packets.Wedding');
+    const Wedding = Java.type('net.packet.Wedding');
     if (chr.getGender() == 0) {
         chr.getMap().broadcastMessage(Wedding.OnWeddingProgress(type == 2, eim.getIntProperty("groomId"), eim.getIntProperty("brideId"), type + 1));
     } else {
@@ -142,13 +142,13 @@ function hidePriestMsg(eim) {
 }
 
 function showStartMsg(eim) {
-    const Wedding = Java.type('tools.packets.Wedding');
+    const Wedding = Java.type('net.packet.Wedding');
     eim.getMapInstance(entryMap + 10).broadcastMessage(Wedding.OnWeddingProgress(false, 0, 0, 0));
     eim.schedule("hidePriestMsg", forceHideMsgTime * 1000);
 }
 
 function showBlessMsg(eim) {
-    const Wedding = Java.type('tools.packets.Wedding');
+    const Wedding = Java.type('net.packet.Wedding');
     eim.getMapInstance(entryMap + 10).broadcastMessage(Wedding.OnWeddingProgress(false, 0, 0, 1));
     eim.setIntProperty("guestBlessings", 1);
     eim.schedule("hidePriestMsg", forceHideMsgTime * 1000);

scripts/event/WeddingChapel.js

@@ -130,7 +130,7 @@ function stopBlessings(eim) {
 function sendWeddingAction(eim, type) {
     var chr = eim.getLeader();
 
-    const Wedding = Java.type('tools.packets.Wedding');
+    const Wedding = Java.type('net.packet.Wedding');
     if (chr.getGender() == 0) {
         chr.getMap().broadcastMessage(Wedding.OnWeddingProgress(type == 2, eim.getIntProperty("groomId"), eim.getIntProperty("brideId"), type + 1));
     } else {
@@ -143,13 +143,13 @@ function hidePriestMsg(eim) {
 }
 
 function showStartMsg(eim) {
-    const Wedding = Java.type('tools.packets.Wedding');
+    const Wedding = Java.type('net.packet.Wedding');
     eim.getMapInstance(entryMap + 10).broadcastMessage(Wedding.OnWeddingProgress(false, 0, 0, 0));
     eim.schedule("hidePriestMsg", forceHideMsgTime * 1000);
 }
 
 function showBlessMsg(eim) {
-    const Wedding = Java.type('tools.packets.Wedding');
+    const Wedding = Java.type('net.packet.Wedding');
     eim.getMapInstance(entryMap + 10).broadcastMessage(Wedding.OnWeddingProgress(false, 0, 0, 1));
     eim.setIntProperty("guestBlessings", 1);
     eim.schedule("hidePriestMsg", forceHideMsgTime * 1000);

src/main/java/client/Character.java

@@ -154,7 +154,7 @@
 import net.PacketCreator;
 import tools.Pair;
 import tools.Randomizer;
-import tools.packets.WeddingPackets;
+import net.packet.WeddingPackets;
 
 import java.awt.*;
 import java.lang.ref.WeakReference;

src/main/java/tools/exceptions/EmptyMovementException.java → src/main/java/net/exceptions/EmptyMovementException.java

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package tools.exceptions;
+package net.exceptions;
 
 import net.packet.InPacket;
 

src/main/java/tools/packets/WeddingPackets.java → src/main/java/net/packet/WeddingPackets.java

@@ -4,23 +4,22 @@
  * and open the template in the editor.
  */
 
-package tools.packets;
+package net.packet;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import client.Character;
 import client.inventory.Item;
 import constants.id.ItemId;
 import constants.id.MapId;
-import net.opcodes.SendOpcode;
-import net.packet.OutPacket;
-import net.packet.Packet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import net.PacketCreator;
+import net.opcodes.SendOpcode;
 import tools.StringUtil;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * CField_Wedding, CField_WeddingPhoto, CWeddingMan, OnMarriageResult, and all Wedding/Marriage enum/structs.
  *
@@ -419,4 +418,4 @@ public static Packet onWeddingGiftResult(byte mode, List<String> itemnames, List
         }
         return p;
     }
-} 
+} 

src/main/java/net/server/channel/handlers/AbstractMovementPacketHandler.java

@@ -32,7 +32,7 @@
 import server.movement.LifeMovementFragment;
 import server.movement.RelativeLifeMovement;
 import server.movement.TeleportMovement;
-import tools.exceptions.EmptyMovementException;
+import net.exceptions.EmptyMovementException;
 
 import java.awt.*;
 import java.util.ArrayList;

src/main/java/net/server/channel/handlers/MoveDragonHandler.java

@@ -21,14 +21,14 @@
  */
 package net.server.channel.handlers;
 
+import java.awt.Point;
+
 import client.Character;
 import client.Client;
+import net.PacketCreator;
+import net.exceptions.EmptyMovementException;
 import net.packet.InPacket;
 import server.maps.Dragon;
-import net.PacketCreator;
-import tools.exceptions.EmptyMovementException;
-
-import java.awt.*;
 
 
 public class MoveDragonHandler extends AbstractMovementPacketHandler {
@@ -53,4 +53,4 @@ public void handlePacket(InPacket p, Client c) {
             }
         }
     }
-}
+}

src/main/java/net/server/channel/handlers/MoveLifeHandler.java

@@ -21,12 +21,19 @@
 */
 package net.server.channel.handlers;
 
+import java.awt.Point;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import client.Character;
 import client.Client;
 import config.YamlConfig;
+import net.PacketCreator;
+import net.exceptions.EmptyMovementException;
 import net.packet.InPacket;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import server.life.MobSkill;
 import server.life.MobSkillFactory;
 import server.life.MobSkillId;
@@ -36,12 +43,6 @@
 import server.maps.MapObject;
 import server.maps.MapObjectType;
 import server.maps.MapleMap;
-import net.PacketCreator;
-import tools.exceptions.EmptyMovementException;
-
-import java.awt.*;
-import java.util.LinkedList;
-import java.util.List;
 
 /**
  * @author Danny (Leifde)

src/main/java/net/server/channel/handlers/MovePetHandler.java

@@ -26,7 +26,7 @@
 import net.packet.InPacket;
 import server.movement.LifeMovementFragment;
 import net.PacketCreator;
-import tools.exceptions.EmptyMovementException;
+import net.exceptions.EmptyMovementException;
 
 import java.util.List;
 

src/main/java/net/server/channel/handlers/MovePlayerHandler.java

@@ -22,9 +22,9 @@
 package net.server.channel.handlers;
 
 import client.Client;
-import net.packet.InPacket;
 import net.PacketCreator;
-import tools.exceptions.EmptyMovementException;
+import net.exceptions.EmptyMovementException;
+import net.packet.InPacket;
 
 public final class MovePlayerHandler extends AbstractMovementPacketHandler {
     @Override

src/main/java/net/server/channel/handlers/MoveSummonHandler.java

@@ -21,15 +21,15 @@
 */
 package net.server.channel.handlers;
 
+import java.awt.Point;
+import java.util.Collection;
+
 import client.Character;
 import client.Client;
+import net.PacketCreator;
+import net.exceptions.EmptyMovementException;
 import net.packet.InPacket;
 import server.maps.Summon;
-import net.PacketCreator;
-import tools.exceptions.EmptyMovementException;
-
-import java.awt.*;
-import java.util.Collection;
 
 public final class MoveSummonHandler extends AbstractMovementPacketHandler {
     @Override

src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java

@@ -62,7 +62,7 @@
 import server.life.MobSkill;
 import net.PacketCreator;
 import tools.Pair;
-import tools.packets.WeddingPackets;
+import net.packet.WeddingPackets;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

src/main/java/net/server/channel/handlers/RingActionHandler.java

@@ -42,7 +42,7 @@
 import server.ItemInformationProvider;
 import net.PacketCreator;
 import tools.Pair;
-import tools.packets.WeddingPackets;
+import net.packet.WeddingPackets;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

src/main/java/net/server/channel/handlers/WeddingHandler.java

@@ -22,7 +22,7 @@
 import org.slf4j.LoggerFactory;
 import server.Marriage;
 import net.PacketCreator;
-import tools.packets.WeddingPackets;
+import net.packet.WeddingPackets;
 
 import java.util.Collections;
 import java.util.List;

src/main/java/net/server/channel/handlers/WeddingTalkHandler.java

@@ -25,7 +25,7 @@
 import net.packet.InPacket;
 import scripting.event.EventInstanceManager;
 import net.PacketCreator;
-import tools.packets.WeddingPackets;
+import net.packet.WeddingPackets;
 
 /**
  * @author Ronan

src/main/java/net/server/channel/handlers/WeddingTalkMoreHandler.java

@@ -25,7 +25,7 @@
 import net.packet.InPacket;
 import scripting.event.EventInstanceManager;
 import net.PacketCreator;
-import tools.packets.WeddingPackets;
+import net.packet.WeddingPackets;
 
 /**
  * @author Ronan

src/main/java/scripting/event/EventManager.java

@@ -40,7 +40,7 @@
 import server.life.Monster;
 import server.maps.MapleMap;
 import server.quest.Quest;
-import tools.exceptions.EventInstanceInProgressException;
+import scripting.exceptions.EventInstanceInProgressException;
 
 import javax.script.Invocable;
 import javax.script.ScriptException;
@@ -945,4 +945,4 @@ public void run() {
             instantiateQueuedInstance();
         }
     }
-}
+}

src/main/java/tools/exceptions/EventInstanceInProgressException.java → src/main/java/scripting/exceptions/EventInstanceInProgressException.java

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package tools.exceptions;
+package scripting.exceptions;
 
 
 /**

src/main/java/scripting/npc/NPCConversationManager.java

@@ -63,7 +63,7 @@
 import server.partyquest.Pyramid;
 import server.partyquest.Pyramid.PyramidMode;
 import net.PacketCreator;
-import tools.packets.WeddingPackets;
+import net.packet.WeddingPackets;
 
 import java.awt.*;
 import java.sql.SQLException;