Clean up .utils

2026-02-06 01:57:31 +01:00 · 2023-05-20 02:25:49 -04:00
parent 51c5cb5c62
commit 1a6fa43367
147 changed files with 623 additions and 291 deletions
--- a/src/main/java/emu/grasscutter/GameConstants.java
+++ b/src/main/java/emu/grasscutter/GameConstants.java
@@ -1,7 +1,7 @@
 package emu.grasscutter;

-import emu.grasscutter.utils.Position;
-import emu.grasscutter.utils.SparseSet;
+import emu.grasscutter.game.world.Position;
+import emu.grasscutter.utils.objects.SparseSet;
 import emu.grasscutter.utils.Utils;
 import java.util.Arrays;

--- a/src/main/java/emu/grasscutter/Grasscutter.java
+++ b/src/main/java/emu/grasscutter/Grasscutter.java
@@ -1,8 +1,5 @@
 package emu.grasscutter;

-import static emu.grasscutter.config.Configuration.SERVER;
-import static emu.grasscutter.utils.Language.translate;
-
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import emu.grasscutter.auth.AuthenticationSystem;
@@ -28,13 +25,11 @@ 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.*;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOError;
-import java.io.IOException;
-import java.util.Calendar;
-import javax.annotation.Nullable;
+import emu.grasscutter.utils.Crypto;
+import emu.grasscutter.utils.JsonUtils;
+import emu.grasscutter.utils.StartupArguments;
+import emu.grasscutter.utils.Utils;
+import emu.grasscutter.utils.lang.Language;
 import lombok.Getter;
 import lombok.Setter;
 import org.jline.reader.EndOfFileException;
@@ -46,6 +41,16 @@ import org.jline.terminal.TerminalBuilder;
 import org.reflections.Reflections;
 import org.slf4j.LoggerFactory;

