Move config java files to their own package

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 {

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

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

src/main/java/emu/grasscutter/command/commands/AccountCommand.java

 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;

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")

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 {

src/main/java/emu/grasscutter/utils/ConfigContainer.java → src/main/java/emu/grasscutter/config/ConfigContainer.java

-package emu.grasscutter.utils;
+package emu.grasscutter.config;
 
 import com.google.gson.JsonObject;
 import emu.grasscutter.Grasscutter;

src/main/java/emu/grasscutter/Configuration.java → src/main/java/emu/grasscutter/config/Configuration.java

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

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 {
 
     /**

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 {

src/main/java/emu/grasscutter/database/DatabaseManager.java

 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;

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;

src/main/java/emu/grasscutter/game/avatar/Avatar.java

 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;

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;
 

src/main/java/emu/grasscutter/game/gacha/GachaBanner.java

 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;

src/main/java/emu/grasscutter/game/gacha/GachaSystem.java

 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;

src/main/java/emu/grasscutter/game/inventory/Inventory.java

 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;

src/main/java/emu/grasscutter/game/managers/ResinManager.java

 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) {

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

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;