Move DatabaseConnection, update imports

tower-industries · Aug 24, 2024 · 55a7b73 · 55a7b73
1 parent 9080806
commit 55a7b73
Show file tree

Hide file tree

Showing 56 changed files with 59 additions and 59 deletions.
diff --git a/src/main/java/client/BuddyList.java b/src/main/java/client/BuddyList.java
@@ -21,9 +21,9 @@
 */
 package client;
 
+import databse.DatabaseConnection;
 import net.packet.Packet;
 import net.server.PlayerStorage;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 
 import java.sql.Connection;

diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java
@@ -78,6 +78,7 @@
 import constants.skills.Sniper;
 import constants.skills.ThunderBreaker;
 import constants.skills.Warrior;
+import database.DatabaseConnection;
 import net.packet.Packet;
 import net.server.PlayerBuffValueHolder;
 import net.server.PlayerCoolDownValueHolder;
@@ -149,7 +150,6 @@
 import server.partyquest.MonsterCarnivalParty;
 import server.partyquest.PartyQuest;
 import server.quest.Quest;
-import tools.DatabaseConnection;
 import tools.LongTool;
 import tools.PacketCreator;
 import tools.Pair;

diff --git a/src/main/java/client/Client.java b/src/main/java/client/Client.java
@@ -25,6 +25,7 @@
 import config.YamlConfig;
 import constants.game.GameConstants;
 import constants.id.MapId;
+import database.DatabaseConnection;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.handler.timeout.IdleStateEvent;
@@ -66,7 +67,6 @@
 import server.maps.MapleMap;
 import server.maps.MiniDungeonInfo;
 import tools.BCrypt;
-import tools.DatabaseConnection;
 import tools.HexTool;
 import tools.PacketCreator;
 

diff --git a/src/main/java/client/Family.java b/src/main/java/client/Family.java
@@ -21,12 +21,12 @@
  */
 package client;
 
+import database.DatabaseConnection;
 import net.packet.Packet;
 import net.server.Server;
 import net.server.world.World;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 import tools.Pair;
 

diff --git a/src/main/java/client/FamilyEntry.java b/src/main/java/client/FamilyEntry.java
@@ -19,11 +19,11 @@
 */
 package client;
 
+import database.DatabaseConnection;
 import net.packet.Packet;
 import net.server.Server;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 import tools.Pair;
 

diff --git a/src/main/java/client/MonsterBook.java b/src/main/java/client/MonsterBook.java
@@ -21,7 +21,7 @@
 */
 package client;
 
-import tools.DatabaseConnection;
+import database.DatabaseConnection;
 import tools.PacketCreator;
 
 import java.sql.Connection;

diff --git a/src/main/java/client/Ring.java b/src/main/java/client/Ring.java
@@ -22,7 +22,7 @@
 package client;
 
 import client.inventory.manipulator.CashIdGenerator;
-import tools.DatabaseConnection;
+import database.DatabaseConnection;
 import tools.Pair;
 
 import java.sql.Connection;

diff --git a/src/main/java/client/inventory/ItemFactory.java b/src/main/java/client/inventory/ItemFactory.java
@@ -20,7 +20,7 @@
  */
 package client.inventory;
 
-import tools.DatabaseConnection;
+import database.DatabaseConnection;
 import tools.Pair;
 
 import java.sql.Connection;

diff --git a/src/main/java/client/inventory/Pet.java b/src/main/java/client/inventory/Pet.java
@@ -24,11 +24,11 @@
 import client.Character;
 import client.inventory.manipulator.CashIdGenerator;
 import constants.game.ExpTable;
+import database.DatabaseConnection;
 import server.ItemInformationProvider;
 import server.movement.AbsoluteLifeMovement;
 import server.movement.LifeMovement;
 import server.movement.LifeMovementFragment;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 import tools.Pair;
 
@@ -325,4 +325,4 @@ public void updatePosition(List<LifeMovementFragment> movement) {
             }
         }
     }
-}
+}
diff --git a/src/main/java/client/inventory/manipulator/CashIdGenerator.java b/src/main/java/client/inventory/manipulator/CashIdGenerator.java
@@ -19,9 +19,9 @@
 */
 package client.inventory.manipulator;
 
+import databse.DatabaseConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import tools.DatabaseConnection;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

