diff --git a/src/main/java/emu/grasscutter/Grasscutter.java b/src/main/java/emu/grasscutter/Grasscutter.java index 881a1d2ac..34bf4a582 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 51f0684ba..62d512ebd 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 81b463046..6ac5f9fbb 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 4f96b986f..3d622a505 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 3a962cf28..1306991ef 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 [amount] [level(monster only)] [ (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 c425059f7..afcaa4a74 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 [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 dd7002482..5049e3b20 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 486c5d33c..82c7b3f71 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 5dee449ef..a006448f3 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 763fb7281..70b006567 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 d0c322864..15d78eb51 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 8685a16e3..43f4efe5c 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 92dd421ba..3ab2e1dc8 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 01c18cca0..0faca23b7 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> expeditionRewardData; diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java b/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java index dd68ad4af..4b8bd95c2 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 ac513a1e7..c1c591584 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 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 bdda8ac9f..b2ee9aebf 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 { private final Long2ObjectMap store; private final Int2ObjectMap inventoryTypes; diff --git a/src/main/java/emu/grasscutter/game/managers/ResinManager.java b/src/main/java/emu/grasscutter/game/managers/ResinManager.java index 2fefe88e1..78f4b09fd 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 d9d243dcd..66acd2e9a 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 c509d85d1..710ec31a4 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 e72d737ec..b45fdac1f 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 c718b0460..4172368e2 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 89383e486..b1f265339 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 7fe31ab5a..5281f85f5 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 2169a06eb..8ad4fa657 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> shopData; private final List shopChestData; diff --git a/src/main/java/emu/grasscutter/game/tower/TowerSystem.java b/src/main/java/emu/grasscutter/game/tower/TowerSystem.java index 2b9b9e5af..2923dfd0b 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 f322adc93..d14ad5c51 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 4c7b0ac68..6de30da38 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 5ec0a15db..48903f68b 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 417da4749..507f80c34 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 9d6cf1f1a..efb6744fe 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 5b53e31dc..84c4c2605 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 f0d2aaa40..e9c2be311 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 handlers; diff --git a/src/main/java/emu/grasscutter/server/game/GameSession.java b/src/main/java/emu/grasscutter/server/game/GameSession.java index e2d726941..005fcc4af 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 34d2059a1..d35e7de25 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 336bda588..e9af92cb3 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 4810978ad..8457b7e0e 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 8153368a0..5968e64c4 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 12b738bf3..7cf376979 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 07790a641..f2c04be7e 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 6032e774f..7c42555ae 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 5b3be8d8b..664bbed60 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 35ca9b006..b3603d94c 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 40a08ebd8..7577da5ca 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 8d1615587..c73019a9a 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 45810b16c..714d3161b 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 ddb2e8948..48ac9151f 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 a86ffb084..5c1d6c550 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 7bea1374a..97a7d4a97 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 52a487d55..a05075460 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 2a61aeda9..01c89a4ae 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 472075c76..ac846f8a9 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 17600932b..17ccf8865 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 f6d425ee2..c473a145a 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 c343e949e..da022a25e 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 cachedLanguages = new ConcurrentHashMap<>(); diff --git a/src/main/java/emu/grasscutter/utils/Utils.java b/src/main/java/emu/grasscutter/utils/Utils.java index f379def58..c7bdad311 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;