more refactoring of server

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
 
 
 

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.entity.poseactor.PoseActor;
-import electrosphere.server.poseactor.PoseModel;
+import electrosphere.server.entity.poseactor.PoseModel;
 import imgui.ImGui;
 
 /**

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

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;

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;

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 {
 

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;

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)

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;

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;

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

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

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;

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 {
 

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;
 

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

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{
 

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

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

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

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;
 

src/main/java/electrosphere/server/gen/DungeonGen.java

@@ -1,10 +0,0 @@
-package electrosphere.server.gen;
-
-/**
- * Generates dungeons
- */
-public class DungeonGen {
-
-    
-
-}

src/main/java/electrosphere/server/region/Region.java

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

src/main/java/electrosphere/server/region/RegionCuboid.java

@@ -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<Entity> 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<Entity> getContainedEntities() {
-        return containedEntities;
-    }
-    
-}

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

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