Merge branch 'refs/heads/master' into feat/postgresql-database

# Conflicts: # config.yaml # docker-compose.yml # pom.xml # src/main/java/client/Character.java # src/main/java/client/Client.java # src/main/java/client/MonsterBook.java # src/main/java/client/command/commands/gm0/BuyBackCommand.java # src/main/java/client/processor/stat/AssignAPProcessor.java # src/main/java/config/ServerConfig.java # src/main/java/net/server/channel/Channel.java # src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java # src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java # src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java # src/main/java/net/server/channel/handlers/EnterMTSHandler.java # src/main/java/net/server/channel/handlers/NPCTalkHandler.java # src/main/java/net/server/channel/handlers/RangedAttackHandler.java # src/main/java/net/server/channel/handlers/SummonDamageHandler.java # src/main/java/net/server/channel/handlers/UseCashItemHandler.java # src/main/java/net/server/handlers/login/CreateCharHandler.java # src/main/java/net/server/world/World.java # src/main/java/scripting/npc/NPCConversationManager.java # src/main/java/server/ItemInformationProvider.java # src/main/java/server/life/Monster.java # src/main/java/server/life/MonsterInformationProvider.java # src/main/java/server/maps/MapleMap.java # src/main/java/tools/PacketCreator.java # src/test/java/service/NoteServiceTest.java # src/test/java/testutil/Any.java
2024-09-02 20:29:52 +02:00
parent a7d03cf8c0 8f2b8dd013
commit 559fe2d550
179 changed files with 3447 additions and 2090 deletions
--- a/src/main/java/tools/DatabaseConnection.java
+++ b/src/main/java/tools/DatabaseConnection.java
@@ -81,8 +81,9 @@ public class DatabaseConnection {
            return true;
        }

-        log.info("Initializing connection pool...");
        final HikariConfig config = getConfig();
