Clean up .utils

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;

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;

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;

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;

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;

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;

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 {

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;
 

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;

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;
 

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;

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;
 

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;

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;

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;

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 {

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;

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;
 

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;
 

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

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;

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;

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;

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;

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;

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;

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;
 

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;

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 {

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 {

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

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

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;

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;

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;

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 {

src/main/java/emu/grasscutter/game/world/GridPosition.java

@@ -0,0 +1,125 @@
+package emu.grasscutter.game.world;
+
+import com.github.davidmoten.rtreemulti.geometry.Point;
+import dev.morphia.annotations.Entity;
+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;
+
+    @Getter @Setter private int x;
+
+    @Getter @Setter private int z;
+
+    @Getter @Setter private int width;
+
+    public GridPosition() {}
+
+    public GridPosition(int x, int y, int width) {
+        set(x, y, width);
+    }
+
+    public GridPosition(GridPosition pos) {
+        this.set(pos);
+    }
+
+    public GridPosition(Position pos, int width) {
+        this.set((int) (pos.getX() / width), (int) (pos.getZ() / width), width);
+    }
+
+    public GridPosition(List<Integer> xzwidth) {
+        this.width = xzwidth.get(2);
+        this.z = xzwidth.get(1);
+        this.x = xzwidth.get(0);
+    }
+
+    @SneakyThrows
+    public GridPosition(String str) {
+        var listOfParams = str.replace(" ", "").replace("(", "").replace(")", "").split(",");
+        if (listOfParams.length != 3)
+            throw new IOException("invalid size on GridPosition definition - ");
+        try {
+            this.x = Integer.parseInt(listOfParams[0]);
+            this.z = Integer.parseInt(listOfParams[1]);
+            this.width = Integer.parseInt(listOfParams[2]);
+        } catch (NumberFormatException ignored) {
+            throw new IOException("invalid number on GridPosition definition - ");
+        }
+    }
+
+    public GridPosition set(int x, int z) {
+        this.x = x;
+        this.z = z;
+        return this;
+    }
+
+    public GridPosition set(int x, int z, int width) {
+        this.x = x;
+        this.z = z;
+        this.width = width;
+        return this;
+    }
+
+    // Deep copy
+    public GridPosition set(GridPosition pos) {
+        return this.set(pos.getX(), pos.getZ(), pos.getWidth());
+    }
+
+    public GridPosition addClone(int x, int z) {
+        GridPosition pos = clone();
+        pos.x += x;
+        pos.z += z;
+        return pos;
+    }
+
+    @Override
+    public GridPosition clone() {
+        return new GridPosition(x, z, width);
+    }
+
+    @Override
+    public String toString() {
+        return "(" + this.getX() + ", " + this.getZ() + ", " + this.getWidth() + ")";
+    }
+
+    public int[] toIntArray() {
+        return new int[] {x, z, width};
+    }
+
+    public double[] toDoubleArray() {
+        return new double[] {x, z};
+    }
+
+    public int[] toXZIntArray() {
+        return new int[] {x, z};
+    }
+
+    public Point toPoint() {
+        return Point.create(x, z);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = x ^ (x >>> 32);
+        result = 31 * result + (z ^ (z >>> 32));
+        result = 31 * result + (width ^ (width >>> 32));
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null) return false;
+        if (getClass() != o.getClass()) return false;
+        GridPosition pos = (GridPosition) o;
+        // field comparison
+        return pos.x == x && pos.z == z && pos.width == width;
+    }
+}

src/main/java/emu/grasscutter/game/world/Location.java

@@ -0,0 +1,39 @@
+package emu.grasscutter.game.world;
+
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Transient;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+public class Location extends Position {
+    @Transient @Getter @Setter private Scene scene;
+
+    public Location(Scene scene, Position position) {
+        this.set(position);
+
+        this.scene = scene;
+    }
+
+    public Location(Scene scene, float x, float y) {
+        this.set(x, y);
+
+        this.scene = scene;
+    }
+
+    public Location(Scene scene, float x, float y, float z) {
+        this.set(x, y, z);
+
+        this.scene = scene;
+    }
+
+    @Override
+    public Location clone() {
+        return new Location(this.scene, super.clone());
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%s:%s,%s,%s", this.scene.getId(), this.getX(), this.getY(), this.getZ());
+    }
+}

src/main/java/emu/grasscutter/game/world/Position.java

@@ -0,0 +1,201 @@
+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;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Entity
+public class Position implements Serializable {
+    private static final long serialVersionUID = -2001232313615923575L;
+
+    public static final Position ZERO = new Position(0, 0, 0);
+    public static final Position IDENTITY = new Position(0, 0);
+
+    @SerializedName(
+            value = "x",
+            alternate = {"_x", "X"})
+    @Getter
+    @Setter
+    private float x;
+
+    @SerializedName(
+            value = "y",
+            alternate = {"_y", "Y"})
+    @Getter
+    @Setter
+    private float y;
+
+    @SerializedName(
+            value = "z",
+            alternate = {"_z", "Z"})
+    @Getter
+    @Setter
+    private float z;
+
+    public Position() {}
+
+    public Position(float x, float y) {
+        set(x, y);
+    }
+
+    public Position(float x, float y, float z) {
+        set(x, y, z);
+    }
+
+    public Position(List<Float> xyz) {
+        switch (xyz.size()) {
+            default: // Might want to error on excess elements, but maybe we want to extend to 3+3
+                // representation later.
+            case 3:
+                this.z = xyz.get(2); // Fall-through
+            case 2:
+                this.y = xyz.get(1); // Fall-through
+            case 1:
+                this.y = xyz.get(0); // pointless fall-through
+            case 0:
+                break;
+        }
+    }
+
+    public Position(String p) {
+        String[] split = p.split(",");
+        if (split.length >= 2) {
+            this.x = Float.parseFloat(split[0]);
+            this.y = Float.parseFloat(split[1]);
+        }
+        if (split.length >= 3) {
+            this.z = Float.parseFloat(split[2]);
+        }
+    }
+
+    public Position(Vector vector) {
+        this.set(vector);
+    }
+
+    public Position(Position pos) {
+        this.set(pos);
+    }
+
+    public Position set(float x, float y) {
+        this.x = x;
+        this.y = y;
+        return this;
+    }
+
+    // Deep copy
+    public Position set(Position pos) {
+        return this.set(pos.getX(), pos.getY(), pos.getZ());
+    }
+
+    public Position set(Vector pos) {
+        return this.set(pos.getX(), pos.getY(), pos.getZ());
+    }
+
+    public Position set(float x, float y, float z) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        return this;
+    }
+
+    public Position add(Position add) {
+        this.x += add.getX();
+        this.y += add.getY();
+        this.z += add.getZ();
+        return this;
+    }
+
+    public Position addX(float d) {
+        this.x += d;
+        return this;
+    }
+
+    public Position addY(float d) {
+        this.y += d;
+        return this;
+    }
+
+    public Position addZ(float d) {
+        this.z += d;
+        return this;
+    }
+
+    public Position subtract(Position sub) {
+        this.x -= sub.getX();
+        this.y -= sub.getY();
+        this.z -= sub.getZ();
+        return this;
+    }
+
+    /** In radians */
+    public Position translate(float dist, float angle) {
+        this.x += dist * Math.sin(angle);
+        this.y += dist * Math.cos(angle);
+        return this;
+    }
+
+    public boolean equal2d(Position other) {
+        // Y is height
+        return getX() == other.getX() && getZ() == other.getZ();
+    }
+
+    public boolean equal3d(Position other) {
+        return getX() == other.getX() && getY() == other.getY() && getZ() == other.getZ();
+    }
+
+    public double computeDistance(Position b) {
+        double detX = getX() - b.getX();
+        double detY = getY() - b.getY();
+        double detZ = getZ() - b.getZ();
+        return Math.sqrt(detX * detX + detY * detY + detZ * detZ);
+    }
+
+    public Position nearby2d(float range) {
+        Position position = clone();
+        position.z += Utils.randomFloatRange(-range, range);
+        position.x += Utils.randomFloatRange(-range, range);
+        return position;
+    }
+
+    public Position translateWithDegrees(float dist, float angle) {
+        angle = (float) Math.toRadians(angle);
+        this.x += dist * Math.sin(angle);
+        this.y += -dist * Math.cos(angle);
+        return this;
+    }
+
+    @Override
+    public Position clone() {
+        return new Position(x, y, z);
+    }
+
+    @Override
+    public String toString() {
+        return "(" + this.getX() + ", " + this.getY() + ", " + this.getZ() + ")";
+    }
+
+    public Vector toProto() {
+        return Vector.newBuilder().setX(this.getX()).setY(this.getY()).setZ(this.getZ()).build();
+    }
+
+    public Point toPoint() {
+        return Point.create(x, y, z);
+    }
+
+    /** To XYZ array for Spatial Index */
+    public double[] toDoubleArray() {
+        return new double[] {x, y, z};
+    }
+
+    /** To XZ array for Spatial Index (Blocks) */
+    public double[] toXZDoubleArray() {
+        return new double[] {x, z};
+    }
+}

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;

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;

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;

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;