diff --git a/.gitignore b/.gitignore index 580bdf21a1..8543b81417 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /logs/** -.idea/ +.idea/* +!.idea/codeStyles/ *.iml /target @@ -16,3 +17,7 @@ .project # JDT-specific (Eclipse Java Development Tools) .classpath + +# Database +database/docker-db-data +database/docker-pg-db-data diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000000..a74a84d3a0 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000000..79ee123c2b --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/src/main/java/client/BuddyList.java b/src/main/java/client/BuddyList.java index fdc98f3cff..6d2bdb974a 100644 --- a/src/main/java/client/BuddyList.java +++ b/src/main/java/client/BuddyList.java @@ -30,7 +30,12 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.Deque; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.Map; public class BuddyList { public enum BuddyOperation { diff --git a/src/main/java/client/Client.java b/src/main/java/client/Client.java index edeea33ba8..b3292fd04d 100644 --- a/src/main/java/client/Client.java +++ b/src/main/java/client/Client.java @@ -44,7 +44,11 @@ import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.guild.Guild; import net.server.guild.GuildCharacter; import net.server.guild.GuildPackets; -import net.server.world.*; +import net.server.world.MessengerCharacter; +import net.server.world.Party; +import net.server.world.PartyCharacter; +import net.server.world.PartyOperation; +import net.server.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scripting.AbstractPlayerInteraction; @@ -73,9 +77,23 @@ import java.net.InetSocketAddress; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collections; import java.util.Date; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.Semaphore; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -1581,4 +1599,4 @@ public class Client extends ChannelInboundHandlerAdapter { public void setLanguage(int lingua) { this.lang = lingua; } -} \ No newline at end of file +} diff --git a/src/main/java/client/MonsterBook.java b/src/main/java/client/MonsterBook.java index cb3e882e76..ca75906e82 100644 --- a/src/main/java/client/MonsterBook.java +++ b/src/main/java/client/MonsterBook.java @@ -28,8 +28,12 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/src/main/java/client/QuestStatus.java b/src/main/java/client/QuestStatus.java index 4e681f23c0..48ad279435 100644 --- a/src/main/java/client/QuestStatus.java +++ b/src/main/java/client/QuestStatus.java @@ -24,7 +24,11 @@ package client; import server.quest.Quest; import tools.StringUtil; -import java.util.*; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * @author Matze diff --git a/src/main/java/client/SkillFactory.java b/src/main/java/client/SkillFactory.java index d4386c58f9..1c7b6fde80 100644 --- a/src/main/java/client/SkillFactory.java +++ b/src/main/java/client/SkillFactory.java @@ -21,8 +21,63 @@ */ package client; -import constants.skills.*; -import provider.*; +import constants.skills.Aran; +import constants.skills.Archer; +import constants.skills.Assassin; +import constants.skills.Bandit; +import constants.skills.Beginner; +import constants.skills.Bishop; +import constants.skills.BlazeWizard; +import constants.skills.Bowmaster; +import constants.skills.Buccaneer; +import constants.skills.ChiefBandit; +import constants.skills.Cleric; +import constants.skills.Corsair; +import constants.skills.Crossbowman; +import constants.skills.Crusader; +import constants.skills.DarkKnight; +import constants.skills.DawnWarrior; +import constants.skills.DragonKnight; +import constants.skills.Evan; +import constants.skills.FPArchMage; +import constants.skills.FPMage; +import constants.skills.FPWizard; +import constants.skills.Fighter; +import constants.skills.GM; +import constants.skills.Gunslinger; +import constants.skills.Hermit; +import constants.skills.Hero; +import constants.skills.Hunter; +import constants.skills.ILArchMage; +import constants.skills.ILMage; +import constants.skills.ILWizard; +import constants.skills.Legend; +import constants.skills.Magician; +import constants.skills.Marauder; +import constants.skills.Marksman; +import constants.skills.NightLord; +import constants.skills.NightWalker; +import constants.skills.Noblesse; +import constants.skills.Page; +import constants.skills.Paladin; +import constants.skills.Pirate; +import constants.skills.Priest; +import constants.skills.Ranger; +import constants.skills.Rogue; +import constants.skills.Shadower; +import constants.skills.Sniper; +import constants.skills.Spearman; +import constants.skills.SuperGM; +import constants.skills.ThunderBreaker; +import constants.skills.Warrior; +import constants.skills.WhiteKnight; +import constants.skills.WindArcher; +import provider.Data; +import provider.DataDirectoryEntry; +import provider.DataFileEntry; +import provider.DataProvider; +import provider.DataProviderFactory; +import provider.DataTool; import provider.wz.WZFiles; import server.StatEffect; import server.life.Element; diff --git a/src/main/java/client/command/commands/gm0/UptimeCommand.java b/src/main/java/client/command/commands/gm0/UptimeCommand.java index fd4a234c5c..8080a4d41b 100644 --- a/src/main/java/client/command/commands/gm0/UptimeCommand.java +++ b/src/main/java/client/command/commands/gm0/UptimeCommand.java @@ -27,7 +27,10 @@ import client.Client; import client.command.Command; import net.server.Server; -import static java.util.concurrent.TimeUnit.*; +import static java.util.concurrent.TimeUnit.DAYS; +import static java.util.concurrent.TimeUnit.HOURS; +import static java.util.concurrent.TimeUnit.MINUTES; +import static java.util.concurrent.TimeUnit.SECONDS; public class UptimeCommand extends Command { { diff --git a/src/main/java/client/command/commands/gm1/GotoCommand.java b/src/main/java/client/command/commands/gm1/GotoCommand.java index c6e32e2e3d..dfbf0c6105 100644 --- a/src/main/java/client/command/commands/gm1/GotoCommand.java +++ b/src/main/java/client/command/commands/gm1/GotoCommand.java @@ -28,7 +28,11 @@ import client.Client; import client.command.Command; import constants.game.GameConstants; import constants.id.NpcId; -import server.maps.*; +import server.maps.FieldLimit; +import server.maps.MapFactory; +import server.maps.MapleMap; +import server.maps.MiniDungeonInfo; +import server.maps.Portal; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/client/command/commands/gm2/IdCommand.java b/src/main/java/client/command/commands/gm2/IdCommand.java index c64466b68d..36d119b8a1 100644 --- a/src/main/java/client/command/commands/gm2/IdCommand.java +++ b/src/main/java/client/command/commands/gm2/IdCommand.java @@ -11,7 +11,11 @@ import tools.exceptions.IdTypeNotSupportedException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; import java.util.stream.Collectors; diff --git a/src/main/java/client/command/commands/gm2/MaxSkillCommand.java b/src/main/java/client/command/commands/gm2/MaxSkillCommand.java index a91cd89097..8f1ffbd9a6 100644 --- a/src/main/java/client/command/commands/gm2/MaxSkillCommand.java +++ b/src/main/java/client/command/commands/gm2/MaxSkillCommand.java @@ -24,7 +24,10 @@ package client.command.commands.gm2; import client.Character; -import client.*; +import client.Client; +import client.Job; +import client.Skill; +import client.SkillFactory; import client.command.Command; import provider.Data; import provider.DataProviderFactory; diff --git a/src/main/java/client/command/commands/gm2/ResetSkillCommand.java b/src/main/java/client/command/commands/gm2/ResetSkillCommand.java index a1724f5d4a..db578291ac 100644 --- a/src/main/java/client/command/commands/gm2/ResetSkillCommand.java +++ b/src/main/java/client/command/commands/gm2/ResetSkillCommand.java @@ -24,7 +24,10 @@ package client.command.commands.gm2; import client.Character; -import client.*; +import client.Client; +import client.Job; +import client.Skill; +import client.SkillFactory; import client.command.Command; import provider.Data; import provider.DataProviderFactory; diff --git a/src/main/java/client/command/commands/gm6/ShutdownCommand.java b/src/main/java/client/command/commands/gm6/ShutdownCommand.java index ad575d29d4..a083c9b63f 100644 --- a/src/main/java/client/command/commands/gm6/ShutdownCommand.java +++ b/src/main/java/client/command/commands/gm6/ShutdownCommand.java @@ -30,7 +30,10 @@ import net.server.Server; import net.server.world.World; import server.TimerManager; -import static java.util.concurrent.TimeUnit.*; +import static java.util.concurrent.TimeUnit.DAYS; +import static java.util.concurrent.TimeUnit.HOURS; +import static java.util.concurrent.TimeUnit.MINUTES; +import static java.util.concurrent.TimeUnit.SECONDS; public class ShutdownCommand extends Command { { diff --git a/src/main/java/client/inventory/Inventory.java b/src/main/java/client/inventory/Inventory.java index 6e1c9e433c..a0ddedda82 100644 --- a/src/main/java/client/inventory/Inventory.java +++ b/src/main/java/client/inventory/Inventory.java @@ -31,7 +31,14 @@ import server.ItemInformationProvider; import server.ThreadManager; import tools.Pair; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -652,4 +659,4 @@ public class Inventory implements Iterable { public void dispose() { owner = null; } -} \ No newline at end of file +} diff --git a/src/main/java/client/inventory/ItemFactory.java b/src/main/java/client/inventory/ItemFactory.java index 1c24f0108a..22538041a9 100644 --- a/src/main/java/client/inventory/ItemFactory.java +++ b/src/main/java/client/inventory/ItemFactory.java @@ -23,7 +23,11 @@ package client.inventory; import tools.DatabaseConnection; import tools.Pair; -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; import java.util.ArrayList; import java.util.List; import java.util.concurrent.locks.Lock; @@ -418,4 +422,4 @@ public enum ItemFactory { lock.unlock(); } } -} \ No newline at end of file +} diff --git a/src/main/java/client/inventory/manipulator/InventoryManipulator.java b/src/main/java/client/inventory/manipulator/InventoryManipulator.java index 331a7061b0..acf3607b64 100644 --- a/src/main/java/client/inventory/manipulator/InventoryManipulator.java +++ b/src/main/java/client/inventory/manipulator/InventoryManipulator.java @@ -24,7 +24,12 @@ package client.inventory.manipulator; import client.BuffStat; import client.Character; import client.Client; -import client.inventory.*; +import client.inventory.Equip; +import client.inventory.Inventory; +import client.inventory.InventoryType; +import client.inventory.Item; +import client.inventory.ModifyInventory; +import client.inventory.Pet; import client.newyear.NewYearCardRecord; import config.YamlConfig; import constants.id.ItemId; diff --git a/src/main/java/client/processor/npc/DueyProcessor.java b/src/main/java/client/processor/npc/DueyProcessor.java index 8a8615985b..7aa5cfa7b7 100644 --- a/src/main/java/client/processor/npc/DueyProcessor.java +++ b/src/main/java/client/processor/npc/DueyProcessor.java @@ -45,7 +45,12 @@ import tools.DatabaseConnection; import tools.PacketCreator; import tools.Pair; -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Timestamp; import java.util.Calendar; import java.util.Collections; import java.util.LinkedList; diff --git a/src/main/java/client/processor/npc/FredrickProcessor.java b/src/main/java/client/processor/npc/FredrickProcessor.java index 5e0bd24015..ed91e2d083 100644 --- a/src/main/java/client/processor/npc/FredrickProcessor.java +++ b/src/main/java/client/processor/npc/FredrickProcessor.java @@ -41,7 +41,11 @@ import tools.DatabaseConnection; import tools.PacketCreator; import tools.Pair; -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/client/processor/stat/AssignAPProcessor.java b/src/main/java/client/processor/stat/AssignAPProcessor.java index 8f33ac3b55..bc42c06cc5 100644 --- a/src/main/java/client/processor/stat/AssignAPProcessor.java +++ b/src/main/java/client/processor/stat/AssignAPProcessor.java @@ -24,13 +24,22 @@ package client.processor.stat; import client.Character; -import client.*; +import client.Client; +import client.Job; +import client.Skill; +import client.SkillFactory; +import client.Stat; import client.autoban.AutobanFactory; import client.inventory.Equip; import client.inventory.InventoryType; import client.inventory.Item; import config.YamlConfig; -import constants.skills.*; +import constants.skills.BlazeWizard; +import constants.skills.Brawler; +import constants.skills.DawnWarrior; +import constants.skills.Magician; +import constants.skills.ThunderBreaker; +import constants.skills.Warrior; import net.packet.InPacket; import tools.PacketCreator; import tools.Randomizer; diff --git a/src/main/java/net/PacketProcessor.java b/src/main/java/net/PacketProcessor.java index 391143cb1a..6a27fb7085 100644 --- a/src/main/java/net/PacketProcessor.java +++ b/src/main/java/net/PacketProcessor.java @@ -23,11 +23,174 @@ package net; import net.netty.LoginServer; import net.opcodes.RecvOpcode; -import net.server.channel.handlers.*; +import net.server.channel.handlers.AcceptFamilyHandler; +import net.server.channel.handlers.AdminChatHandler; +import net.server.channel.handlers.AdminCommandHandler; +import net.server.channel.handlers.AdminLogHandler; +import net.server.channel.handlers.AllianceOperationHandler; +import net.server.channel.handlers.AranComboHandler; +import net.server.channel.handlers.AutoAggroHandler; +import net.server.channel.handlers.AutoAssignHandler; +import net.server.channel.handlers.BBSOperationHandler; +import net.server.channel.handlers.BeholderHandler; +import net.server.channel.handlers.BuddylistModifyHandler; +import net.server.channel.handlers.CancelBuffHandler; +import net.server.channel.handlers.CancelChairHandler; +import net.server.channel.handlers.CancelDebuffHandler; +import net.server.channel.handlers.CancelItemEffectHandler; +import net.server.channel.handlers.CashOperationHandler; +import net.server.channel.handlers.CashShopSurpriseHandler; +import net.server.channel.handlers.ChangeChannelHandler; +import net.server.channel.handlers.ChangeMapHandler; +import net.server.channel.handlers.ChangeMapSpecialHandler; +import net.server.channel.handlers.CharInfoRequestHandler; +import net.server.channel.handlers.ClickGuideHandler; +import net.server.channel.handlers.CloseChalkboardHandler; +import net.server.channel.handlers.CloseRangeDamageHandler; +import net.server.channel.handlers.CoconutHandler; +import net.server.channel.handlers.CouponCodeHandler; +import net.server.channel.handlers.DamageSummonHandler; +import net.server.channel.handlers.DenyAllianceRequestHandler; +import net.server.channel.handlers.DenyGuildRequestHandler; +import net.server.channel.handlers.DenyPartyRequestHandler; +import net.server.channel.handlers.DistributeAPHandler; +import net.server.channel.handlers.DistributeSPHandler; +import net.server.channel.handlers.DoorHandler; +import net.server.channel.handlers.DueyHandler; +import net.server.channel.handlers.EnterCashShopHandler; +import net.server.channel.handlers.EnterMTSHandler; +import net.server.channel.handlers.FaceExpressionHandler; +import net.server.channel.handlers.FamilyAddHandler; +import net.server.channel.handlers.FamilyPreceptsHandler; +import net.server.channel.handlers.FamilySeparateHandler; +import net.server.channel.handlers.FamilySummonResponseHandler; +import net.server.channel.handlers.FamilyUseHandler; +import net.server.channel.handlers.FieldDamageMobHandler; +import net.server.channel.handlers.FredrickHandler; +import net.server.channel.handlers.GeneralChatHandler; +import net.server.channel.handlers.GiveFameHandler; +import net.server.channel.handlers.GrenadeEffectHandler; +import net.server.channel.handlers.GuildOperationHandler; +import net.server.channel.handlers.HealOvertimeHandler; +import net.server.channel.handlers.HiredMerchantRequest; +import net.server.channel.handlers.InnerPortalHandler; +import net.server.channel.handlers.InventoryMergeHandler; +import net.server.channel.handlers.InventorySortHandler; +import net.server.channel.handlers.ItemMoveHandler; +import net.server.channel.handlers.ItemPickupHandler; +import net.server.channel.handlers.ItemRewardHandler; +import net.server.channel.handlers.KeymapChangeHandler; +import net.server.channel.handlers.LeftKnockbackHandler; +import net.server.channel.handlers.MTSHandler; +import net.server.channel.handlers.MagicDamageHandler; +import net.server.channel.handlers.MakerSkillHandler; +import net.server.channel.handlers.MesoDropHandler; +import net.server.channel.handlers.MessengerHandler; +import net.server.channel.handlers.MobBanishPlayerHandler; +import net.server.channel.handlers.MobDamageMobFriendlyHandler; +import net.server.channel.handlers.MobDamageMobHandler; +import net.server.channel.handlers.MonsterBombHandler; +import net.server.channel.handlers.MonsterBookCoverHandler; +import net.server.channel.handlers.MonsterCarnivalHandler; +import net.server.channel.handlers.MoveDragonHandler; +import net.server.channel.handlers.MoveLifeHandler; +import net.server.channel.handlers.MovePetHandler; +import net.server.channel.handlers.MovePlayerHandler; +import net.server.channel.handlers.MoveSummonHandler; +import net.server.channel.handlers.MultiChatHandler; +import net.server.channel.handlers.NPCAnimationHandler; +import net.server.channel.handlers.NPCMoreTalkHandler; +import net.server.channel.handlers.NPCShopHandler; +import net.server.channel.handlers.NPCTalkHandler; +import net.server.channel.handlers.NewYearCardHandler; +import net.server.channel.handlers.NoteActionHandler; +import net.server.channel.handlers.OpenFamilyHandler; +import net.server.channel.handlers.OpenFamilyPedigreeHandler; +import net.server.channel.handlers.OwlWarpHandler; +import net.server.channel.handlers.PartyOperationHandler; +import net.server.channel.handlers.PartySearchRegisterHandler; +import net.server.channel.handlers.PartySearchStartHandler; +import net.server.channel.handlers.PartySearchUpdateHandler; +import net.server.channel.handlers.PetAutoPotHandler; +import net.server.channel.handlers.PetChatHandler; +import net.server.channel.handlers.PetCommandHandler; +import net.server.channel.handlers.PetExcludeItemsHandler; +import net.server.channel.handlers.PetFoodHandler; +import net.server.channel.handlers.PetLootHandler; +import net.server.channel.handlers.PlayerInteractionHandler; +import net.server.channel.handlers.PlayerLoggedinHandler; +import net.server.channel.handlers.PlayerMapTransitionHandler; +import net.server.channel.handlers.QuestActionHandler; +import net.server.channel.handlers.QuickslotKeyMappedModifiedHandler; +import net.server.channel.handlers.RPSActionHandler; +import net.server.channel.handlers.RaiseIncExpHandler; +import net.server.channel.handlers.RaiseUIStateHandler; +import net.server.channel.handlers.RangedAttackHandler; +import net.server.channel.handlers.ReactorHitHandler; +import net.server.channel.handlers.RemoteGachaponHandler; +import net.server.channel.handlers.RemoteStoreHandler; +import net.server.channel.handlers.ReportHandler; +import net.server.channel.handlers.RingActionHandler; +import net.server.channel.handlers.ScriptedItemHandler; +import net.server.channel.handlers.ScrollHandler; +import net.server.channel.handlers.SkillBookHandler; +import net.server.channel.handlers.SkillEffectHandler; +import net.server.channel.handlers.SkillMacroHandler; +import net.server.channel.handlers.SnowballHandler; +import net.server.channel.handlers.SpawnPetHandler; +import net.server.channel.handlers.SpecialMoveHandler; +import net.server.channel.handlers.SpouseChatHandler; +import net.server.channel.handlers.StorageHandler; +import net.server.channel.handlers.SummonDamageHandler; +import net.server.channel.handlers.TakeDamageHandler; +import net.server.channel.handlers.TouchMonsterDamageHandler; +import net.server.channel.handlers.TouchReactorHandler; +import net.server.channel.handlers.TouchingCashShopHandler; +import net.server.channel.handlers.TransferNameHandler; +import net.server.channel.handlers.TransferNameResultHandler; +import net.server.channel.handlers.TransferWorldHandler; +import net.server.channel.handlers.TrockAddMapHandler; +import net.server.channel.handlers.UseCashItemHandler; +import net.server.channel.handlers.UseCatchItemHandler; +import net.server.channel.handlers.UseChairHandler; +import net.server.channel.handlers.UseDeathItemHandler; +import net.server.channel.handlers.UseGachaExpHandler; +import net.server.channel.handlers.UseHammerHandler; +import net.server.channel.handlers.UseItemEffectHandler; +import net.server.channel.handlers.UseItemHandler; +import net.server.channel.handlers.UseMapleLifeHandler; +import net.server.channel.handlers.UseMountFoodHandler; +import net.server.channel.handlers.UseOwlOfMinervaHandler; +import net.server.channel.handlers.UseSolomonHandler; +import net.server.channel.handlers.UseSummonBagHandler; +import net.server.channel.handlers.UseWaterOfLifeHandler; +import net.server.channel.handlers.WeddingHandler; +import net.server.channel.handlers.WeddingTalkHandler; +import net.server.channel.handlers.WeddingTalkMoreHandler; +import net.server.channel.handlers.WhisperHandler; import net.server.handlers.CustomPacketHandler; import net.server.handlers.KeepAliveHandler; import net.server.handlers.LoginRequiringNoOpHandler; -import net.server.handlers.login.*; +import net.server.handlers.login.AcceptToSHandler; +import net.server.handlers.login.AfterLoginHandler; +import net.server.handlers.login.CharSelectedHandler; +import net.server.handlers.login.CharSelectedWithPicHandler; +import net.server.handlers.login.CharlistRequestHandler; +import net.server.handlers.login.CheckCharNameHandler; +import net.server.handlers.login.CreateCharHandler; +import net.server.handlers.login.DeleteCharHandler; +import net.server.handlers.login.GuestLoginHandler; +import net.server.handlers.login.LoginPasswordHandler; +import net.server.handlers.login.RegisterPicHandler; +import net.server.handlers.login.RegisterPinHandler; +import net.server.handlers.login.RelogRequestHandler; +import net.server.handlers.login.ServerStatusRequestHandler; +import net.server.handlers.login.ServerlistRequestHandler; +import net.server.handlers.login.SetGenderHandler; +import net.server.handlers.login.ViewAllCharHandler; +import net.server.handlers.login.ViewAllCharRegisterPicHandler; +import net.server.handlers.login.ViewAllCharSelectedHandler; +import net.server.handlers.login.ViewAllCharSelectedWithPicHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -286,4 +449,4 @@ public final class PacketProcessor { registerHandler(RecvOpcode.USE_ITEMUI, new RaiseIncExpHandler()); registerHandler(RecvOpcode.CHANGE_QUICKSLOT, new QuickslotKeyMappedModifiedHandler()); } -} \ No newline at end of file +} diff --git a/src/main/java/net/server/PlayerStorage.java b/src/main/java/net/server/PlayerStorage.java index fd406cadbb..c964d357f8 100644 --- a/src/main/java/net/server/PlayerStorage.java +++ b/src/main/java/net/server/PlayerStorage.java @@ -24,7 +24,11 @@ package net.server; import client.Character; import client.Client; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -124,4 +128,4 @@ public class PlayerStorage { rlock.unlock(); } } -} \ No newline at end of file +} diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java index 679d136643..1b0159d2cc 100644 --- a/src/main/java/net/server/Server.java +++ b/src/main/java/net/server/Server.java @@ -47,7 +47,17 @@ import net.server.coordinator.session.SessionCoordinator; import net.server.guild.Alliance; import net.server.guild.Guild; import net.server.guild.GuildCharacter; -import net.server.task.*; +import net.server.task.BossLogTask; +import net.server.task.CharacterDiseaseTask; +import net.server.task.CouponTask; +import net.server.task.DueyFredrickTask; +import net.server.task.EventRecallCoordinatorTask; +import net.server.task.InvitationTask; +import net.server.task.LoginCoordinatorTask; +import net.server.task.LoginStorageTask; +import net.server.task.RankingCommandTask; +import net.server.task.RankingLoginTask; +import net.server.task.RespawnTask; import net.server.world.World; import org.apache.logging.log4j.LogManager; import org.slf4j.Logger; @@ -69,8 +79,20 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.time.Duration; import java.time.Instant; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Properties; +import java.util.Set; +import java.util.SortedMap; +import java.util.TimeZone; +import java.util.TreeMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -80,7 +102,10 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import static java.util.concurrent.TimeUnit.*; +import static java.util.concurrent.TimeUnit.DAYS; +import static java.util.concurrent.TimeUnit.HOURS; +import static java.util.concurrent.TimeUnit.MINUTES; +import static java.util.concurrent.TimeUnit.SECONDS; public class Server { private static final Logger log = LoggerFactory.getLogger(Server.class); diff --git a/src/main/java/net/server/channel/Channel.java b/src/main/java/net/server/channel/Channel.java index 98c3151953..13a0d22a95 100644 --- a/src/main/java/net/server/channel/Channel.java +++ b/src/main/java/net/server/channel/Channel.java @@ -41,7 +41,11 @@ import server.TimerManager; import server.events.gm.Event; import server.expeditions.Expedition; import server.expeditions.ExpeditionType; -import server.maps.*; +import server.maps.HiredMerchant; +import server.maps.MapManager; +import server.maps.MapleMap; +import server.maps.MiniDungeon; +import server.maps.MiniDungeonInfo; import tools.PacketCreator; import tools.Pair; @@ -49,14 +53,25 @@ import java.io.IOException; import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; +import java.util.WeakHashMap; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import static java.util.concurrent.TimeUnit.*; +import static java.util.concurrent.TimeUnit.HOURS; +import static java.util.concurrent.TimeUnit.MINUTES; +import static java.util.concurrent.TimeUnit.SECONDS; public final class Channel { private static final Logger log = LoggerFactory.getLogger(Channel.class); @@ -1035,4 +1050,4 @@ public final class Channel { log.debug("Guest list: {}", ongoingChapelGuests); log.debug("Starttime: {}", ongoingStartTime); } -} \ No newline at end of file +} diff --git a/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java b/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java index 62dac683ce..8a882e2a0c 100644 --- a/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java @@ -21,8 +21,11 @@ */ package net.server.channel.handlers; +import client.BuffStat; import client.Character; -import client.*; +import client.Job; +import client.Skill; +import client.SkillFactory; import client.autoban.AutobanFactory; import client.status.MonsterStatus; import client.status.MonsterStatusEffect; @@ -31,14 +34,66 @@ import constants.game.GameConstants; import constants.id.ItemId; import constants.id.MapId; import constants.id.MobId; -import constants.skills.*; +import constants.skills.Aran; +import constants.skills.Assassin; +import constants.skills.Bandit; +import constants.skills.Beginner; +import constants.skills.Bishop; +import constants.skills.BlazeWizard; +import constants.skills.Bowmaster; +import constants.skills.Brawler; +import constants.skills.Buccaneer; +import constants.skills.ChiefBandit; +import constants.skills.Cleric; +import constants.skills.Corsair; +import constants.skills.Crossbowman; +import constants.skills.Crusader; +import constants.skills.DawnWarrior; +import constants.skills.DragonKnight; +import constants.skills.Evan; +import constants.skills.FPArchMage; +import constants.skills.FPMage; +import constants.skills.FPWizard; +import constants.skills.Fighter; +import constants.skills.Gunslinger; +import constants.skills.Hermit; +import constants.skills.Hero; +import constants.skills.Hunter; +import constants.skills.ILArchMage; +import constants.skills.ILMage; +import constants.skills.Legend; +import constants.skills.Marauder; +import constants.skills.Marksman; +import constants.skills.NightLord; +import constants.skills.NightWalker; +import constants.skills.Noblesse; +import constants.skills.Outlaw; +import constants.skills.Page; +import constants.skills.Paladin; +import constants.skills.Ranger; +import constants.skills.Rogue; +import constants.skills.Shadower; +import constants.skills.Sniper; +import constants.skills.Spearman; +import constants.skills.SuperGM; +import constants.skills.ThunderBreaker; +import constants.skills.WhiteKnight; +import constants.skills.WindArcher; import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.PlayerBuffValueHolder; import scripting.AbstractPlayerInteraction; import server.StatEffect; import server.TimerManager; -import server.life.*; +import server.life.Element; +import server.life.ElementalEffectiveness; +import server.life.MobSkill; +import server.life.MobSkillFactory; +import server.life.MobSkillId; +import server.life.MobSkillType; +import server.life.Monster; +import server.life.MonsterDropEntry; +import server.life.MonsterInformationProvider; import server.maps.MapItem; import server.maps.MapObject; import server.maps.MapObjectType; @@ -47,8 +102,12 @@ import tools.PacketCreator; import tools.Randomizer; import java.awt.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; -import java.util.*; +import java.util.Map; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/src/main/java/net/server/channel/handlers/AbstractMovementPacketHandler.java b/src/main/java/net/server/channel/handlers/AbstractMovementPacketHandler.java index b6dea059aa..e15d75e736 100644 --- a/src/main/java/net/server/channel/handlers/AbstractMovementPacketHandler.java +++ b/src/main/java/net/server/channel/handlers/AbstractMovementPacketHandler.java @@ -26,7 +26,12 @@ import net.packet.InPacket; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import server.maps.AnimatedMapObject; -import server.movement.*; +import server.movement.AbsoluteLifeMovement; +import server.movement.ChangeEquip; +import server.movement.JumpDownMovement; +import server.movement.LifeMovementFragment; +import server.movement.RelativeLifeMovement; +import server.movement.TeleportMovement; import tools.exceptions.EmptyMovementException; import java.awt.*; diff --git a/src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java b/src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java index 88b4453a99..a6d9bb66d0 100644 --- a/src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java +++ b/src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java @@ -21,10 +21,13 @@ */ package net.server.channel.handlers; -import client.*; +import client.BuddyList; import client.BuddyList.BuddyAddResult; -import client.Character; import client.BuddyList.BuddyOperation; +import client.BuddylistEntry; +import client.Character; +import client.CharacterNameAndId; +import client.Client; import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.world.World; diff --git a/src/main/java/net/server/channel/handlers/CancelBuffHandler.java b/src/main/java/net/server/channel/handlers/CancelBuffHandler.java index a9788250b2..584f6ecc73 100644 --- a/src/main/java/net/server/channel/handlers/CancelBuffHandler.java +++ b/src/main/java/net/server/channel/handlers/CancelBuffHandler.java @@ -23,7 +23,14 @@ package net.server.channel.handlers; import client.Client; import client.SkillFactory; -import constants.skills.*; +import constants.skills.Bishop; +import constants.skills.Bowmaster; +import constants.skills.Corsair; +import constants.skills.Evan; +import constants.skills.FPArchMage; +import constants.skills.ILArchMage; +import constants.skills.Marksman; +import constants.skills.WindArcher; import net.AbstractPacketHandler; import net.PacketHandler; import net.packet.InPacket; @@ -53,4 +60,4 @@ public final class CancelBuffHandler extends AbstractPacketHandler implements Pa break; } } -} \ No newline at end of file +} diff --git a/src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java b/src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java index 756675623b..5a8a9bef61 100644 --- a/src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java @@ -21,12 +21,22 @@ */ package net.server.channel.handlers; +import client.BuffStat; import client.Character; -import client.*; +import client.Client; +import client.Job; +import client.Skill; +import client.SkillFactory; import config.YamlConfig; import constants.game.GameConstants; import constants.id.MapId; -import constants.skills.*; +import constants.skills.Crusader; +import constants.skills.DawnWarrior; +import constants.skills.DragonKnight; +import constants.skills.Hero; +import constants.skills.NightWalker; +import constants.skills.Rogue; +import constants.skills.WindArcher; import net.packet.InPacket; import server.StatEffect; import tools.PacketCreator; @@ -183,4 +193,4 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler { applyAttack(attack, chr, attackCount); } -} \ No newline at end of file +} diff --git a/src/main/java/net/server/channel/handlers/CouponCodeHandler.java b/src/main/java/net/server/channel/handlers/CouponCodeHandler.java index 7f5085990c..199d0d376f 100644 --- a/src/main/java/net/server/channel/handlers/CouponCodeHandler.java +++ b/src/main/java/net/server/channel/handlers/CouponCodeHandler.java @@ -42,7 +42,11 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; /** diff --git a/src/main/java/net/server/channel/handlers/InventorySortHandler.java b/src/main/java/net/server/channel/handlers/InventorySortHandler.java index e6721569bf..f60824475f 100644 --- a/src/main/java/net/server/channel/handlers/InventorySortHandler.java +++ b/src/main/java/net/server/channel/handlers/InventorySortHandler.java @@ -23,7 +23,11 @@ package net.server.channel.handlers; import client.Character; import client.Client; -import client.inventory.*; +import client.inventory.Equip; +import client.inventory.Inventory; +import client.inventory.InventoryType; +import client.inventory.Item; +import client.inventory.ModifyInventory; import config.YamlConfig; import net.AbstractPacketHandler; import net.packet.InPacket; diff --git a/src/main/java/net/server/channel/handlers/MTSHandler.java b/src/main/java/net/server/channel/handlers/MTSHandler.java index abffbe9ad1..bc5d3dac74 100644 --- a/src/main/java/net/server/channel/handlers/MTSHandler.java +++ b/src/main/java/net/server/channel/handlers/MTSHandler.java @@ -48,7 +48,6 @@ import java.sql.SQLException; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; -import java.util.Calendar; import java.util.List; public final class MTSHandler extends AbstractPacketHandler { diff --git a/src/main/java/net/server/channel/handlers/MagicDamageHandler.java b/src/main/java/net/server/channel/handlers/MagicDamageHandler.java index 8b8201e863..7350e55c55 100644 --- a/src/main/java/net/server/channel/handlers/MagicDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/MagicDamageHandler.java @@ -21,8 +21,11 @@ */ package net.server.channel.handlers; +import client.BuffStat; import client.Character; -import client.*; +import client.Client; +import client.Skill; +import client.SkillFactory; import config.YamlConfig; import constants.id.MapId; import constants.skills.Bishop; diff --git a/src/main/java/net/server/channel/handlers/MoveLifeHandler.java b/src/main/java/net/server/channel/handlers/MoveLifeHandler.java index 0f6ea855a5..34ec1daad7 100644 --- a/src/main/java/net/server/channel/handlers/MoveLifeHandler.java +++ b/src/main/java/net/server/channel/handlers/MoveLifeHandler.java @@ -27,7 +27,12 @@ import config.YamlConfig; import net.packet.InPacket; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import server.life.*; +import server.life.MobSkill; +import server.life.MobSkillFactory; +import server.life.MobSkillId; +import server.life.MobSkillType; +import server.life.Monster; +import server.life.MonsterInformationProvider; import server.maps.MapObject; import server.maps.MapObjectType; import server.maps.MapleMap; @@ -176,4 +181,4 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler { private static boolean inRangeInclusive(Byte pVal, Integer pMin, Integer pMax) { return !(pVal < pMin) || (pVal > pMax); } -} \ No newline at end of file +} diff --git a/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java b/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java index a671b51690..f8680e757a 100644 --- a/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java @@ -39,8 +39,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import server.ItemInformationProvider; import server.Trade; -import server.maps.*; +import server.maps.FieldLimit; +import server.maps.HiredMerchant; +import server.maps.MapObject; +import server.maps.MapObjectType; +import server.maps.MiniGame; import server.maps.MiniGame.MiniGameType; +import server.maps.PlayerShop; +import server.maps.PlayerShopItem; +import server.maps.Portal; import tools.PacketCreator; import java.awt.*; diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java index 72a904006c..f3e2b9288c 100644 --- a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java @@ -21,9 +21,21 @@ */ package net.server.channel.handlers; +import client.BuddyList; +import client.BuddylistEntry; import client.Character; -import client.*; -import client.inventory.*; +import client.CharacterNameAndId; +import client.Client; +import client.Disease; +import client.Family; +import client.FamilyEntry; +import client.Mount; +import client.SkillFactory; +import client.inventory.Equip; +import client.inventory.Inventory; +import client.inventory.InventoryType; +import client.inventory.Item; +import client.inventory.Pet; import client.keybind.KeyBinding; import config.YamlConfig; import constants.game.GameConstants; @@ -56,8 +68,13 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import java.util.stream.Collectors; public final class PlayerLoggedinHandler extends AbstractPacketHandler { diff --git a/src/main/java/net/server/channel/handlers/RangedAttackHandler.java b/src/main/java/net/server/channel/handlers/RangedAttackHandler.java index a8ea010361..85d599b9fc 100644 --- a/src/main/java/net/server/channel/handlers/RangedAttackHandler.java +++ b/src/main/java/net/server/channel/handlers/RangedAttackHandler.java @@ -21,8 +21,11 @@ along with this program. If not, see . */ package net.server.channel.handlers; +import client.BuffStat; import client.Character; -import client.*; +import client.Client; +import client.Skill; +import client.SkillFactory; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; @@ -32,7 +35,13 @@ import config.YamlConfig; import constants.id.ItemId; import constants.id.MapId; import constants.inventory.ItemConstants; -import constants.skills.*; +import constants.skills.Aran; +import constants.skills.Buccaneer; +import constants.skills.NightLord; +import constants.skills.NightWalker; +import constants.skills.Shadower; +import constants.skills.ThunderBreaker; +import constants.skills.WindArcher; import net.packet.InPacket; import net.packet.Packet; import org.slf4j.Logger; @@ -237,4 +246,4 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { } } } -} \ No newline at end of file +} diff --git a/src/main/java/net/server/channel/handlers/SkillEffectHandler.java b/src/main/java/net/server/channel/handlers/SkillEffectHandler.java index 6b5b251da0..e5443004c7 100644 --- a/src/main/java/net/server/channel/handlers/SkillEffectHandler.java +++ b/src/main/java/net/server/channel/handlers/SkillEffectHandler.java @@ -22,7 +22,23 @@ package net.server.channel.handlers; import client.Client; -import constants.skills.*; +import constants.skills.Bishop; +import constants.skills.Bowmaster; +import constants.skills.Brawler; +import constants.skills.ChiefBandit; +import constants.skills.Corsair; +import constants.skills.DarkKnight; +import constants.skills.Evan; +import constants.skills.FPArchMage; +import constants.skills.FPMage; +import constants.skills.Gunslinger; +import constants.skills.Hero; +import constants.skills.ILArchMage; +import constants.skills.Marksman; +import constants.skills.NightWalker; +import constants.skills.Paladin; +import constants.skills.ThunderBreaker; +import constants.skills.WindArcher; import net.AbstractPacketHandler; import net.packet.InPacket; import org.slf4j.Logger; @@ -65,4 +81,4 @@ public final class SkillEffectHandler extends AbstractPacketHandler { return; } } -} \ No newline at end of file +} diff --git a/src/main/java/net/server/channel/handlers/SpecialMoveHandler.java b/src/main/java/net/server/channel/handlers/SpecialMoveHandler.java index 5e5d665d7e..6c2d1bf1eb 100644 --- a/src/main/java/net/server/channel/handlers/SpecialMoveHandler.java +++ b/src/main/java/net/server/channel/handlers/SpecialMoveHandler.java @@ -26,7 +26,13 @@ import client.Client; import client.Skill; import client.SkillFactory; import config.YamlConfig; -import constants.skills.*; +import constants.skills.Brawler; +import constants.skills.Corsair; +import constants.skills.DarkKnight; +import constants.skills.Hero; +import constants.skills.Paladin; +import constants.skills.Priest; +import constants.skills.SuperGM; import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; @@ -153,4 +159,4 @@ public final class SpecialMoveHandler extends AbstractPacketHandler { c.sendPacket(PacketCreator.enableActions()); } } -} \ No newline at end of file +} diff --git a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java index ca21a3f257..234f56eb0c 100644 --- a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java @@ -21,8 +21,11 @@ along with this program. If not, see . */ package net.server.channel.handlers; +import client.BuffStat; import client.Character; -import client.*; +import client.Client; +import client.Skill; +import client.SkillFactory; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; @@ -39,7 +42,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import server.StatEffect; import server.life.LifeFactory.loseItem; -import server.life.*; +import server.life.MobAttackInfo; +import server.life.MobAttackInfoFactory; +import server.life.MobSkill; +import server.life.MobSkillFactory; +import server.life.MobSkillType; +import server.life.Monster; import server.maps.MapObject; import server.maps.MapleMap; import tools.PacketCreator; diff --git a/src/main/java/net/server/channel/handlers/TransferNameHandler.java b/src/main/java/net/server/channel/handlers/TransferNameHandler.java index fd4f142dc1..6996e0bfa3 100644 --- a/src/main/java/net/server/channel/handlers/TransferNameHandler.java +++ b/src/main/java/net/server/channel/handlers/TransferNameHandler.java @@ -28,7 +28,11 @@ import net.packet.InPacket; import tools.DatabaseConnection; import tools.PacketCreator; -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; import java.util.Calendar; import static java.util.concurrent.TimeUnit.DAYS; @@ -81,4 +85,4 @@ public final class TransferNameHandler extends AbstractPacketHandler { } c.sendPacket(PacketCreator.sendNameTransferRules(0)); } -} \ No newline at end of file +} diff --git a/src/main/java/net/server/channel/handlers/TransferWorldHandler.java b/src/main/java/net/server/channel/handlers/TransferWorldHandler.java index 17179ca903..baf3f99426 100644 --- a/src/main/java/net/server/channel/handlers/TransferWorldHandler.java +++ b/src/main/java/net/server/channel/handlers/TransferWorldHandler.java @@ -29,7 +29,11 @@ import net.server.Server; import tools.DatabaseConnection; import tools.PacketCreator; -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; /** * @author Ronan @@ -76,4 +80,4 @@ public final class TransferWorldHandler extends AbstractPacketHandler { } c.sendPacket(PacketCreator.sendWorldTransferRules(0, c)); } -} \ No newline at end of file +} diff --git a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java index 56b6b02a3c..d998e724e3 100644 --- a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java @@ -22,10 +22,22 @@ package net.server.channel.handlers; import client.Character; -import client.*; -import client.creator.veteran.*; -import client.inventory.*; +import client.Client; +import client.Skill; +import client.SkillFactory; +import client.SkillMacro; +import client.creator.veteran.BowmanCreator; +import client.creator.veteran.MagicianCreator; +import client.creator.veteran.PirateCreator; +import client.creator.veteran.ThiefCreator; +import client.creator.veteran.WarriorCreator; +import client.inventory.Equip; import client.inventory.Equip.ScrollResult; +import client.inventory.Inventory; +import client.inventory.InventoryType; +import client.inventory.Item; +import client.inventory.ModifyInventory; +import client.inventory.Pet; import client.inventory.manipulator.InventoryManipulator; import client.inventory.manipulator.KarmaManipulator; import client.processor.npc.DueyProcessor; @@ -46,7 +58,12 @@ import server.ItemInformationProvider; import server.Shop; import server.ShopFactory; import server.TimerManager; -import server.maps.*; +import server.maps.AbstractMapObject; +import server.maps.FieldLimit; +import server.maps.Kite; +import server.maps.MapleMap; +import server.maps.MapleTVEffect; +import server.maps.PlayerShopItem; import service.NoteService; import tools.PacketCreator; import tools.Pair; diff --git a/src/main/java/net/server/coordinator/matchchecker/MatchCheckerCoordinator.java b/src/main/java/net/server/coordinator/matchchecker/MatchCheckerCoordinator.java index 10ab35c236..de9851c175 100644 --- a/src/main/java/net/server/coordinator/matchchecker/MatchCheckerCoordinator.java +++ b/src/main/java/net/server/coordinator/matchchecker/MatchCheckerCoordinator.java @@ -25,8 +25,12 @@ import net.server.Server; import net.server.coordinator.matchchecker.MatchCheckerListenerFactory.MatchCheckerType; import net.server.world.World; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.Semaphore; /** diff --git a/src/main/java/net/server/coordinator/partysearch/PartySearchCoordinator.java b/src/main/java/net/server/coordinator/partysearch/PartySearchCoordinator.java index fbaba5e7e9..6d56a94a5f 100644 --- a/src/main/java/net/server/coordinator/partysearch/PartySearchCoordinator.java +++ b/src/main/java/net/server/coordinator/partysearch/PartySearchCoordinator.java @@ -33,8 +33,14 @@ import provider.wz.WZFiles; import tools.PacketCreator; import tools.Pair; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; diff --git a/src/main/java/net/server/coordinator/partysearch/PartySearchStorage.java b/src/main/java/net/server/coordinator/partysearch/PartySearchStorage.java index 27a8407e69..854665a7b9 100644 --- a/src/main/java/net/server/coordinator/partysearch/PartySearchStorage.java +++ b/src/main/java/net/server/coordinator/partysearch/PartySearchStorage.java @@ -22,7 +22,11 @@ package net.server.coordinator.partysearch; import client.Character; import tools.IntervalBuilder; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; diff --git a/src/main/java/net/server/coordinator/session/SessionCoordinator.java b/src/main/java/net/server/coordinator/session/SessionCoordinator.java index 18c9f5559c..29f340ad61 100644 --- a/src/main/java/net/server/coordinator/session/SessionCoordinator.java +++ b/src/main/java/net/server/coordinator/session/SessionCoordinator.java @@ -32,8 +32,14 @@ import tools.DatabaseConnection; import java.sql.Connection; import java.sql.SQLException; import java.time.Instant; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; diff --git a/src/main/java/net/server/coordinator/session/SessionDAO.java b/src/main/java/net/server/coordinator/session/SessionDAO.java index ca862632bf..c77d53c0b7 100644 --- a/src/main/java/net/server/coordinator/session/SessionDAO.java +++ b/src/main/java/net/server/coordinator/session/SessionDAO.java @@ -4,7 +4,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import tools.DatabaseConnection; -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; import java.time.Instant; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/net/server/coordinator/world/MonsterAggroCoordinator.java b/src/main/java/net/server/coordinator/world/MonsterAggroCoordinator.java index b5e8bf4113..e699b227fe 100644 --- a/src/main/java/net/server/coordinator/world/MonsterAggroCoordinator.java +++ b/src/main/java/net/server/coordinator/world/MonsterAggroCoordinator.java @@ -27,8 +27,14 @@ import server.life.Monster; import server.maps.MapleMap; import tools.Pair; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/src/main/java/net/server/guild/Guild.java b/src/main/java/net/server/guild/Guild.java index a68f00e89d..10c8783b15 100644 --- a/src/main/java/net/server/guild/Guild.java +++ b/src/main/java/net/server/guild/Guild.java @@ -42,7 +42,13 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/src/main/java/net/server/handlers/login/LoginPasswordHandler.java b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java index 4dbbae373b..b9c6089c97 100644 --- a/src/main/java/net/server/handlers/login/LoginPasswordHandler.java +++ b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java @@ -37,7 +37,13 @@ import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.sql.*; +import java.sql.Connection; +import java.sql.Date; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Timestamp; import java.util.Calendar; public final class LoginPasswordHandler implements PacketHandler { diff --git a/src/main/java/net/server/handlers/login/ViewAllCharHandler.java b/src/main/java/net/server/handlers/login/ViewAllCharHandler.java index d48e7d6302..df81896b70 100644 --- a/src/main/java/net/server/handlers/login/ViewAllCharHandler.java +++ b/src/main/java/net/server/handlers/login/ViewAllCharHandler.java @@ -29,7 +29,11 @@ import net.packet.InPacket; import net.server.Server; import tools.PacketCreator; -import java.util.*; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.SortedMap; +import java.util.TreeMap; public final class ViewAllCharHandler extends AbstractPacketHandler { private static final int CHARACTER_LIMIT = 60; // Client will crash if sending 61 or more characters diff --git a/src/main/java/net/server/services/BaseScheduler.java b/src/main/java/net/server/services/BaseScheduler.java index 5314813f8e..d8f9147a76 100644 --- a/src/main/java/net/server/services/BaseScheduler.java +++ b/src/main/java/net/server/services/BaseScheduler.java @@ -24,7 +24,11 @@ import net.server.Server; import server.TimerManager; import tools.Pair; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.locks.Lock; diff --git a/src/main/java/net/server/services/type/ChannelServices.java b/src/main/java/net/server/services/type/ChannelServices.java index bd3cadf9b2..f8fffb85e4 100644 --- a/src/main/java/net/server/services/type/ChannelServices.java +++ b/src/main/java/net/server/services/type/ChannelServices.java @@ -22,7 +22,12 @@ package net.server.services.type; import net.server.services.BaseService; import net.server.services.Service; import net.server.services.ServiceType; -import net.server.services.task.channel.*; +import net.server.services.task.channel.EventService; +import net.server.services.task.channel.MobAnimationService; +import net.server.services.task.channel.MobClearSkillService; +import net.server.services.task.channel.MobMistService; +import net.server.services.task.channel.MobStatusService; +import net.server.services.task.channel.OverallService; /** * @author Ronan diff --git a/src/main/java/net/server/world/Party.java b/src/main/java/net/server/world/Party.java index c466418fdf..69bc913c82 100644 --- a/src/main/java/net/server/world/Party.java +++ b/src/main/java/net/server/world/Party.java @@ -32,7 +32,12 @@ import server.maps.MapleMap; import server.partyquest.MonsterCarnival; import tools.PacketCreator; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/src/main/java/net/server/world/World.java b/src/main/java/net/server/world/World.java index 2bdf1b3ada..0abb0e570e 100644 --- a/src/main/java/net/server/world/World.java +++ b/src/main/java/net/server/world/World.java @@ -46,21 +46,57 @@ import net.server.guild.GuildSummary; import net.server.services.BaseService; import net.server.services.ServicesManager; import net.server.services.type.WorldServices; -import net.server.task.*; +import net.server.task.CharacterAutosaverTask; +import net.server.task.CharacterHpDecreaseTask; +import net.server.task.FamilyDailyResetTask; +import net.server.task.FishingTask; +import net.server.task.HiredMerchantTask; +import net.server.task.MapOwnershipTask; +import net.server.task.MountTirednessTask; +import net.server.task.PartySearchTask; +import net.server.task.PetFullnessTask; +import net.server.task.ServerMessageTask; +import net.server.task.TimedMapObjectTask; +import net.server.task.TimeoutTask; +import net.server.task.WeddingReservationTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scripting.event.EventInstanceManager; import server.Storage; import server.TimerManager; -import server.maps.*; +import server.maps.AbstractMapObject; +import server.maps.HiredMerchant; +import server.maps.MapleMap; +import server.maps.MiniDungeon; +import server.maps.MiniDungeonInfo; +import server.maps.PlayerShop; +import server.maps.PlayerShopItem; import tools.DatabaseConnection; import tools.PacketCreator; import tools.Pair; import tools.packets.Fishing; -import java.sql.*; -import java.util.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.PriorityQueue; +import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.atomic.AtomicInteger; @@ -69,7 +105,10 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import static java.util.concurrent.TimeUnit.*; +import static java.util.concurrent.TimeUnit.DAYS; +import static java.util.concurrent.TimeUnit.HOURS; +import static java.util.concurrent.TimeUnit.MINUTES; +import static java.util.concurrent.TimeUnit.SECONDS; /** * @author kevintjuh93 diff --git a/src/main/java/server/CashShop.java b/src/main/java/server/CashShop.java index cb5e4f9db8..346a909391 100644 --- a/src/main/java/server/CashShop.java +++ b/src/main/java/server/CashShop.java @@ -21,7 +21,11 @@ along with this program. If not, see . */ package server; -import client.inventory.*; +import client.inventory.Equip; +import client.inventory.InventoryType; +import client.inventory.Item; +import client.inventory.ItemFactory; +import client.inventory.Pet; import config.YamlConfig; import constants.id.ItemId; import constants.inventory.ItemConstants; @@ -38,7 +42,11 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/src/main/java/server/ExpLogger.java b/src/main/java/server/ExpLogger.java index c9016bdf69..0093d7dd2f 100644 --- a/src/main/java/server/ExpLogger.java +++ b/src/main/java/server/ExpLogger.java @@ -1,19 +1,21 @@ package server; +import config.YamlConfig; +import tools.DatabaseConnection; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; -import java.sql.Timestamp; -import static java.util.concurrent.TimeUnit.*; -import config.YamlConfig; -import tools.DatabaseConnection; +import static java.util.concurrent.TimeUnit.MINUTES; +import static java.util.concurrent.TimeUnit.SECONDS; public class ExpLogger { private static final LinkedBlockingQueue expLoggerQueue = new LinkedBlockingQueue<>(); diff --git a/src/main/java/server/StatEffect.java b/src/main/java/server/StatEffect.java index 820d5df9b5..44cf094b63 100644 --- a/src/main/java/server/StatEffect.java +++ b/src/main/java/server/StatEffect.java @@ -21,8 +21,13 @@ */ package server; +import client.BuffStat; import client.Character; -import client.*; +import client.Disease; +import client.Job; +import client.Mount; +import client.Skill; +import client.SkillFactory; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; @@ -33,7 +38,57 @@ import config.YamlConfig; import constants.id.ItemId; import constants.id.MapId; import constants.inventory.ItemConstants; -import constants.skills.*; +import constants.skills.Aran; +import constants.skills.Assassin; +import constants.skills.Bandit; +import constants.skills.Beginner; +import constants.skills.Bishop; +import constants.skills.BlazeWizard; +import constants.skills.Bowmaster; +import constants.skills.Brawler; +import constants.skills.Buccaneer; +import constants.skills.ChiefBandit; +import constants.skills.Cleric; +import constants.skills.Corsair; +import constants.skills.Crossbowman; +import constants.skills.Crusader; +import constants.skills.DarkKnight; +import constants.skills.DawnWarrior; +import constants.skills.DragonKnight; +import constants.skills.Evan; +import constants.skills.FPArchMage; +import constants.skills.FPMage; +import constants.skills.FPWizard; +import constants.skills.Fighter; +import constants.skills.GM; +import constants.skills.Gunslinger; +import constants.skills.Hermit; +import constants.skills.Hero; +import constants.skills.Hunter; +import constants.skills.ILArchMage; +import constants.skills.ILMage; +import constants.skills.ILWizard; +import constants.skills.Legend; +import constants.skills.Magician; +import constants.skills.Marauder; +import constants.skills.Marksman; +import constants.skills.NightLord; +import constants.skills.NightWalker; +import constants.skills.Noblesse; +import constants.skills.Outlaw; +import constants.skills.Page; +import constants.skills.Paladin; +import constants.skills.Pirate; +import constants.skills.Priest; +import constants.skills.Ranger; +import constants.skills.Rogue; +import constants.skills.Shadower; +import constants.skills.Sniper; +import constants.skills.Spearman; +import constants.skills.SuperGM; +import constants.skills.ThunderBreaker; +import constants.skills.WhiteKnight; +import constants.skills.WindArcher; import net.packet.Packet; import net.server.Server; import net.server.world.Party; @@ -44,15 +99,27 @@ import server.life.MobSkill; import server.life.MobSkillFactory; import server.life.MobSkillType; import server.life.Monster; -import server.maps.*; +import server.maps.Door; +import server.maps.FieldLimit; +import server.maps.MapObject; +import server.maps.MapObjectType; +import server.maps.MapleMap; +import server.maps.Mist; +import server.maps.Portal; +import server.maps.Summon; +import server.maps.SummonMovementType; import server.partyquest.CarnivalFactory; import server.partyquest.CarnivalFactory.MCSkill; import tools.PacketCreator; import tools.Pair; import java.awt.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.EnumMap; import java.util.List; -import java.util.*; +import java.util.Map; /** * @author Matze diff --git a/src/main/java/server/Storage.java b/src/main/java/server/Storage.java index 67e64e75b9..0c50479138 100644 --- a/src/main/java/server/Storage.java +++ b/src/main/java/server/Storage.java @@ -38,7 +38,12 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -358,4 +363,4 @@ public class Storage { } } -} \ No newline at end of file +} diff --git a/src/main/java/server/ThreadManager.java b/src/main/java/server/ThreadManager.java index 683c419d7d..3d4bf099fe 100644 --- a/src/main/java/server/ThreadManager.java +++ b/src/main/java/server/ThreadManager.java @@ -19,7 +19,11 @@ */ package server; -import java.util.concurrent.*; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.Executors; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/src/main/java/server/expeditions/Expedition.java b/src/main/java/server/expeditions/Expedition.java index 2becc69565..ba96778515 100644 --- a/src/main/java/server/expeditions/Expedition.java +++ b/src/main/java/server/expeditions/Expedition.java @@ -37,8 +37,14 @@ import server.maps.MapleMap; import tools.PacketCreator; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ScheduledFuture; diff --git a/src/main/java/server/expeditions/ExpeditionBossLog.java b/src/main/java/server/expeditions/ExpeditionBossLog.java index 6f6355a70e..c7337d69d4 100644 --- a/src/main/java/server/expeditions/ExpeditionBossLog.java +++ b/src/main/java/server/expeditions/ExpeditionBossLog.java @@ -23,7 +23,11 @@ import config.YamlConfig; import tools.DatabaseConnection; import tools.Pair; -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; import java.util.Calendar; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/server/life/LifeFactory.java b/src/main/java/server/life/LifeFactory.java index 6f2e9f8aed..04e6cabe2a 100644 --- a/src/main/java/server/life/LifeFactory.java +++ b/src/main/java/server/life/LifeFactory.java @@ -33,8 +33,12 @@ import tools.Pair; import tools.StringUtil; import java.awt.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; -import java.util.*; +import java.util.Map; +import java.util.Set; public class LifeFactory { private static final Logger log = LoggerFactory.getLogger(LifeFactory.class); diff --git a/src/main/java/server/life/MobSkill.java b/src/main/java/server/life/MobSkill.java index 4b47f1ad74..63f500ef09 100644 --- a/src/main/java/server/life/MobSkill.java +++ b/src/main/java/server/life/MobSkill.java @@ -38,8 +38,11 @@ import server.maps.Mist; import tools.Randomizer; import java.awt.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumMap; import java.util.List; -import java.util.*; +import java.util.Map; /** * @author Danny (Leifde) diff --git a/src/main/java/server/life/MobSkillFactory.java b/src/main/java/server/life/MobSkillFactory.java index 7b5ea96b9e..435f4c9e3f 100644 --- a/src/main/java/server/life/MobSkillFactory.java +++ b/src/main/java/server/life/MobSkillFactory.java @@ -28,8 +28,11 @@ import provider.DataTool; import provider.wz.WZFiles; import java.awt.*; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.*; +import java.util.Map; +import java.util.Optional; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; diff --git a/src/main/java/server/life/Monster.java b/src/main/java/server/life/Monster.java index efd42f8b8d..71f9b66c45 100644 --- a/src/main/java/server/life/Monster.java +++ b/src/main/java/server/life/Monster.java @@ -21,13 +21,26 @@ */ package server.life; +import client.BuffStat; import client.Character; -import client.*; +import client.Client; +import client.FamilyEntry; +import client.Job; +import client.Skill; +import client.SkillFactory; import client.status.MonsterStatus; import client.status.MonsterStatusEffect; import config.YamlConfig; import constants.id.MobId; -import constants.skills.*; +import constants.skills.Crusader; +import constants.skills.FPMage; +import constants.skills.Hermit; +import constants.skills.ILMage; +import constants.skills.NightLord; +import constants.skills.NightWalker; +import constants.skills.Priest; +import constants.skills.Shadower; +import constants.skills.WhiteKnight; import net.packet.Packet; import net.server.channel.Channel; import net.server.coordinator.world.MonsterAggroCoordinator; @@ -56,9 +69,17 @@ import tools.Randomizer; import java.awt.*; import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; -import java.util.*; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -2177,4 +2198,4 @@ public class Monster extends AbstractLoadedLife { this.getMap().dismissRemoveAfter(this); } -} \ No newline at end of file +} diff --git a/src/main/java/server/life/MonsterInformationProvider.java b/src/main/java/server/life/MonsterInformationProvider.java index e610559007..6055a4fdb0 100644 --- a/src/main/java/server/life/MonsterInformationProvider.java +++ b/src/main/java/server/life/MonsterInformationProvider.java @@ -38,7 +38,13 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; public class MonsterInformationProvider { private static final Logger log = LoggerFactory.getLogger(MonsterInformationProvider.class); diff --git a/src/main/java/server/life/MonsterStats.java b/src/main/java/server/life/MonsterStats.java index 093adc9334..5c091fd76d 100644 --- a/src/main/java/server/life/MonsterStats.java +++ b/src/main/java/server/life/MonsterStats.java @@ -27,7 +27,13 @@ import server.life.LifeFactory.selfDestruction; import tools.Pair; import java.lang.reflect.Field; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author Frz diff --git a/src/main/java/server/life/PlayerNPC.java b/src/main/java/server/life/PlayerNPC.java index f5a592016d..c1fb312859 100644 --- a/src/main/java/server/life/PlayerNPC.java +++ b/src/main/java/server/life/PlayerNPC.java @@ -44,9 +44,19 @@ import tools.PacketCreator; import tools.Pair; import java.awt.*; -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; -import java.util.*; +import java.util.Map; +import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; /** diff --git a/src/main/java/server/maps/AbstractAnimatedMapObject.java b/src/main/java/server/maps/AbstractAnimatedMapObject.java index f0dba2ca91..5e05797d21 100644 --- a/src/main/java/server/maps/AbstractAnimatedMapObject.java +++ b/src/main/java/server/maps/AbstractAnimatedMapObject.java @@ -22,7 +22,11 @@ package server.maps; import io.netty.buffer.Unpooled; -import net.packet.*; +import net.packet.ByteBufInPacket; +import net.packet.ByteBufOutPacket; +import net.packet.InPacket; +import net.packet.OutPacket; +import net.packet.Packet; import java.util.Arrays; diff --git a/src/main/java/server/maps/HiredMerchant.java b/src/main/java/server/maps/HiredMerchant.java index c668e2cd24..bcc4fb636e 100644 --- a/src/main/java/server/maps/HiredMerchant.java +++ b/src/main/java/server/maps/HiredMerchant.java @@ -45,7 +45,12 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.time.Duration; import java.time.Instant; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java index bf44ba733f..ceadc01aff 100644 --- a/src/main/java/server/maps/MapleMap.java +++ b/src/main/java/server/maps/MapleMap.java @@ -52,9 +52,21 @@ import scripting.map.MapScriptManager; import server.ItemInformationProvider; import server.StatEffect; import server.TimerManager; -import server.events.gm.*; -import server.life.*; +import server.events.gm.Coconut; +import server.events.gm.Fitness; +import server.events.gm.Ola; +import server.events.gm.OxQuiz; +import server.events.gm.Snowball; +import server.life.LifeFactory; import server.life.LifeFactory.selfDestruction; +import server.life.Monster; +import server.life.MonsterDropEntry; +import server.life.MonsterGlobalDropEntry; +import server.life.MonsterInformationProvider; +import server.life.MonsterListener; +import server.life.NPC; +import server.life.PlayerNPC; +import server.life.SpawnPoint; import server.partyquest.CarnivalFactory; import server.partyquest.CarnivalFactory.MCSkill; import server.partyquest.GuardianSpawnPoint; @@ -64,9 +76,22 @@ import tools.Randomizer; import java.awt.*; import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; import java.util.List; -import java.util.*; +import java.util.Map; import java.util.Map.Entry; +import java.util.Random; +import java.util.Set; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.Lock; diff --git a/src/main/java/server/maps/Mist.java b/src/main/java/server/maps/Mist.java index 6aa41391d8..9f60884e32 100644 --- a/src/main/java/server/maps/Mist.java +++ b/src/main/java/server/maps/Mist.java @@ -25,7 +25,11 @@ import client.Character; import client.Client; import client.Skill; import client.SkillFactory; -import constants.skills.*; +import constants.skills.BlazeWizard; +import constants.skills.Evan; +import constants.skills.FPMage; +import constants.skills.NightWalker; +import constants.skills.Shadower; import net.packet.Packet; import server.StatEffect; import server.life.MobSkill; diff --git a/src/main/java/server/maps/PlayerShop.java b/src/main/java/server/maps/PlayerShop.java index ab110cc008..2918276974 100644 --- a/src/main/java/server/maps/PlayerShop.java +++ b/src/main/java/server/maps/PlayerShop.java @@ -33,7 +33,12 @@ import server.Trade; import tools.PacketCreator; import tools.Pair; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -617,4 +622,4 @@ public class PlayerShop extends AbstractMapObject { return mesos; } } -} \ No newline at end of file +} diff --git a/src/main/java/server/quest/Quest.java b/src/main/java/server/quest/Quest.java index bab66d9a60..b53eda0fc1 100644 --- a/src/main/java/server/quest/Quest.java +++ b/src/main/java/server/quest/Quest.java @@ -32,13 +32,52 @@ import provider.DataProvider; import provider.DataProviderFactory; import provider.DataTool; import provider.wz.WZFiles; -import server.quest.actions.*; -import server.quest.requirements.*; +import server.quest.actions.AbstractQuestAction; +import server.quest.actions.BuffAction; +import server.quest.actions.ExpAction; +import server.quest.actions.FameAction; +import server.quest.actions.InfoAction; +import server.quest.actions.ItemAction; +import server.quest.actions.MesoAction; +import server.quest.actions.NextQuestAction; +import server.quest.actions.PetSkillAction; +import server.quest.actions.PetSpeedAction; +import server.quest.actions.PetTamenessAction; +import server.quest.actions.QuestAction; +import server.quest.actions.SkillAction; +import server.quest.requirements.AbstractQuestRequirement; +import server.quest.requirements.BuffExceptRequirement; +import server.quest.requirements.BuffRequirement; +import server.quest.requirements.CompletedQuestRequirement; +import server.quest.requirements.EndDateRequirement; +import server.quest.requirements.FieldEnterRequirement; +import server.quest.requirements.InfoExRequirement; +import server.quest.requirements.InfoNumberRequirement; +import server.quest.requirements.IntervalRequirement; +import server.quest.requirements.ItemRequirement; +import server.quest.requirements.JobRequirement; +import server.quest.requirements.MaxLevelRequirement; +import server.quest.requirements.MesoRequirement; +import server.quest.requirements.MinLevelRequirement; +import server.quest.requirements.MinTamenessRequirement; +import server.quest.requirements.MobRequirement; +import server.quest.requirements.MonsterBookCountRequirement; +import server.quest.requirements.NpcRequirement; +import server.quest.requirements.PetRequirement; +import server.quest.requirements.QuestRequirement; +import server.quest.requirements.ScriptRequirement; import tools.PacketCreator; import tools.StringUtil; -import java.util.*; +import java.util.Collection; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import static java.util.concurrent.TimeUnit.HOURS; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/src/main/java/tools/mapletools/BossHpBarFetcher.java b/src/main/java/tools/mapletools/BossHpBarFetcher.java index e7634f09bb..7305c56cd1 100644 --- a/src/main/java/tools/mapletools/BossHpBarFetcher.java +++ b/src/main/java/tools/mapletools/BossHpBarFetcher.java @@ -2,7 +2,10 @@ package tools.mapletools; import provider.wz.WZFiles; -import java.io.*; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.PrintWriter; import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/main/java/tools/mapletools/CashCosmeticsChecker.java b/src/main/java/tools/mapletools/CashCosmeticsChecker.java index 261cf555b1..5034721660 100644 --- a/src/main/java/tools/mapletools/CashCosmeticsChecker.java +++ b/src/main/java/tools/mapletools/CashCosmeticsChecker.java @@ -3,11 +3,23 @@ package tools.mapletools; import provider.wz.WZFiles; import tools.Pair; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author RonanLana diff --git a/src/main/java/tools/mapletools/CashCosmeticsFetcher.java b/src/main/java/tools/mapletools/CashCosmeticsFetcher.java index ef290f40d8..c6f64adb07 100644 --- a/src/main/java/tools/mapletools/CashCosmeticsFetcher.java +++ b/src/main/java/tools/mapletools/CashCosmeticsFetcher.java @@ -8,7 +8,11 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * @author RonanLana diff --git a/src/main/java/tools/mapletools/CashDropFetcher.java b/src/main/java/tools/mapletools/CashDropFetcher.java index 91282fa6d7..03b0b97abd 100644 --- a/src/main/java/tools/mapletools/CashDropFetcher.java +++ b/src/main/java/tools/mapletools/CashDropFetcher.java @@ -3,7 +3,9 @@ package tools.mapletools; import provider.wz.WZFiles; import tools.Pair; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintWriter; import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; @@ -11,7 +13,11 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author RonanLana diff --git a/src/main/java/tools/mapletools/CashVegaChecker.java b/src/main/java/tools/mapletools/CashVegaChecker.java index 1cbea1b5aa..929ec0a4d9 100644 --- a/src/main/java/tools/mapletools/CashVegaChecker.java +++ b/src/main/java/tools/mapletools/CashVegaChecker.java @@ -2,7 +2,12 @@ package tools.mapletools; import provider.wz.WZFiles; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/main/java/tools/mapletools/CodeCouponGenerator.java b/src/main/java/tools/mapletools/CodeCouponGenerator.java index 62e35c6e09..93da8662fd 100644 --- a/src/main/java/tools/mapletools/CodeCouponGenerator.java +++ b/src/main/java/tools/mapletools/CodeCouponGenerator.java @@ -2,10 +2,15 @@ package tools.mapletools; import tools.Pair; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/tools/mapletools/CouponInstaller.java b/src/main/java/tools/mapletools/CouponInstaller.java index 2532458370..5aeb2960db 100644 --- a/src/main/java/tools/mapletools/CouponInstaller.java +++ b/src/main/java/tools/mapletools/CouponInstaller.java @@ -2,7 +2,9 @@ package tools.mapletools; import provider.wz.WZFiles; -import java.io.*; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.sql.Connection; diff --git a/src/main/java/tools/mapletools/EmptyItemWzChecker.java b/src/main/java/tools/mapletools/EmptyItemWzChecker.java index 4ac3face4f..f52b11db31 100644 --- a/src/main/java/tools/mapletools/EmptyItemWzChecker.java +++ b/src/main/java/tools/mapletools/EmptyItemWzChecker.java @@ -2,11 +2,23 @@ package tools.mapletools; import provider.wz.WZFiles; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Stack; /** * @author RonanLana diff --git a/src/main/java/tools/mapletools/EquipmentOmniLeveller.java b/src/main/java/tools/mapletools/EquipmentOmniLeveller.java index 71e3635b31..d2644f1eec 100644 --- a/src/main/java/tools/mapletools/EquipmentOmniLeveller.java +++ b/src/main/java/tools/mapletools/EquipmentOmniLeveller.java @@ -2,7 +2,10 @@ package tools.mapletools; import provider.wz.WZFiles; -import java.io.*; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.PrintWriter; import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/main/java/tools/mapletools/EventMethodFiller.java b/src/main/java/tools/mapletools/EventMethodFiller.java index c8686ff0dc..584d7805b1 100644 --- a/src/main/java/tools/mapletools/EventMethodFiller.java +++ b/src/main/java/tools/mapletools/EventMethodFiller.java @@ -5,7 +5,12 @@ import java.io.PrintWriter; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/tools/mapletools/GachaponItemIdRetriever.java b/src/main/java/tools/mapletools/GachaponItemIdRetriever.java index f39fb0f918..48b5e11acd 100644 --- a/src/main/java/tools/mapletools/GachaponItemIdRetriever.java +++ b/src/main/java/tools/mapletools/GachaponItemIdRetriever.java @@ -1,13 +1,20 @@ package tools.mapletools; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintWriter; import java.nio.file.Files; import java.nio.file.Path; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/tools/mapletools/IdRetriever.java b/src/main/java/tools/mapletools/IdRetriever.java index b511499f96..37ceff1712 100644 --- a/src/main/java/tools/mapletools/IdRetriever.java +++ b/src/main/java/tools/mapletools/IdRetriever.java @@ -1,6 +1,11 @@ package tools.mapletools; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/main/java/tools/mapletools/MapFieldLimitChecker.java b/src/main/java/tools/mapletools/MapFieldLimitChecker.java index 92909399bc..1aa2a127af 100644 --- a/src/main/java/tools/mapletools/MapFieldLimitChecker.java +++ b/src/main/java/tools/mapletools/MapFieldLimitChecker.java @@ -2,7 +2,8 @@ package tools.mapletools; import provider.wz.WZFiles; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/main/java/tools/mapletools/MobBookIndexer.java b/src/main/java/tools/mapletools/MobBookIndexer.java index 91dbcaadbc..1686dacd4b 100644 --- a/src/main/java/tools/mapletools/MobBookIndexer.java +++ b/src/main/java/tools/mapletools/MobBookIndexer.java @@ -2,7 +2,9 @@ package tools.mapletools; import provider.wz.WZFiles; -import java.io.*; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.sql.Connection; diff --git a/src/main/java/tools/mapletools/MobBookUpdate.java b/src/main/java/tools/mapletools/MobBookUpdate.java index a83af1c0e0..b652802e0e 100644 --- a/src/main/java/tools/mapletools/MobBookUpdate.java +++ b/src/main/java/tools/mapletools/MobBookUpdate.java @@ -2,7 +2,10 @@ package tools.mapletools; import provider.wz.WZFiles; -import java.io.*; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.PrintWriter; import java.nio.file.Files; import java.nio.file.Path; import java.sql.Connection; diff --git a/src/main/java/tools/mapletools/MonsterStatFetcher.java b/src/main/java/tools/mapletools/MonsterStatFetcher.java index 6cbb136ca8..38033757b8 100644 --- a/src/main/java/tools/mapletools/MonsterStatFetcher.java +++ b/src/main/java/tools/mapletools/MonsterStatFetcher.java @@ -1,17 +1,31 @@ package tools.mapletools; -import provider.*; +import provider.Data; +import provider.DataDirectoryEntry; +import provider.DataFileEntry; +import provider.DataProvider; +import provider.DataProviderFactory; +import provider.DataTool; import provider.wz.DataType; import provider.wz.WZFiles; -import server.life.*; +import server.life.Element; +import server.life.ElementalEffectiveness; import server.life.LifeFactory.BanishInfo; import server.life.LifeFactory.loseItem; import server.life.LifeFactory.selfDestruction; +import server.life.MobSkillId; +import server.life.MobSkillType; +import server.life.MonsterStats; import tools.Pair; import java.time.Duration; import java.time.Instant; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; public class MonsterStatFetcher { private static final DataProvider data = DataProviderFactory.getDataProvider(WZFiles.MOB); diff --git a/src/main/java/tools/mapletools/NoItemIdFetcher.java b/src/main/java/tools/mapletools/NoItemIdFetcher.java index 7e55e11fff..4eed18f474 100644 --- a/src/main/java/tools/mapletools/NoItemIdFetcher.java +++ b/src/main/java/tools/mapletools/NoItemIdFetcher.java @@ -2,7 +2,13 @@ package tools.mapletools; import provider.wz.WZFiles; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; @@ -10,7 +16,11 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author RonanLana @@ -211,4 +221,4 @@ public class NoItemIdFetcher { e.printStackTrace(); } } -} \ No newline at end of file +} diff --git a/src/main/java/tools/mapletools/NoItemNameFetcher.java b/src/main/java/tools/mapletools/NoItemNameFetcher.java index c5e463b769..fb35c80992 100644 --- a/src/main/java/tools/mapletools/NoItemNameFetcher.java +++ b/src/main/java/tools/mapletools/NoItemNameFetcher.java @@ -1,12 +1,23 @@ package tools.mapletools; -import provider.*; +import provider.Data; +import provider.DataDirectoryEntry; +import provider.DataFileEntry; +import provider.DataProvider; +import provider.DataProviderFactory; +import provider.DataTool; import provider.wz.WZFiles; import java.io.PrintWriter; import java.nio.file.Files; import java.nio.file.Path; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author RonanLana diff --git a/src/main/java/tools/mapletools/QuestItemCountFetcher.java b/src/main/java/tools/mapletools/QuestItemCountFetcher.java index 1881438f48..5d8d379984 100644 --- a/src/main/java/tools/mapletools/QuestItemCountFetcher.java +++ b/src/main/java/tools/mapletools/QuestItemCountFetcher.java @@ -3,11 +3,20 @@ package tools.mapletools; import provider.wz.WZFiles; import tools.Pair; -import java.io.*; +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * @author RonanLana diff --git a/src/main/java/tools/mapletools/QuestItemFetcher.java b/src/main/java/tools/mapletools/QuestItemFetcher.java index 130ba51de9..ac6631a728 100644 --- a/src/main/java/tools/mapletools/QuestItemFetcher.java +++ b/src/main/java/tools/mapletools/QuestItemFetcher.java @@ -15,7 +15,14 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author RonanLana diff --git a/src/main/java/tools/mapletools/QuestMesoFetcher.java b/src/main/java/tools/mapletools/QuestMesoFetcher.java index c2aae9e4d5..5c0157745e 100644 --- a/src/main/java/tools/mapletools/QuestMesoFetcher.java +++ b/src/main/java/tools/mapletools/QuestMesoFetcher.java @@ -2,10 +2,18 @@ package tools.mapletools; import provider.wz.WZFiles; -import java.io.*; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.PrintWriter; import java.nio.file.Files; import java.nio.file.Path; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author RonanLana diff --git a/src/main/java/tools/mapletools/QuestlineFetcher.java b/src/main/java/tools/mapletools/QuestlineFetcher.java index 25c8e256a0..52fc56988c 100644 --- a/src/main/java/tools/mapletools/QuestlineFetcher.java +++ b/src/main/java/tools/mapletools/QuestlineFetcher.java @@ -2,13 +2,27 @@ package tools.mapletools; import provider.wz.WZFiles; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.time.Duration; import java.time.Instant; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Stack; /** * @author RonanLana diff --git a/src/main/java/tools/mapletools/ReactorDropFetcher.java b/src/main/java/tools/mapletools/ReactorDropFetcher.java index 795d85c9b9..1b90a42b60 100644 --- a/src/main/java/tools/mapletools/ReactorDropFetcher.java +++ b/src/main/java/tools/mapletools/ReactorDropFetcher.java @@ -9,7 +9,11 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author RonanLana @@ -110,4 +114,4 @@ public class ReactorDropFetcher { public static void main(String[] args) { reportMissingReactors(); } -} \ No newline at end of file +} diff --git a/src/main/java/tools/mapletools/SkillMakerFetcher.java b/src/main/java/tools/mapletools/SkillMakerFetcher.java index 38a52ad07e..4b7b072315 100644 --- a/src/main/java/tools/mapletools/SkillMakerFetcher.java +++ b/src/main/java/tools/mapletools/SkillMakerFetcher.java @@ -4,7 +4,10 @@ import provider.wz.WZFiles; import server.ItemInformationProvider; import tools.DatabaseConnection; -import java.io.*; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.PrintWriter; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; diff --git a/src/main/java/tools/mapletools/SkillMakerReagentIndexer.java b/src/main/java/tools/mapletools/SkillMakerReagentIndexer.java index 77708d225a..340148344d 100644 --- a/src/main/java/tools/mapletools/SkillMakerReagentIndexer.java +++ b/src/main/java/tools/mapletools/SkillMakerReagentIndexer.java @@ -3,7 +3,10 @@ package tools.mapletools; import provider.wz.WZFiles; import tools.Pair; -import java.io.*; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.PrintWriter; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; diff --git a/src/main/java/tools/mapletools/SkillbookStackUpdate.java b/src/main/java/tools/mapletools/SkillbookStackUpdate.java index cedd89a2b9..7f5fc76fb4 100644 --- a/src/main/java/tools/mapletools/SkillbookStackUpdate.java +++ b/src/main/java/tools/mapletools/SkillbookStackUpdate.java @@ -2,7 +2,9 @@ package tools.mapletools; import provider.wz.WZFiles; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintWriter; import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/main/java/tools/mapletools/WorldmapChecker.java b/src/main/java/tools/mapletools/WorldmapChecker.java index a05c2b97a5..e2902d69b3 100644 --- a/src/main/java/tools/mapletools/WorldmapChecker.java +++ b/src/main/java/tools/mapletools/WorldmapChecker.java @@ -3,11 +3,22 @@ package tools.mapletools; import provider.wz.WZFiles; import tools.Pair; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author RonanLana diff --git a/src/test/java/model/NoteTest.java b/src/test/java/model/NoteTest.java index 1779e3f258..87071e4dbe 100644 --- a/src/test/java/model/NoteTest.java +++ b/src/test/java/model/NoteTest.java @@ -2,7 +2,8 @@ package model; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertThrows; class NoteTest { @@ -25,4 +26,4 @@ class NoteTest { void createNew() { assertDoesNotThrow(() -> new Note(4, "message", "from", "to", System.currentTimeMillis(), 5)); } -} \ No newline at end of file +} diff --git a/src/test/java/server/life/MobSkillFactoryTest.java b/src/test/java/server/life/MobSkillFactoryTest.java index c4aebebec6..078a9c6035 100644 --- a/src/test/java/server/life/MobSkillFactoryTest.java +++ b/src/test/java/server/life/MobSkillFactoryTest.java @@ -10,7 +10,10 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Optional; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; class MobSkillFactoryTest { @@ -67,4 +70,4 @@ class MobSkillFactoryTest { assertThrows(IllegalArgumentException.class, () -> MobSkillFactory.getMobSkillOrThrow(MobSkillType.DEFENSE_UP, 1)); } -} \ No newline at end of file +} diff --git a/src/test/java/service/NoteServiceTest.java b/src/test/java/service/NoteServiceTest.java index 9ce7c3cad9..7256e31cf3 100644 --- a/src/test/java/service/NoteServiceTest.java +++ b/src/test/java/service/NoteServiceTest.java @@ -14,9 +14,16 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import static testutil.AnyValues.daoException; import static testutil.AnyValues.string; @@ -139,4 +146,4 @@ class NoteServiceTest { assertTrue(deletedNote.isEmpty()); } -} \ No newline at end of file +}