+import javax.annotation.Nullable;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOError;
+import java.io.IOException;
+import java.util.Calendar;
+
+import static emu.grasscutter.config.Configuration.SERVER;
+import static emu.grasscutter.utils.lang.Language.translate;
+
 public final class Grasscutter {
    public static final File configFile = new File("./config.json");
    public static final Reflections reflector = new Reflections("emu.grasscutter");
--- a/src/main/java/emu/grasscutter/auth/DefaultAuthentication.java
+++ b/src/main/java/emu/grasscutter/auth/DefaultAuthentication.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.auth;

 import static emu.grasscutter.config.Configuration.ACCOUNT;
-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.auth.DefaultAuthenticators.*;
--- a/src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java
+++ b/src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.auth;

 import static emu.grasscutter.config.Configuration.ACCOUNT;
-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import at.favre.lib.crypto.bcrypt.BCrypt;
 import emu.grasscutter.Grasscutter;
--- a/src/main/java/emu/grasscutter/command/CommandHandler.java
+++ b/src/main/java/emu/grasscutter/command/CommandHandler.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.player.Player;
--- a/src/main/java/emu/grasscutter/command/commands/AccountCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/AccountCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import at.favre.lib.crypto.bcrypt.BCrypt;
 import emu.grasscutter.Grasscutter;
--- a/src/main/java/emu/grasscutter/command/commands/AnnounceCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/AnnounceCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
--- a/src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
--- a/src/main/java/emu/grasscutter/command/commands/EntityCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/EntityCommand.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.command.commands;

 import static emu.grasscutter.command.CommandHelpers.*;
-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
--- a/src/main/java/emu/grasscutter/command/commands/GroupCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/GroupCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
--- a/src/main/java/emu/grasscutter/command/commands/HealCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/HealCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
--- a/src/main/java/emu/grasscutter/command/commands/HelpCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/HelpCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
--- a/src/main/java/emu/grasscutter/command/commands/KillAllCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/KillAllCommand.java
@@ -1,15 +1,16 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
-
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.entity.EntityMonster;
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.Scene;
+
 import java.util.List;

+import static emu.grasscutter.utils.lang.Language.translate;
+
@Command(
        label = "killall",
        usage = {"[<sceneId>]"},
--- a/src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
--- a/src/main/java/emu/grasscutter/command/commands/LanguageCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/LanguageCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
--- a/src/main/java/emu/grasscutter/command/commands/ListCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ListCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
--- a/src/main/java/emu/grasscutter/command/commands/PermissionCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/PermissionCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
--- a/src/main/java/emu/grasscutter/command/commands/PositionCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/PositionCommand.java
@@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.List;

@Command(
--- a/src/main/java/emu/grasscutter/command/commands/QuestCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/QuestCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
--- a/src/main/java/emu/grasscutter/command/commands/ReloadCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ReloadCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
--- a/src/main/java/emu/grasscutter/command/commands/ResetConstCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ResetConstCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
--- a/src/main/java/emu/grasscutter/command/commands/ResetShopLimitCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ResetShopLimitCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
--- a/src/main/java/emu/grasscutter/command/commands/SendMailCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SendMailCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
--- a/src/main/java/emu/grasscutter/command/commands/SetConstCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SetConstCommand.java
@@ -8,7 +8,7 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.game.world.World;
 import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.List;

@Command(
--- a/src/main/java/emu/grasscutter/command/commands/SetFetterLevelCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SetFetterLevelCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
--- a/src/main/java/emu/grasscutter/command/commands/SoundCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SoundCommand.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.packet.send.PacketScenePlayerSoundNotify;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.List;
 import lombok.val;

--- a/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java
@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;

 import static emu.grasscutter.command.CommandHelpers.*;
 import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
@@ -15,7 +15,7 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.EntityType;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiConsumer;
--- a/src/main/java/emu/grasscutter/command/commands/StopCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/StopCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
--- a/src/main/java/emu/grasscutter/command/commands/TalentCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/TalentCommand.java
@@ -6,7 +6,7 @@ import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.utils.Language;
+import emu.grasscutter.utils.lang.Language;
 import java.util.List;

@Command(
--- a/src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
--- a/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.List;

@Command(
--- a/src/main/java/emu/grasscutter/command/commands/TrialAvatarActivityCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/TrialAvatarActivityCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
--- a/src/main/java/emu/grasscutter/command/commands/UnlockAllCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/UnlockAllCommand.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.command.commands;

-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
--- a/src/main/java/emu/grasscutter/data/GameDepot.java
+++ b/src/main/java/emu/grasscutter/data/GameDepot.java
@@ -6,7 +6,7 @@ import emu.grasscutter.data.excels.reliquary.ReliquaryAffixData;
 import emu.grasscutter.data.excels.reliquary.ReliquaryMainPropData;
 import emu.grasscutter.game.managers.blossom.BlossomConfig;
 import emu.grasscutter.game.world.SpawnDataEntry;
-import emu.grasscutter.utils.WeightedList;
+import emu.grasscutter.utils.objects.WeightedList;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import java.util.ArrayList;
--- a/src/main/java/emu/grasscutter/data/ResourceLoader.java
+++ b/src/main/java/emu/grasscutter/data/ResourceLoader.java
@@ -1,9 +1,5 @@
 package emu.grasscutter.data;

-import static emu.grasscutter.utils.FileUtils.getDataPath;
-import static emu.grasscutter.utils.FileUtils.getResourcePath;
-import static emu.grasscutter.utils.Language.translate;
-
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.binout.*;
@@ -28,12 +24,18 @@ import emu.grasscutter.scripts.SceneIndexManager;
 import emu.grasscutter.scripts.ScriptLoader;
 import emu.grasscutter.utils.FileUtils;
 import emu.grasscutter.utils.JsonUtils;
-import emu.grasscutter.utils.Language;
 import emu.grasscutter.utils.TsvUtils;
+import emu.grasscutter.utils.lang.Language;
 import it.unimi.dsi.fastutil.Pair;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntArraySet;
+import lombok.SneakyThrows;
+import lombok.val;
+import org.reflections.Reflections;
+
+import javax.script.Bindings;
+import javax.script.CompiledScript;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.file.Files;
@@ -46,11 +48,10 @@ import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.script.Bindings;
-import javax.script.CompiledScript;
-import lombok.SneakyThrows;
-import lombok.val;
-import org.reflections.Reflections;
+
+import static emu.grasscutter.utils.FileUtils.getDataPath;
+import static emu.grasscutter.utils.FileUtils.getResourcePath;
+import static emu.grasscutter.utils.lang.Language.translate;

 public final class ResourceLoader {

@@ -125,6 +126,8 @@ public final class ResourceLoader {
    @SneakyThrows
    public static void loadAll() {
        if (loadedAll) return;
+        loadedAll = true;
+
        Grasscutter.getLogger().info(translate("messages.status.resources.loading"));

        // Mark the starting time.
@@ -202,7 +205,6 @@ public final class ResourceLoader {
        Grasscutter.getLogger().debug("Loading resources took " + ns + "ns (" + ns / 1000000 + "ms).");

        Grasscutter.getLogger().info(translate("messages.status.resources.finish"));
-        loadedAll = true;
    }

    public static void loadResources() {
--- a/src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java
+++ b/src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.data.binout;

 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.List;
 import lombok.AccessLevel;
 import lombok.Data;
--- a/src/main/java/emu/grasscutter/data/binout/SceneNpcBornEntry.java
+++ b/src/main/java/emu/grasscutter/data/binout/SceneNpcBornEntry.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.data.binout;

 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.List;
 import lombok.AccessLevel;
 import lombok.Data;
--- a/src/main/java/emu/grasscutter/data/binout/routes/RoutePoint.java
+++ b/src/main/java/emu/grasscutter/data/binout/routes/RoutePoint.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.data.binout.routes;

 import emu.grasscutter.net.proto.RoutePointOuterClass;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.experimental.FieldDefaults;
--- a/src/main/java/emu/grasscutter/data/common/PointData.java
+++ b/src/main/java/emu/grasscutter/data/common/PointData.java
@@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.dungeon.DailyDungeonData;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
 import lombok.Getter;
--- a/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonData.java
+++ b/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonData.java
@@ -6,7 +6,7 @@ import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.excels.RewardPreviewData;
 import emu.grasscutter.game.dungeons.enums.*;
 import emu.grasscutter.scripts.data.SceneMeta;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.List;
 import lombok.Getter;

--- a/src/main/java/emu/grasscutter/data/server/Grid.java
+++ b/src/main/java/emu/grasscutter/data/server/Grid.java
@@ -4,8 +4,8 @@ import com.github.davidmoten.rtreemulti.RTree;
 import com.github.davidmoten.rtreemulti.geometry.Geometry;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.scripts.SceneIndexManager;
-import emu.grasscutter.utils.GridPosition;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.GridPosition;
+import emu.grasscutter.game.world.Position;
 import java.util.*;

 public class Grid {
--- a/src/main/java/emu/grasscutter/game/activity/ActivityHandler.java
+++ b/src/main/java/emu/grasscutter/game/activity/ActivityHandler.java
@@ -9,7 +9,7 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.WatcherTriggerType;
 import emu.grasscutter.game.quest.enums.QuestCond;
 import emu.grasscutter.net.proto.ActivityInfoOuterClass;
-import emu.grasscutter.utils.DateHelper;
+import emu.grasscutter.utils.helpers.DateHelper;
 import java.util.*;
 import java.util.stream.Collectors;
 import lombok.AccessLevel;
--- a/src/main/java/emu/grasscutter/game/avatar/Avatar.java
+++ b/src/main/java/emu/grasscutter/game/avatar/Avatar.java
@@ -40,7 +40,7 @@ import emu.grasscutter.net.proto.ShowEquipOuterClass.ShowEquip;
 import emu.grasscutter.net.proto.TrialAvatarGrantRecordOuterClass.TrialAvatarGrantRecord;
 import emu.grasscutter.net.proto.TrialAvatarInfoOuterClass.TrialAvatarInfo;
 import emu.grasscutter.server.packet.send.*;
-import emu.grasscutter.utils.ProtoHelper;
+import emu.grasscutter.utils.helpers.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.*;
 import java.util.*;
 import java.util.stream.Stream;
--- a/src/main/java/emu/grasscutter/game/drop/DropSystemLegacy.java
+++ b/src/main/java/emu/grasscutter/game/drop/DropSystemLegacy.java
@@ -14,7 +14,7 @@ import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.server.game.BaseGameSystem;
 import emu.grasscutter.server.game.GameServer;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
--- a/src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java
@@ -20,7 +20,7 @@ import emu.grasscutter.scripts.constants.EventType;
 import emu.grasscutter.scripts.data.ScriptArgs;
 import emu.grasscutter.server.packet.send.PacketDungeonWayPointNotify;
 import emu.grasscutter.server.packet.send.PacketGadgetAutoPickDropInfoNotify;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
--- a/src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
@@ -15,7 +15,7 @@ import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.server.game.BaseGameSystem;
 import emu.grasscutter.server.game.GameServer;
 import emu.grasscutter.server.packet.send.PacketDungeonEntryInfoRsp;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import lombok.val;
--- a/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java
@@ -34,8 +34,8 @@ import emu.grasscutter.server.event.player.PlayerMoveEvent;
 import emu.grasscutter.server.packet.send.PacketAvatarFightPropUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketEntityFightPropChangeReasonNotify;
 import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
-import emu.grasscutter.utils.Position;
-import emu.grasscutter.utils.ProtoHelper;
+import emu.grasscutter.game.world.Position;
+import emu.grasscutter.utils.helpers.ProtoHelper;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import lombok.Getter;
--- a/src/main/java/emu/grasscutter/game/entity/EntityBaseGadget.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityBaseGadget.java
@@ -8,7 +8,7 @@ import emu.grasscutter.game.quest.enums.QuestContent;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.ScriptArgs;
 import emu.grasscutter.server.event.entity.EntityDamageEvent;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import lombok.Getter;

 public abstract class EntityBaseGadget extends GameEntity {
--- a/src/main/java/emu/grasscutter/game/entity/EntityClientGadget.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityClientGadget.java
@@ -17,8 +17,8 @@ import emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo;
 import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
 import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
 import emu.grasscutter.net.proto.VectorOuterClass.Vector;
-import emu.grasscutter.utils.Position;
-import emu.grasscutter.utils.ProtoHelper;
+import emu.grasscutter.game.world.Position;
+import emu.grasscutter.utils.helpers.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import lombok.Getter;

--- a/src/main/java/emu/grasscutter/game/entity/EntityGadget.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityGadget.java
@@ -34,8 +34,8 @@ import emu.grasscutter.server.packet.send.PacketGadgetStateNotify;
 import emu.grasscutter.server.packet.send.PacketPlatformStartRouteNotify;
 import emu.grasscutter.server.packet.send.PacketPlatformStopRouteNotify;
 import emu.grasscutter.server.packet.send.PacketSceneTimeNotify;
-import emu.grasscutter.utils.Position;
-import emu.grasscutter.utils.ProtoHelper;
+import emu.grasscutter.game.world.Position;
+import emu.grasscutter.utils.helpers.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
 import java.util.ArrayList;
--- a/src/main/java/emu/grasscutter/game/entity/EntityItem.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityItem.java
@@ -23,8 +23,8 @@ import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
 import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
 import emu.grasscutter.net.proto.VectorOuterClass.Vector;
 import emu.grasscutter.server.packet.send.PacketGadgetInteractRsp;
-import emu.grasscutter.utils.Position;
-import emu.grasscutter.utils.ProtoHelper;
+import emu.grasscutter.game.world.Position;
+import emu.grasscutter.utils.helpers.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import lombok.Getter;

--- a/src/main/java/emu/grasscutter/game/entity/EntityMonster.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityMonster.java
@@ -28,8 +28,8 @@ import emu.grasscutter.scripts.constants.EventType;
 import emu.grasscutter.scripts.data.SceneMonster;
 import emu.grasscutter.scripts.data.ScriptArgs;
 import emu.grasscutter.server.event.entity.EntityDamageEvent;
-import emu.grasscutter.utils.Position;
-import emu.grasscutter.utils.ProtoHelper;
+import emu.grasscutter.game.world.Position;
+import emu.grasscutter.utils.helpers.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
 import lombok.Getter;
 import lombok.Setter;
--- a/src/main/java/emu/grasscutter/game/entity/EntityNPC.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityNPC.java
@@ -4,7 +4,7 @@ import emu.grasscutter.game.props.EntityIdType;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.net.proto.*;
 import emu.grasscutter.scripts.data.SceneNPC;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import lombok.Getter;

--- a/src/main/java/emu/grasscutter/game/entity/EntityRegion.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityRegion.java
@@ -4,7 +4,7 @@ import emu.grasscutter.game.props.EntityIdType;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.net.proto.SceneEntityInfoOuterClass;
 import emu.grasscutter.scripts.data.SceneRegion;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
--- a/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
@@ -21,8 +21,8 @@ import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
 import emu.grasscutter.net.proto.VectorOuterClass.Vector;
 import emu.grasscutter.net.proto.VehicleInfoOuterClass.VehicleInfo;
 import emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember;
-import emu.grasscutter.utils.Position;
-import emu.grasscutter.utils.ProtoHelper;
+import emu.grasscutter.game.world.Position;
+import emu.grasscutter.utils.helpers.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
 import java.util.ArrayList;
--- a/src/main/java/emu/grasscutter/game/entity/GameEntity.java
+++ b/src/main/java/emu/grasscutter/game/entity/GameEntity.java
@@ -18,7 +18,7 @@ import emu.grasscutter.scripts.data.controller.EntityController;
 import emu.grasscutter.server.event.entity.EntityDamageEvent;
 import emu.grasscutter.server.event.entity.EntityDeathEvent;
 import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
--- a/src/main/java/emu/grasscutter/game/entity/gadget/platform/AbilityRoute.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/platform/AbilityRoute.java
@@ -3,7 +3,7 @@ package emu.grasscutter.game.entity.gadget.platform;
 import emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion;
 import emu.grasscutter.net.proto.MovingPlatformTypeOuterClass;
 import emu.grasscutter.net.proto.PlatformInfoOuterClass;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;

 /** TODO mostly hardcoded for EntitySolarIsotomaElevatorPlatform, should be more generic */
 public class AbilityRoute extends BaseRoute {
--- a/src/main/java/emu/grasscutter/game/entity/gadget/platform/BaseRoute.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/platform/BaseRoute.java
@@ -4,7 +4,7 @@ import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion;
 import emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo;
 import emu.grasscutter.scripts.data.SceneGadget;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.val;
--- a/src/main/java/emu/grasscutter/game/entity/gadget/platform/ConfigRoute.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/platform/ConfigRoute.java
@@ -3,7 +3,7 @@ package emu.grasscutter.game.entity.gadget.platform;
 import emu.grasscutter.net.proto.MovingPlatformTypeOuterClass;
 import emu.grasscutter.net.proto.PlatformInfoOuterClass;
 import emu.grasscutter.scripts.data.SceneGadget;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import lombok.Getter;
 import lombok.Setter;

--- a/src/main/java/emu/grasscutter/game/entity/gadget/platform/PointArrayRoute.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/platform/PointArrayRoute.java
@@ -3,7 +3,7 @@ package emu.grasscutter.game.entity.gadget.platform;
 import emu.grasscutter.net.proto.MovingPlatformTypeOuterClass;
 import emu.grasscutter.net.proto.PlatformInfoOuterClass;
 import emu.grasscutter.scripts.data.SceneGadget;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import lombok.Getter;
 import lombok.Setter;

--- a/src/main/java/emu/grasscutter/game/entity/platform/EntitySolarIsotomaElevatorPlatform.java
+++ b/src/main/java/emu/grasscutter/game/entity/platform/EntitySolarIsotomaElevatorPlatform.java
@@ -6,7 +6,7 @@ import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.entity.gadget.GadgetAbility;
 import emu.grasscutter.game.entity.gadget.platform.AbilityRoute;
 import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;

 public class EntitySolarIsotomaElevatorPlatform extends EntityGadget {
    @SuppressWarnings("removal")
--- a/src/main/java/emu/grasscutter/game/home/HomeAnimalItem.java
+++ b/src/main/java/emu/grasscutter/game/home/HomeAnimalItem.java
@@ -2,7 +2,7 @@ package emu.grasscutter.game.home;

 import dev.morphia.annotations.Entity;
 import emu.grasscutter.net.proto.HomeAnimalDataOuterClass;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Data;
--- a/src/main/java/emu/grasscutter/game/home/HomeFurnitureItem.java
+++ b/src/main/java/emu/grasscutter/game/home/HomeFurnitureItem.java
@@ -6,7 +6,7 @@ import emu.grasscutter.data.binout.HomeworldDefaultSaveData;
 import emu.grasscutter.data.excels.ItemData;
 import emu.grasscutter.net.proto.HomeFurnitureDataOuterClass;
 import emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Data;
--- a/src/main/java/emu/grasscutter/game/home/HomeNPCItem.java
+++ b/src/main/java/emu/grasscutter/game/home/HomeNPCItem.java
@@ -2,7 +2,7 @@ package emu.grasscutter.game.home;

 import dev.morphia.annotations.Entity;
 import emu.grasscutter.net.proto.HomeNpcDataOuterClass;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Data;
--- a/src/main/java/emu/grasscutter/game/home/HomeSceneItem.java
+++ b/src/main/java/emu/grasscutter/game/home/HomeSceneItem.java
@@ -5,7 +5,7 @@ import dev.morphia.annotations.Id;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.binout.HomeworldDefaultSaveData;
 import emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.Map;
 import java.util.stream.Collectors;
 import lombok.AccessLevel;
--- a/src/main/java/emu/grasscutter/game/inventory/GameItem.java
+++ b/src/main/java/emu/grasscutter/game/inventory/GameItem.java
@@ -21,7 +21,7 @@ import emu.grasscutter.net.proto.ReliquaryOuterClass.Reliquary;
 import emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo;
 import emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo;
 import emu.grasscutter.net.proto.WeaponOuterClass.Weapon;
-import emu.grasscutter.utils.WeightedList;
+import emu.grasscutter.utils.objects.WeightedList;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
--- a/src/main/java/emu/grasscutter/game/managers/blossom/BlossomActivity.java
+++ b/src/main/java/emu/grasscutter/game/managers/blossom/BlossomActivity.java
@@ -11,7 +11,7 @@ import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.SceneBossChest;
 import emu.grasscutter.scripts.data.SceneGadget;
 import emu.grasscutter.scripts.data.SceneGroup;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import emu.grasscutter.utils.Utils;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
--- a/src/main/java/emu/grasscutter/game/managers/deforestation/DeforestationManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/deforestation/DeforestationManager.java
@@ -8,7 +8,7 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.net.proto.HitTreeNotifyOuterClass;
 import emu.grasscutter.net.proto.VectorOuterClass;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.ArrayList;
 import java.util.HashMap;

--- a/src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java
@@ -25,7 +25,7 @@ import emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason
 import emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo;
 import emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
--- a/src/main/java/emu/grasscutter/game/managers/mapmark/MapMark.java
+++ b/src/main/java/emu/grasscutter/game/managers/mapmark/MapMark.java
@@ -4,7 +4,7 @@ import dev.morphia.annotations.Entity;
 import emu.grasscutter.net.proto.MapMarkFromTypeOuterClass.MapMarkFromType;
 import emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint;
 import emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.MapMarkPointType;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;

@Entity
 public class MapMark {
--- a/src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
@@ -9,7 +9,7 @@ import emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation;
 import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
 import emu.grasscutter.server.packet.send.PacketMarkMapRsp;
 import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.Map;

 public class MapMarksManager extends BasePlayerManager {
--- a/src/main/java/emu/grasscutter/game/managers/stamina/StaminaManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/stamina/StaminaManager.java
@@ -22,7 +22,7 @@ import emu.grasscutter.server.packet.send.PacketAvatarLifeStateChangeNotify;
 import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketLifeStateChangeNotify;
 import emu.grasscutter.server.packet.send.PacketVehicleStaminaNotify;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import org.jetbrains.annotations.NotNull;

 import java.util.*;
--- a/src/main/java/emu/grasscutter/game/player/Player.java
+++ b/src/main/java/emu/grasscutter/game/player/Player.java
@@ -47,6 +47,7 @@ import emu.grasscutter.game.shop.ShopLimit;
 import emu.grasscutter.game.talk.TalkManager;
 import emu.grasscutter.game.tower.TowerData;
 import emu.grasscutter.game.tower.TowerManager;
+import emu.grasscutter.game.world.Position;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.game.world.World;
 import emu.grasscutter.net.packet.BasePacket;
@@ -73,6 +74,7 @@ import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.game.GameSession.SessionState;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.*;
+import emu.grasscutter.utils.helpers.DateHelper;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import lombok.Getter;
@@ -152,7 +154,6 @@ public class Player implements PlayerHook {
    @Getter private transient Inventory inventory;
    @Getter private transient FriendsList friendsList;
    @Getter private transient MailHandler mailHandler;
-    @Getter @Setter private transient MessageHandler messageHandler;
    @Getter private transient AbilityManager abilityManager;
    @Getter @Setter private transient QuestManager questManager;
    @Getter private transient TowerManager towerManager;
@@ -277,7 +278,6 @@ public class Player implements PlayerHook {
        this.progressManager = new PlayerProgressManager(this);
        this.shopLimit = new ArrayList<>();
        this.expeditionInfo = new HashMap<>();
-        this.messageHandler = null;
        this.mapMarksManager = new MapMarksManager(this);
        this.staminaManager = new StaminaManager(this);
        this.sotsManager = new SotSManager(this);
@@ -309,7 +309,6 @@ public class Player implements PlayerHook {
        this.getFlyCloakList().add(140001);
        this.getNameCardList().add(210001);

-        this.messageHandler = null;
        this.mapMarksManager = new MapMarksManager(this);
        this.staminaManager = new StaminaManager(this);
        this.sotsManager = new SotSManager(this);
@@ -954,11 +953,6 @@ public class Player implements PlayerHook {
     * @param message The message to send.
     */
    public void dropMessage(Object message) {
-        if (this.messageHandler != null) {
-            this.messageHandler.append(message.toString());
-            return;
-        }
-
        this.getServer().getChatSystem().sendPrivateMessageFromServer(getUid(), message.toString());
    }

--- a/src/main/java/emu/grasscutter/game/player/TeamManager.java
+++ b/src/main/java/emu/grasscutter/game/player/TeamManager.java
@@ -26,7 +26,7 @@ import emu.grasscutter.net.proto.TrialAvatarGrantRecordOuterClass.TrialAvatarGra
 import emu.grasscutter.net.proto.VisionTypeOuterClass;
 import emu.grasscutter.server.event.player.PlayerTeamDeathEvent;
 import emu.grasscutter.server.packet.send.*;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
--- a/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
+++ b/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
@@ -23,7 +23,7 @@ import emu.grasscutter.server.packet.send.PacketFinishedParentQuestUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketQuestProgressUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketQuestUpdateQuestVarNotify;
 import emu.grasscutter.utils.ConversionUtils;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.*;
 import java.util.stream.Collectors;
 import lombok.Getter;
--- a/src/main/java/emu/grasscutter/game/quest/QuestManager.java
+++ b/src/main/java/emu/grasscutter/game/quest/QuestManager.java
@@ -12,7 +12,7 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.enums.*;
 import emu.grasscutter.server.packet.send.PacketFinishedParentQuestUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketQuestGlobalVarNotify;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import io.netty.util.concurrent.FastThreadLocalThread;
 import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
--- a/src/main/java/emu/grasscutter/game/talk/exec/ExecTransSceneDummyPoint.java
+++ b/src/main/java/emu/grasscutter/game/talk/exec/ExecTransSceneDummyPoint.java
@@ -7,7 +7,7 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.talk.TalkExec;
 import emu.grasscutter.game.talk.TalkExecHandler;
 import emu.grasscutter.game.talk.TalkValueExec;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;

@TalkValueExec(TalkExec.TALK_EXEC_TRANS_SCENE_DUMMY_POINT)
 public final class ExecTransSceneDummyPoint extends TalkExecHandler {
--- a/src/main/java/emu/grasscutter/game/world/GridPosition.java
+++ b/src/main/java/emu/grasscutter/game/world/GridPosition.java
@@ -1,14 +1,15 @@
-package emu.grasscutter.utils;
+package emu.grasscutter.game.world;

 import com.github.davidmoten.rtreemulti.geometry.Point;
 import dev.morphia.annotations.Entity;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.SneakyThrows;

+import java.io.IOException;
+import java.io.Serializable;
+import java.util.List;
+
@Entity
 public final class GridPosition implements Serializable {
    private static final long serialVersionUID = -2001232300615923575L;
--- a/src/main/java/emu/grasscutter/game/world/Location.java
+++ b/src/main/java/emu/grasscutter/game/world/Location.java
@@ -1,8 +1,7 @@
-package emu.grasscutter.utils;
+package emu.grasscutter.game.world;

 import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Transient;
-import emu.grasscutter.game.world.Scene;
 import lombok.Getter;
 import lombok.Setter;

--- a/src/main/java/emu/grasscutter/game/world/Position.java
+++ b/src/main/java/emu/grasscutter/game/world/Position.java
@@ -1,9 +1,10 @@
-package emu.grasscutter.utils;
+package emu.grasscutter.game.world;

 import com.github.davidmoten.rtreemulti.geometry.Point;
 import com.google.gson.annotations.SerializedName;
 import dev.morphia.annotations.Entity;
 import emu.grasscutter.net.proto.VectorOuterClass.Vector;
+import emu.grasscutter.utils.Utils;
 import lombok.Getter;
 import lombok.Setter;

--- a/src/main/java/emu/grasscutter/game/world/Scene.java
+++ b/src/main/java/emu/grasscutter/game/world/Scene.java
@@ -38,8 +38,7 @@ import emu.grasscutter.scripts.data.SceneGroup;
 import emu.grasscutter.scripts.data.ScriptArgs;
 import emu.grasscutter.server.event.player.PlayerTeleportEvent;
 import emu.grasscutter.server.packet.send.*;
-import emu.grasscutter.utils.KahnsSort;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.utils.objects.KahnsSort;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
--- a/src/main/java/emu/grasscutter/game/world/SpawnDataEntry.java
+++ b/src/main/java/emu/grasscutter/game/world/SpawnDataEntry.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.game.world;

 import emu.grasscutter.data.GameDepot;
-import emu.grasscutter.utils.Position;
+
 import java.util.List;
 import java.util.Objects;
 import lombok.Getter;
--- a/src/main/java/emu/grasscutter/game/world/World.java
+++ b/src/main/java/emu/grasscutter/game/world/World.java
@@ -20,7 +20,6 @@ import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
 import emu.grasscutter.server.game.GameServer;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.ConversionUtils;
-import emu.grasscutter.utils.Position;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
--- a/src/main/java/emu/grasscutter/game/world/data/TeleportProperties.java
+++ b/src/main/java/emu/grasscutter/game/world/data/TeleportProperties.java
@@ -3,13 +3,13 @@ package emu.grasscutter.game.world.data;
 import emu.grasscutter.game.props.EnterReason;
 import emu.grasscutter.net.proto.EnterTypeOuterClass;
 import emu.grasscutter.server.event.player.PlayerTeleportEvent;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import lombok.Builder;
 import lombok.Data;

@Data
@Builder
-public class TeleportProperties {
+public final class TeleportProperties {
    private final int sceneId;
    private final int dungeonId;
    private final PlayerTeleportEvent.TeleportType teleportType;
--- a/src/main/java/emu/grasscutter/plugin/PluginManager.java
+++ b/src/main/java/emu/grasscutter/plugin/PluginManager.java
@@ -1,13 +1,15 @@
 package emu.grasscutter.plugin;

-import static emu.grasscutter.utils.Language.translate;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.server.event.Event;
 import emu.grasscutter.server.event.EventHandler;
 import emu.grasscutter.server.event.HandlerPriority;
 import emu.grasscutter.utils.FileUtils;
 import emu.grasscutter.utils.JsonUtils;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import javax.annotation.Nullable;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.InputStreamReader;
@@ -18,9 +20,8 @@ import java.net.URLClassLoader;
 import java.util.*;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import javax.annotation.Nullable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
+
+import static emu.grasscutter.utils.lang.Language.translate;

 /** Manages the server's plugins and the event system. */
 public final class PluginManager {
--- a/src/main/java/emu/grasscutter/plugin/api/PlayerHook.java
+++ b/src/main/java/emu/grasscutter/plugin/api/PlayerHook.java
@@ -10,7 +10,7 @@ import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;
 import emu.grasscutter.server.packet.send.PacketAvatarFightPropUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketAvatarLifeStateChangeNotify;
 import emu.grasscutter.server.packet.send.PacketPlayerEnterSceneNotify;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;

 /** Hooks into the {@link Player} class, adding convenient ways to do certain things. */
 public interface PlayerHook {
--- a/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
+++ b/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
@@ -22,9 +22,9 @@ import emu.grasscutter.scripts.service.ScriptMonsterSpawnService;
 import emu.grasscutter.scripts.service.ScriptMonsterTideService;
 import emu.grasscutter.server.packet.send.PacketGroupSuiteNotify;
 import emu.grasscutter.utils.FileUtils;
-import emu.grasscutter.utils.GridPosition;
+import emu.grasscutter.game.world.GridPosition;
 import emu.grasscutter.utils.JsonUtils;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import io.netty.util.concurrent.FastThreadLocalThread;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
--- a/src/main/java/emu/grasscutter/scripts/ScriptLib.java
+++ b/src/main/java/emu/grasscutter/scripts/ScriptLib.java
@@ -23,7 +23,7 @@ import emu.grasscutter.scripts.data.SceneGroup;
 import emu.grasscutter.scripts.data.SceneObject;
 import emu.grasscutter.scripts.data.ScriptArgs;
 import emu.grasscutter.server.packet.send.*;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import io.netty.util.concurrent.FastThreadLocal;
 import lombok.val;
 import org.luaj.vm2.LuaTable;
--- a/src/main/java/emu/grasscutter/scripts/ScriptUtils.java
+++ b/src/main/java/emu/grasscutter/scripts/ScriptUtils.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.scripts;

 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.HashMap;
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
--- a/src/main/java/emu/grasscutter/scripts/data/SceneBlock.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneBlock.java
@@ -6,7 +6,7 @@ import com.github.davidmoten.rtreemulti.geometry.Rectangle;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.scripts.SceneIndexManager;
 import emu.grasscutter.scripts.ScriptLoader;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.Map;
 import java.util.stream.Collectors;
 import javax.script.Bindings;
--- a/src/main/java/emu/grasscutter/scripts/data/SceneConfig.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneConfig.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.scripts.data;

-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import lombok.Setter;
 import lombok.ToString;

--- a/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java
@@ -2,7 +2,7 @@ package emu.grasscutter.scripts.data;

 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.scripts.ScriptLoader;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
--- a/src/main/java/emu/grasscutter/scripts/data/SceneObject.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneObject.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.scripts.data;

-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import lombok.Setter;
 import lombok.ToString;

--- a/src/main/java/emu/grasscutter/scripts/data/SceneRegion.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneRegion.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.scripts.data;

 import emu.grasscutter.scripts.constants.ScriptRegionShape;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;
 import java.util.List;
 import lombok.EqualsAndHashCode;
 import lombok.Setter;
--- a/src/main/java/emu/grasscutter/server/event/EventHandler.java
+++ b/src/main/java/emu/grasscutter/server/event/EventHandler.java
@@ -2,7 +2,7 @@ package emu.grasscutter.server.event;

 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.plugin.Plugin;
-import emu.grasscutter.utils.EventConsumer;
+import emu.grasscutter.utils.objects.EventConsumer;

 public final class EventHandler<T extends Event> {
    /**
--- a/src/main/java/emu/grasscutter/server/event/entity/EntityDeathEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/entity/EntityDeathEvent.java
@@ -2,7 +2,7 @@ package emu.grasscutter.server.event.entity;

 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.server.event.types.EntityEvent;
-import emu.grasscutter.utils.Location;
+import emu.grasscutter.game.world.Location;
 import javax.annotation.Nullable;
 import lombok.Getter;

--- a/src/main/java/emu/grasscutter/server/event/entity/EntityMoveEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/entity/EntityMoveEvent.java
@@ -3,7 +3,7 @@ package emu.grasscutter.server.event.entity;
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.net.proto.MotionStateOuterClass.MotionState;
 import emu.grasscutter.server.event.types.EntityEvent;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;

 public final class EntityMoveEvent extends EntityEvent {
    private final Position position, rotation;
--- a/src/main/java/emu/grasscutter/server/event/player/PlayerMoveEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/player/PlayerMoveEvent.java
@@ -2,7 +2,7 @@ package emu.grasscutter.server.event.player;

 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.event.types.PlayerEvent;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;

 public final class PlayerMoveEvent extends PlayerEvent {
    private final MoveType type;
--- a/src/main/java/emu/grasscutter/server/event/player/PlayerTeleportEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/player/PlayerTeleportEvent.java
@@ -4,7 +4,7 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.data.TeleportProperties;
 import emu.grasscutter.server.event.Cancellable;
 import emu.grasscutter.server.event.types.PlayerEvent;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.game.world.Position;

 public final class PlayerTeleportEvent extends PlayerEvent implements Cancellable {
    private final TeleportProperties properties;
--- a/src/main/java/emu/grasscutter/server/game/GameServer.java
+++ b/src/main/java/emu/grasscutter/server/game/GameServer.java
@@ -54,7 +54,7 @@ import java.util.concurrent.ConcurrentHashMap;

 import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
 import static emu.grasscutter.config.Configuration.GAME_INFO;
-import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.utils.lang.Language.translate;

@Getter
 public final class GameServer extends KcpServer implements Iterable<Player> {
--- a/Show More
+++ b/Show More