From 55a7b737a5bfaea598d718dc6fbb73e59d158091 Mon Sep 17 00:00:00 2001 From: MarloDelatorre Date: Fri, 23 Aug 2024 23:13:58 -0700 Subject: [PATCH 1/7] Move DatabaseConnection, update imports --- src/main/java/client/BuddyList.java | 2 +- src/main/java/client/Character.java | 2 +- src/main/java/client/Client.java | 2 +- src/main/java/client/Family.java | 2 +- src/main/java/client/FamilyEntry.java | 2 +- src/main/java/client/MonsterBook.java | 2 +- src/main/java/client/Ring.java | 2 +- src/main/java/client/inventory/ItemFactory.java | 2 +- src/main/java/client/inventory/Pet.java | 4 ++-- .../java/client/inventory/manipulator/CashIdGenerator.java | 2 +- src/main/java/client/newyear/NewYearCardRecord.java | 2 +- src/main/java/client/processor/npc/DueyProcessor.java | 2 +- src/main/java/client/processor/npc/FredrickProcessor.java | 2 +- src/main/java/{tools => database}/DatabaseConnection.java | 2 +- src/main/java/net/server/Server.java | 2 +- .../java/net/server/channel/handlers/AcceptFamilyHandler.java | 2 +- .../java/net/server/channel/handlers/BBSOperationHandler.java | 2 +- .../net/server/channel/handlers/BuddylistModifyHandler.java | 2 +- .../java/net/server/channel/handlers/CouponCodeHandler.java | 2 +- .../java/net/server/channel/handlers/EnterMTSHandler.java | 2 +- src/main/java/net/server/channel/handlers/MTSHandler.java | 2 +- .../java/net/server/channel/handlers/NewYearCardHandler.java | 2 +- .../net/server/channel/handlers/PlayerLoggedinHandler.java | 2 +- src/main/java/net/server/channel/handlers/ReportHandler.java | 2 +- .../java/net/server/channel/handlers/RingActionHandler.java | 2 +- .../java/net/server/channel/handlers/TransferNameHandler.java | 2 +- .../net/server/channel/handlers/TransferWorldHandler.java | 2 +- .../net/server/coordinator/session/SessionCoordinator.java | 2 +- src/main/java/net/server/coordinator/session/SessionDAO.java | 2 +- src/main/java/net/server/guild/Alliance.java | 2 +- src/main/java/net/server/guild/Guild.java | 2 +- .../java/net/server/handlers/login/DeleteCharHandler.java | 2 +- .../java/net/server/handlers/login/LoginPasswordHandler.java | 2 +- src/main/java/net/server/task/CouponTask.java | 2 +- src/main/java/net/server/task/FamilyDailyResetTask.java | 2 +- src/main/java/net/server/task/RankingLoginTask.java | 2 +- src/main/java/net/server/world/World.java | 2 +- src/main/java/note/NoteDao.java | 2 +- src/main/java/scripting/portal/PortalPlayerInteraction.java | 4 ++-- src/main/java/scripting/reactor/ReactorScriptManager.java | 4 ++-- src/main/java/server/CashShop.java | 2 +- src/main/java/server/ExpLogger.java | 2 +- src/main/java/server/ItemInformationProvider.java | 2 +- src/main/java/server/Marriage.java | 2 +- src/main/java/server/Shop.java | 2 +- src/main/java/server/SkillbookInformationProvider.java | 2 +- src/main/java/server/Storage.java | 2 +- src/main/java/server/expeditions/ExpeditionBossLog.java | 2 +- src/main/java/server/life/MonsterInformationProvider.java | 2 +- src/main/java/server/life/PlayerNPC.java | 2 +- src/main/java/server/maps/HiredMerchant.java | 2 +- src/main/java/server/maps/MapFactory.java | 2 +- src/main/java/tools/mapletools/CashCosmeticsFetcher.java | 2 +- src/main/java/tools/mapletools/QuestItemFetcher.java | 2 +- src/main/java/tools/mapletools/SimpleDatabaseConnection.java | 2 +- src/main/java/tools/mapletools/SkillMakerFetcher.java | 2 +- 56 files changed, 59 insertions(+), 59 deletions(-) rename src/main/java/{tools => database}/DatabaseConnection.java (99%) diff --git a/src/main/java/client/BuddyList.java b/src/main/java/client/BuddyList.java index 6d2bdb974ad..968118ce956 100644 --- 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 index ae44c80eff4..1f584873559 100644 --- 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 index 7120bb1455d..2a94aac43e8 100644 --- 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 index ea3f5fd13a7..253b094c667 100644 --- 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 index 73e5e498ca6..33f5ed6035b 100644 --- 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 index ca75906e82d..dfa47d040d7 100644 --- 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 index a753c6a40b6..82d4e14d912 100644 --- 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 index 22538041a96..4b58ec7f9de 100644 --- 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 index b9cf98ecfad..b7f077bd4f2 100644 --- 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 movement) { } } } -} \ No newline at end of file +} diff --git a/src/main/java/client/inventory/manipulator/CashIdGenerator.java b/src/main/java/client/inventory/manipulator/CashIdGenerator.java index 999b1256424..d28fec251c7 100644 --- 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 index 0b771c2785c..20d1514063b 100644 --- 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 index 7aa5cfa7b70..f2c335ecfa7 100644 --- 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 index fc1ffaf5141..3cf80b6d1dc 100644 --- a/src/main/java/client/processor/npc/FredrickProcessor.java +++ b/src/main/java/client/processor/npc/FredrickProcessor.java @@ -30,6 +30,7 @@ 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; @@ -37,7 +38,6 @@ 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 b/src/main/java/database/DatabaseConnection.java similarity index 99% rename from src/main/java/tools/DatabaseConnection.java rename to src/main/java/database/DatabaseConnection.java index 007ed67ca94..f0d85221d83 100644 --- a/src/main/java/tools/DatabaseConnection.java +++ b/src/main/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 index 5171e6ab545..f9022e16315 100644 --- 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 index 22fe7bba77a..f0e22dc449f 100644 --- 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 index 06031e5cdc3..75a20de07e3 100644 --- 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 index a6d9bb66d05..0b4eae935c8 100644 --- 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 index 199d0d376f4..add1c98d293 100644 --- a/src/main/java/net/server/channel/handlers/CouponCodeHandler.java +++ b/src/main/java/net/server/channel/handlers/CouponCodeHandler.java @@ -27,6 +27,7 @@ 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; @@ -34,7 +35,6 @@ 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 index 493916af787..b1a22cb0506 100644 --- 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 index 4634c2bef3a..3b18bd79ebc 100644 --- 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 index 8a12340d39d..1960b508f99 100644 --- 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 index d5f2a6f892a..18069859230 100644 --- 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 index b92e08c7c93..c3bde5e82f4 100644 --- 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 index d11a22ae80b..e06e933dea1 100644 --- 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 index 6996e0bfa3e..712af97c1a2 100644 --- 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 index baf3f99426d..1531792c3c0 100644 --- 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 index 29f340ad61a..9f0126926f9 100644 --- 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 index c77d53c0b77..f0dc878157a 100644 --- 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 index e56b58fcb8a..9c71c090c95 100644 --- a/src/main/java/net/server/guild/Alliance.java +++ b/src/main/java/net/server/guild/Alliance.java @@ -23,6 +23,7 @@ import client.Character; import client.Client; +import database.DatabaseConnection; import net.packet.Packet; import net.server.Server; import net.server.coordinator.world.InviteCoordinator; @@ -30,7 +31,6 @@ 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; diff --git a/src/main/java/net/server/guild/Guild.java b/src/main/java/net/server/guild/Guild.java index 23d12f5c96d..ab735d045b3 100644 --- a/src/main/java/net/server/guild/Guild.java +++ b/src/main/java/net/server/guild/Guild.java @@ -24,6 +24,7 @@ import client.Character; import client.Client; import config.YamlConfig; +import database.DatabaseConnection; import net.packet.Packet; import net.server.PlayerStorage; import net.server.Server; @@ -35,7 +36,6 @@ import note.NoteService; 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/handlers/login/DeleteCharHandler.java b/src/main/java/net/server/handlers/login/DeleteCharHandler.java index ff774ef1875..85f3eed236b 100644 --- a/src/main/java/net/server/handlers/login/DeleteCharHandler.java +++ b/src/main/java/net/server/handlers/login/DeleteCharHandler.java @@ -23,12 +23,12 @@ import client.Client; import client.Family; +import database.DatabaseConnection; import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; 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/handlers/login/LoginPasswordHandler.java b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java index f781dbf77c6..6a974b828b5 100644 --- a/src/main/java/net/server/handlers/login/LoginPasswordHandler.java +++ b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java @@ -24,12 +24,12 @@ import client.Client; import client.DefaultDates; import config.YamlConfig; +import database.DatabaseConnection; import net.PacketHandler; import net.packet.InPacket; import net.server.Server; import net.server.coordinator.session.Hwid; import tools.BCrypt; -import tools.DatabaseConnection; import tools.HexTool; import tools.PacketCreator; diff --git a/src/main/java/net/server/task/CouponTask.java b/src/main/java/net/server/task/CouponTask.java index 13a05201f32..f1aac42c200 100644 --- a/src/main/java/net/server/task/CouponTask.java +++ b/src/main/java/net/server/task/CouponTask.java @@ -22,7 +22,7 @@ import net.server.Server; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tools.DatabaseConnection; +import database.DatabaseConnection; import java.sql.Connection; import java.sql.SQLException; diff --git a/src/main/java/net/server/task/FamilyDailyResetTask.java b/src/main/java/net/server/task/FamilyDailyResetTask.java index 876d068dbfb..c389abae1c8 100644 --- a/src/main/java/net/server/task/FamilyDailyResetTask.java +++ b/src/main/java/net/server/task/FamilyDailyResetTask.java @@ -1,10 +1,10 @@ package net.server.task; import client.Family; +import database.DatabaseConnection; import net.server.world.World; 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/task/RankingLoginTask.java b/src/main/java/net/server/task/RankingLoginTask.java index 254538c7ef9..27e12a43ee9 100644 --- a/src/main/java/net/server/task/RankingLoginTask.java +++ b/src/main/java/net/server/task/RankingLoginTask.java @@ -23,8 +23,8 @@ import client.Job; import config.YamlConfig; +import database.DatabaseConnection; import net.server.Server; -import tools.DatabaseConnection; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/net/server/world/World.java b/src/main/java/net/server/world/World.java index 0ad8caef1cd..fe9599670c1 100644 --- a/src/main/java/net/server/world/World.java +++ b/src/main/java/net/server/world/World.java @@ -29,6 +29,7 @@ import client.Family; import config.YamlConfig; import constants.game.GameConstants; +import database.DatabaseConnection; import net.packet.Packet; import net.server.PlayerStorage; import net.server.Server; @@ -70,7 +71,6 @@ import server.maps.MiniDungeonInfo; import server.maps.PlayerShop; import server.maps.PlayerShopItem; -import tools.DatabaseConnection; import tools.PacketCreator; import tools.Pair; diff --git a/src/main/java/note/NoteDao.java b/src/main/java/note/NoteDao.java index 021adb806c4..2f901141395 100644 --- a/src/main/java/note/NoteDao.java +++ b/src/main/java/note/NoteDao.java @@ -1,10 +1,10 @@ package note; import database.DaoException; +import database.DatabaseConnection; import note.Note; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.JdbiException; -import tools.DatabaseConnection; import java.util.List; import java.util.Optional; diff --git a/src/main/java/scripting/portal/PortalPlayerInteraction.java b/src/main/java/scripting/portal/PortalPlayerInteraction.java index 1b2546676b6..fd0d80f2e16 100644 --- a/src/main/java/scripting/portal/PortalPlayerInteraction.java +++ b/src/main/java/scripting/portal/PortalPlayerInteraction.java @@ -22,10 +22,10 @@ package scripting.portal; import client.Client; +import database.DatabaseConnection; import scripting.AbstractPlayerInteraction; import scripting.map.MapScriptManager; import server.maps.Portal; -import tools.DatabaseConnection; import tools.PacketCreator; import java.sql.Connection; @@ -80,4 +80,4 @@ public void unblockPortal() { public void playPortalSound() { c.sendPacket(PacketCreator.playPortalSound()); } -} \ No newline at end of file +} diff --git a/src/main/java/scripting/reactor/ReactorScriptManager.java b/src/main/java/scripting/reactor/ReactorScriptManager.java index fcefd236504..197871e03d9 100644 --- a/src/main/java/scripting/reactor/ReactorScriptManager.java +++ b/src/main/java/scripting/reactor/ReactorScriptManager.java @@ -22,12 +22,12 @@ package scripting.reactor; import client.Client; +import database.DatabaseConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scripting.AbstractScriptManager; import server.maps.Reactor; import server.maps.ReactorDropEntry; -import tools.DatabaseConnection; import javax.script.Invocable; import javax.script.ScriptEngine; @@ -140,4 +140,4 @@ private Invocable initializeInvocable(Client c, Reactor reactor) { return iv; } -} \ No newline at end of file +} diff --git a/src/main/java/server/CashShop.java b/src/main/java/server/CashShop.java index 6801764fe13..f310d367da8 100644 --- a/src/main/java/server/CashShop.java +++ b/src/main/java/server/CashShop.java @@ -29,6 +29,7 @@ import config.YamlConfig; import constants.id.ItemId; import constants.inventory.ItemConstants; +import database.DatabaseConnection; import net.jcip.annotations.GuardedBy; import net.server.Server; import provider.Data; @@ -36,7 +37,6 @@ import provider.DataProviderFactory; import provider.DataTool; import provider.wz.WZFiles; -import tools.DatabaseConnection; import tools.Pair; import java.sql.Connection; diff --git a/src/main/java/server/ExpLogger.java b/src/main/java/server/ExpLogger.java index 0093d7dd2f8..899dd15d80a 100644 --- a/src/main/java/server/ExpLogger.java +++ b/src/main/java/server/ExpLogger.java @@ -1,7 +1,7 @@ package server; import config.YamlConfig; -import tools.DatabaseConnection; +import database.DatabaseConnection; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/server/ItemInformationProvider.java b/src/main/java/server/ItemInformationProvider.java index c12759719f0..ca243085754 100644 --- a/src/main/java/server/ItemInformationProvider.java +++ b/src/main/java/server/ItemInformationProvider.java @@ -39,6 +39,7 @@ import constants.skills.Assassin; import constants.skills.Gunslinger; import constants.skills.NightWalker; +import database.DatabaseConnection; import net.server.Server; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +53,6 @@ import server.MakerItemFactory.MakerItemCreateEntry; import server.life.LifeFactory; import server.life.MonsterInformationProvider; -import tools.DatabaseConnection; import tools.PacketCreator; import tools.Pair; import tools.Randomizer; diff --git a/src/main/java/server/Marriage.java b/src/main/java/server/Marriage.java index e44a7a85f2b..eaf012c4c54 100644 --- a/src/main/java/server/Marriage.java +++ b/src/main/java/server/Marriage.java @@ -26,9 +26,9 @@ import client.inventory.Item; import client.inventory.ItemFactory; import client.inventory.manipulator.InventoryManipulator; +import database.DatabaseConnection; import scripting.event.EventInstanceManager; import scripting.event.EventManager; -import tools.DatabaseConnection; import tools.Pair; import java.sql.Connection; diff --git a/src/main/java/server/Shop.java b/src/main/java/server/Shop.java index cc0f65bd6ac..d5da0c810f9 100644 --- a/src/main/java/server/Shop.java +++ b/src/main/java/server/Shop.java @@ -28,9 +28,9 @@ import client.inventory.manipulator.InventoryManipulator; import constants.id.ItemId; import constants.inventory.ItemConstants; +import database.DatabaseConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tools.DatabaseConnection; import tools.PacketCreator; import java.sql.Connection; diff --git a/src/main/java/server/SkillbookInformationProvider.java b/src/main/java/server/SkillbookInformationProvider.java index b493233b163..b0063800005 100644 --- a/src/main/java/server/SkillbookInformationProvider.java +++ b/src/main/java/server/SkillbookInformationProvider.java @@ -20,6 +20,7 @@ package server; import client.Character; +import database.DatabaseConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import provider.Data; @@ -27,7 +28,6 @@ import provider.DataProviderFactory; import provider.DataTool; import provider.wz.WZFiles; -import tools.DatabaseConnection; import java.io.IOException; import java.nio.file.DirectoryStream; diff --git a/src/main/java/server/Storage.java b/src/main/java/server/Storage.java index 0c504791389..15842fdd759 100644 --- a/src/main/java/server/Storage.java +++ b/src/main/java/server/Storage.java @@ -23,6 +23,7 @@ import client.inventory.Item; import client.inventory.ItemFactory; import constants.game.GameConstants; +import database.DatabaseConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import provider.Data; @@ -30,7 +31,6 @@ import provider.DataProviderFactory; import provider.DataTool; import provider.wz.WZFiles; -import tools.DatabaseConnection; import tools.PacketCreator; import tools.Pair; diff --git a/src/main/java/server/expeditions/ExpeditionBossLog.java b/src/main/java/server/expeditions/ExpeditionBossLog.java index c7337d69d4a..4f9b680cd79 100644 --- a/src/main/java/server/expeditions/ExpeditionBossLog.java +++ b/src/main/java/server/expeditions/ExpeditionBossLog.java @@ -20,7 +20,7 @@ package server.expeditions; import config.YamlConfig; -import tools.DatabaseConnection; +import database.DatabaseConnection; import tools.Pair; import java.sql.Connection; diff --git a/src/main/java/server/life/MonsterInformationProvider.java b/src/main/java/server/life/MonsterInformationProvider.java index 6055a4fdb03..48a7b009ff8 100644 --- a/src/main/java/server/life/MonsterInformationProvider.java +++ b/src/main/java/server/life/MonsterInformationProvider.java @@ -22,6 +22,7 @@ import config.YamlConfig; import constants.inventory.ItemConstants; +import database.DatabaseConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import provider.Data; @@ -30,7 +31,6 @@ import provider.DataTool; import provider.wz.WZFiles; import server.ItemInformationProvider; -import tools.DatabaseConnection; import tools.Pair; import tools.Randomizer; diff --git a/src/main/java/server/life/PlayerNPC.java b/src/main/java/server/life/PlayerNPC.java index c1fb3128595..b1a7cf00f0a 100644 --- a/src/main/java/server/life/PlayerNPC.java +++ b/src/main/java/server/life/PlayerNPC.java @@ -28,6 +28,7 @@ import config.YamlConfig; import constants.game.GameConstants; import constants.id.NpcId; +import database.DatabaseConnection; import net.server.Server; import net.server.channel.Channel; import net.server.world.World; @@ -39,7 +40,6 @@ import server.maps.MapObject; import server.maps.MapObjectType; import server.maps.MapleMap; -import tools.DatabaseConnection; import tools.PacketCreator; import tools.Pair; diff --git a/src/main/java/server/maps/HiredMerchant.java b/src/main/java/server/maps/HiredMerchant.java index bcc4fb636ef..43df50e04e6 100644 --- a/src/main/java/server/maps/HiredMerchant.java +++ b/src/main/java/server/maps/HiredMerchant.java @@ -31,11 +31,11 @@ import client.inventory.manipulator.KarmaManipulator; import client.processor.npc.FredrickProcessor; import config.YamlConfig; +import database.DatabaseConnection; import net.packet.Packet; import net.server.Server; import server.ItemInformationProvider; import server.Trade; -import tools.DatabaseConnection; import tools.PacketCreator; import tools.Pair; diff --git a/src/main/java/server/maps/MapFactory.java b/src/main/java/server/maps/MapFactory.java index a1c3f14c218..233bda4dda3 100644 --- a/src/main/java/server/maps/MapFactory.java +++ b/src/main/java/server/maps/MapFactory.java @@ -22,6 +22,7 @@ package server.maps; import constants.id.MapId; +import database.DatabaseConnection; import provider.Data; import provider.DataProvider; import provider.DataProviderFactory; @@ -33,7 +34,6 @@ import server.life.Monster; import server.life.PlayerNPC; import server.partyquest.GuardianSpawnPoint; -import tools.DatabaseConnection; import tools.StringUtil; import java.awt.*; diff --git a/src/main/java/tools/mapletools/CashCosmeticsFetcher.java b/src/main/java/tools/mapletools/CashCosmeticsFetcher.java index c6f64adb073..56ad7f88f85 100644 --- a/src/main/java/tools/mapletools/CashCosmeticsFetcher.java +++ b/src/main/java/tools/mapletools/CashCosmeticsFetcher.java @@ -1,7 +1,7 @@ package tools.mapletools; +import database.DatabaseConnection; import server.ItemInformationProvider; -import tools.DatabaseConnection; import java.io.BufferedReader; import java.io.File; diff --git a/src/main/java/tools/mapletools/QuestItemFetcher.java b/src/main/java/tools/mapletools/QuestItemFetcher.java index ac6631a7280..3227c0848eb 100644 --- a/src/main/java/tools/mapletools/QuestItemFetcher.java +++ b/src/main/java/tools/mapletools/QuestItemFetcher.java @@ -1,8 +1,8 @@ package tools.mapletools; +import database.DatabaseConnection; import provider.wz.WZFiles; import server.ItemInformationProvider; -import tools.DatabaseConnection; import tools.Pair; import java.io.BufferedReader; diff --git a/src/main/java/tools/mapletools/SimpleDatabaseConnection.java b/src/main/java/tools/mapletools/SimpleDatabaseConnection.java index 80f5f1bf88f..ea4eb4a2845 100644 --- a/src/main/java/tools/mapletools/SimpleDatabaseConnection.java +++ b/src/main/java/tools/mapletools/SimpleDatabaseConnection.java @@ -1,9 +1,9 @@ package tools.mapletools; +import database.DatabaseConnection; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.config.Configurator; -import tools.DatabaseConnection; import java.sql.Connection; import java.sql.SQLException; diff --git a/src/main/java/tools/mapletools/SkillMakerFetcher.java b/src/main/java/tools/mapletools/SkillMakerFetcher.java index 4b7b0723153..6ff15213adc 100644 --- a/src/main/java/tools/mapletools/SkillMakerFetcher.java +++ b/src/main/java/tools/mapletools/SkillMakerFetcher.java @@ -1,8 +1,8 @@ package tools.mapletools; +import database.DatabaseConnection; import provider.wz.WZFiles; import server.ItemInformationProvider; -import tools.DatabaseConnection; import java.io.BufferedReader; import java.io.FileNotFoundException; From ceeed89bf5846ba81ee94140d5385e500db30360 Mon Sep 17 00:00:00 2001 From: MarloDelatorre Date: Fri, 23 Aug 2024 23:21:58 -0700 Subject: [PATCH 2/7] Move SimpleDatabaseConnection, update imports --- .../mapletools => database}/SimpleDatabaseConnection.java | 3 +-- src/main/java/tools/mapletools/ArrowFetcher.java | 3 ++- src/main/java/tools/mapletools/CashDropFetcher.java | 1 + src/main/java/tools/mapletools/CodeCouponGenerator.java | 1 + src/main/java/tools/mapletools/CouponInstaller.java | 1 + src/main/java/tools/mapletools/GachaponItemIdRetriever.java | 2 ++ src/main/java/tools/mapletools/IdRetriever.java | 2 ++ src/main/java/tools/mapletools/MesoFetcher.java | 1 + src/main/java/tools/mapletools/MobBookIndexer.java | 1 + src/main/java/tools/mapletools/MobBookUpdate.java | 1 + src/main/java/tools/mapletools/NoItemIdFetcher.java | 1 + src/main/java/tools/mapletools/QuestItemFetcher.java | 1 + src/main/java/tools/mapletools/ReactorDropFetcher.java | 2 ++ src/main/java/tools/mapletools/SkillbookChanceFetcher.java | 1 + 14 files changed, 18 insertions(+), 3 deletions(-) rename src/main/java/{tools/mapletools => database}/SimpleDatabaseConnection.java (93%) diff --git a/src/main/java/tools/mapletools/SimpleDatabaseConnection.java b/src/main/java/database/SimpleDatabaseConnection.java similarity index 93% rename from src/main/java/tools/mapletools/SimpleDatabaseConnection.java rename to src/main/java/database/SimpleDatabaseConnection.java index ea4eb4a2845..76ee412a96b 100644 --- a/src/main/java/tools/mapletools/SimpleDatabaseConnection.java +++ b/src/main/java/database/SimpleDatabaseConnection.java @@ -1,6 +1,5 @@ -package tools.mapletools; +package database; -import database.DatabaseConnection; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.config.Configurator; diff --git a/src/main/java/tools/mapletools/ArrowFetcher.java b/src/main/java/tools/mapletools/ArrowFetcher.java index d049fa08695..73af62a5135 100644 --- a/src/main/java/tools/mapletools/ArrowFetcher.java +++ b/src/main/java/tools/mapletools/ArrowFetcher.java @@ -19,7 +19,8 @@ */ package tools.mapletools; -import server.life.MonsterStats; +import database.SimpleDatabaseConnection; +iSimpleDatabaseConnecitonmport server.life.MonsterStats; import tools.Pair; import java.io.PrintWriter; diff --git a/src/main/java/tools/mapletools/CashDropFetcher.java b/src/main/java/tools/mapletools/CashDropFetcher.java index 03b0b97abde..d3258825547 100644 --- a/src/main/java/tools/mapletools/CashDropFetcher.java +++ b/src/main/java/tools/mapletools/CashDropFetcher.java @@ -1,5 +1,6 @@ package tools.mapletools; +import database.SimpleDatabaseConnection; import provider.wz.WZFiles; import tools.Pair; diff --git a/src/main/java/tools/mapletools/CodeCouponGenerator.java b/src/main/java/tools/mapletools/CodeCouponGenerator.java index 93da8662fd9..5f3d1a8c5b4 100644 --- a/src/main/java/tools/mapletools/CodeCouponGenerator.java +++ b/src/main/java/tools/mapletools/CodeCouponGenerator.java @@ -1,5 +1,6 @@ package tools.mapletools; +import database.SimpleDatabaseConnection; import tools.Pair; import java.io.BufferedReader; diff --git a/src/main/java/tools/mapletools/CouponInstaller.java b/src/main/java/tools/mapletools/CouponInstaller.java index 5aeb2960db4..a030a221a21 100644 --- a/src/main/java/tools/mapletools/CouponInstaller.java +++ b/src/main/java/tools/mapletools/CouponInstaller.java @@ -1,5 +1,6 @@ package tools.mapletools; +import database.SimpleDatabaseConnection; import provider.wz.WZFiles; import java.io.BufferedReader; diff --git a/src/main/java/tools/mapletools/GachaponItemIdRetriever.java b/src/main/java/tools/mapletools/GachaponItemIdRetriever.java index 48b5e11acdb..dfa078e3d99 100644 --- a/src/main/java/tools/mapletools/GachaponItemIdRetriever.java +++ b/src/main/java/tools/mapletools/GachaponItemIdRetriever.java @@ -1,5 +1,7 @@ package tools.mapletools; +import database.SimpleDatabaseConnection; + import java.io.BufferedReader; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/main/java/tools/mapletools/IdRetriever.java b/src/main/java/tools/mapletools/IdRetriever.java index 37ceff1712b..7542fcb871e 100644 --- a/src/main/java/tools/mapletools/IdRetriever.java +++ b/src/main/java/tools/mapletools/IdRetriever.java @@ -1,5 +1,7 @@ package tools.mapletools; +import database.SimpleDatabaseConnection; + import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/tools/mapletools/MesoFetcher.java b/src/main/java/tools/mapletools/MesoFetcher.java index 44384fcb12c..bc662af0900 100644 --- a/src/main/java/tools/mapletools/MesoFetcher.java +++ b/src/main/java/tools/mapletools/MesoFetcher.java @@ -1,5 +1,6 @@ package tools.mapletools; +import database.SimpleDatabaseConnection; import server.life.MonsterStats; import tools.Pair; diff --git a/src/main/java/tools/mapletools/MobBookIndexer.java b/src/main/java/tools/mapletools/MobBookIndexer.java index 1686dacd4ba..0272e84ebc0 100644 --- a/src/main/java/tools/mapletools/MobBookIndexer.java +++ b/src/main/java/tools/mapletools/MobBookIndexer.java @@ -1,5 +1,6 @@ package tools.mapletools; +import database.SimpleDatabaseConnection; import provider.wz.WZFiles; import java.io.BufferedReader; diff --git a/src/main/java/tools/mapletools/MobBookUpdate.java b/src/main/java/tools/mapletools/MobBookUpdate.java index b652802e0ed..0a06990a0d1 100644 --- a/src/main/java/tools/mapletools/MobBookUpdate.java +++ b/src/main/java/tools/mapletools/MobBookUpdate.java @@ -1,5 +1,6 @@ package tools.mapletools; +import database.SimpleDatabaseConnection; import provider.wz.WZFiles; import java.io.BufferedReader; diff --git a/src/main/java/tools/mapletools/NoItemIdFetcher.java b/src/main/java/tools/mapletools/NoItemIdFetcher.java index 4eed18f4744..55ef49642af 100644 --- a/src/main/java/tools/mapletools/NoItemIdFetcher.java +++ b/src/main/java/tools/mapletools/NoItemIdFetcher.java @@ -1,5 +1,6 @@ package tools.mapletools; +import database.SimpleDatabaseConnection; import provider.wz.WZFiles; import java.io.BufferedReader; diff --git a/src/main/java/tools/mapletools/QuestItemFetcher.java b/src/main/java/tools/mapletools/QuestItemFetcher.java index 3227c0848eb..6c735ab7db0 100644 --- a/src/main/java/tools/mapletools/QuestItemFetcher.java +++ b/src/main/java/tools/mapletools/QuestItemFetcher.java @@ -1,6 +1,7 @@ package tools.mapletools; import database.DatabaseConnection; +import database.SimpleDatabaseConnection; import provider.wz.WZFiles; import server.ItemInformationProvider; import tools.Pair; diff --git a/src/main/java/tools/mapletools/ReactorDropFetcher.java b/src/main/java/tools/mapletools/ReactorDropFetcher.java index 1b90a42b60c..c40aa0b469e 100644 --- a/src/main/java/tools/mapletools/ReactorDropFetcher.java +++ b/src/main/java/tools/mapletools/ReactorDropFetcher.java @@ -1,5 +1,7 @@ package tools.mapletools; +import database.SimpleDatabaseConnection; + import java.io.IOException; import java.io.PrintWriter; import java.nio.file.DirectoryStream; diff --git a/src/main/java/tools/mapletools/SkillbookChanceFetcher.java b/src/main/java/tools/mapletools/SkillbookChanceFetcher.java index 9d9d065f68c..8f641d3f0de 100644 --- a/src/main/java/tools/mapletools/SkillbookChanceFetcher.java +++ b/src/main/java/tools/mapletools/SkillbookChanceFetcher.java @@ -1,5 +1,6 @@ package tools.mapletools; +import database.SimpleDatabaseConnection; import server.life.MonsterStats; import tools.Pair; From 6b5d55d2cb6d6df562c7b5948a13749acea1f77f Mon Sep 17 00:00:00 2001 From: MarloDelatorre Date: Fri, 23 Aug 2024 23:23:19 -0700 Subject: [PATCH 3/7] Fix typos --- src/main/java/client/BuddyList.java | 2 +- src/main/java/client/inventory/manipulator/CashIdGenerator.java | 2 +- src/main/java/tools/mapletools/ArrowFetcher.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/client/BuddyList.java b/src/main/java/client/BuddyList.java index 968118ce956..86928382eab 100644 --- a/src/main/java/client/BuddyList.java +++ b/src/main/java/client/BuddyList.java @@ -21,7 +21,7 @@ */ package client; -import databse.DatabaseConnection; +import database.DatabaseConnection; import net.packet.Packet; import net.server.PlayerStorage; import tools.PacketCreator; diff --git a/src/main/java/client/inventory/manipulator/CashIdGenerator.java b/src/main/java/client/inventory/manipulator/CashIdGenerator.java index d28fec251c7..4adaf57c522 100644 --- a/src/main/java/client/inventory/manipulator/CashIdGenerator.java +++ b/src/main/java/client/inventory/manipulator/CashIdGenerator.java @@ -19,7 +19,7 @@ */ package client.inventory.manipulator; -import databse.DatabaseConnection; +import database.DatabaseConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/tools/mapletools/ArrowFetcher.java b/src/main/java/tools/mapletools/ArrowFetcher.java index 73af62a5135..4384411576c 100644 --- a/src/main/java/tools/mapletools/ArrowFetcher.java +++ b/src/main/java/tools/mapletools/ArrowFetcher.java @@ -20,7 +20,7 @@ package tools.mapletools; import database.SimpleDatabaseConnection; -iSimpleDatabaseConnecitonmport server.life.MonsterStats; +import server.life.MonsterStats; import tools.Pair; import java.io.PrintWriter; From ee37942ed8b2b97be5db346302282aee0d4d8112 Mon Sep 17 00:00:00 2001 From: MarloDelatorre Date: Fri, 23 Aug 2024 23:36:18 -0700 Subject: [PATCH 4/7] Make SimpleDatabseConnection public --- src/main/java/database/SimpleDatabaseConnection.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/database/SimpleDatabaseConnection.java b/src/main/java/database/SimpleDatabaseConnection.java index 76ee412a96b..1da7bb23328 100644 --- a/src/main/java/database/SimpleDatabaseConnection.java +++ b/src/main/java/database/SimpleDatabaseConnection.java @@ -7,10 +7,8 @@ import java.sql.Connection; import java.sql.SQLException; -final class SimpleDatabaseConnection { - private SimpleDatabaseConnection() {} - - static Connection getConnection() { +public final class SimpleDatabaseConnection { + public static Connection getConnection() { muffleLogging(); DatabaseConnection.initializeConnectionPool(); From 5c9012d3ca964cfaf9c6bc365f6f26ae3c955c2a Mon Sep 17 00:00:00 2001 From: MarloDelatorre Date: Fri, 23 Aug 2024 23:41:07 -0700 Subject: [PATCH 5/7] Move Database config to purely envvars --- config.yaml | 6 ------ src/main/java/config/ServerConfig.java | 7 ------- src/main/java/config/YamlConfig.java | 2 ++ src/main/java/database/DatabaseConnection.java | 7 +++---- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/config.yaml b/config.yaml index 6e29be16923..8e4a6a9e252 100644 --- a/config.yaml +++ b/config.yaml @@ -155,13 +155,7 @@ worlds: why_am_i_recommended: Welcome to Medere! channels: 3 - server: - #Database Configuration - DB_URL: "jdbc:mysql://localhost:3306/ashes" - DB_USER: "root" - INIT_CONNECTION_POOL_TIMEOUT: 90 # Seconds - #Login Configuration WORLDS: 1 #Initial number of worlds on the server. WLDLIST_SIZE: 21 #Max possible worlds on the server. diff --git a/src/main/java/config/ServerConfig.java b/src/main/java/config/ServerConfig.java index 8ddff9bd617..cc47c2f7d10 100644 --- a/src/main/java/config/ServerConfig.java +++ b/src/main/java/config/ServerConfig.java @@ -4,13 +4,6 @@ import java.util.Map; public class ServerConfig { - - //Database Configuration - public String DB_URL; - public String DB_USER; - public String DB_PASS; - public int INIT_CONNECTION_POOL_TIMEOUT; - //Login Configuration public int WORLDS; public int WLDLIST_SIZE; diff --git a/src/main/java/config/YamlConfig.java b/src/main/java/config/YamlConfig.java index afbec0429c6..90ea9b21e7e 100644 --- a/src/main/java/config/YamlConfig.java +++ b/src/main/java/config/YamlConfig.java @@ -1,5 +1,6 @@ package config; +import database.DatabaseConfig; import com.esotericsoftware.yamlbeans.YamlReader; import java.io.FileNotFoundException; @@ -16,6 +17,7 @@ public class YamlConfig { public List worlds; public ServerConfig server; + public DatabaseConfig database; private static YamlConfig loadConfig() { try { diff --git a/src/main/java/database/DatabaseConnection.java b/src/main/java/database/DatabaseConnection.java index f0d85221d83..8583a6ba377 100644 --- a/src/main/java/database/DatabaseConnection.java +++ b/src/main/java/database/DatabaseConnection.java @@ -46,12 +46,11 @@ public static Handle getHandle() { private static HikariConfig getConfig() { HikariConfig config = new HikariConfig(); - config.setJdbcUrl(YamlConfig.config.server.DB_URL); - config.setUsername(YamlConfig.config.server.DB_USER); + config.setJdbcUrl(System.getenv("DB_URL")); + config.setUsername(System.getenv("DB_USER"); config.setPassword(System.getenv("DB_PASS")); - final int initFailTimeoutSeconds = YamlConfig.config.server.INIT_CONNECTION_POOL_TIMEOUT; - config.setInitializationFailTimeout(SECONDS.toMillis(initFailTimeoutSeconds)); + config.setInitializationFailTimeout(SECONDS.toMillis(90)); config.setConnectionTimeout(SECONDS.toMillis(30)); // Hikari default config.setMaximumPoolSize(10); // Hikari default From b64035fc42b0b2144ff9537d3fb888acdfcc17a2 Mon Sep 17 00:00:00 2001 From: MarloDelatorre Date: Fri, 23 Aug 2024 23:43:01 -0700 Subject: [PATCH 6/7] Add missing closing brace --- src/main/java/database/DatabaseConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/database/DatabaseConnection.java b/src/main/java/database/DatabaseConnection.java index 8583a6ba377..cb1fb9459aa 100644 --- a/src/main/java/database/DatabaseConnection.java +++ b/src/main/java/database/DatabaseConnection.java @@ -47,7 +47,7 @@ private static HikariConfig getConfig() { HikariConfig config = new HikariConfig(); config.setJdbcUrl(System.getenv("DB_URL")); - config.setUsername(System.getenv("DB_USER"); + config.setUsername(System.getenv("DB_USER")); config.setPassword(System.getenv("DB_PASS")); config.setInitializationFailTimeout(SECONDS.toMillis(90)); From 3eb091d5de83aa72356d5cbdf0b401b9038713dc Mon Sep 17 00:00:00 2001 From: MarloDelatorre Date: Fri, 23 Aug 2024 23:44:30 -0700 Subject: [PATCH 7/7] Remove DatabaseConfig from YamlConfig --- src/main/java/config/YamlConfig.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/config/YamlConfig.java b/src/main/java/config/YamlConfig.java index 90ea9b21e7e..afbec0429c6 100644 --- a/src/main/java/config/YamlConfig.java +++ b/src/main/java/config/YamlConfig.java @@ -1,6 +1,5 @@ package config; -import database.DatabaseConfig; import com.esotericsoftware.yamlbeans.YamlReader; import java.io.FileNotFoundException; @@ -17,7 +16,6 @@ public class YamlConfig { public List worlds; public ServerConfig server; - public DatabaseConfig database; private static YamlConfig loadConfig() { try {