diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 4cfef5a5..761b4ce9 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1507,6 +1507,7 @@ Terrain editing/saving work (04/16/2025) Refactoring server classes under physics package +Refactoring server classes under entity package diff --git a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityMacros.java b/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityMacros.java index e01867dd..e85498fb 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityMacros.java +++ b/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityMacros.java @@ -38,8 +38,8 @@ import electrosphere.renderer.model.Model; import electrosphere.renderer.ui.imgui.ImGuiWindow; import electrosphere.renderer.ui.imgui.ImGuiWindow.ImGuiWindowCallback; import electrosphere.server.datacell.utils.EntityLookupUtils; -import electrosphere.server.poseactor.PoseActor; -import electrosphere.server.poseactor.PoseModel; +import electrosphere.server.entity.poseactor.PoseActor; +import electrosphere.server.entity.poseactor.PoseModel; import imgui.ImGui; /** diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java index 68a87dff..c2a6047e 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java +++ b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java @@ -37,9 +37,9 @@ import electrosphere.renderer.ui.elementtypes.ContainerElement.YogaFlexDirection import electrosphere.renderer.ui.elementtypes.ContainerElement.YogaJustification; import electrosphere.renderer.ui.events.NavigationEvent; import electrosphere.renderer.ui.events.ValueChangeEvent; -import electrosphere.server.content.unit.UnitUtils; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.utils.EntityLookupUtils; +import electrosphere.server.entity.unit.UnitUtils; /** * Menu generators for level editor diff --git a/src/main/java/electrosphere/engine/Globals.java b/src/main/java/electrosphere/engine/Globals.java index 615d4b03..bb2c63fc 100644 --- a/src/main/java/electrosphere/engine/Globals.java +++ b/src/main/java/electrosphere/engine/Globals.java @@ -83,8 +83,8 @@ import electrosphere.server.ai.AIManager; import electrosphere.server.datacell.EntityDataCellMapper; import electrosphere.server.datacell.RealmManager; import electrosphere.server.db.DatabaseController; +import electrosphere.server.entity.poseactor.PoseModel; import electrosphere.server.pathfinding.NavMeshManager; -import electrosphere.server.poseactor.PoseModel; import electrosphere.server.saves.Save; import electrosphere.server.simulation.MacroSimulation; import electrosphere.server.simulation.MicroSimulation; diff --git a/src/main/java/electrosphere/engine/assetmanager/AssetManager.java b/src/main/java/electrosphere/engine/assetmanager/AssetManager.java index 36e74b2b..bc181dd4 100644 --- a/src/main/java/electrosphere/engine/assetmanager/AssetManager.java +++ b/src/main/java/electrosphere/engine/assetmanager/AssetManager.java @@ -17,7 +17,7 @@ import electrosphere.renderer.shader.ComputeShader; import electrosphere.renderer.shader.VisualShader; import electrosphere.renderer.texture.Texture; import electrosphere.renderer.texture.TextureMap; -import electrosphere.server.poseactor.PoseModel; +import electrosphere.server.entity.poseactor.PoseModel; import electrosphere.util.FileUtils; import java.io.File; diff --git a/src/main/java/electrosphere/entity/EntityCreationUtils.java b/src/main/java/electrosphere/entity/EntityCreationUtils.java index b1397e8c..d2c5be78 100644 --- a/src/main/java/electrosphere/entity/EntityCreationUtils.java +++ b/src/main/java/electrosphere/entity/EntityCreationUtils.java @@ -11,7 +11,7 @@ import electrosphere.server.datacell.ServerDataCell; import electrosphere.server.datacell.utils.EntityLookupUtils; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; import electrosphere.server.datacell.utils.ServerEntityTagUtils; -import electrosphere.server.poseactor.PoseActorUtils; +import electrosphere.server.entity.poseactor.PoseActorUtils; public class EntityCreationUtils { diff --git a/src/main/java/electrosphere/entity/EntityUtils.java b/src/main/java/electrosphere/entity/EntityUtils.java index 06740394..423bb164 100644 --- a/src/main/java/electrosphere/entity/EntityUtils.java +++ b/src/main/java/electrosphere/entity/EntityUtils.java @@ -5,7 +5,7 @@ import electrosphere.renderer.actor.Actor; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.ServerDataCell; import electrosphere.server.datacell.utils.EntityLookupUtils; -import electrosphere.server.poseactor.PoseActor; +import electrosphere.server.entity.poseactor.PoseActor; import org.joml.Quaterniond; import org.joml.Vector3d; diff --git a/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java b/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java index bda1b6aa..b94b2986 100644 --- a/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java +++ b/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java @@ -12,7 +12,7 @@ import electrosphere.game.data.common.treedata.TreeDataAudio; import electrosphere.game.data.common.treedata.TreeDataState; import electrosphere.logger.LoggerInterface; import electrosphere.renderer.actor.Actor; -import electrosphere.server.poseactor.PoseActor; +import electrosphere.server.entity.poseactor.PoseActor; /** * For a lot of behavior trees, there are states where we simply want to play an animation (ie a cooldown) diff --git a/src/main/java/electrosphere/entity/scene/SceneLoader.java b/src/main/java/electrosphere/entity/scene/SceneLoader.java index c6d6945d..140bbbb8 100644 --- a/src/main/java/electrosphere/entity/scene/SceneLoader.java +++ b/src/main/java/electrosphere/entity/scene/SceneLoader.java @@ -9,9 +9,9 @@ import electrosphere.entity.types.common.CommonEntityUtils; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.item.ItemUtils; import electrosphere.game.server.world.ServerWorldData; -import electrosphere.server.content.ServerContentManager; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.gridded.GriddedDataCellManager; +import electrosphere.server.entity.ServerContentManager; import electrosphere.server.physics.terrain.generation.DefaultChunkGenerator; import electrosphere.server.physics.terrain.manager.ServerTerrainChunk; import electrosphere.util.FileUtils; diff --git a/src/main/java/electrosphere/entity/state/attach/AttachUtils.java b/src/main/java/electrosphere/entity/state/attach/AttachUtils.java index 98d032e6..659e973b 100644 --- a/src/main/java/electrosphere/entity/state/attach/AttachUtils.java +++ b/src/main/java/electrosphere/entity/state/attach/AttachUtils.java @@ -9,7 +9,7 @@ import electrosphere.logger.LoggerInterface; import electrosphere.renderer.actor.Actor; import electrosphere.server.datacell.ServerDataCell; import electrosphere.server.datacell.utils.ServerEntityTagUtils; -import electrosphere.server.poseactor.PoseActor; +import electrosphere.server.entity.poseactor.PoseActor; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java b/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java index 4e04452f..be546ee9 100644 --- a/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java +++ b/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java @@ -42,7 +42,7 @@ import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.ServerDataCell; import electrosphere.server.datacell.utils.DataCellSearchUtils; import electrosphere.server.datacell.utils.ServerEntityTagUtils; -import electrosphere.server.poseactor.PoseActor; +import electrosphere.server.entity.poseactor.PoseActor; import electrosphere.server.utils.ServerScriptUtils; @SynchronizedBehaviorTree(name = "serverEquipState", isServer = true, correspondingTree="clientEquipState") diff --git a/src/main/java/electrosphere/entity/state/hitbox/HitboxCollectionState.java b/src/main/java/electrosphere/entity/state/hitbox/HitboxCollectionState.java index c20416f7..ec936f98 100644 --- a/src/main/java/electrosphere/entity/state/hitbox/HitboxCollectionState.java +++ b/src/main/java/electrosphere/entity/state/hitbox/HitboxCollectionState.java @@ -27,7 +27,7 @@ import electrosphere.game.data.collidable.HitboxData; import electrosphere.game.data.utils.DataFormatUtil; import electrosphere.logger.LoggerInterface; import electrosphere.server.datacell.Realm; -import electrosphere.server.poseactor.PoseActor; +import electrosphere.server.entity.poseactor.PoseActor; import electrosphere.util.math.SpatialMathUtils; /** diff --git a/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java b/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java index 21c7ebc4..3488c521 100644 --- a/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java +++ b/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java @@ -21,7 +21,7 @@ import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums; import electrosphere.net.synchronization.enums.FieldIdEnums; import electrosphere.server.datacell.utils.DataCellSearchUtils; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; -import electrosphere.server.poseactor.PoseActor; +import electrosphere.server.entity.poseactor.PoseActor; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/electrosphere/entity/state/movement/fall/ServerFallTree.java b/src/main/java/electrosphere/entity/state/movement/fall/ServerFallTree.java index 727fa5e6..85d1239a 100644 --- a/src/main/java/electrosphere/entity/state/movement/fall/ServerFallTree.java +++ b/src/main/java/electrosphere/entity/state/movement/fall/ServerFallTree.java @@ -10,7 +10,7 @@ import electrosphere.entity.state.gravity.ServerGravityTree; import electrosphere.entity.state.movement.jump.ServerJumpTree; import electrosphere.game.data.common.treedata.TreeDataAnimation; import electrosphere.game.data.creature.type.movement.FallMovementSystem; -import electrosphere.server.poseactor.PoseActor; +import electrosphere.server.entity.poseactor.PoseActor; public class ServerFallTree implements BehaviorTree { diff --git a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java index c6f445b7..228076e2 100644 --- a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java @@ -2,6 +2,7 @@ package electrosphere.entity.state.movement.groundmove; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; +import electrosphere.server.entity.poseactor.PoseActor; import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.entity.state.gravity.GravityUtils; import electrosphere.client.entity.camera.CameraEntityUtils; @@ -31,7 +32,6 @@ import electrosphere.net.synchronization.enums.FieldIdEnums; import electrosphere.renderer.anim.Animation; import electrosphere.script.utils.AccessTransforms; import electrosphere.server.datacell.utils.DataCellSearchUtils; -import electrosphere.server.poseactor.PoseActor; import electrosphere.server.utils.ServerScriptUtils; import electrosphere.util.math.SpatialMathUtils; diff --git a/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java b/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java index 372e8fd5..bb680bad 100644 --- a/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java +++ b/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java @@ -2,6 +2,7 @@ package electrosphere.entity.state.movement.jump; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; +import electrosphere.server.entity.poseactor.PoseActor; import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.server.datacell.utils.DataCellSearchUtils; import electrosphere.engine.Globals; @@ -21,7 +22,6 @@ import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums; import electrosphere.net.synchronization.enums.FieldIdEnums; -import electrosphere.server.poseactor.PoseActor; @SynchronizedBehaviorTree(name = "serverJumpTree", isServer = true, correspondingTree="clientJumpTree") /* diff --git a/src/main/java/electrosphere/entity/state/rotator/ServerRotatorTree.java b/src/main/java/electrosphere/entity/state/rotator/ServerRotatorTree.java index a34b2f63..c406fa32 100644 --- a/src/main/java/electrosphere/entity/state/rotator/ServerRotatorTree.java +++ b/src/main/java/electrosphere/entity/state/rotator/ServerRotatorTree.java @@ -14,7 +14,7 @@ import electrosphere.entity.EntityUtils; import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.state.view.ViewUtils; import electrosphere.renderer.actor.ActorBoneRotator; -import electrosphere.server.poseactor.PoseActor; +import electrosphere.server.entity.poseactor.PoseActor; public class ServerRotatorTree implements BehaviorTree{ diff --git a/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java b/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java index e89cc90a..3ba1369e 100644 --- a/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java +++ b/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java @@ -90,7 +90,7 @@ import electrosphere.renderer.actor.ActorUtils; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; import electrosphere.server.datacell.utils.ServerEntityTagUtils; -import electrosphere.server.poseactor.PoseActor; +import electrosphere.server.entity.poseactor.PoseActor; import electrosphere.util.math.SpatialMathUtils; /** diff --git a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java b/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java index 5ada874e..87b228dc 100644 --- a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java +++ b/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java @@ -40,7 +40,7 @@ import electrosphere.renderer.actor.Actor; import electrosphere.renderer.actor.ActorStaticMorph; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.utils.EntityLookupUtils; -import electrosphere.server.poseactor.PoseActor; +import electrosphere.server.entity.poseactor.PoseActor; import electrosphere.util.Utilities; /** diff --git a/src/main/java/electrosphere/entity/types/item/ItemUtils.java b/src/main/java/electrosphere/entity/types/item/ItemUtils.java index f3ef5292..f98c3f8d 100644 --- a/src/main/java/electrosphere/entity/types/item/ItemUtils.java +++ b/src/main/java/electrosphere/entity/types/item/ItemUtils.java @@ -39,7 +39,7 @@ import electrosphere.net.server.player.Player; import electrosphere.renderer.actor.Actor; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.utils.ServerEntityTagUtils; -import electrosphere.server.poseactor.PoseActor; +import electrosphere.server.entity.poseactor.PoseActor; /** * Utilities for working with items diff --git a/src/main/java/electrosphere/server/datacell/Realm.java b/src/main/java/electrosphere/server/datacell/Realm.java index 21281c9e..748fb7ba 100644 --- a/src/main/java/electrosphere/server/datacell/Realm.java +++ b/src/main/java/electrosphere/server/datacell/Realm.java @@ -9,8 +9,8 @@ import electrosphere.entity.scene.Scene; import electrosphere.game.server.world.ServerWorldData; import electrosphere.net.parser.net.message.NetworkMessage; import electrosphere.script.ScriptEngine; -import electrosphere.server.content.ServerContentManager; import electrosphere.server.datacell.interfaces.DataCellManager; +import electrosphere.server.entity.ServerContentManager; import java.util.HashSet; import java.util.LinkedList; diff --git a/src/main/java/electrosphere/server/datacell/RealmManager.java b/src/main/java/electrosphere/server/datacell/RealmManager.java index 5d55cbed..3d5a9269 100644 --- a/src/main/java/electrosphere/server/datacell/RealmManager.java +++ b/src/main/java/electrosphere/server/datacell/RealmManager.java @@ -15,8 +15,8 @@ import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.game.server.world.ServerWorldData; import electrosphere.net.server.player.Player; -import electrosphere.server.content.ServerContentManager; import electrosphere.server.datacell.gridded.GriddedDataCellManager; +import electrosphere.server.entity.ServerContentManager; import electrosphere.server.physics.chemistry.ServerChemistryCollisionCallback; import electrosphere.server.physics.collision.ServerHitboxResolutionCallback; import electrosphere.server.physics.fluid.simulator.FluidAcceleratedSimulator; diff --git a/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java b/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java index cdf5d087..08014307 100644 --- a/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java +++ b/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java @@ -29,13 +29,13 @@ import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.parser.net.message.TerrainMessage; import electrosphere.net.server.player.Player; import electrosphere.net.server.protocol.TerrainProtocol; -import electrosphere.server.content.ServerContentManager; -import electrosphere.server.content.serialization.ContentSerialization; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.ServerDataCell; import electrosphere.server.datacell.interfaces.DataCellManager; import electrosphere.server.datacell.interfaces.VoxelCellManager; import electrosphere.server.datacell.physics.PhysicsDataCell; +import electrosphere.server.entity.ServerContentManager; +import electrosphere.server.entity.serialization.ContentSerialization; import electrosphere.server.physics.block.manager.ServerBlockManager; import electrosphere.server.physics.fluid.manager.ServerFluidChunk; import electrosphere.server.physics.fluid.manager.ServerFluidManager; diff --git a/src/main/java/electrosphere/server/content/EnvironmentGenerator.java b/src/main/java/electrosphere/server/entity/EnvironmentGenerator.java similarity index 98% rename from src/main/java/electrosphere/server/content/EnvironmentGenerator.java rename to src/main/java/electrosphere/server/entity/EnvironmentGenerator.java index a6381a03..524232f7 100644 --- a/src/main/java/electrosphere/server/content/EnvironmentGenerator.java +++ b/src/main/java/electrosphere/server/entity/EnvironmentGenerator.java @@ -1,4 +1,4 @@ -package electrosphere.server.content; +package electrosphere.server.entity; import electrosphere.entity.Entity; import electrosphere.entity.types.foliage.FoliageUtils; diff --git a/src/main/java/electrosphere/server/content/ServerContentGenerator.java b/src/main/java/electrosphere/server/entity/ServerContentGenerator.java similarity index 99% rename from src/main/java/electrosphere/server/content/ServerContentGenerator.java rename to src/main/java/electrosphere/server/entity/ServerContentGenerator.java index f6c17924..dcc13341 100644 --- a/src/main/java/electrosphere/server/content/ServerContentGenerator.java +++ b/src/main/java/electrosphere/server/entity/ServerContentGenerator.java @@ -1,4 +1,4 @@ -package electrosphere.server.content; +package electrosphere.server.entity; import java.util.List; import java.util.Random; diff --git a/src/main/java/electrosphere/server/content/ServerContentManager.java b/src/main/java/electrosphere/server/entity/ServerContentManager.java similarity index 97% rename from src/main/java/electrosphere/server/content/ServerContentManager.java rename to src/main/java/electrosphere/server/entity/ServerContentManager.java index 3b63d420..8434b041 100644 --- a/src/main/java/electrosphere/server/content/ServerContentManager.java +++ b/src/main/java/electrosphere/server/entity/ServerContentManager.java @@ -1,4 +1,4 @@ -package electrosphere.server.content; +package electrosphere.server.entity; import java.util.Collection; @@ -8,9 +8,9 @@ import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.server.ServerCharacterData; import electrosphere.server.character.CharacterService; -import electrosphere.server.content.serialization.ContentSerialization; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.ServerDataCell; +import electrosphere.server.entity.serialization.ContentSerialization; import electrosphere.server.saves.SaveUtils; import electrosphere.util.FileUtils; import electrosphere.util.math.HashUtils; diff --git a/src/main/java/electrosphere/server/poseactor/PoseActor.java b/src/main/java/electrosphere/server/entity/poseactor/PoseActor.java similarity index 99% rename from src/main/java/electrosphere/server/poseactor/PoseActor.java rename to src/main/java/electrosphere/server/entity/poseactor/PoseActor.java index 7421cb7b..0ba1b54a 100644 --- a/src/main/java/electrosphere/server/poseactor/PoseActor.java +++ b/src/main/java/electrosphere/server/entity/poseactor/PoseActor.java @@ -1,4 +1,4 @@ -package electrosphere.server.poseactor; +package electrosphere.server.entity.poseactor; import java.util.HashMap; import java.util.LinkedList; diff --git a/src/main/java/electrosphere/server/poseactor/PoseActorUtils.java b/src/main/java/electrosphere/server/entity/poseactor/PoseActorUtils.java similarity index 91% rename from src/main/java/electrosphere/server/poseactor/PoseActorUtils.java rename to src/main/java/electrosphere/server/entity/poseactor/PoseActorUtils.java index 4a5e58a1..1706791f 100644 --- a/src/main/java/electrosphere/server/poseactor/PoseActorUtils.java +++ b/src/main/java/electrosphere/server/entity/poseactor/PoseActorUtils.java @@ -1,4 +1,4 @@ -package electrosphere.server.poseactor; +package electrosphere.server.entity.poseactor; import electrosphere.engine.Globals; diff --git a/src/main/java/electrosphere/server/poseactor/PoseModel.java b/src/main/java/electrosphere/server/entity/poseactor/PoseModel.java similarity index 99% rename from src/main/java/electrosphere/server/poseactor/PoseModel.java rename to src/main/java/electrosphere/server/entity/poseactor/PoseModel.java index 5a0779de..aad12c93 100644 --- a/src/main/java/electrosphere/server/poseactor/PoseModel.java +++ b/src/main/java/electrosphere/server/entity/poseactor/PoseModel.java @@ -1,4 +1,4 @@ -package electrosphere.server.poseactor; +package electrosphere.server.entity.poseactor; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/electrosphere/server/content/serialization/ContentSerialization.java b/src/main/java/electrosphere/server/entity/serialization/ContentSerialization.java similarity index 99% rename from src/main/java/electrosphere/server/content/serialization/ContentSerialization.java rename to src/main/java/electrosphere/server/entity/serialization/ContentSerialization.java index a2f9f3ce..17c1ecd3 100644 --- a/src/main/java/electrosphere/server/content/serialization/ContentSerialization.java +++ b/src/main/java/electrosphere/server/entity/serialization/ContentSerialization.java @@ -1,4 +1,4 @@ -package electrosphere.server.content.serialization; +package electrosphere.server.entity.serialization; import java.util.Collection; import java.util.LinkedList; diff --git a/src/main/java/electrosphere/server/content/serialization/EntitySerialization.java b/src/main/java/electrosphere/server/entity/serialization/EntitySerialization.java similarity index 97% rename from src/main/java/electrosphere/server/content/serialization/EntitySerialization.java rename to src/main/java/electrosphere/server/entity/serialization/EntitySerialization.java index 8b44ca8a..741b1e70 100644 --- a/src/main/java/electrosphere/server/content/serialization/EntitySerialization.java +++ b/src/main/java/electrosphere/server/entity/serialization/EntitySerialization.java @@ -1,4 +1,4 @@ -package electrosphere.server.content.serialization; +package electrosphere.server.entity.serialization; import org.joml.Quaterniond; import org.joml.Vector3d; diff --git a/src/main/java/electrosphere/server/content/unit/UnitUtils.java b/src/main/java/electrosphere/server/entity/unit/UnitUtils.java similarity index 98% rename from src/main/java/electrosphere/server/content/unit/UnitUtils.java rename to src/main/java/electrosphere/server/entity/unit/UnitUtils.java index ead7dd8e..888f7c8f 100644 --- a/src/main/java/electrosphere/server/content/unit/UnitUtils.java +++ b/src/main/java/electrosphere/server/entity/unit/UnitUtils.java @@ -1,4 +1,4 @@ -package electrosphere.server.content.unit; +package electrosphere.server.entity.unit; import org.joml.Vector3d; diff --git a/src/main/java/electrosphere/server/gen/DungeonGen.java b/src/main/java/electrosphere/server/gen/DungeonGen.java deleted file mode 100644 index 80dd9c6c..00000000 --- a/src/main/java/electrosphere/server/gen/DungeonGen.java +++ /dev/null @@ -1,10 +0,0 @@ -package electrosphere.server.gen; - -/** - * Generates dungeons - */ -public class DungeonGen { - - - -} \ No newline at end of file diff --git a/src/main/java/electrosphere/server/region/Region.java b/src/main/java/electrosphere/server/region/Region.java deleted file mode 100644 index 2d8aba8b..00000000 --- a/src/main/java/electrosphere/server/region/Region.java +++ /dev/null @@ -1,23 +0,0 @@ -package electrosphere.server.region; - -import java.util.List; - -import org.joml.Vector3d; - -import electrosphere.entity.Entity; - -public interface Region { - - public static enum RegionType { - REGION_TYPE_CUBOID, - } - - public Vector3d getPosition(); - - public void setPosition(Vector3d position); - - public RegionType getRegionType(); - - public List getContainedEntities(); - -} diff --git a/src/main/java/electrosphere/server/region/RegionCuboid.java b/src/main/java/electrosphere/server/region/RegionCuboid.java deleted file mode 100644 index f7c05793..00000000 --- a/src/main/java/electrosphere/server/region/RegionCuboid.java +++ /dev/null @@ -1,49 +0,0 @@ -package electrosphere.server.region; - -import java.util.List; - -import org.joml.Vector3d; - -import electrosphere.entity.Entity; - -public class RegionCuboid implements Region { - - Vector3d position; - Vector3d radius; - - List containedEntities; - - public RegionCuboid(Vector3d position, Vector3d radius){ - this.position = position; - this.radius = radius; - } - - @Override - public Vector3d getPosition() { - return position; - } - - @Override - public void setPosition(Vector3d position) { - this.position = position; - } - - @Override - public RegionType getRegionType() { - return RegionType.REGION_TYPE_CUBOID; - } - - public Vector3d getRadius(){ - return radius; - } - - public void setRadius(Vector3d radius){ - this.radius = radius; - } - - @Override - public List getContainedEntities() { - return containedEntities; - } - -} diff --git a/src/main/java/electrosphere/server/simulation/MicroSimulation.java b/src/main/java/electrosphere/server/simulation/MicroSimulation.java index 1e9f572a..385f8a84 100644 --- a/src/main/java/electrosphere/server/simulation/MicroSimulation.java +++ b/src/main/java/electrosphere/server/simulation/MicroSimulation.java @@ -10,7 +10,7 @@ import electrosphere.entity.state.attach.AttachUtils; import electrosphere.entity.state.collidable.ServerCollidableTree; import electrosphere.entity.types.item.ItemUtils; import electrosphere.server.datacell.ServerDataCell; -import electrosphere.server.poseactor.PoseActor; +import electrosphere.server.entity.poseactor.PoseActor; /** * Server-side micro-scale simulation diff --git a/src/test/java/electrosphere/server/ai/nodes/actions/combat/MeleeTargetingNodeTests.java b/src/test/java/electrosphere/server/ai/nodes/actions/combat/MeleeTargetingNodeTests.java index 5d6c6db3..2fbca188 100644 --- a/src/test/java/electrosphere/server/ai/nodes/actions/combat/MeleeTargetingNodeTests.java +++ b/src/test/java/electrosphere/server/ai/nodes/actions/combat/MeleeTargetingNodeTests.java @@ -12,7 +12,7 @@ import electrosphere.entity.types.creature.CreatureTemplate; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.server.ai.blackboard.Blackboard; import electrosphere.server.ai.nodes.AITreeNode.AITreeNodeResult; -import electrosphere.server.content.unit.UnitUtils; +import electrosphere.server.entity.unit.UnitUtils; import electrosphere.test.template.EntityTestTemplate; /**