macro data refactoring

docs/src/progress/renderertodo.md

@@ -1508,6 +1508,7 @@ Terrain editing/saving work
 (04/16/2025)
 Refactoring server classes under physics package
 Refactoring server classes under entity package
+Refactoring server macro data classes
 
 
 

src/main/java/electrosphere/collision/CollisionWorldData.java

@@ -2,7 +2,7 @@ package electrosphere.collision;
 
 import electrosphere.client.scene.ClientWorldData;
 import electrosphere.client.terrain.manager.ClientTerrainManager;
-import electrosphere.game.server.world.ServerWorldData;
+import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.physics.terrain.manager.ServerTerrainManager;
 
 import org.joml.Vector3f;

src/main/java/electrosphere/collision/PhysicsEntityUtils.java

@@ -23,8 +23,8 @@ import electrosphere.entity.state.collidable.TriGeomData;
 import electrosphere.entity.state.physicssync.ClientPhysicsSyncTree;
 import electrosphere.entity.state.physicssync.ServerPhysicsSyncTree;
 import electrosphere.game.data.collidable.CollidableTemplate;
-import electrosphere.game.server.world.ServerWorldData;
 import electrosphere.server.datacell.Realm;
+import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.datacell.utils.ServerEntityTagUtils;
 
 /**

src/main/java/electrosphere/engine/Globals.java

@@ -52,8 +52,6 @@ import electrosphere.game.config.UserSettings;
 import electrosphere.game.data.common.CommonEntityType;
 import electrosphere.game.data.particle.ParticleDefinition;
 import electrosphere.game.data.voxel.VoxelType;
-import electrosphere.game.server.structure.virtual.StructureManager;
-import electrosphere.game.server.world.MacroData;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.net.client.ClientNetworking;
 import electrosphere.net.config.NetConfig;
@@ -84,6 +82,8 @@ import electrosphere.server.datacell.EntityDataCellMapper;
 import electrosphere.server.datacell.RealmManager;
 import electrosphere.server.db.DatabaseController;
 import electrosphere.server.entity.poseactor.PoseModel;
+import electrosphere.server.macro.MacroData;
+import electrosphere.server.macro.structure.virtual.StructureManager;
 import electrosphere.server.pathfinding.NavMeshManager;
 import electrosphere.server.saves.Save;
 import electrosphere.server.simulation.MacroSimulation;

src/main/java/electrosphere/engine/Main.java

@@ -17,10 +17,10 @@ import electrosphere.engine.loadingthreads.LoadingThread;
 import electrosphere.engine.loadingthreads.LoadingThread.LoadingThreadType;
 import electrosphere.engine.signal.SynchronousSignalHandling;
 import electrosphere.engine.time.Timekeeper;
-import electrosphere.game.server.world.MacroData;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.renderer.RenderingEngine;
 import electrosphere.server.MainServerFunctions;
+import electrosphere.server.macro.MacroData;
 import electrosphere.server.simulation.MacroSimulation;
 
 

src/main/java/electrosphere/entity/ServerEntityUtils.java

@@ -8,11 +8,11 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.hitbox.HitboxCollectionState;
 import electrosphere.entity.types.collision.CollisionObjUtils;
-import electrosphere.game.server.world.ServerWorldData;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.server.datacell.Realm;
 import electrosphere.server.datacell.ServerDataCell;
+import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.datacell.utils.DataCellSearchUtils;
 import electrosphere.server.datacell.utils.EntityLookupUtils;
 import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;

src/main/java/electrosphere/entity/scene/SceneLoader.java

@@ -8,8 +8,8 @@ import electrosphere.entity.EntityUtils;
 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.datacell.Realm;
+import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.datacell.gridded.GriddedDataCellManager;
 import electrosphere.server.entity.ServerContentManager;
 import electrosphere.server.physics.terrain.generation.DefaultChunkGenerator;

src/main/java/electrosphere/game/data/Config.java

@@ -24,8 +24,8 @@ import electrosphere.game.data.units.UnitDefinitionFile;
 import electrosphere.game.data.units.UnitLoader;
 import electrosphere.game.data.voxel.VoxelData;
 import electrosphere.game.data.voxel.sampler.SamplerFile;
-import electrosphere.game.server.race.model.RaceMap;
-import electrosphere.game.server.symbolism.model.SymbolMap;
+import electrosphere.server.macro.race.model.RaceMap;
+import electrosphere.server.macro.symbolism.model.SymbolMap;
 import electrosphere.util.FileUtils;
 
 /**

src/main/java/electrosphere/game/server/character/AdvancedPersonality.java

@@ -1,5 +0,0 @@
-package electrosphere.game.server.character;
-
-public class AdvancedPersonality {
-    
-}

src/main/java/electrosphere/game/server/character/BasicPersonality.java

@@ -1,5 +0,0 @@
-package electrosphere.game.server.character;
-
-public class BasicPersonality {
-    
-}

src/main/java/electrosphere/game/server/civilization/Civilization.java

@@ -1,5 +0,0 @@
-package electrosphere.game.server.civilization;
-
-public class Civilization {
-    
-}

src/main/java/electrosphere/game/server/civilization/model/CivilizationMap.java

@@ -1,5 +0,0 @@
-package electrosphere.game.server.civilization.model;
-
-public class CivilizationMap {
-    
-}

src/main/java/electrosphere/game/server/culture/Culture.java

@@ -1,5 +0,0 @@
-package electrosphere.game.server.culture;
-
-public class Culture {
-    
-}

src/main/java/electrosphere/game/server/culture/Ritual.java

@@ -1,5 +0,0 @@
-package electrosphere.game.server.culture;
-
-public class Ritual {
-    
-}

src/main/java/electrosphere/game/server/culture/religion/Religion.java

@@ -1,8 +0,0 @@
-package electrosphere.game.server.culture.religion;
-
-import electrosphere.game.server.character.diety.Diety;
-import java.util.List;
-
-public class Religion {
-    List<Diety> dietyList;
-}

src/main/java/electrosphere/game/server/settlement/Settlement.java

@@ -1,5 +0,0 @@
-package electrosphere.game.server.settlement;
-
-public class Settlement {
-    
-}

src/main/java/electrosphere/net/server/protocol/TerrainProtocol.java

@@ -11,13 +11,13 @@ import org.joml.Vector3d;
 import electrosphere.client.block.BlockChunkData;
 import electrosphere.client.terrain.cache.ChunkData;
 import electrosphere.engine.Globals;
-import electrosphere.game.server.world.ServerWorldData;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.net.server.ServerConnectionHandler;
 import electrosphere.net.server.player.Player;
 import electrosphere.net.template.ServerProtocolTemplate;
 import electrosphere.server.datacell.Realm;
+import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
 import electrosphere.server.physics.terrain.editing.TerrainEditing;
 import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;

src/main/java/electrosphere/server/datacell/Realm.java

@@ -6,7 +6,6 @@ import electrosphere.collision.hitbox.HitboxManager;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 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.datacell.interfaces.DataCellManager;

src/main/java/electrosphere/server/datacell/RealmManager.java

@@ -13,7 +13,6 @@ import electrosphere.collision.CollisionWorldData;
 import electrosphere.collision.hitbox.HitboxManager;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
-import electrosphere.game.server.world.ServerWorldData;
 import electrosphere.net.server.player.Player;
 import electrosphere.server.datacell.gridded.GriddedDataCellManager;
 import electrosphere.server.entity.ServerContentManager;

src/main/java/electrosphere/server/datacell/ServerDataCell.java

@@ -8,10 +8,10 @@ import electrosphere.entity.types.common.CommonEntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.foliage.FoliageUtils;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.game.server.character.Character;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.parser.net.message.NetworkMessage;
 import electrosphere.net.server.player.Player;
+import electrosphere.server.macro.character.Character;
 import electrosphere.server.pathfinding.navmesh.NavMesh;
 
 import java.util.HashSet;

src/main/java/electrosphere/server/datacell/ServerWorldData.java

@@ -1,4 +1,4 @@
-package electrosphere.game.server.world;
+package electrosphere.server.datacell;
 
 import electrosphere.client.block.BlockChunkData;
 import electrosphere.server.physics.block.manager.ServerBlockManager;

src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java

@@ -23,7 +23,6 @@ import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.ServerEntityUtils;
 import electrosphere.entity.state.server.ServerPlayerViewDirTree;
-import electrosphere.game.server.world.ServerWorldData;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.parser.net.message.TerrainMessage;
@@ -31,6 +30,7 @@ import electrosphere.net.server.player.Player;
 import electrosphere.net.server.protocol.TerrainProtocol;
 import electrosphere.server.datacell.Realm;
 import electrosphere.server.datacell.ServerDataCell;
+import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.datacell.interfaces.DataCellManager;
 import electrosphere.server.datacell.interfaces.VoxelCellManager;
 import electrosphere.server.datacell.physics.PhysicsDataCell;

src/main/java/electrosphere/server/macro/MacroData.java

@@ -1,19 +1,19 @@
-package electrosphere.game.server.world;
+package electrosphere.server.macro;
 
 import java.util.LinkedList;
 import java.util.List;
 
 import electrosphere.engine.Globals;
-import electrosphere.game.server.character.Character;
-import electrosphere.game.server.character.CharacterDataStrings;
-import electrosphere.game.server.character.CharacterUtils;
-import electrosphere.game.server.character.diety.Diety;
-import electrosphere.game.server.civilization.Civilization;
-import electrosphere.game.server.race.model.Race;
-import electrosphere.game.server.race.model.RaceMap;
-import electrosphere.game.server.structure.virtual.Structure;
-import electrosphere.game.server.symbolism.model.Symbol;
-import electrosphere.game.server.town.Town;
+import electrosphere.server.macro.character.Character;
+import electrosphere.server.macro.character.CharacterDataStrings;
+import electrosphere.server.macro.character.CharacterUtils;
+import electrosphere.server.macro.character.diety.Diety;
+import electrosphere.server.macro.civilization.Civilization;
+import electrosphere.server.macro.race.model.Race;
+import electrosphere.server.macro.race.model.RaceMap;
+import electrosphere.server.macro.structure.virtual.Structure;
+import electrosphere.server.macro.symbolism.model.Symbol;
+import electrosphere.server.macro.town.Town;
 
 import java.util.Random;
 import org.joml.Vector2i;

src/main/java/electrosphere/server/macro/character/AdvancedPersonality.java

@@ -0,0 +1,5 @@
+package electrosphere.server.macro.character;
+
+public class AdvancedPersonality {
+    
+}

src/main/java/electrosphere/server/macro/character/BasicPersonality.java

@@ -0,0 +1,5 @@
+package electrosphere.server.macro.character;
+
+public class BasicPersonality {
+    
+}

src/main/java/electrosphere/server/macro/character/Character.java

@@ -1,4 +1,4 @@
-package electrosphere.game.server.character;
+package electrosphere.server.macro.character;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/electrosphere/server/macro/character/CharacterDataStrings.java

@@ -1,4 +1,4 @@
-package electrosphere.game.server.character;
+package electrosphere.server.macro.character;
 
 /**
  * Data strings for characters

src/main/java/electrosphere/server/macro/character/CharacterUtils.java

@@ -1,9 +1,10 @@
-package electrosphere.game.server.character;
+package electrosphere.server.macro.character;
+
+import electrosphere.server.macro.character.diety.Diety;
+import electrosphere.server.macro.race.model.Race;
+import electrosphere.server.macro.structure.virtual.Structure;
+import electrosphere.server.macro.town.Town;
 
-import electrosphere.game.server.character.diety.Diety;
-import electrosphere.game.server.race.model.Race;
-import electrosphere.game.server.structure.virtual.Structure;
-import electrosphere.game.server.town.Town;
 import org.joml.Vector2i;
 
 /**

src/main/java/electrosphere/server/macro/character/diety/Diety.java

@@ -1,8 +1,8 @@
-package electrosphere.game.server.character.diety;
+package electrosphere.server.macro.character.diety;
 
 import electrosphere.engine.Globals;
-import electrosphere.game.server.symbolism.model.Symbol;
-import electrosphere.game.server.symbolism.model.SymbolMap;
+import electrosphere.server.macro.symbolism.model.Symbol;
+import electrosphere.server.macro.symbolism.model.SymbolMap;
 
 import java.util.LinkedList;
 import java.util.List;

src/main/java/electrosphere/server/macro/civilization/Civilization.java

@@ -0,0 +1,5 @@
+package electrosphere.server.macro.civilization;
+
+public class Civilization {
+    
+}

src/main/java/electrosphere/server/macro/civilization/model/CivilizationMap.java

@@ -0,0 +1,5 @@
+package electrosphere.server.macro.civilization.model;
+
+public class CivilizationMap {
+    
+}

src/main/java/electrosphere/server/macro/culture/Culture.java

@@ -0,0 +1,5 @@
+package electrosphere.server.macro.culture;
+
+public class Culture {
+    
+}

src/main/java/electrosphere/server/macro/culture/Ritual.java

@@ -0,0 +1,5 @@
+package electrosphere.server.macro.culture;
+
+public class Ritual {
+    
+}

src/main/java/electrosphere/server/macro/culture/religion/Religion.java

@@ -0,0 +1,9 @@
+package electrosphere.server.macro.culture.religion;
+
+import java.util.List;
+
+import electrosphere.server.macro.character.diety.Diety;
+
+public class Religion {
+    List<Diety> dietyList;
+}

src/main/java/electrosphere/server/macro/culture/religion/Story.java

@@ -1,4 +1,4 @@
-package electrosphere.game.server.culture.religion;
+package electrosphere.server.macro.culture.religion;
 
 /**
  *

src/main/java/electrosphere/server/macro/culture/religion/StoryDataStrings.java

@@ -1,4 +1,4 @@
-package electrosphere.game.server.culture.religion;
+package electrosphere.server.macro.culture.religion;
 
 /**
  * Story data strings

src/main/java/electrosphere/server/macro/race/model/Race.java

@@ -1,4 +1,4 @@
-package electrosphere.game.server.race.model;
+package electrosphere.server.macro.race.model;
 
 /**
  * The race of a creature

src/main/java/electrosphere/server/macro/race/model/RaceMap.java

@@ -1,4 +1,4 @@
-package electrosphere.game.server.race.model;
+package electrosphere.server.macro.race.model;
 
 import java.util.List;
 

src/main/java/electrosphere/server/macro/settlement/Settlement.java

@@ -0,0 +1,5 @@
+package electrosphere.server.macro.settlement;
+
+public class Settlement {
+    
+}

src/main/java/electrosphere/server/macro/structure/virtual/Structure.java

@@ -1,4 +1,4 @@
-package electrosphere.game.server.structure.virtual;
+package electrosphere.server.macro.structure.virtual;
 
 import java.util.HashMap;
 import java.util.LinkedList;

src/main/java/electrosphere/server/macro/structure/virtual/StructureDataStrings.java

@@ -1,4 +1,4 @@
-package electrosphere.game.server.structure.virtual;
+package electrosphere.server.macro.structure.virtual;
 
 /**
  *

src/main/java/electrosphere/server/macro/structure/virtual/StructureManager.java

@@ -1,4 +1,4 @@
-package electrosphere.game.server.structure.virtual;
+package electrosphere.server.macro.structure.virtual;
 
 import com.google.gson.Gson;
 

src/main/java/electrosphere/server/macro/structure/virtual/VirtualStructureUtils.java

@@ -1,8 +1,8 @@
-package electrosphere.game.server.structure.virtual;
+package electrosphere.server.macro.structure.virtual;
 
 import electrosphere.engine.Globals;
-import electrosphere.game.server.character.Character;
 import electrosphere.server.datacell.Realm;
+import electrosphere.server.macro.character.Character;
 
 import java.util.LinkedList;
 import java.util.List;

src/main/java/electrosphere/server/macro/symbolism/model/Symbol.java

@@ -1,4 +1,4 @@
-package electrosphere.game.server.symbolism.model;
+package electrosphere.server.macro.symbolism.model;
 
 import java.util.List;
 

src/main/java/electrosphere/server/macro/symbolism/model/SymbolMap.java

@@ -1,4 +1,4 @@
-package electrosphere.game.server.symbolism.model;
+package electrosphere.server.macro.symbolism.model;
 
 import java.util.List;
 

src/main/java/electrosphere/server/macro/symbolism/model/SymbolismRelation.java

@@ -1,4 +1,4 @@
-package electrosphere.game.server.symbolism.model;
+package electrosphere.server.macro.symbolism.model;
 
 public class SymbolismRelation {
     String name;

src/main/java/electrosphere/server/macro/town/Town.java

@@ -1,8 +1,8 @@
-package electrosphere.game.server.town;
+package electrosphere.server.macro.town;
 
-import electrosphere.game.server.structure.virtual.Structure;
 import electrosphere.engine.Globals;
-import electrosphere.game.server.character.Character;
+import electrosphere.server.macro.character.Character;
+import electrosphere.server.macro.structure.virtual.Structure;
 
 import java.util.LinkedList;
 import java.util.List;

src/main/java/electrosphere/server/macro/town/TownUtils.java

@@ -1,4 +1,4 @@
-package electrosphere.game.server.town;
+package electrosphere.server.macro.town;
 
 /**
  *

src/main/java/electrosphere/server/physics/block/manager/ServerBlockManager.java

@@ -3,7 +3,7 @@ package electrosphere.server.physics.block.manager;
 import electrosphere.client.block.BlockChunkCache;
 import electrosphere.client.block.BlockChunkData;
 import electrosphere.engine.Globals;
-import electrosphere.game.server.world.ServerWorldData;
+import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.physics.block.diskmap.ServerBlockChunkDiskMap;
 import electrosphere.util.annotation.Exclude;
 

src/main/java/electrosphere/server/physics/fluid/manager/ServerFluidManager.java

@@ -2,7 +2,7 @@ package electrosphere.server.physics.fluid.manager;
 
 
 import electrosphere.engine.Globals;
-import electrosphere.game.server.world.ServerWorldData;
+import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.physics.fluid.diskmap.FluidDiskMap;
 import electrosphere.server.physics.fluid.generation.FluidGenerator;
 import electrosphere.server.physics.fluid.models.FluidModel;

src/main/java/electrosphere/server/physics/terrain/generation/JSChunkGenerator.java

@@ -10,7 +10,7 @@ import org.graalvm.polyglot.Value;
 import electrosphere.engine.Globals;
 import electrosphere.game.data.biome.BiomeData;
 import electrosphere.game.data.biome.BiomeSurfaceGenerationParams;
-import electrosphere.game.server.world.ServerWorldData;
+import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.physics.terrain.generation.heightmap.EmptySkyGen;
 import electrosphere.server.physics.terrain.generation.heightmap.HeightmapGenerator;
 import electrosphere.server.physics.terrain.generation.heightmap.HillsGen;

src/main/java/electrosphere/server/physics/terrain/generation/TestGenerationChunkGenerator.java

@@ -9,7 +9,7 @@ import electrosphere.engine.Globals;
 import electrosphere.game.data.biome.BiomeData;
 import electrosphere.game.data.biome.BiomeSurfaceGenerationParams;
 import electrosphere.game.data.voxel.sampler.SamplerFile;
-import electrosphere.game.server.world.ServerWorldData;
+import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.physics.terrain.generation.heightmap.EmptySkyGen;
 import electrosphere.server.physics.terrain.generation.heightmap.HeightmapGenerator;
 import electrosphere.server.physics.terrain.generation.heightmap.HeightmapNoiseGen;

src/main/java/electrosphere/server/physics/terrain/generation/continentphase/ErosionSimulation.java

@@ -5,7 +5,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
 
-import electrosphere.game.terrain.processing.TerrainInterpolator;
+import electrosphere.server.physics.terrain.processing.TerrainInterpolator;
 
 /**
  * Performs an erosion simulation that expands the heightmap and simulates drainage across the world

src/main/java/electrosphere/server/physics/terrain/generation/interfaces/GenerationContext.java

@@ -1,6 +1,6 @@
 package electrosphere.server.physics.terrain.generation.interfaces;
 
-import electrosphere.game.server.world.ServerWorldData;
+import electrosphere.server.datacell.ServerWorldData;
 
 /**
  * The context the generation is happening in. Stores things like biomes to interpolate between.

src/main/java/electrosphere/server/physics/terrain/manager/ServerTerrainManager.java

@@ -3,7 +3,7 @@ package electrosphere.server.physics.terrain.manager;
 import electrosphere.client.terrain.cache.ChunkData;
 import electrosphere.engine.Globals;
 import electrosphere.entity.scene.RealmDescriptor;
-import electrosphere.game.server.world.ServerWorldData;
+import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.physics.terrain.diskmap.ChunkDiskMap;
 import electrosphere.server.physics.terrain.generation.TestGenerationChunkGenerator;
 import electrosphere.server.physics.terrain.generation.interfaces.ChunkGenerator;

src/main/java/electrosphere/server/physics/terrain/processing/TerrainInterpolator.java

@@ -1,4 +1,4 @@
-package electrosphere.game.terrain.processing;
+package electrosphere.server.physics.terrain.processing;
 
 public class TerrainInterpolator {
     

src/main/java/electrosphere/server/player/PlayerActions.java

@@ -16,11 +16,11 @@ import electrosphere.game.data.creature.type.CreatureData;
 import electrosphere.game.data.creature.type.block.BlockVariant;
 import electrosphere.game.data.item.Item;
 import electrosphere.game.data.item.ItemUsage;
-import electrosphere.game.server.world.ServerWorldData;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.net.parser.net.message.InventoryMessage;
 import electrosphere.net.server.ServerConnectionHandler;
 import electrosphere.server.datacell.Realm;
+import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.datacell.utils.EntityLookupUtils;
 import electrosphere.server.physics.block.editing.ServerBlockEditing;
 import electrosphere.server.utils.ServerScriptUtils;

src/main/java/electrosphere/server/saves/SaveUtils.java

@@ -6,8 +6,8 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.scene.RealmDescriptor;
 import electrosphere.entity.scene.SceneFile;
 import electrosphere.entity.scene.SceneLoader;
-import electrosphere.game.server.world.ServerWorldData;
 import electrosphere.logger.LoggerInterface;
+import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.db.DatabaseController;
 import electrosphere.server.db.DatabaseUtils;
 import electrosphere.server.physics.fluid.generation.DefaultFluidGenerator;

src/main/java/electrosphere/server/simulation/MacroSimulation.java

@@ -1,13 +1,14 @@
 package electrosphere.server.simulation;
 
 import electrosphere.engine.Globals;
-import electrosphere.game.server.structure.virtual.Structure;
-import electrosphere.game.server.town.Town;
-import electrosphere.game.server.character.Character;
-import electrosphere.game.server.character.CharacterDataStrings;
-import electrosphere.game.server.character.CharacterUtils;
-import electrosphere.game.server.structure.virtual.StructureDataStrings;
-import electrosphere.game.server.structure.virtual.VirtualStructureUtils;
+import electrosphere.server.macro.character.Character;
+import electrosphere.server.macro.character.CharacterDataStrings;
+import electrosphere.server.macro.character.CharacterUtils;
+import electrosphere.server.macro.structure.virtual.Structure;
+import electrosphere.server.macro.structure.virtual.StructureDataStrings;
+import electrosphere.server.macro.structure.virtual.VirtualStructureUtils;
+import electrosphere.server.macro.town.Town;
+
 import java.util.LinkedList;
 import java.util.List;
 import org.joml.Vector2f;

src/main/java/electrosphere/util/worldviewer/TerrainViewer.java

@@ -1,6 +1,6 @@
 package electrosphere.util.worldviewer;
 
-import electrosphere.game.server.world.ServerWorldData;
+import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.physics.terrain.generation.OverworldChunkGenerator;
 import electrosphere.server.physics.terrain.manager.ServerTerrainManager;
 import electrosphere.server.physics.terrain.models.TerrainModel;