Move WeddingPackets

tower-industries · Aug 25, 2024 · cdbe8d8 · cdbe8d8
1 parent 35249df
commit cdbe8d8
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 16 deletions.
diff --git a/scripts/event/WeddingCathedral.js b/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.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.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.Wedding');
     eim.getMapInstance(entryMap + 10).broadcastMessage(Wedding.OnWeddingProgress(false, 0, 0, 1));
     eim.setIntProperty("guestBlessings", 1);
     eim.schedule("hidePriestMsg", forceHideMsgTime * 1000);

diff --git a/scripts/event/WeddingChapel.js b/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.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.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.Wedding');
     eim.getMapInstance(entryMap + 10).broadcastMessage(Wedding.OnWeddingProgress(false, 0, 0, 1));
     eim.setIntProperty("guestBlessings", 1);
     eim.schedule("hidePriestMsg", forceHideMsgTime * 1000);

diff --git a/src/main/java/client/Character.java b/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.WeddingPackets;
 
 import java.awt.*;
 import java.lang.ref.WeakReference;

diff --git a/...in/java/tools/packets/WeddingPackets.java → src/main/java/net/WeddingPackets.java b/...in/java/tools/packets/WeddingPackets.java → src/main/java/net/WeddingPackets.java
@@ -4,7 +4,7 @@
  * and open the template in the editor.
  */
 
-package tools.packets;
+package net;
 
 import client.Character;
 import client.inventory.Item;
@@ -15,7 +15,6 @@
 import net.packet.Packet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import net.PacketCreator;
 import tools.StringUtil;
 
 import java.util.ArrayList;
@@ -419,4 +418,4 @@ public static Packet onWeddingGiftResult(byte mode, List<String> itemnames, List
         }
         return p;
     }
-} 
+} 
diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/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.WeddingPackets;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

diff --git a/src/main/java/net/server/channel/handlers/RingActionHandler.java b/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.WeddingPackets;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

diff --git a/src/main/java/net/server/channel/handlers/WeddingHandler.java b/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.WeddingPackets;
 
 import java.util.Collections;
 import java.util.List;

diff --git a/src/main/java/net/server/channel/handlers/WeddingTalkHandler.java b/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.WeddingPackets;
 
 /**
  * @author Ronan

diff --git a/src/main/java/net/server/channel/handlers/WeddingTalkMoreHandler.java b/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.WeddingPackets;
 
 /**
  * @author Ronan

diff --git a/src/main/java/scripting/npc/NPCConversationManager.java b/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.WeddingPackets;
 
 import java.awt.*;
 import java.sql.SQLException;