+        log.info("Initializing database connection pool. Connecting to:'{}' with user:'{}'", config.getJdbcUrl(),
+                config.getUsername());
        Instant initStart = Instant.now();
        try {
            dataSource = new HikariDataSource(config);
--- a/src/main/java/tools/PacketCreator.java
+++ b/src/main/java/tools/PacketCreator.java
@@ -20,11 +20,29 @@
 */
 package tools;

+import client.BuddylistEntry;
+import client.BuffStat;
 import client.Character;
-import client.*;
 import client.Character.SkillEntry;
-import client.inventory.*;
+import client.Client;
+import client.Disease;
+import client.FamilyEntitlement;
+import client.FamilyEntry;
+import client.MonsterBook;
+import client.Mount;
+import client.QuestStatus;
+import client.Ring;
+import client.Skill;
+import client.SkillMacro;
+import client.Stat;
+import client.inventory.Equip;
 import client.inventory.Equip.ScrollResult;
+import client.inventory.Inventory;
+import client.inventory.InventoryType;
+import client.inventory.Item;
+import client.inventory.ItemFactory;
+import client.inventory.ModifyInventory;
+import client.inventory.Pet;
 import client.keybind.KeyBinding;
 import client.keybind.QuickslotBinding;
 import client.newyear.NewYearCardRecord;
@@ -38,6 +56,7 @@ import constants.id.MapId;
 import constants.id.NpcId;
 import constants.inventory.ItemConstants;
 import constants.skills.Buccaneer;
+import constants.skills.ChiefBandit;
 import constants.skills.Corsair;
 import constants.skills.ThunderBreaker;
 import database.monsterbook.MonsterCard;
@@ -50,8 +69,9 @@ import net.packet.Packet;
 import net.server.PlayerCoolDownValueHolder;
 import net.server.Server;
 import net.server.channel.Channel;
+import net.server.channel.handlers.AbstractDealDamageHandler.AttackTarget;
 import net.server.channel.handlers.PlayerInteractionHandler;
-import net.server.channel.handlers.SummonDamageHandler.SummonAttackEntry;
+import net.server.channel.handlers.SummonDamageHandler.SummonAttackTarget;
 import net.server.channel.handlers.WhisperHandler;
 import net.server.guild.Alliance;
 import net.server.guild.Guild;
@@ -60,6 +80,7 @@ import net.server.world.Party;
 import net.server.world.PartyCharacter;
 import net.server.world.PartyOperation;
 import net.server.world.World;
+import server.CashShop;
 import server.CashShop.CashItem;
 import server.CashShop.CashItemFactory;
 import server.CashShop.SpecialCashItem;
@@ -68,18 +89,40 @@ import server.ItemInformationProvider;
 import server.MTSItemInfo;
 import server.Trade;
 import server.events.gm.Snowball;
-import server.life.*;
-import server.maps.*;
+import server.life.MobSkill;
+import server.life.MobSkillId;
+import server.life.Monster;
+import server.life.NPC;
+import server.life.PlayerNPC;
+import server.maps.AbstractMapObject;
+import server.maps.Door;
+import server.maps.DoorObject;
+import server.maps.Dragon;
+import server.maps.HiredMerchant;
+import server.maps.MapItem;
+import server.maps.MapleMap;
+import server.maps.MiniGame;
 import server.maps.MiniGame.MiniGameResult;
+import server.maps.Mist;
+import server.maps.PlayerShop;
+import server.maps.PlayerShopItem;
+import server.maps.Reactor;
+import server.maps.Summon;
 import server.movement.LifeMovementFragment;
 import server.shop.ShopItem;

 import java.awt.*;
 import java.net.InetAddress;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.*;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TimeZone;
 import java.util.stream.Collectors;

 /**
@@ -1771,7 +1814,8 @@ public class PacketCreator {
        return p;
    }

-    public static Packet dropItemFromMapObject(Character player, MapItem drop, Point dropfrom, Point dropto, byte mod) {
+    public static Packet dropItemFromMapObject(Character player, MapItem drop, Point dropfrom, Point dropto, byte mod,
+                                               short delay) {
        int dropType = drop.getDropType();
        if (drop.hasClientsideOwnership(player) && dropType < 3) {
            dropType = 2;
@@ -1789,7 +1833,7 @@ public class PacketCreator {

        if (mod != 2) {
            p.writePos(dropfrom);
-            p.writeShort(0);//Fh?
+            p.writeShort(delay);
        }
        if (drop.getMeso() == 0) {
            addExpirationTime(p, drop.getItem().getExpiration());
@@ -2259,18 +2303,18 @@ public class PacketCreator {
        return p;
    }

-    public static Packet summonAttack(int cid, int summonOid, byte direction, List<SummonAttackEntry> allDamage) {
+    public static Packet summonAttack(int cid, int summonOid, byte direction, List<SummonAttackTarget> targets) {
        OutPacket p = OutPacket.create(SendOpcode.SUMMON_ATTACK);
        //b2 00 29 f7 00 00 9a a3 04 00 c8 04 01 94 a3 04 00 06 ff 2b 00
        p.writeInt(cid);
        p.writeInt(summonOid);
        p.writeByte(0);     // char level
        p.writeByte(direction);
-        p.writeByte(allDamage.size());
-        for (SummonAttackEntry attackEntry : allDamage) {
-            p.writeInt(attackEntry.getMonsterOid()); // oid
+        p.writeByte(targets.size());
+        for (SummonAttackTarget target : targets) {
+            p.writeInt(target.monsterOid()); // oid
            p.writeByte(6); // who knows
-            p.writeInt(attackEntry.getDamage()); // damage
+            p.writeInt(target.damage()); // damage
        }

        return p;
@@ -2295,29 +2339,40 @@ public class PacketCreator {
        }
        */

-    public static Packet closeRangeAttack(Character chr, int skill, int skilllevel, int stance, int numAttackedAndDamage, Map<Integer, List<Integer>> damage, int speed, int direction, int display) {
+    public static Packet closeRangeAttack(Character chr, int skill, int skilllevel, int stance,
+                                          int numAttackedAndDamage, Map<Integer, AttackTarget> targets, int speed,
+                                          int direction, int display) {
        final OutPacket p = OutPacket.create(SendOpcode.CLOSE_RANGE_ATTACK);
-        addAttackBody(p, chr, skill, skilllevel, stance, numAttackedAndDamage, 0, damage, speed, direction, display);
+        addAttackBody(p, chr, skill, skilllevel, stance, numAttackedAndDamage, 0, targets, speed, direction,
+                display);
        return p;
    }

-    public static Packet rangedAttack(Character chr, int skill, int skilllevel, int stance, int numAttackedAndDamage, int projectile, Map<Integer, List<Integer>> damage, int speed, int direction, int display) {
+    public static Packet rangedAttack(Character chr, int skill, int skilllevel, int stance, int numAttackedAndDamage,
+                                      int projectile, Map<Integer, AttackTarget> targets, int speed, int direction,
+                                      int display) {
        final OutPacket p = OutPacket.create(SendOpcode.RANGED_ATTACK);
-        addAttackBody(p, chr, skill, skilllevel, stance, numAttackedAndDamage, projectile, damage, speed, direction, display);
+        addAttackBody(p, chr, skill, skilllevel, stance, numAttackedAndDamage, projectile, targets, speed, direction,
+                display);
        p.writeInt(0);
        return p;
    }

-    public static Packet magicAttack(Character chr, int skill, int skilllevel, int stance, int numAttackedAndDamage, Map<Integer, List<Integer>> damage, int charge, int speed, int direction, int display) {
+    public static Packet magicAttack(Character chr, int skill, int skilllevel, int stance, int numAttackedAndDamage,
+                                     Map<Integer, AttackTarget> targets, int charge, int speed, int direction,
+                                     int display) {
        final OutPacket p = OutPacket.create(SendOpcode.MAGIC_ATTACK);
-        addAttackBody(p, chr, skill, skilllevel, stance, numAttackedAndDamage, 0, damage, speed, direction, display);
+        addAttackBody(p, chr, skill, skilllevel, stance, numAttackedAndDamage, 0, targets, speed, direction,
+                display);
        if (charge != -1) {
            p.writeInt(charge);
        }
        return p;
    }

-    private static void addAttackBody(OutPacket p, Character chr, int skill, int skilllevel, int stance, int numAttackedAndDamage, int projectile, Map<Integer, List<Integer>> damage, int speed, int direction, int display) {
+    private static void addAttackBody(OutPacket p, Character chr, int skill, int skilllevel, int stance,
+                                      int numAttackedAndDamage, int projectile, Map<Integer, AttackTarget> targets,
+                                      int speed, int direction, int display) {
        p.writeInt(chr.getId());
        p.writeByte(numAttackedAndDamage);
        p.writeByte(0x5B);//?
@@ -2331,16 +2386,16 @@ public class PacketCreator {
        p.writeByte(speed);
        p.writeByte(0x0A);
        p.writeInt(projectile);
-        for (Integer oned : damage.keySet()) {
-            List<Integer> onedList = damage.get(oned);
-            if (onedList != null) {
-                p.writeInt(oned);
+        for (Map.Entry<Integer, AttackTarget> target : targets.entrySet()) {
+            AttackTarget value = target.getValue();
+            if (value != null) {
+                p.writeInt(target.getKey());
                p.writeByte(0x0);
-                if (skill == 4211006) {
-                    p.writeByte(onedList.size());
+                if (skill == ChiefBandit.MESO_EXPLOSION) {
+                    p.writeByte(value.damageLines().size());
                }
-                for (Integer eachd : onedList) {
-                    p.writeInt(eachd);
+                for (Integer damageLine : value.damageLines()) {
+                    p.writeInt(damageLine);
                }
            }
        }
@@ -2551,6 +2606,14 @@ public class PacketCreator {
        return p;
    }

+    public static Packet removeExplodedMesoFromMap(int mapObjectId, short delay) {
+        OutPacket p = OutPacket.create(SendOpcode.REMOVE_ITEM_FROM_MAP);
+        p.writeByte(4);
+        p.writeInt(mapObjectId);
+        p.writeShort(delay);
+        return p;
+    }
+
    public static Packet updateCharLook(Client target, Character chr) {
        OutPacket p = OutPacket.create(SendOpcode.UPDATE_CHAR_LOOK);
        p.writeInt(chr.getId());
@@ -5538,8 +5601,8 @@ public class PacketCreator {

    public static Packet showMTSCash(Character chr) {
        final OutPacket p = OutPacket.create(SendOpcode.MTS_OPERATION2);
-        p.writeInt(chr.getCashShop().getCash(4));
-        p.writeInt(chr.getCashShop().getCash(2));
+        p.writeInt(chr.getCashShop().getCash(CashShop.NX_PREPAID));
+        p.writeInt(chr.getCashShop().getCash(CashShop.MAPLE_POINT));
        return p;
    }

@@ -5647,9 +5710,9 @@ public class PacketCreator {

    public static Packet showCash(Character mc) {
        final OutPacket p = OutPacket.create(SendOpcode.QUERY_CASH_RESULT);
-        p.writeInt(mc.getCashShop().getCash(1));
-        p.writeInt(mc.getCashShop().getCash(2));
-        p.writeInt(mc.getCashShop().getCash(4));
+        p.writeInt(mc.getCashShop().getCash(CashShop.NX_CREDIT));
+        p.writeInt(mc.getCashShop().getCash(CashShop.MAPLE_POINT));
+        p.writeInt(mc.getCashShop().getCash(CashShop.NX_PREPAID));
        return p;
    }

@@ -6154,23 +6217,6 @@ public class PacketCreator {
        return showSpecialEffect(15);
    }

-    public static Packet showBuybackEffect() {
-        final OutPacket p = OutPacket.create(SendOpcode.SHOW_ITEM_GAIN_INCHAT);
-        p.writeByte(11);
-        p.writeInt(0);
-
-        return p;
-    }
-
-    public static Packet showForeignBuybackEffect(int cid) {
-        final OutPacket p = OutPacket.create(SendOpcode.SHOW_FOREIGN_EFFECT);
-        p.writeInt(cid);
-        p.writeByte(11);
-        p.writeInt(0);
-
-        return p;
-    }
-
    /**
     * 0 = Levelup 6 = Exp did not drop (Safety Charms) 7 = Enter portal sound
     * 8 = Job change 9 = Quest complete 10 = Recovery 11 = Buff effect
@@ -6470,14 +6516,15 @@ public class PacketCreator {
        return p;
    }

-    public static Packet onCashGachaponOpenSuccess(int accountid, long sn, int remainingBoxes, Item item, int itemid, int nSelectedItemCount, boolean bJackpot) {
+    public static Packet onCashGachaponOpenSuccess(int accountid, long boxCashId, int remainingBoxes, Item reward,
+                                                   int rewardItemId, int rewardQuantity, boolean bJackpot) {
        OutPacket p = OutPacket.create(SendOpcode.CASHSHOP_CASH_ITEM_GACHAPON_RESULT);
        p.writeByte(0xE5);   // subopcode thanks to Ubaware
-        p.writeLong(sn);// sn of the box used
+        p.writeLong(boxCashId);
        p.writeInt(remainingBoxes);
-        addCashItemInformation(p, item, accountid);
-        p.writeInt(itemid);// the itemid of the liSN?
-        p.writeByte(nSelectedItemCount);// the total count now? o.O
+        addCashItemInformation(p, reward, accountid);
+        p.writeInt(rewardItemId);
+        p.writeByte(rewardQuantity); // nSelectedItemCount
        p.writeBool(bJackpot);// "CashGachaponJackpot"
        return p;
    }
--- a/src/main/java/tools/exceptions/NotEnabledException.java
+++ b/src/main/java/tools/exceptions/NotEnabledException.java
@@ -1,12 +0,0 @@
-package tools.exceptions;
-
-public class NotEnabledException extends RuntimeException {
-
-    public NotEnabledException() {
-        super("Feature not enabled, please enable the feature in ServerConstant");
-    }
-
-    public NotEnabledException(String message) {
-        super(message);
-    }
-}
--- 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;
--- 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
--- 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
--- 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
--- 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;
--- 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;
--- 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;
--- 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
--- 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;
--- 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;

--- 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;

--- 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;
--- 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;
--- 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;
--- 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;
--- 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.LifeFactory.BanishInfo;
+import server.life.BanishInfo;
+import server.life.Element;
+import server.life.ElementalEffectiveness;
 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);
@@ -120,7 +134,10 @@ public class MonsterStatFetcher {
                }
                Data banishData = monsterInfoData.getChildByPath("ban");
                if (banishData != null) {
-                    stats.setBanishInfo(new BanishInfo(DataTool.getString("banMsg", banishData), DataTool.getInt("banMap/0/field", banishData, -1), DataTool.getString("banMap/0/portal", banishData, "sp")));
+                    int map = DataTool.getInt("banMap/0/field", banishData, -1);
+                    String portal = DataTool.getString("banMap/0/portal", banishData, "sp");
+                    String msg = DataTool.getString("banMsg", banishData);
+                    stats.setBanishInfo(new BanishInfo(map, portal, msg));
                }

                monsterStats.put(mid, stats);
--- 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();
        }
    }
-}
+}
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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();
    }
-}
+}
--- 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;
--- 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;
--- 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