From 4d7ce6f9b77cf58750eab8b54c10cbe9f90b70db Mon Sep 17 00:00:00 2001 From: MarloDelatorre Date: Sat, 24 Aug 2024 21:19:01 -0700 Subject: [PATCH] Move WeddingPackets to net.packet --- scripts/event/WeddingCathedral.js | 6 +++--- scripts/event/WeddingChapel.js | 6 +++--- src/main/java/client/Character.java | 2 +- .../java/net/{ => packet}/WeddingPackets.java | 16 ++++++++-------- .../channel/handlers/PlayerLoggedinHandler.java | 2 +- .../channel/handlers/RingActionHandler.java | 2 +- .../server/channel/handlers/WeddingHandler.java | 2 +- .../channel/handlers/WeddingTalkHandler.java | 2 +- .../channel/handlers/WeddingTalkMoreHandler.java | 2 +- .../scripting/npc/NPCConversationManager.java | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) rename src/main/java/net/{ => packet}/WeddingPackets.java (99%) diff --git a/scripts/event/WeddingCathedral.js b/scripts/event/WeddingCathedral.js index 3c908e8118..1516ea8684 100644 --- 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('net.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('net.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('net.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); diff --git a/scripts/event/WeddingChapel.js b/scripts/event/WeddingChapel.js index 9fa2b5e79e..3b2a9f65af 100644 --- 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('net.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('net.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('net.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); diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index ee102cbfed..9c70f3bf9b 100644 --- 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 net.WeddingPackets; +import net.packet.WeddingPackets; import java.awt.*; import java.lang.ref.WeakReference; diff --git a/src/main/java/net/WeddingPackets.java b/src/main/java/net/packet/WeddingPackets.java similarity index 99% rename from src/main/java/net/WeddingPackets.java rename to src/main/java/net/packet/WeddingPackets.java index 759d640b40..32db709856 100644 --- a/src/main/java/net/WeddingPackets.java +++ b/src/main/java/net/packet/WeddingPackets.java @@ -4,22 +4,22 @@ * and open the template in the editor. */ -package net; +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.PacketCreator; import net.opcodes.SendOpcode; -import net.packet.OutPacket; -import net.packet.Packet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import tools.StringUtil; -import java.util.ArrayList; -import java.util.List; - /** * CField_Wedding, CField_WeddingPhoto, CWeddingMan, OnMarriageResult, and all Wedding/Marriage enum/structs. * diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java index 912fdb54ec..c6162ff324 100644 --- 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 net.WeddingPackets; +import net.packet.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 index 4264b534c4..1e33b47f1f 100644 --- 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 net.WeddingPackets; +import net.packet.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 index bb67aba4ea..786790c0f6 100644 --- 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 net.WeddingPackets; +import net.packet.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 index b03c26a077..894bf7b279 100644 --- 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 net.WeddingPackets; +import net.packet.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 index 6bcf5f6809..44a0f978c1 100644 --- 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 net.WeddingPackets; +import net.packet.WeddingPackets; /** * @author Ronan diff --git a/src/main/java/scripting/npc/NPCConversationManager.java b/src/main/java/scripting/npc/NPCConversationManager.java index f320851013..61b58e8472 100644 --- 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 net.WeddingPackets; +import net.packet.WeddingPackets; import java.awt.*; import java.sql.SQLException;