From 408fa907285970224116b1a0332f272d47862ab3 Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Wed, 20 Jul 2022 02:29:51 -0700
Subject: [PATCH] Move config java files to their own package
---
src/main/java/emu/grasscutter/Grasscutter.java | 6 +++---
.../java/emu/grasscutter/auth/DefaultAuthentication.java | 2 +-
.../java/emu/grasscutter/auth/DefaultAuthenticators.java | 2 +-
.../emu/grasscutter/command/commands/AccountCommand.java | 2 +-
.../emu/grasscutter/command/commands/SpawnCommand.java | 2 +-
.../java/emu/grasscutter/command/commands/TeamCommand.java | 5 +++--
.../emu/grasscutter/{utils => config}/ConfigContainer.java | 2 +-
.../java/emu/grasscutter/{ => config}/Configuration.java | 6 ++----
src/main/java/emu/grasscutter/data/DataLoader.java | 4 ++--
src/main/java/emu/grasscutter/data/ResourceLoader.java | 2 +-
.../java/emu/grasscutter/database/DatabaseManager.java | 4 ++--
src/main/java/emu/grasscutter/game/Account.java | 4 ++--
src/main/java/emu/grasscutter/game/avatar/Avatar.java | 4 ++--
.../emu/grasscutter/game/expedition/ExpeditionSystem.java | 4 ++--
src/main/java/emu/grasscutter/game/gacha/GachaBanner.java | 4 ++--
src/main/java/emu/grasscutter/game/gacha/GachaSystem.java | 4 ++--
.../java/emu/grasscutter/game/inventory/Inventory.java | 4 ++--
.../java/emu/grasscutter/game/managers/ResinManager.java | 4 ++--
.../emu/grasscutter/game/managers/chat/ChatManager.java | 5 +++--
.../grasscutter/game/managers/energy/EnergyManager.java | 4 ++--
.../grasscutter/game/managers/stamina/StaminaManager.java | 4 ++--
src/main/java/emu/grasscutter/game/player/Player.java | 4 ++--
src/main/java/emu/grasscutter/game/player/TeamInfo.java | 4 ++--
src/main/java/emu/grasscutter/game/player/TeamManager.java | 4 ++--
src/main/java/emu/grasscutter/game/shop/ShopSystem.java | 4 ++--
src/main/java/emu/grasscutter/game/tower/TowerSystem.java | 4 ++--
src/main/java/emu/grasscutter/plugin/Plugin.java | 4 ++--
src/main/java/emu/grasscutter/plugin/PluginManager.java | 5 +++--
src/main/java/emu/grasscutter/scripts/data/SceneBlock.java | 5 +++--
src/main/java/emu/grasscutter/scripts/data/SceneGroup.java | 5 +++--
src/main/java/emu/grasscutter/scripts/data/SceneMeta.java | 5 +++--
src/main/java/emu/grasscutter/server/game/GameServer.java | 2 +-
.../grasscutter/server/game/GameServerPacketHandler.java | 4 ++--
src/main/java/emu/grasscutter/server/game/GameSession.java | 2 +-
src/main/java/emu/grasscutter/server/http/HttpServer.java | 2 +-
.../grasscutter/server/http/dispatch/RegionHandler.java | 3 +--
.../http/documentation/GachaMappingRequestHandler.java | 7 ++++---
.../server/http/documentation/HandbookRequestHandler.java | 2 +-
.../server/http/documentation/RootRequestHandler.java | 2 +-
.../server/http/handlers/AnnouncementsHandler.java | 4 ++--
.../emu/grasscutter/server/http/handlers/GachaHandler.java | 2 +-
.../grasscutter/server/http/handlers/GenericHandler.java | 4 ++--
.../grasscutter/server/http/objects/HttpJsonResponse.java | 2 +-
.../server/http/objects/WebStaticVersionResponse.java | 4 ++--
.../server/packet/recv/HandlerGetPlayerTokenReq.java | 6 +++---
.../server/packet/recv/HandlerPlayerLoginReq.java | 4 ++--
.../server/packet/recv/HandlerSetPlayerBornDataReq.java | 4 ++--
.../server/packet/recv/HandlerUnionCmdNotify.java | 4 ++--
.../server/packet/send/PacketGetPlayerFriendListRsp.java | 4 ++--
.../server/packet/send/PacketPlayerLoginRsp.java | 4 ++--
.../server/packet/send/PacketPlayerStoreNotify.java | 4 ++--
.../server/packet/send/PacketPullRecentChatRsp.java | 2 +-
.../server/packet/send/PacketStoreWeightLimitNotify.java | 4 ++--
src/main/java/emu/grasscutter/tools/Tools.java | 2 +-
src/main/java/emu/grasscutter/utils/Language.java | 5 +++--
src/main/java/emu/grasscutter/utils/Utils.java | 1 +
56 files changed, 106 insertions(+), 100 deletions(-)
rename src/main/java/emu/grasscutter/{utils => config}/ConfigContainer.java (99%)
rename src/main/java/emu/grasscutter/{ => config}/Configuration.java (96%)
diff --git a/src/main/java/emu/grasscutter/Grasscutter.java b/src/main/java/emu/grasscutter/Grasscutter.java
index 881a1d2a..34bf4a58 100644
--- a/src/main/java/emu/grasscutter/Grasscutter.java
+++ b/src/main/java/emu/grasscutter/Grasscutter.java
@@ -11,6 +11,7 @@ import emu.grasscutter.auth.DefaultAuthentication;
import emu.grasscutter.command.CommandMap;
import emu.grasscutter.command.DefaultPermissionHandler;
import emu.grasscutter.command.PermissionHandler;
+import emu.grasscutter.config.ConfigContainer;
import emu.grasscutter.data.ResourceLoader;
import emu.grasscutter.database.DatabaseManager;
import emu.grasscutter.plugin.PluginManager;
@@ -26,7 +27,6 @@ import emu.grasscutter.server.http.handlers.GachaHandler;
import emu.grasscutter.server.http.handlers.GenericHandler;
import emu.grasscutter.server.http.handlers.LogHandler;
import emu.grasscutter.tools.Tools;
-import emu.grasscutter.utils.ConfigContainer;
import emu.grasscutter.utils.Crypto;
import emu.grasscutter.utils.Language;
import emu.grasscutter.utils.Utils;
@@ -43,8 +43,8 @@ import javax.annotation.Nullable;
import java.io.*;
import java.util.Calendar;
-import static emu.grasscutter.Configuration.DATA;
-import static emu.grasscutter.Configuration.SERVER;
+import static emu.grasscutter.config.Configuration.DATA;
+import static emu.grasscutter.config.Configuration.SERVER;
import static emu.grasscutter.utils.Language.translate;
public final class Grasscutter {
diff --git a/src/main/java/emu/grasscutter/auth/DefaultAuthentication.java b/src/main/java/emu/grasscutter/auth/DefaultAuthentication.java
index 51f0684b..62d512eb 100644
--- a/src/main/java/emu/grasscutter/auth/DefaultAuthentication.java
+++ b/src/main/java/emu/grasscutter/auth/DefaultAuthentication.java
@@ -6,7 +6,7 @@ import emu.grasscutter.game.Account;
import emu.grasscutter.server.http.objects.ComboTokenResJson;
import emu.grasscutter.server.http.objects.LoginResultJson;
-import static emu.grasscutter.Configuration.ACCOUNT;
+import static emu.grasscutter.config.Configuration.ACCOUNT;
import static emu.grasscutter.utils.Language.translate;
/**
diff --git a/src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java b/src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java
index 81b46304..6ac5f9fb 100644
--- a/src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java
+++ b/src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java
@@ -15,7 +15,7 @@ import java.security.KeyFactory;
import java.security.interfaces.RSAPrivateKey;
import java.security.spec.PKCS8EncodedKeySpec;
-import static emu.grasscutter.Configuration.*;
+import static emu.grasscutter.config.Configuration.*;
import static emu.grasscutter.utils.Language.translate;
/**
diff --git a/src/main/java/emu/grasscutter/command/commands/AccountCommand.java b/src/main/java/emu/grasscutter/command/commands/AccountCommand.java
index 4f96b986..3d622a50 100644
--- a/src/main/java/emu/grasscutter/command/commands/AccountCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/AccountCommand.java
@@ -1,10 +1,10 @@
package emu.grasscutter.command.commands;
import at.favre.lib.crypto.bcrypt.BCrypt;
-import emu.grasscutter.Configuration;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.config.Configuration;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.Account;
import emu.grasscutter.game.player.Player;
diff --git a/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java b/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java
index 3a962cf2..1306991e 100644
--- a/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java
@@ -20,7 +20,7 @@ import javax.swing.text.html.parser.Entity;
import java.util.List;
import java.util.Random;
-import static emu.grasscutter.Configuration.*;
+import static emu.grasscutter.config.Configuration.*;
import static emu.grasscutter.utils.Language.translate;
@Command(label = "spawn", usage = "spawn <entityId> [amount] [level(monster only)] [<x> <y> <z>(monster only, optional)]", aliases = {"drop"}, permission = "server.spawn", permissionTargeted = "server.spawn.others", description = "commands.spawn.description")
diff --git a/src/main/java/emu/grasscutter/command/commands/TeamCommand.java b/src/main/java/emu/grasscutter/command/commands/TeamCommand.java
index c425059f..afcaa4a7 100644
--- a/src/main/java/emu/grasscutter/command/commands/TeamCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/TeamCommand.java
@@ -6,11 +6,12 @@ import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.packet.send.PacketChangeMpTeamAvatarRsp;
import java.util.List;
+
+import static emu.grasscutter.config.Configuration.*;
+
import java.util.ArrayList;
import java.util.HashSet;
-import static emu.grasscutter.Configuration.*;
-
@Command(label = "team", usage = "team <add|remove|set> [avatarId,...] [index|first|last|index-index,...]",
permission = "player.team", permissionTargeted = "player.team.others", description = "commands.team.description")
public final class TeamCommand implements CommandHandler {
diff --git a/src/main/java/emu/grasscutter/utils/ConfigContainer.java b/src/main/java/emu/grasscutter/config/ConfigContainer.java
similarity index 99%
rename from src/main/java/emu/grasscutter/utils/ConfigContainer.java
rename to src/main/java/emu/grasscutter/config/ConfigContainer.java
index dd700248..5049e3b2 100644
--- a/src/main/java/emu/grasscutter/utils/ConfigContainer.java
+++ b/src/main/java/emu/grasscutter/config/ConfigContainer.java
@@ -1,4 +1,4 @@
-package emu.grasscutter.utils;
+package emu.grasscutter.config;
import com.google.gson.JsonObject;
import emu.grasscutter.Grasscutter;
diff --git a/src/main/java/emu/grasscutter/Configuration.java b/src/main/java/emu/grasscutter/config/Configuration.java
similarity index 96%
rename from src/main/java/emu/grasscutter/Configuration.java
rename to src/main/java/emu/grasscutter/config/Configuration.java
index 486c5d33..82c7b3f7 100644
--- a/src/main/java/emu/grasscutter/Configuration.java
+++ b/src/main/java/emu/grasscutter/config/Configuration.java
@@ -1,9 +1,7 @@
-package emu.grasscutter;
-
-import emu.grasscutter.utils.ConfigContainer;
-import emu.grasscutter.utils.ConfigContainer.*;
+package emu.grasscutter.config;
import java.util.Locale;
+
import java.nio.file.Paths;
import static emu.grasscutter.Grasscutter.config;
diff --git a/src/main/java/emu/grasscutter/data/DataLoader.java b/src/main/java/emu/grasscutter/data/DataLoader.java
index 5dee449e..a006448f 100644
--- a/src/main/java/emu/grasscutter/data/DataLoader.java
+++ b/src/main/java/emu/grasscutter/data/DataLoader.java
@@ -6,6 +6,8 @@ import emu.grasscutter.tools.Tools;
import emu.grasscutter.utils.FileUtils;
import emu.grasscutter.utils.Utils;
+import static emu.grasscutter.config.Configuration.DATA;
+
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -14,8 +16,6 @@ import java.io.InputStreamReader;
import java.nio.file.Path;
import java.util.List;
-import static emu.grasscutter.Configuration.DATA;
-
public class DataLoader {
/**
diff --git a/src/main/java/emu/grasscutter/data/ResourceLoader.java b/src/main/java/emu/grasscutter/data/ResourceLoader.java
index 763fb728..70b00656 100644
--- a/src/main/java/emu/grasscutter/data/ResourceLoader.java
+++ b/src/main/java/emu/grasscutter/data/ResourceLoader.java
@@ -29,7 +29,7 @@ import emu.grasscutter.data.common.ScenePointConfig;
import emu.grasscutter.game.world.SpawnDataEntry.*;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import static emu.grasscutter.Configuration.*;
+import static emu.grasscutter.config.Configuration.*;
import static emu.grasscutter.utils.Language.translate;
public class ResourceLoader {
diff --git a/src/main/java/emu/grasscutter/database/DatabaseManager.java b/src/main/java/emu/grasscutter/database/DatabaseManager.java
index d0c32286..15d78eb5 100644
--- a/src/main/java/emu/grasscutter/database/DatabaseManager.java
+++ b/src/main/java/emu/grasscutter/database/DatabaseManager.java
@@ -1,5 +1,7 @@
package emu.grasscutter.database;
+import static emu.grasscutter.config.Configuration.*;
+
import com.mongodb.MongoCommandException;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
@@ -26,8 +28,6 @@ import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.quest.GameMainQuest;
import emu.grasscutter.game.quest.GameQuest;
-import static emu.grasscutter.Configuration.*;
-
public final class DatabaseManager {
private static Datastore gameDatastore;
private static Datastore dispatchDatastore;
diff --git a/src/main/java/emu/grasscutter/game/Account.java b/src/main/java/emu/grasscutter/game/Account.java
index 8685a16e..43f4efe5 100644
--- a/src/main/java/emu/grasscutter/game/Account.java
+++ b/src/main/java/emu/grasscutter/game/Account.java
@@ -5,13 +5,13 @@ import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.utils.Crypto;
import emu.grasscutter.utils.Utils;
+import static emu.grasscutter.config.Configuration.*;
+
import java.util.*;
import java.util.stream.Stream;
import org.bson.Document;
-import static emu.grasscutter.Configuration.*;
-
@Entity(value = "accounts", useDiscriminator = false)
public class Account {
@Id private String id;
diff --git a/src/main/java/emu/grasscutter/game/avatar/Avatar.java b/src/main/java/emu/grasscutter/game/avatar/Avatar.java
index 92dd421b..3ab2e1dc 100644
--- a/src/main/java/emu/grasscutter/game/avatar/Avatar.java
+++ b/src/main/java/emu/grasscutter/game/avatar/Avatar.java
@@ -1,5 +1,7 @@
package emu.grasscutter.game.avatar;
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -62,8 +64,6 @@ import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import static emu.grasscutter.Configuration.GAME_OPTIONS;
-
@Entity(value = "avatars", useDiscriminator = false)
public class Avatar {
@Id private ObjectId id;
diff --git a/src/main/java/emu/grasscutter/game/expedition/ExpeditionSystem.java b/src/main/java/emu/grasscutter/game/expedition/ExpeditionSystem.java
index 01c18cca..0faca23b 100644
--- a/src/main/java/emu/grasscutter/game/expedition/ExpeditionSystem.java
+++ b/src/main/java/emu/grasscutter/game/expedition/ExpeditionSystem.java
@@ -8,14 +8,14 @@ import emu.grasscutter.server.game.GameServer;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import static emu.grasscutter.config.Configuration.*;
+
import java.io.FileReader;
import java.io.InputStreamReader;
import java.io.Reader;
import java.util.Collection;
import java.util.List;
-import static emu.grasscutter.Configuration.*;
-
public class ExpeditionSystem extends BaseGameSystem {
private final Int2ObjectMap<List<ExpeditionRewardDataList>> expeditionRewardData;
diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java b/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
index dd68ad4a..4b8bd95c 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
@@ -1,5 +1,7 @@
package emu.grasscutter.game.gacha;
+import static emu.grasscutter.config.Configuration.*;
+
import emu.grasscutter.data.common.ItemParamData;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo;
@@ -7,8 +9,6 @@ import emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo;
import emu.grasscutter.utils.Utils;
import lombok.Getter;
-import static emu.grasscutter.Configuration.*;
-
public class GachaBanner {
@Getter private int gachaType;
@Getter private int scheduleId;
diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaSystem.java b/src/main/java/emu/grasscutter/game/gacha/GachaSystem.java
index ac513a1e..c1c59158 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaSystem.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaSystem.java
@@ -1,5 +1,7 @@
package emu.grasscutter.game.gacha;
+import static emu.grasscutter.config.Configuration.*;
+
import java.io.File;
import java.io.FileReader;
import java.io.InputStreamReader;
@@ -45,8 +47,6 @@ import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
import org.greenrobot.eventbus.Subscribe;
-import static emu.grasscutter.Configuration.*;
-
public class GachaSystem extends BaseGameSystem {
private final Int2ObjectMap<GachaBanner> gachaBanners;
private WatchService watchService;
diff --git a/src/main/java/emu/grasscutter/game/inventory/Inventory.java b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
index bdda8ac9..b2ee9aeb 100644
--- a/src/main/java/emu/grasscutter/game/inventory/Inventory.java
+++ b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
@@ -1,5 +1,7 @@
package emu.grasscutter.game.inventory;
+import static emu.grasscutter.config.Configuration.*;
+
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
@@ -30,8 +32,6 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
-import static emu.grasscutter.Configuration.*;
-
public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
private final Long2ObjectMap<GameItem> store;
private final Int2ObjectMap<InventoryTab> inventoryTypes;
diff --git a/src/main/java/emu/grasscutter/game/managers/ResinManager.java b/src/main/java/emu/grasscutter/game/managers/ResinManager.java
index 2fefe88e..78f4b09f 100644
--- a/src/main/java/emu/grasscutter/game/managers/ResinManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/ResinManager.java
@@ -1,5 +1,7 @@
package emu.grasscutter.game.managers;
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+
import emu.grasscutter.game.player.BasePlayerManager;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.PlayerProperty;
@@ -8,8 +10,6 @@ import emu.grasscutter.server.packet.send.PacketPlayerPropNotify;
import emu.grasscutter.server.packet.send.PacketResinChangeNotify;
import emu.grasscutter.utils.Utils;
-import static emu.grasscutter.Configuration.GAME_OPTIONS;
-
public class ResinManager extends BasePlayerManager {
public ResinManager(Player player) {
diff --git a/src/main/java/emu/grasscutter/game/managers/chat/ChatManager.java b/src/main/java/emu/grasscutter/game/managers/chat/ChatManager.java
index d9d243dc..66acd2e9 100644
--- a/src/main/java/emu/grasscutter/game/managers/chat/ChatManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/chat/ChatManager.java
@@ -12,13 +12,14 @@ import emu.grasscutter.server.packet.send.PacketPullRecentChatRsp;
import emu.grasscutter.utils.Utils;
import java.util.regex.Pattern;
+
+import static emu.grasscutter.config.Configuration.*;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static emu.grasscutter.Configuration.*;
-
public class ChatManager implements ChatManagerHandler {
static final String PREFIXES = "[/!]";
static final Pattern RE_PREFIXES = Pattern.compile(PREFIXES);
diff --git a/src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java b/src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java
index c509d85d..710ec31a 100644
--- a/src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java
@@ -32,8 +32,6 @@ import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import static emu.grasscutter.Configuration.GAME_OPTIONS;
-
import java.io.InputStreamReader;
import java.io.Reader;
import java.util.Collection;
@@ -42,6 +40,8 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ThreadLocalRandom;
+
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
import static java.util.Map.entry;
import com.google.gson.reflect.TypeToken;
diff --git a/src/main/java/emu/grasscutter/game/managers/stamina/StaminaManager.java b/src/main/java/emu/grasscutter/game/managers/stamina/StaminaManager.java
index e72d737e..b45fdac1 100644
--- a/src/main/java/emu/grasscutter/game/managers/stamina/StaminaManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/stamina/StaminaManager.java
@@ -22,9 +22,9 @@ import emu.grasscutter.server.packet.send.*;
import emu.grasscutter.utils.Position;
import org.jetbrains.annotations.NotNull;
-import java.util.*;
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
-import static emu.grasscutter.Configuration.GAME_OPTIONS;
+import java.util.*;
public class StaminaManager extends BasePlayerManager {
diff --git a/src/main/java/emu/grasscutter/game/player/Player.java b/src/main/java/emu/grasscutter/game/player/Player.java
index c718b046..4172368e 100644
--- a/src/main/java/emu/grasscutter/game/player/Player.java
+++ b/src/main/java/emu/grasscutter/game/player/Player.java
@@ -76,6 +76,8 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import lombok.Getter;
+import static emu.grasscutter.config.Configuration.*;
+
import java.time.DayOfWeek;
import java.time.Instant;
import java.time.LocalDate;
@@ -83,8 +85,6 @@ import java.time.ZoneId;
import java.util.*;
import java.util.concurrent.LinkedBlockingQueue;
-import static emu.grasscutter.Configuration.*;
-
@Entity(value = "players", useDiscriminator = false)
public class Player {
@Id private int id;
diff --git a/src/main/java/emu/grasscutter/game/player/TeamInfo.java b/src/main/java/emu/grasscutter/game/player/TeamInfo.java
index 89383e48..b1f26533 100644
--- a/src/main/java/emu/grasscutter/game/player/TeamInfo.java
+++ b/src/main/java/emu/grasscutter/game/player/TeamInfo.java
@@ -1,13 +1,13 @@
package emu.grasscutter.game.player;
+import static emu.grasscutter.config.Configuration.*;
+
import java.util.ArrayList;
import java.util.List;
import dev.morphia.annotations.Entity;
import emu.grasscutter.game.avatar.Avatar;
-import static emu.grasscutter.Configuration.*;
-
@Entity
public class TeamInfo {
private String name;
diff --git a/src/main/java/emu/grasscutter/game/player/TeamManager.java b/src/main/java/emu/grasscutter/game/player/TeamManager.java
index 7fe31ab5..5281f85f 100644
--- a/src/main/java/emu/grasscutter/game/player/TeamManager.java
+++ b/src/main/java/emu/grasscutter/game/player/TeamManager.java
@@ -1,5 +1,7 @@
package emu.grasscutter.game.player;
+import static emu.grasscutter.config.Configuration.*;
+
import java.util.*;
import dev.morphia.annotations.Entity;
@@ -38,8 +40,6 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet;
-import static emu.grasscutter.Configuration.*;
-
@Entity
public class TeamManager extends BasePlayerDataManager {
@Transient private Player player;
diff --git a/src/main/java/emu/grasscutter/game/shop/ShopSystem.java b/src/main/java/emu/grasscutter/game/shop/ShopSystem.java
index 2169a06e..8ad4fa65 100644
--- a/src/main/java/emu/grasscutter/game/shop/ShopSystem.java
+++ b/src/main/java/emu/grasscutter/game/shop/ShopSystem.java
@@ -12,6 +12,8 @@ import emu.grasscutter.utils.Utils;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import static emu.grasscutter.config.Configuration.*;
+
import java.io.FileReader;
import java.io.InputStreamReader;
import java.io.Reader;
@@ -20,8 +22,6 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import static emu.grasscutter.Configuration.*;
-
public class ShopSystem extends BaseGameSystem {
private final Int2ObjectMap<List<ShopInfo>> shopData;
private final List<ShopChestTable> shopChestData;
diff --git a/src/main/java/emu/grasscutter/game/tower/TowerSystem.java b/src/main/java/emu/grasscutter/game/tower/TowerSystem.java
index 2b9b9e5a..2923dfd0 100644
--- a/src/main/java/emu/grasscutter/game/tower/TowerSystem.java
+++ b/src/main/java/emu/grasscutter/game/tower/TowerSystem.java
@@ -7,14 +7,14 @@ import emu.grasscutter.data.excels.TowerScheduleData;
import emu.grasscutter.server.game.BaseGameSystem;
import emu.grasscutter.server.game.GameServer;
+import static emu.grasscutter.config.Configuration.*;
+
import java.io.FileReader;
import java.io.InputStreamReader;
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
-import static emu.grasscutter.Configuration.*;
-
public class TowerSystem extends BaseGameSystem {
public TowerSystem(GameServer server) {
diff --git a/src/main/java/emu/grasscutter/plugin/Plugin.java b/src/main/java/emu/grasscutter/plugin/Plugin.java
index f322adc9..d14ad5c5 100644
--- a/src/main/java/emu/grasscutter/plugin/Plugin.java
+++ b/src/main/java/emu/grasscutter/plugin/Plugin.java
@@ -6,12 +6,12 @@ import emu.grasscutter.server.game.GameServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static emu.grasscutter.config.Configuration.*;
+
import java.io.File;
import java.io.InputStream;
import java.net.URLClassLoader;
-import static emu.grasscutter.Configuration.*;
-
/**
* The base class for all plugins to extend.
*/
diff --git a/src/main/java/emu/grasscutter/plugin/PluginManager.java b/src/main/java/emu/grasscutter/plugin/PluginManager.java
index 4c7b0ac6..6de30da3 100644
--- a/src/main/java/emu/grasscutter/plugin/PluginManager.java
+++ b/src/main/java/emu/grasscutter/plugin/PluginManager.java
@@ -6,14 +6,15 @@ import emu.grasscutter.utils.Utils;
import lombok.*;
import javax.annotation.Nullable;
+
+import static emu.grasscutter.config.Configuration.PLUGIN;
+
import java.io.*;
import java.lang.reflect.Method;
import java.net.*;
import java.util.*;
import java.util.jar.*;
-import static emu.grasscutter.Configuration.PLUGIN;
-
/**
* Manages the server's plugins and the event system.
*/
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneBlock.java b/src/main/java/emu/grasscutter/scripts/data/SceneBlock.java
index 5ec0a15d..48903f68 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneBlock.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneBlock.java
@@ -13,11 +13,12 @@ import lombok.ToString;
import javax.script.Bindings;
import javax.script.CompiledScript;
import javax.script.ScriptException;
+
+import static emu.grasscutter.config.Configuration.SCRIPT;
+
import java.util.Map;
import java.util.stream.Collectors;
-import static emu.grasscutter.Configuration.SCRIPT;
-
@ToString
@Setter
public class SceneBlock {
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java b/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java
index 417da474..507f80c3 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java
@@ -10,13 +10,14 @@ import org.luaj.vm2.LuaValue;
import javax.script.Bindings;
import javax.script.CompiledScript;
import javax.script.ScriptException;
+
+import static emu.grasscutter.config.Configuration.SCRIPT;
+
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
-import static emu.grasscutter.Configuration.SCRIPT;
-
@ToString
@Setter
public class SceneGroup {
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneMeta.java b/src/main/java/emu/grasscutter/scripts/data/SceneMeta.java
index 9d6cf1f1..efb6744f 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneMeta.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneMeta.java
@@ -11,12 +11,13 @@ import lombok.ToString;
import javax.script.Bindings;
import javax.script.CompiledScript;
import javax.script.ScriptException;
+
+import static emu.grasscutter.config.Configuration.SCRIPT;
+
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import static emu.grasscutter.Configuration.SCRIPT;
-
@ToString
@Setter
public class SceneMeta {
diff --git a/src/main/java/emu/grasscutter/server/game/GameServer.java b/src/main/java/emu/grasscutter/server/game/GameServer.java
index 5b53e31d..84c4c260 100644
--- a/src/main/java/emu/grasscutter/server/game/GameServer.java
+++ b/src/main/java/emu/grasscutter/server/game/GameServer.java
@@ -44,8 +44,8 @@ import java.time.OffsetDateTime;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
+import static emu.grasscutter.config.Configuration.*;
import static emu.grasscutter.utils.Language.translate;
-import static emu.grasscutter.Configuration.*;
@Getter
public final class GameServer extends KcpServer {
diff --git a/src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java b/src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java
index f0d2aaa4..e9c2be31 100644
--- a/src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java
+++ b/src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java
@@ -1,5 +1,7 @@
package emu.grasscutter.server.game;
+import static emu.grasscutter.config.Configuration.*;
+
import java.util.Set;
import emu.grasscutter.server.event.game.ReceivePacketEvent;
@@ -14,8 +16,6 @@ import emu.grasscutter.server.game.GameSession.SessionState;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import static emu.grasscutter.Configuration.*;
-
@SuppressWarnings("unchecked")
public class GameServerPacketHandler {
private final Int2ObjectMap<PacketHandler> handlers;
diff --git a/src/main/java/emu/grasscutter/server/game/GameSession.java b/src/main/java/emu/grasscutter/server/game/GameSession.java
index e2d72694..005fcc4a 100644
--- a/src/main/java/emu/grasscutter/server/game/GameSession.java
+++ b/src/main/java/emu/grasscutter/server/game/GameSession.java
@@ -17,8 +17,8 @@ import emu.grasscutter.utils.Utils;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
+import static emu.grasscutter.config.Configuration.*;
import static emu.grasscutter.utils.Language.translate;
-import static emu.grasscutter.Configuration.*;
public class GameSession implements GameSessionManager.KcpChannel {
private final GameServer server;
diff --git a/src/main/java/emu/grasscutter/server/http/HttpServer.java b/src/main/java/emu/grasscutter/server/http/HttpServer.java
index 34d2059a..d35e7de2 100644
--- a/src/main/java/emu/grasscutter/server/http/HttpServer.java
+++ b/src/main/java/emu/grasscutter/server/http/HttpServer.java
@@ -13,7 +13,7 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
import java.io.File;
import java.io.UnsupportedEncodingException;
-import static emu.grasscutter.Configuration.*;
+import static emu.grasscutter.config.Configuration.*;
import static emu.grasscutter.utils.Language.translate;
/**
diff --git a/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java b/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
index 336bda58..e9af92cb 100644
--- a/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
@@ -29,8 +29,7 @@ import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.security.Signature;
-
-import static emu.grasscutter.Configuration.*;
+import static emu.grasscutter.config.Configuration.*;
import static emu.grasscutter.net.proto.QueryRegionListHttpRspOuterClass.QueryRegionListHttpRsp;
/**
diff --git a/src/main/java/emu/grasscutter/server/http/documentation/GachaMappingRequestHandler.java b/src/main/java/emu/grasscutter/server/http/documentation/GachaMappingRequestHandler.java
index 4810978a..8457b7e0 100644
--- a/src/main/java/emu/grasscutter/server/http/documentation/GachaMappingRequestHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/documentation/GachaMappingRequestHandler.java
@@ -1,16 +1,17 @@
package emu.grasscutter.server.http.documentation;
-import static emu.grasscutter.Configuration.RESOURCE;
-
import com.google.gson.reflect.TypeToken;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.excels.AvatarData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.utils.Utils;
-import static emu.grasscutter.Configuration.DOCUMENT_LANGUAGE;
import express.http.Request;
import express.http.Response;
+
+import static emu.grasscutter.config.Configuration.DOCUMENT_LANGUAGE;
+import static emu.grasscutter.config.Configuration.RESOURCE;
+
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
diff --git a/src/main/java/emu/grasscutter/server/http/documentation/HandbookRequestHandler.java b/src/main/java/emu/grasscutter/server/http/documentation/HandbookRequestHandler.java
index 8153368a..5968e64c 100644
--- a/src/main/java/emu/grasscutter/server/http/documentation/HandbookRequestHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/documentation/HandbookRequestHandler.java
@@ -1,6 +1,6 @@
package emu.grasscutter.server.http.documentation;
-import static emu.grasscutter.Configuration.*;
+import static emu.grasscutter.config.Configuration.*;
import static emu.grasscutter.utils.Language.translate;
import com.google.gson.reflect.TypeToken;
diff --git a/src/main/java/emu/grasscutter/server/http/documentation/RootRequestHandler.java b/src/main/java/emu/grasscutter/server/http/documentation/RootRequestHandler.java
index 12b738bf..7cf37697 100644
--- a/src/main/java/emu/grasscutter/server/http/documentation/RootRequestHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/documentation/RootRequestHandler.java
@@ -1,6 +1,6 @@
package emu.grasscutter.server.http.documentation;
-import static emu.grasscutter.Configuration.DATA;
+import static emu.grasscutter.config.Configuration.DATA;
import static emu.grasscutter.utils.Language.translate;
import emu.grasscutter.Grasscutter;
diff --git a/src/main/java/emu/grasscutter/server/http/handlers/AnnouncementsHandler.java b/src/main/java/emu/grasscutter/server/http/handlers/AnnouncementsHandler.java
index 07790a64..f2c04be7 100644
--- a/src/main/java/emu/grasscutter/server/http/handlers/AnnouncementsHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/handlers/AnnouncementsHandler.java
@@ -12,6 +12,8 @@ import express.http.Request;
import express.http.Response;
import io.javalin.Javalin;
+import static emu.grasscutter.config.Configuration.*;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -19,8 +21,6 @@ import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.Objects;
-import static emu.grasscutter.Configuration.*;
-
/**
* Handles requests related to the announcements page.
*/
diff --git a/src/main/java/emu/grasscutter/server/http/handlers/GachaHandler.java b/src/main/java/emu/grasscutter/server/http/handlers/GachaHandler.java
index 6032e774..7c42555a 100644
--- a/src/main/java/emu/grasscutter/server/http/handlers/GachaHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/handlers/GachaHandler.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;
-import static emu.grasscutter.Configuration.DATA;
+import static emu.grasscutter.config.Configuration.DATA;
import static emu.grasscutter.utils.Language.translate;
/**
diff --git a/src/main/java/emu/grasscutter/server/http/handlers/GenericHandler.java b/src/main/java/emu/grasscutter/server/http/handlers/GenericHandler.java
index 5b3be8d8..664bbed6 100644
--- a/src/main/java/emu/grasscutter/server/http/handlers/GenericHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/handlers/GenericHandler.java
@@ -1,5 +1,7 @@
package emu.grasscutter.server.http.handlers;
+import static emu.grasscutter.config.Configuration.ACCOUNT;
+
import emu.grasscutter.GameConstants;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.server.http.objects.HttpJsonResponse;
@@ -10,8 +12,6 @@ import express.http.Request;
import express.http.Response;
import io.javalin.Javalin;
-import static emu.grasscutter.Configuration.ACCOUNT;
-
/**
* Handles all generic, hard-coded responses.
*/
diff --git a/src/main/java/emu/grasscutter/server/http/objects/HttpJsonResponse.java b/src/main/java/emu/grasscutter/server/http/objects/HttpJsonResponse.java
index 35ca9b00..b3603d94 100644
--- a/src/main/java/emu/grasscutter/server/http/objects/HttpJsonResponse.java
+++ b/src/main/java/emu/grasscutter/server/http/objects/HttpJsonResponse.java
@@ -10,8 +10,8 @@ import express.http.HttpContextHandler;
import express.http.Request;
import express.http.Response;
+import static emu.grasscutter.config.Configuration.*;
import static emu.grasscutter.utils.Language.translate;
-import static emu.grasscutter.Configuration.*;
public final class HttpJsonResponse implements HttpContextHandler {
private final String response;
diff --git a/src/main/java/emu/grasscutter/server/http/objects/WebStaticVersionResponse.java b/src/main/java/emu/grasscutter/server/http/objects/WebStaticVersionResponse.java
index 40a08ebd..7577da5c 100644
--- a/src/main/java/emu/grasscutter/server/http/objects/WebStaticVersionResponse.java
+++ b/src/main/java/emu/grasscutter/server/http/objects/WebStaticVersionResponse.java
@@ -10,11 +10,11 @@ import express.http.Request;
import express.http.Response;
import io.javalin.core.util.FileUtil;
+import static emu.grasscutter.config.Configuration.DATA;
+
import java.io.IOException;
import java.io.InputStream;
-import static emu.grasscutter.Configuration.DATA;
-
public class WebStaticVersionResponse implements HttpContextHandler {
@Override
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java
index 8d161558..c73019a9 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java
@@ -1,8 +1,5 @@
package emu.grasscutter.server.packet.recv;
-import static emu.grasscutter.Configuration.ACCOUNT;
-import static emu.grasscutter.Configuration.GAME_OPTIONS;
-
import emu.grasscutter.Grasscutter;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.Account;
@@ -21,6 +18,9 @@ import emu.grasscutter.utils.Utils;
import javax.crypto.Cipher;
+import static emu.grasscutter.config.Configuration.ACCOUNT;
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+
import java.nio.ByteBuffer;
import java.security.Signature;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerLoginReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerLoginReq.java
index 45810b16..714d3161 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerLoginReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerLoginReq.java
@@ -1,5 +1,7 @@
package emu.grasscutter.server.packet.recv;
+import static emu.grasscutter.config.Configuration.ACCOUNT;
+
import emu.grasscutter.Grasscutter;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.player.Player;
@@ -13,8 +15,6 @@ import emu.grasscutter.server.game.GameSession.SessionState;
import emu.grasscutter.server.packet.send.PacketPlayerLoginRsp;
import emu.grasscutter.server.packet.send.PacketTakeAchievementRewardReq;
-import static emu.grasscutter.Configuration.ACCOUNT;
-
@Opcodes(PacketOpcodes.PlayerLoginReq) // Sends initial data packets
public class HandlerPlayerLoginReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBornDataReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBornDataReq.java
index ddb2e894..48ac9151 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBornDataReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBornDataReq.java
@@ -17,9 +17,9 @@ import emu.grasscutter.server.event.game.PlayerCreationEvent;
import emu.grasscutter.server.game.GameSession;
import emu.grasscutter.server.game.GameSession.SessionState;
-import java.util.Arrays;
+import static emu.grasscutter.config.Configuration.*;
-import static emu.grasscutter.Configuration.*;
+import java.util.Arrays;
@Opcodes(PacketOpcodes.SetPlayerBornDataReq)
public class HandlerSetPlayerBornDataReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnionCmdNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnionCmdNotify.java
index a86ffb08..5c1d6c55 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnionCmdNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnionCmdNotify.java
@@ -1,5 +1,7 @@
package emu.grasscutter.server.packet.recv;
+import static emu.grasscutter.config.Configuration.SERVER;
+
import emu.grasscutter.Grasscutter;
import emu.grasscutter.net.packet.Opcodes;
import emu.grasscutter.net.packet.PacketOpcodes;
@@ -9,8 +11,6 @@ import emu.grasscutter.net.packet.PacketHandler;
import emu.grasscutter.server.game.GameSession;
import emu.grasscutter.Grasscutter.ServerDebugMode;
-import static emu.grasscutter.Configuration.SERVER;
-
@Opcodes(PacketOpcodes.UnionCmdNotify)
public class HandlerUnionCmdNotify extends PacketHandler {
@Override
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerFriendListRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerFriendListRsp.java
index 7bea1374..97a7d4a9 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerFriendListRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerFriendListRsp.java
@@ -1,5 +1,7 @@
package emu.grasscutter.server.packet.send;
+import static emu.grasscutter.config.Configuration.*;
+
import emu.grasscutter.GameConstants;
import emu.grasscutter.game.friends.Friendship;
import emu.grasscutter.game.player.Player;
@@ -11,8 +13,6 @@ import emu.grasscutter.net.proto.GetPlayerFriendListRspOuterClass.GetPlayerFrien
import emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture;
import emu.grasscutter.net.proto.PlatformTypeOuterClass;
-import static emu.grasscutter.Configuration.*;
-
public class PacketGetPlayerFriendListRsp extends BasePacket {
public PacketGetPlayerFriendListRsp(Player player) {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java
index 52a487d5..a0507546 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java
@@ -13,12 +13,12 @@ import emu.grasscutter.server.http.dispatch.RegionHandler;
import emu.grasscutter.utils.Crypto;
import emu.grasscutter.utils.FileUtils;
+import static emu.grasscutter.config.Configuration.*;
+
import java.io.File;
import java.util.Base64;
import java.util.Objects;
-import static emu.grasscutter.Configuration.*;
-
public class PacketPlayerLoginRsp extends BasePacket {
private static QueryCurrRegionHttpRspOuterClass.QueryCurrRegionHttpRsp regionCache;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerStoreNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerStoreNotify.java
index 2a61aeda..01c89a4a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerStoreNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerStoreNotify.java
@@ -1,5 +1,7 @@
package emu.grasscutter.server.packet.send;
+import static emu.grasscutter.config.Configuration.*;
+
import emu.grasscutter.game.inventory.GameItem;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.net.packet.BasePacket;
@@ -8,8 +10,6 @@ import emu.grasscutter.net.proto.ItemOuterClass.Item;
import emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify;
import emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType;
-import static emu.grasscutter.Configuration.*;
-
public class PacketPlayerStoreNotify extends BasePacket {
public PacketPlayerStoreNotify(Player player) {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPullRecentChatRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPullRecentChatRsp.java
index 472075c7..ac846f8a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPullRecentChatRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPullRecentChatRsp.java
@@ -8,7 +8,7 @@ import emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo;
import emu.grasscutter.net.proto.PullRecentChatRspOuterClass.PullRecentChatRsp;
import emu.grasscutter.utils.Utils;
-import static emu.grasscutter.Configuration.*;
+import static emu.grasscutter.config.Configuration.*;
import java.util.List;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketStoreWeightLimitNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketStoreWeightLimitNotify.java
index 17600932..17ccf886 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketStoreWeightLimitNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketStoreWeightLimitNotify.java
@@ -1,12 +1,12 @@
package emu.grasscutter.server.packet.send;
+import static emu.grasscutter.config.Configuration.*;
+
import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType;
import emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLimitNotify;
-import static emu.grasscutter.Configuration.*;
-
public class PacketStoreWeightLimitNotify extends BasePacket {
public PacketStoreWeightLimitNotify() {
diff --git a/src/main/java/emu/grasscutter/tools/Tools.java b/src/main/java/emu/grasscutter/tools/Tools.java
index f6d425ee..c473a145 100644
--- a/src/main/java/emu/grasscutter/tools/Tools.java
+++ b/src/main/java/emu/grasscutter/tools/Tools.java
@@ -27,8 +27,8 @@ import emu.grasscutter.data.excels.QuestData;
import emu.grasscutter.data.excels.SceneData;
import emu.grasscutter.utils.Utils;
+import static emu.grasscutter.config.Configuration.*;
import static emu.grasscutter.utils.Language.translate;
-import static emu.grasscutter.Configuration.*;
public final class Tools {
public static void createGmHandbook() throws Exception {
diff --git a/src/main/java/emu/grasscutter/utils/Language.java b/src/main/java/emu/grasscutter/utils/Language.java
index c343e949..da022a25 100644
--- a/src/main/java/emu/grasscutter/utils/Language.java
+++ b/src/main/java/emu/grasscutter/utils/Language.java
@@ -6,12 +6,13 @@ import emu.grasscutter.Grasscutter;
import emu.grasscutter.game.player.Player;
import javax.annotation.Nullable;
+
+import static emu.grasscutter.config.Configuration.*;
+
import java.io.InputStream;
import java.util.concurrent.ConcurrentHashMap;
import java.util.Map;
-import static emu.grasscutter.Configuration.*;
-
public final class Language {
private static final Map<String, Language> cachedLanguages = new ConcurrentHashMap<>();
diff --git a/src/main/java/emu/grasscutter/utils/Utils.java b/src/main/java/emu/grasscutter/utils/Utils.java
index f379def5..c7bdad31 100644
--- a/src/main/java/emu/grasscutter/utils/Utils.java
+++ b/src/main/java/emu/grasscutter/utils/Utils.java
@@ -10,6 +10,7 @@ import java.util.*;
import java.util.concurrent.ThreadLocalRandom;
import emu.grasscutter.Grasscutter;
+import emu.grasscutter.config.ConfigContainer;
import emu.grasscutter.data.DataLoader;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
--
GitLab