Move scene entities into their own package

src/main/java/emu/lunarcore/commands/PlayerCommands.java

@@ -11,7 +11,7 @@ import emu.lunarcore.data.excel.NpcMonsterExcel;
 import emu.lunarcore.data.excel.StageExcel;
 import emu.lunarcore.game.inventory.GameItem;
 import emu.lunarcore.game.player.Player;
-import emu.lunarcore.game.scene.EntityMonster;
+import emu.lunarcore.game.scene.entity.EntityMonster;
 import emu.lunarcore.util.Position;
 
 @SuppressWarnings("unused")

src/main/java/emu/lunarcore/data/config/PropInfo.java

@@ -1,6 +1,6 @@
 package emu.lunarcore.data.config;
 
-import emu.lunarcore.game.scene.PropState;
+import emu.lunarcore.game.scene.entity.PropState;
 import lombok.Getter;
 
 @Getter

src/main/java/emu/lunarcore/game/avatar/GameAvatar.java

@@ -15,7 +15,7 @@ import emu.lunarcore.data.excel.AvatarExcel;
 import emu.lunarcore.game.inventory.GameItem;
 import emu.lunarcore.game.inventory.ItemMainType;
 import emu.lunarcore.game.player.Player;
-import emu.lunarcore.game.scene.GameEntity;
+import emu.lunarcore.game.scene.entity.GameEntity;
 import emu.lunarcore.proto.AvatarOuterClass.Avatar;
 import emu.lunarcore.proto.AvatarSkillTreeOuterClass.AvatarSkillTree;
 import emu.lunarcore.proto.AvatarTypeOuterClass.AvatarType;

src/main/java/emu/lunarcore/game/battle/Battle.java

@@ -9,7 +9,7 @@ import emu.lunarcore.data.excel.StageExcel;
 import emu.lunarcore.game.avatar.GameAvatar;
 import emu.lunarcore.game.player.Player;
 import emu.lunarcore.game.player.PlayerLineup;
-import emu.lunarcore.game.scene.EntityMonster;
+import emu.lunarcore.game.scene.entity.EntityMonster;
 import emu.lunarcore.proto.SceneBattleInfoOuterClass.SceneBattleInfo;
 import emu.lunarcore.proto.SceneMonsterOuterClass.SceneMonster;
 import emu.lunarcore.proto.SceneMonsterWaveOuterClass.SceneMonsterWave;

src/main/java/emu/lunarcore/game/battle/BattleService.java

@@ -8,9 +8,9 @@ import java.util.Objects;
 import emu.lunarcore.data.GameData;
 import emu.lunarcore.game.avatar.GameAvatar;
 import emu.lunarcore.game.player.Player;
-import emu.lunarcore.game.scene.EntityMonster;
-import emu.lunarcore.game.scene.EntityProp;
-import emu.lunarcore.game.scene.GameEntity;
+import emu.lunarcore.game.scene.entity.EntityMonster;
+import emu.lunarcore.game.scene.entity.EntityProp;
+import emu.lunarcore.game.scene.entity.GameEntity;
 import emu.lunarcore.proto.AvatarBattleInfoOuterClass.AvatarBattleInfo;
 import emu.lunarcore.proto.AvatarPropertyOuterClass.AvatarProperty;
 import emu.lunarcore.proto.BattleEndStatusOuterClass.BattleEndStatus;

src/main/java/emu/lunarcore/game/scene/Scene.java

@@ -11,6 +11,7 @@ import emu.lunarcore.data.excel.NpcMonsterExcel;
 import emu.lunarcore.data.excel.StageExcel;
 import emu.lunarcore.game.avatar.GameAvatar;
 import emu.lunarcore.game.player.PlayerLineup;
+import emu.lunarcore.game.scene.entity.*;
 import emu.lunarcore.game.player.Player;
 import emu.lunarcore.proto.SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo;
 import emu.lunarcore.proto.SceneInfoOuterClass.SceneInfo;

src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java

@@ -1,4 +1,4 @@
-package emu.lunarcore.game.scene;
+package emu.lunarcore.game.scene.entity;
 
 import emu.lunarcore.data.excel.NpcMonsterExcel;
 import emu.lunarcore.data.excel.StageExcel;

src/main/java/emu/lunarcore/game/scene/entity/EntityNpc.java

@@ -1,4 +1,4 @@
-package emu.lunarcore.game.scene;
+package emu.lunarcore.game.scene.entity;
 
 import emu.lunarcore.proto.MotionInfoOuterClass.MotionInfo;
 import emu.lunarcore.proto.SceneEntityInfoOuterClass.SceneEntityInfo;

src/main/java/emu/lunarcore/game/scene/entity/EntityProp.java

@@ -1,4 +1,4 @@
-package emu.lunarcore.game.scene;
+package emu.lunarcore.game.scene.entity;
 
 import emu.lunarcore.data.excel.NpcMonsterExcel;
 import emu.lunarcore.data.excel.StageExcel;

src/main/java/emu/lunarcore/game/scene/entity/GameEntity.java

@@ -1,4 +1,4 @@
-package emu.lunarcore.game.scene;
+package emu.lunarcore.game.scene.entity;
 
 import emu.lunarcore.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
 

src/main/java/emu/lunarcore/game/scene/entity/PropState.java

@@ -1,4 +1,4 @@
-package emu.lunarcore.game.scene;
+package emu.lunarcore.game.scene.entity;
 
 import lombok.Getter;
 

src/main/java/emu/lunarcore/server/packet/send/PacketSceneCastSkillScRsp.java

@@ -3,8 +3,8 @@ package emu.lunarcore.server.packet.send;
 import emu.lunarcore.game.avatar.GameAvatar;
 import emu.lunarcore.game.battle.Battle;
 import emu.lunarcore.game.player.PlayerLineup;
+import emu.lunarcore.game.scene.entity.EntityMonster;
 import emu.lunarcore.game.player.Player;
-import emu.lunarcore.game.scene.EntityMonster;
 import emu.lunarcore.proto.SceneBattleInfoOuterClass.SceneBattleInfo;
 import emu.lunarcore.proto.SceneCastSkillScRspOuterClass.SceneCastSkillScRsp;
 import emu.lunarcore.proto.SceneMonsterOuterClass.SceneMonster;

src/main/java/emu/lunarcore/server/packet/send/PacketSceneEntityUpdateScNotify.java

@@ -1,6 +1,6 @@
 package emu.lunarcore.server.packet.send;
 
-import emu.lunarcore.game.scene.GameEntity;
+import emu.lunarcore.game.scene.entity.GameEntity;
 import emu.lunarcore.proto.SceneEntityUpdateScNotifyOuterClass.SceneEntityUpdateScNotify;
 import emu.lunarcore.server.packet.BasePacket;
 import emu.lunarcore.server.packet.CmdId;

src/main/java/emu/lunarcore/server/packet/send/PacketSceneGroupRefreshScNotify.java

@@ -2,7 +2,7 @@ package emu.lunarcore.server.packet.send;
 
 import java.util.Collection;
 
-import emu.lunarcore.game.scene.GameEntity;
+import emu.lunarcore.game.scene.entity.GameEntity;
 import emu.lunarcore.proto.SceneEntityRefreshInfoOuterClass.SceneEntityRefreshInfo;
 import emu.lunarcore.proto.SceneGroupRefreshInfoOuterClass.SceneGroupRefreshInfo;
 import emu.lunarcore.proto.SceneGroupRefreshScNotifyOuterClass.SceneGroupRefreshScNotify;