diff --git a/src/main/java/client/newyear/NewYearCardRecord.java b/src/main/java/client/newyear/NewYearCardRecord.java
@@ -20,9 +20,9 @@
 package client.newyear;
 
 import client.Character;
+import database.DatabaseConnection;
 import net.server.Server;
 import server.TimerManager;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 
 import java.sql.Connection;

diff --git a/src/main/java/client/processor/npc/DueyProcessor.java b/src/main/java/client/processor/npc/DueyProcessor.java
@@ -35,13 +35,13 @@
 import config.YamlConfig;
 import constants.id.ItemId;
 import constants.inventory.ItemConstants;
+import database.DatabaseConnection;
 import net.server.channel.Channel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import server.DueyPackage;
 import server.ItemInformationProvider;
 import server.Trade;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 import tools.Pair;
 

diff --git a/src/main/java/client/processor/npc/FredrickProcessor.java b/src/main/java/client/processor/npc/FredrickProcessor.java
@@ -30,14 +30,14 @@
 import client.inventory.Item;
 import client.inventory.ItemFactory;
 import client.inventory.manipulator.InventoryManipulator;
+import database.DatabaseConnection;
 import net.server.Server;
 import net.server.world.World;
 import note.NoteService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import server.ItemInformationProvider;
 import server.maps.HiredMerchant;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 import tools.Pair;
 

diff --git a/src/main/java/tools/DatabaseConnection.java → ...ain/java/database/DatabaseConnection.java b/src/main/java/tools/DatabaseConnection.java → ...ain/java/database/DatabaseConnection.java
@@ -1,4 +1,4 @@
-package tools;
+package database;
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;

diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java
@@ -35,6 +35,7 @@
 import constants.inventory.ItemConstants;
 import constants.net.OpcodeConstants;
 import constants.net.ServerConstants;
+import database.DatabaseConnection;
 import net.ChannelDependencies;
 import net.PacketProcessor;
 import net.netty.LoginServer;
@@ -69,7 +70,6 @@
 import server.expeditions.ExpeditionBossLog;
 import server.life.PlayerNPC;
 import server.quest.Quest;
-import tools.DatabaseConnection;
 import tools.Pair;
 
 import java.sql.Connection;

diff --git a/src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java b/src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java
@@ -26,6 +26,7 @@
 import client.Family;
 import client.FamilyEntry;
 import config.YamlConfig;
+import database.DatabaseConnection;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.coordinator.world.InviteCoordinator;
@@ -34,7 +35,6 @@
 import net.server.coordinator.world.InviteCoordinator.InviteType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 
 import java.sql.Connection;

diff --git a/src/main/java/net/server/channel/handlers/BBSOperationHandler.java b/src/main/java/net/server/channel/handlers/BBSOperationHandler.java
@@ -23,12 +23,12 @@
 
 import client.Character;
 import client.Client;
+import database.DatabaseConnection;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.guild.GuildPackets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import tools.DatabaseConnection;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

diff --git a/src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java b/src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java
@@ -28,10 +28,10 @@
 import client.Character;
 import client.CharacterNameAndId;
 import client.Client;
+import database.DatabaseConnection;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.world.World;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 
 import java.sql.Connection;

diff --git a/src/main/java/net/server/channel/handlers/CouponCodeHandler.java b/src/main/java/net/server/channel/handlers/CouponCodeHandler.java
@@ -27,14 +27,14 @@
 import client.Client;
 import client.inventory.Item;
 import client.inventory.manipulator.InventoryManipulator;
+import database.DatabaseConnection;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import server.CashShop;
 import server.ItemInformationProvider;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 import tools.Pair;
 

diff --git a/src/main/java/net/server/channel/handlers/EnterMTSHandler.java b/src/main/java/net/server/channel/handlers/EnterMTSHandler.java
@@ -26,13 +26,13 @@
 import client.inventory.Equip;
 import client.inventory.Item;
 import config.YamlConfig;
+import database.DatabaseConnection;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
 import server.MTSItemInfo;
 import server.maps.FieldLimit;
 import server.maps.MiniDungeonInfo;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 
 import java.sql.Connection;

diff --git a/src/main/java/net/server/channel/handlers/MTSHandler.java b/src/main/java/net/server/channel/handlers/MTSHandler.java
@@ -28,6 +28,7 @@
 import client.inventory.Item;
 import client.inventory.manipulator.InventoryManipulator;
 import constants.inventory.ItemConstants;
