diff --git a/scripts/event/WeddingCathedral.js b/scripts/event/WeddingCathedral.js index e375a985e9..3c908e8118 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('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 index 96129bab6c..9fa2b5e79e 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('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 index c39bda0231..ee102cbfed 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 tools.packets.WeddingPackets; +import net.WeddingPackets; import java.awt.*; import java.lang.ref.WeakReference; diff --git a/src/main/java/tools/packets/WeddingPackets.java b/src/main/java/net/WeddingPackets.java similarity index 99% rename from src/main/java/tools/packets/WeddingPackets.java rename to src/main/java/net/WeddingPackets.java index f9d8042d79..759d640b40 100644 --- a/src/main/java/tools/packets/WeddingPackets.java +++ b/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 itemnames, List } return p; } -} \ No newline at end of file +} diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java index a0b7ef8cbc..912fdb54ec 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 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 index 8c3c931ed3..4264b534c4 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 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 index 6503551472..bb67aba4ea 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 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 index d7ee3f8f8a..b03c26a077 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 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 index 01777b982f..6bcf5f6809 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 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 index f53c8d93cf..f320851013 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 tools.packets.WeddingPackets; +import net.WeddingPackets; import java.awt.*; import java.sql.SQLException;