Moved some files around

src/main/java/emu/grasscutter/command/CommandHandler.java

@@ -1,7 +1,7 @@
 package emu.grasscutter.command;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 

src/main/java/emu/grasscutter/command/CommandMap.java

@@ -2,7 +2,8 @@ package emu.grasscutter.command;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.Account;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
+
 import org.reflections.Reflections;
 
 import java.util.*;

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

@@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 

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

@@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 

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

@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;
 
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 

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

@@ -3,9 +3,9 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
 import emu.grasscutter.game.inventory.Inventory;
 import emu.grasscutter.game.inventory.ItemType;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 

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

@@ -4,8 +4,8 @@ import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.ItemData;
-import emu.grasscutter.game.Player;
 import emu.grasscutter.game.entity.EntityItem;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.utils.Position;
 
 import java.util.List;

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

@@ -6,10 +6,10 @@ import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.AvatarData;
 import emu.grasscutter.data.def.ItemData;
-import emu.grasscutter.game.Player;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.inventory.ItemType;
+import emu.grasscutter.game.player.Player;
 
 import java.util.*;
 

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

@@ -5,8 +5,8 @@ import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.AvatarData;
-import emu.grasscutter.game.Player;
 import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 

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

@@ -5,8 +5,8 @@ import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.ItemData;
-import emu.grasscutter.game.Player;
 import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.server.packet.send.PacketItemAddHintNotify;
 

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

@@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 

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

@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;
 
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.server.packet.send.PacketAvatarFightPropUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketAvatarLifeStateChangeNotify;

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

@@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.command.CommandMap;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 
 import java.util.*;
 

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

@@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 

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

@@ -3,9 +3,9 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
-import emu.grasscutter.game.Scene;
 import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.world.Scene;
 
 import java.util.List;
 

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

@@ -3,8 +3,8 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
 import emu.grasscutter.game.entity.EntityAvatar;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.game.props.LifeState;
 import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;

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

@@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 import java.util.Map;

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

@@ -4,7 +4,7 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.Account;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 

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

@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;
 
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 

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

@@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 

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

@@ -2,9 +2,9 @@ package emu.grasscutter.command.commands;
 
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.EntityAvatar;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 

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

@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;
 
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 

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

@@ -4,8 +4,8 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.Player;
-import emu.grasscutter.game.Mail;
+import emu.grasscutter.game.mail.Mail;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.packet.send.PacketMailChangeNotify;
 
 import java.time.Instant;

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

@@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 

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

@@ -5,8 +5,8 @@ import java.util.List;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.game.Player;
 import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.packet.send.PacketAvatarFetterDataNotify;
 
 @Command(label = "setfetterlevel", usage = "setfetterlevel <level>",

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

@@ -2,8 +2,8 @@ package emu.grasscutter.command.commands;
 
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
 import emu.grasscutter.game.entity.EntityAvatar;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
 

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

@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;
 
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.PlayerProperty;
 
 import java.util.List;

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

@@ -4,8 +4,8 @@ import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.MonsterData;
-import emu.grasscutter.game.Player;
 import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.utils.Position;
 
 import java.util.List;

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

@@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 

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

@@ -3,9 +3,9 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.def.AvatarSkillDepotData;
-import emu.grasscutter.game.Player;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.EntityAvatar;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.packet.send.PacketAvatarSkillChangeNotify;
 import emu.grasscutter.server.packet.send.PacketAvatarSkillUpgradeRsp;
 

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

@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;
 
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.utils.Position;
 
 import java.util.List;

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

@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;
 
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.Player;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ClimateType;
 import emu.grasscutter.server.packet.send.PacketSceneAreaWeatherNotify;