+import database.DatabaseConnection;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.packet.Packet;
@@ -38,7 +39,6 @@
 import server.CashShop;
 import server.ItemInformationProvider;
 import server.MTSItemInfo;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 import tools.Pair;
 

diff --git a/src/main/java/net/server/channel/handlers/NewYearCardHandler.java b/src/main/java/net/server/channel/handlers/NewYearCardHandler.java
@@ -25,10 +25,10 @@
 import client.newyear.NewYearCardRecord;
 import constants.id.ItemId;
 import constants.inventory.ItemConstants;
+import database.DatabaseConnection;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 
 import java.sql.Connection;

diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java
@@ -39,6 +39,7 @@
 import client.keybind.KeyBinding;
 import config.YamlConfig;
 import constants.game.GameConstants;
+import database.DatabaseConnection;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.PlayerBuffValueHolder;
@@ -59,7 +60,6 @@
 import org.slf4j.LoggerFactory;
 import scripting.event.EventInstanceManager;
 import server.life.MobSkill;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 import tools.Pair;
 import tools.packets.WeddingPackets;

diff --git a/src/main/java/net/server/channel/handlers/ReportHandler.java b/src/main/java/net/server/channel/handlers/ReportHandler.java
@@ -23,10 +23,10 @@
 
 import client.Character;
 import client.Client;
+import database.DatabaseConnection;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 
 import java.sql.Connection;

diff --git a/src/main/java/net/server/channel/handlers/RingActionHandler.java b/src/main/java/net/server/channel/handlers/RingActionHandler.java
@@ -30,6 +30,7 @@
 import client.inventory.manipulator.InventoryManipulator;
 import client.processor.npc.DueyProcessor;
 import constants.id.ItemId;
+import database.DatabaseConnection;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.channel.Channel;
@@ -39,7 +40,6 @@
 import org.slf4j.LoggerFactory;
 import scripting.event.EventInstanceManager;
 import server.ItemInformationProvider;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 import tools.Pair;
 import tools.packets.WeddingPackets;

diff --git a/src/main/java/net/server/channel/handlers/TransferNameHandler.java b/src/main/java/net/server/channel/handlers/TransferNameHandler.java
@@ -23,9 +23,9 @@
 import client.Character;
 import client.Client;
 import config.YamlConfig;
+import database.DatabaseConnection;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 
 import java.sql.Connection;

diff --git a/src/main/java/net/server/channel/handlers/TransferWorldHandler.java b/src/main/java/net/server/channel/handlers/TransferWorldHandler.java
@@ -23,10 +23,10 @@
 import client.Character;
 import client.Client;
 import config.YamlConfig;
+import database.DatabaseConnection;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
-import tools.DatabaseConnection;
 import tools.PacketCreator;
 
 import java.sql.Connection;

diff --git a/src/main/java/net/server/coordinator/session/SessionCoordinator.java b/src/main/java/net/server/coordinator/session/SessionCoordinator.java
@@ -23,11 +23,11 @@
 import client.Client;
 import config.YamlConfig;
 import constants.id.NpcId;
+import database.DatabaseConnection;
 import net.server.Server;
 import net.server.coordinator.login.LoginStorage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import tools.DatabaseConnection;
 
 import java.sql.Connection;
 import java.sql.SQLException;

diff --git a/src/main/java/net/server/coordinator/session/SessionDAO.java b/src/main/java/net/server/coordinator/session/SessionDAO.java
@@ -2,7 +2,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import tools.DatabaseConnection;
+import database.DatabaseConnection;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

diff --git a/src/main/java/net/server/guild/Alliance.java b/src/main/java/net/server/guild/Alliance.java
@@ -23,14 +23,14 @@
 
 import client.Character;
 import client.Client;
+import database.DatabaseConnection;
 import net.packet.Packet;
 import net.server.Server;
 import net.server.coordinator.world.InviteCoordinator;
 import net.server.coordinator.world.InviteCoordinator.InviteResult;
 import net.server.coordinator.world.InviteCoordinator.InviteType;
 import net.server.world.Party;
 import net.server.world.PartyCharacter;
-import tools.DatabaseConnection;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;