From 8e2c86397bdfbeefd07fcf6887d730a813e52181 Mon Sep 17 00:00:00 2001 From: austin Date: Wed, 16 Apr 2025 12:48:09 -0400 Subject: [PATCH] macro data refactoring --- docs/src/progress/renderertodo.md | 1 + .../collision/CollisionWorldData.java | 2 +- .../collision/PhysicsEntityUtils.java | 2 +- .../java/electrosphere/engine/Globals.java | 4 ++-- src/main/java/electrosphere/engine/Main.java | 2 +- .../entity/ServerEntityUtils.java | 2 +- .../entity/scene/SceneLoader.java | 2 +- .../java/electrosphere/game/data/Config.java | 4 ++-- .../server/character/AdvancedPersonality.java | 5 ----- .../server/character/BasicPersonality.java | 5 ----- .../server/civilization/Civilization.java | 5 ----- .../civilization/model/CivilizationMap.java | 5 ----- .../game/server/culture/Culture.java | 5 ----- .../game/server/culture/Ritual.java | 5 ----- .../server/culture/religion/Religion.java | 8 ------- .../game/server/settlement/Settlement.java | 5 ----- .../net/server/protocol/TerrainProtocol.java | 2 +- .../electrosphere/server/datacell/Realm.java | 1 - .../server/datacell/RealmManager.java | 1 - .../server/datacell/ServerDataCell.java | 2 +- .../datacell}/ServerWorldData.java | 2 +- .../gridded/GriddedDataCellManager.java | 2 +- .../world => server/macro}/MacroData.java | 22 +++++++++---------- .../macro/character/AdvancedPersonality.java | 5 +++++ .../macro/character/BasicPersonality.java | 5 +++++ .../macro}/character/Character.java | 2 +- .../character/CharacterDataStrings.java | 2 +- .../macro}/character/CharacterUtils.java | 11 +++++----- .../macro}/character/diety/Diety.java | 6 ++--- .../macro/civilization/Civilization.java | 5 +++++ .../civilization/model/CivilizationMap.java | 5 +++++ .../server/macro/culture/Culture.java | 5 +++++ .../server/macro/culture/Ritual.java | 5 +++++ .../macro/culture/religion/Religion.java | 9 ++++++++ .../macro}/culture/religion/Story.java | 2 +- .../culture/religion/StoryDataStrings.java | 2 +- .../macro}/race/model/Race.java | 2 +- .../macro}/race/model/RaceMap.java | 2 +- .../server/macro/settlement/Settlement.java | 5 +++++ .../macro}/structure/virtual/Structure.java | 2 +- .../virtual/StructureDataStrings.java | 2 +- .../structure/virtual/StructureManager.java | 2 +- .../virtual/VirtualStructureUtils.java | 4 ++-- .../macro}/symbolism/model/Symbol.java | 2 +- .../macro}/symbolism/model/SymbolMap.java | 2 +- .../symbolism/model/SymbolismRelation.java | 2 +- .../server => server/macro}/town/Town.java | 6 ++--- .../macro}/town/TownUtils.java | 2 +- .../block/manager/ServerBlockManager.java | 2 +- .../fluid/manager/ServerFluidManager.java | 2 +- .../terrain/generation/JSChunkGenerator.java | 2 +- .../TestGenerationChunkGenerator.java | 2 +- .../continentphase/ErosionSimulation.java | 2 +- .../interfaces/GenerationContext.java | 2 +- .../terrain/manager/ServerTerrainManager.java | 2 +- .../processing/TerrainInterpolator.java | 2 +- .../server/player/PlayerActions.java | 2 +- .../electrosphere/server/saves/SaveUtils.java | 2 +- .../server/simulation/MacroSimulation.java | 15 +++++++------ .../util/worldviewer/TerrainViewer.java | 2 +- 60 files changed, 115 insertions(+), 113 deletions(-) delete mode 100644 src/main/java/electrosphere/game/server/character/AdvancedPersonality.java delete mode 100644 src/main/java/electrosphere/game/server/character/BasicPersonality.java delete mode 100644 src/main/java/electrosphere/game/server/civilization/Civilization.java delete mode 100644 src/main/java/electrosphere/game/server/civilization/model/CivilizationMap.java delete mode 100644 src/main/java/electrosphere/game/server/culture/Culture.java delete mode 100644 src/main/java/electrosphere/game/server/culture/Ritual.java delete mode 100644 src/main/java/electrosphere/game/server/culture/religion/Religion.java delete mode 100644 src/main/java/electrosphere/game/server/settlement/Settlement.java rename src/main/java/electrosphere/{game/server/world => server/datacell}/ServerWorldData.java (99%) rename src/main/java/electrosphere/{game/server/world => server/macro}/MacroData.java (91%) create mode 100644 src/main/java/electrosphere/server/macro/character/AdvancedPersonality.java create mode 100644 src/main/java/electrosphere/server/macro/character/BasicPersonality.java rename src/main/java/electrosphere/{game/server => server/macro}/character/Character.java (93%) rename src/main/java/electrosphere/{game/server => server/macro}/character/CharacterDataStrings.java (91%) rename src/main/java/electrosphere/{game/server => server/macro}/character/CharacterUtils.java (85%) rename src/main/java/electrosphere/{game/server => server/macro}/character/diety/Diety.java (88%) create mode 100644 src/main/java/electrosphere/server/macro/civilization/Civilization.java create mode 100644 src/main/java/electrosphere/server/macro/civilization/model/CivilizationMap.java create mode 100644 src/main/java/electrosphere/server/macro/culture/Culture.java create mode 100644 src/main/java/electrosphere/server/macro/culture/Ritual.java create mode 100644 src/main/java/electrosphere/server/macro/culture/religion/Religion.java rename src/main/java/electrosphere/{game/server => server/macro}/culture/religion/Story.java (85%) rename src/main/java/electrosphere/{game/server => server/macro}/culture/religion/StoryDataStrings.java (96%) rename src/main/java/electrosphere/{game/server => server/macro}/race/model/Race.java (85%) rename src/main/java/electrosphere/{game/server => server/macro}/race/model/RaceMap.java (82%) create mode 100644 src/main/java/electrosphere/server/macro/settlement/Settlement.java rename src/main/java/electrosphere/{game/server => server/macro}/structure/virtual/Structure.java (95%) rename src/main/java/electrosphere/{game/server => server/macro}/structure/virtual/StructureDataStrings.java (71%) rename src/main/java/electrosphere/{game/server => server/macro}/structure/virtual/StructureManager.java (97%) rename src/main/java/electrosphere/{game/server => server/macro}/structure/virtual/VirtualStructureUtils.java (96%) rename src/main/java/electrosphere/{game/server => server/macro}/symbolism/model/Symbol.java (84%) rename src/main/java/electrosphere/{game/server => server/macro}/symbolism/model/SymbolMap.java (77%) rename src/main/java/electrosphere/{game/server => server/macro}/symbolism/model/SymbolismRelation.java (79%) rename src/main/java/electrosphere/{game/server => server/macro}/town/Town.java (96%) rename src/main/java/electrosphere/{game/server => server/macro}/town/TownUtils.java (61%) rename src/main/java/electrosphere/{game => server/physics}/terrain/processing/TerrainInterpolator.java (99%) diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 761b4ce9..2dec0139 100644 --- a/docs/src/progress/renderertodo.md +++ b/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 diff --git a/src/main/java/electrosphere/collision/CollisionWorldData.java b/src/main/java/electrosphere/collision/CollisionWorldData.java index 5320d6da..3ab85e4a 100644 --- a/src/main/java/electrosphere/collision/CollisionWorldData.java +++ b/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; diff --git a/src/main/java/electrosphere/collision/PhysicsEntityUtils.java b/src/main/java/electrosphere/collision/PhysicsEntityUtils.java index 5e3598ed..c47788ec 100644 --- a/src/main/java/electrosphere/collision/PhysicsEntityUtils.java +++ b/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; /** diff --git a/src/main/java/electrosphere/engine/Globals.java b/src/main/java/electrosphere/engine/Globals.java index bb2c63fc..14c222c7 100644 --- a/src/main/java/electrosphere/engine/Globals.java +++ b/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; diff --git a/src/main/java/electrosphere/engine/Main.java b/src/main/java/electrosphere/engine/Main.java index 93b80bb5..365fb20a 100644 --- a/src/main/java/electrosphere/engine/Main.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/ServerEntityUtils.java b/src/main/java/electrosphere/entity/ServerEntityUtils.java index cf22d544..d35a044d 100644 --- a/src/main/java/electrosphere/entity/ServerEntityUtils.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/scene/SceneLoader.java b/src/main/java/electrosphere/entity/scene/SceneLoader.java index 140bbbb8..b6a832ef 100644 --- a/src/main/java/electrosphere/entity/scene/SceneLoader.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/Config.java b/src/main/java/electrosphere/game/data/Config.java index 6ac59c7e..e03d9a6f 100644 --- a/src/main/java/electrosphere/game/data/Config.java +++ b/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; /** diff --git a/src/main/java/electrosphere/game/server/character/AdvancedPersonality.java b/src/main/java/electrosphere/game/server/character/AdvancedPersonality.java deleted file mode 100644 index 768c7b68..00000000 --- a/src/main/java/electrosphere/game/server/character/AdvancedPersonality.java +++ /dev/null @@ -1,5 +0,0 @@ -package electrosphere.game.server.character; - -public class AdvancedPersonality { - -} diff --git a/src/main/java/electrosphere/game/server/character/BasicPersonality.java b/src/main/java/electrosphere/game/server/character/BasicPersonality.java deleted file mode 100644 index 07729204..00000000 --- a/src/main/java/electrosphere/game/server/character/BasicPersonality.java +++ /dev/null @@ -1,5 +0,0 @@ -package electrosphere.game.server.character; - -public class BasicPersonality { - -} diff --git a/src/main/java/electrosphere/game/server/civilization/Civilization.java b/src/main/java/electrosphere/game/server/civilization/Civilization.java deleted file mode 100644 index 765732ef..00000000 --- a/src/main/java/electrosphere/game/server/civilization/Civilization.java +++ /dev/null @@ -1,5 +0,0 @@ -package electrosphere.game.server.civilization; - -public class Civilization { - -} diff --git a/src/main/java/electrosphere/game/server/civilization/model/CivilizationMap.java b/src/main/java/electrosphere/game/server/civilization/model/CivilizationMap.java deleted file mode 100644 index c9f80de5..00000000 --- a/src/main/java/electrosphere/game/server/civilization/model/CivilizationMap.java +++ /dev/null @@ -1,5 +0,0 @@ -package electrosphere.game.server.civilization.model; - -public class CivilizationMap { - -} diff --git a/src/main/java/electrosphere/game/server/culture/Culture.java b/src/main/java/electrosphere/game/server/culture/Culture.java deleted file mode 100644 index 3330b8ea..00000000 --- a/src/main/java/electrosphere/game/server/culture/Culture.java +++ /dev/null @@ -1,5 +0,0 @@ -package electrosphere.game.server.culture; - -public class Culture { - -} diff --git a/src/main/java/electrosphere/game/server/culture/Ritual.java b/src/main/java/electrosphere/game/server/culture/Ritual.java deleted file mode 100644 index c343509a..00000000 --- a/src/main/java/electrosphere/game/server/culture/Ritual.java +++ /dev/null @@ -1,5 +0,0 @@ -package electrosphere.game.server.culture; - -public class Ritual { - -} diff --git a/src/main/java/electrosphere/game/server/culture/religion/Religion.java b/src/main/java/electrosphere/game/server/culture/religion/Religion.java deleted file mode 100644 index d80e1829..00000000 --- a/src/main/java/electrosphere/game/server/culture/religion/Religion.java +++ /dev/null @@ -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 dietyList; -} diff --git a/src/main/java/electrosphere/game/server/settlement/Settlement.java b/src/main/java/electrosphere/game/server/settlement/Settlement.java deleted file mode 100644 index 5c577065..00000000 --- a/src/main/java/electrosphere/game/server/settlement/Settlement.java +++ /dev/null @@ -1,5 +0,0 @@ -package electrosphere.game.server.settlement; - -public class Settlement { - -} diff --git a/src/main/java/electrosphere/net/server/protocol/TerrainProtocol.java b/src/main/java/electrosphere/net/server/protocol/TerrainProtocol.java index ae971bc7..7b7e35fc 100644 --- a/src/main/java/electrosphere/net/server/protocol/TerrainProtocol.java +++ b/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; diff --git a/src/main/java/electrosphere/server/datacell/Realm.java b/src/main/java/electrosphere/server/datacell/Realm.java index 748fb7ba..fc2a1344 100644 --- a/src/main/java/electrosphere/server/datacell/Realm.java +++ b/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; diff --git a/src/main/java/electrosphere/server/datacell/RealmManager.java b/src/main/java/electrosphere/server/datacell/RealmManager.java index 3d5a9269..061bbb3e 100644 --- a/src/main/java/electrosphere/server/datacell/RealmManager.java +++ b/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; diff --git a/src/main/java/electrosphere/server/datacell/ServerDataCell.java b/src/main/java/electrosphere/server/datacell/ServerDataCell.java index 2cbf85a8..2b269cb8 100644 --- a/src/main/java/electrosphere/server/datacell/ServerDataCell.java +++ b/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; diff --git a/src/main/java/electrosphere/game/server/world/ServerWorldData.java b/src/main/java/electrosphere/server/datacell/ServerWorldData.java similarity index 99% rename from src/main/java/electrosphere/game/server/world/ServerWorldData.java rename to src/main/java/electrosphere/server/datacell/ServerWorldData.java index b434f7c4..fdb20af1 100644 --- a/src/main/java/electrosphere/game/server/world/ServerWorldData.java +++ b/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; diff --git a/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java b/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java index 08014307..ad61986c 100644 --- a/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java +++ b/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; diff --git a/src/main/java/electrosphere/game/server/world/MacroData.java b/src/main/java/electrosphere/server/macro/MacroData.java similarity index 91% rename from src/main/java/electrosphere/game/server/world/MacroData.java rename to src/main/java/electrosphere/server/macro/MacroData.java index 0d0dd7ca..0480c902 100644 --- a/src/main/java/electrosphere/game/server/world/MacroData.java +++ b/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; diff --git a/src/main/java/electrosphere/server/macro/character/AdvancedPersonality.java b/src/main/java/electrosphere/server/macro/character/AdvancedPersonality.java new file mode 100644 index 00000000..57d2ce44 --- /dev/null +++ b/src/main/java/electrosphere/server/macro/character/AdvancedPersonality.java @@ -0,0 +1,5 @@ +package electrosphere.server.macro.character; + +public class AdvancedPersonality { + +} diff --git a/src/main/java/electrosphere/server/macro/character/BasicPersonality.java b/src/main/java/electrosphere/server/macro/character/BasicPersonality.java new file mode 100644 index 00000000..f33edf0c --- /dev/null +++ b/src/main/java/electrosphere/server/macro/character/BasicPersonality.java @@ -0,0 +1,5 @@ +package electrosphere.server.macro.character; + +public class BasicPersonality { + +} diff --git a/src/main/java/electrosphere/game/server/character/Character.java b/src/main/java/electrosphere/server/macro/character/Character.java similarity index 93% rename from src/main/java/electrosphere/game/server/character/Character.java rename to src/main/java/electrosphere/server/macro/character/Character.java index 3e70681e..4118db4a 100644 --- a/src/main/java/electrosphere/game/server/character/Character.java +++ b/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; diff --git a/src/main/java/electrosphere/game/server/character/CharacterDataStrings.java b/src/main/java/electrosphere/server/macro/character/CharacterDataStrings.java similarity index 91% rename from src/main/java/electrosphere/game/server/character/CharacterDataStrings.java rename to src/main/java/electrosphere/server/macro/character/CharacterDataStrings.java index ccd60cbe..937ac7c7 100644 --- a/src/main/java/electrosphere/game/server/character/CharacterDataStrings.java +++ b/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 diff --git a/src/main/java/electrosphere/game/server/character/CharacterUtils.java b/src/main/java/electrosphere/server/macro/character/CharacterUtils.java similarity index 85% rename from src/main/java/electrosphere/game/server/character/CharacterUtils.java rename to src/main/java/electrosphere/server/macro/character/CharacterUtils.java index 7214ee79..24280e9a 100644 --- a/src/main/java/electrosphere/game/server/character/CharacterUtils.java +++ b/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; /** diff --git a/src/main/java/electrosphere/game/server/character/diety/Diety.java b/src/main/java/electrosphere/server/macro/character/diety/Diety.java similarity index 88% rename from src/main/java/electrosphere/game/server/character/diety/Diety.java rename to src/main/java/electrosphere/server/macro/character/diety/Diety.java index 601ae153..7e6f5ef8 100644 --- a/src/main/java/electrosphere/game/server/character/diety/Diety.java +++ b/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; diff --git a/src/main/java/electrosphere/server/macro/civilization/Civilization.java b/src/main/java/electrosphere/server/macro/civilization/Civilization.java new file mode 100644 index 00000000..8711ce4d --- /dev/null +++ b/src/main/java/electrosphere/server/macro/civilization/Civilization.java @@ -0,0 +1,5 @@ +package electrosphere.server.macro.civilization; + +public class Civilization { + +} diff --git a/src/main/java/electrosphere/server/macro/civilization/model/CivilizationMap.java b/src/main/java/electrosphere/server/macro/civilization/model/CivilizationMap.java new file mode 100644 index 00000000..623cd250 --- /dev/null +++ b/src/main/java/electrosphere/server/macro/civilization/model/CivilizationMap.java @@ -0,0 +1,5 @@ +package electrosphere.server.macro.civilization.model; + +public class CivilizationMap { + +} diff --git a/src/main/java/electrosphere/server/macro/culture/Culture.java b/src/main/java/electrosphere/server/macro/culture/Culture.java new file mode 100644 index 00000000..3dc88928 --- /dev/null +++ b/src/main/java/electrosphere/server/macro/culture/Culture.java @@ -0,0 +1,5 @@ +package electrosphere.server.macro.culture; + +public class Culture { + +} diff --git a/src/main/java/electrosphere/server/macro/culture/Ritual.java b/src/main/java/electrosphere/server/macro/culture/Ritual.java new file mode 100644 index 00000000..bc1268f5 --- /dev/null +++ b/src/main/java/electrosphere/server/macro/culture/Ritual.java @@ -0,0 +1,5 @@ +package electrosphere.server.macro.culture; + +public class Ritual { + +} diff --git a/src/main/java/electrosphere/server/macro/culture/religion/Religion.java b/src/main/java/electrosphere/server/macro/culture/religion/Religion.java new file mode 100644 index 00000000..8c59fc5e --- /dev/null +++ b/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 dietyList; +} diff --git a/src/main/java/electrosphere/game/server/culture/religion/Story.java b/src/main/java/electrosphere/server/macro/culture/religion/Story.java similarity index 85% rename from src/main/java/electrosphere/game/server/culture/religion/Story.java rename to src/main/java/electrosphere/server/macro/culture/religion/Story.java index 3f9ab009..1844a7da 100644 --- a/src/main/java/electrosphere/game/server/culture/religion/Story.java +++ b/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; /** * diff --git a/src/main/java/electrosphere/game/server/culture/religion/StoryDataStrings.java b/src/main/java/electrosphere/server/macro/culture/religion/StoryDataStrings.java similarity index 96% rename from src/main/java/electrosphere/game/server/culture/religion/StoryDataStrings.java rename to src/main/java/electrosphere/server/macro/culture/religion/StoryDataStrings.java index bb1823cf..9ec312f5 100644 --- a/src/main/java/electrosphere/game/server/culture/religion/StoryDataStrings.java +++ b/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 diff --git a/src/main/java/electrosphere/game/server/race/model/Race.java b/src/main/java/electrosphere/server/macro/race/model/Race.java similarity index 85% rename from src/main/java/electrosphere/game/server/race/model/Race.java rename to src/main/java/electrosphere/server/macro/race/model/Race.java index 77f2a039..51cb409d 100644 --- a/src/main/java/electrosphere/game/server/race/model/Race.java +++ b/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 diff --git a/src/main/java/electrosphere/game/server/race/model/RaceMap.java b/src/main/java/electrosphere/server/macro/race/model/RaceMap.java similarity index 82% rename from src/main/java/electrosphere/game/server/race/model/RaceMap.java rename to src/main/java/electrosphere/server/macro/race/model/RaceMap.java index 831e5abd..187cec98 100644 --- a/src/main/java/electrosphere/game/server/race/model/RaceMap.java +++ b/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; diff --git a/src/main/java/electrosphere/server/macro/settlement/Settlement.java b/src/main/java/electrosphere/server/macro/settlement/Settlement.java new file mode 100644 index 00000000..e956616e --- /dev/null +++ b/src/main/java/electrosphere/server/macro/settlement/Settlement.java @@ -0,0 +1,5 @@ +package electrosphere.server.macro.settlement; + +public class Settlement { + +} diff --git a/src/main/java/electrosphere/game/server/structure/virtual/Structure.java b/src/main/java/electrosphere/server/macro/structure/virtual/Structure.java similarity index 95% rename from src/main/java/electrosphere/game/server/structure/virtual/Structure.java rename to src/main/java/electrosphere/server/macro/structure/virtual/Structure.java index 094aa39b..fa2f5276 100644 --- a/src/main/java/electrosphere/game/server/structure/virtual/Structure.java +++ b/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; diff --git a/src/main/java/electrosphere/game/server/structure/virtual/StructureDataStrings.java b/src/main/java/electrosphere/server/macro/structure/virtual/StructureDataStrings.java similarity index 71% rename from src/main/java/electrosphere/game/server/structure/virtual/StructureDataStrings.java rename to src/main/java/electrosphere/server/macro/structure/virtual/StructureDataStrings.java index c781916d..f1dcc0aa 100644 --- a/src/main/java/electrosphere/game/server/structure/virtual/StructureDataStrings.java +++ b/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; /** * diff --git a/src/main/java/electrosphere/game/server/structure/virtual/StructureManager.java b/src/main/java/electrosphere/server/macro/structure/virtual/StructureManager.java similarity index 97% rename from src/main/java/electrosphere/game/server/structure/virtual/StructureManager.java rename to src/main/java/electrosphere/server/macro/structure/virtual/StructureManager.java index f4b63474..7baafaa4 100644 --- a/src/main/java/electrosphere/game/server/structure/virtual/StructureManager.java +++ b/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; diff --git a/src/main/java/electrosphere/game/server/structure/virtual/VirtualStructureUtils.java b/src/main/java/electrosphere/server/macro/structure/virtual/VirtualStructureUtils.java similarity index 96% rename from src/main/java/electrosphere/game/server/structure/virtual/VirtualStructureUtils.java rename to src/main/java/electrosphere/server/macro/structure/virtual/VirtualStructureUtils.java index 97ced4dc..aeb4edbe 100644 --- a/src/main/java/electrosphere/game/server/structure/virtual/VirtualStructureUtils.java +++ b/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; diff --git a/src/main/java/electrosphere/game/server/symbolism/model/Symbol.java b/src/main/java/electrosphere/server/macro/symbolism/model/Symbol.java similarity index 84% rename from src/main/java/electrosphere/game/server/symbolism/model/Symbol.java rename to src/main/java/electrosphere/server/macro/symbolism/model/Symbol.java index 852204c3..88039d03 100644 --- a/src/main/java/electrosphere/game/server/symbolism/model/Symbol.java +++ b/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; diff --git a/src/main/java/electrosphere/game/server/symbolism/model/SymbolMap.java b/src/main/java/electrosphere/server/macro/symbolism/model/SymbolMap.java similarity index 77% rename from src/main/java/electrosphere/game/server/symbolism/model/SymbolMap.java rename to src/main/java/electrosphere/server/macro/symbolism/model/SymbolMap.java index c23e4a79..c693313c 100644 --- a/src/main/java/electrosphere/game/server/symbolism/model/SymbolMap.java +++ b/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; diff --git a/src/main/java/electrosphere/game/server/symbolism/model/SymbolismRelation.java b/src/main/java/electrosphere/server/macro/symbolism/model/SymbolismRelation.java similarity index 79% rename from src/main/java/electrosphere/game/server/symbolism/model/SymbolismRelation.java rename to src/main/java/electrosphere/server/macro/symbolism/model/SymbolismRelation.java index a20789b0..90b11a39 100644 --- a/src/main/java/electrosphere/game/server/symbolism/model/SymbolismRelation.java +++ b/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; diff --git a/src/main/java/electrosphere/game/server/town/Town.java b/src/main/java/electrosphere/server/macro/town/Town.java similarity index 96% rename from src/main/java/electrosphere/game/server/town/Town.java rename to src/main/java/electrosphere/server/macro/town/Town.java index 58ba8f5b..7d89c96d 100644 --- a/src/main/java/electrosphere/game/server/town/Town.java +++ b/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; diff --git a/src/main/java/electrosphere/game/server/town/TownUtils.java b/src/main/java/electrosphere/server/macro/town/TownUtils.java similarity index 61% rename from src/main/java/electrosphere/game/server/town/TownUtils.java rename to src/main/java/electrosphere/server/macro/town/TownUtils.java index 00977c7c..61df7961 100644 --- a/src/main/java/electrosphere/game/server/town/TownUtils.java +++ b/src/main/java/electrosphere/server/macro/town/TownUtils.java @@ -1,4 +1,4 @@ -package electrosphere.game.server.town; +package electrosphere.server.macro.town; /** * diff --git a/src/main/java/electrosphere/server/physics/block/manager/ServerBlockManager.java b/src/main/java/electrosphere/server/physics/block/manager/ServerBlockManager.java index 301bf8f5..3ad265de 100644 --- a/src/main/java/electrosphere/server/physics/block/manager/ServerBlockManager.java +++ b/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; diff --git a/src/main/java/electrosphere/server/physics/fluid/manager/ServerFluidManager.java b/src/main/java/electrosphere/server/physics/fluid/manager/ServerFluidManager.java index b194975c..2a7b5cf4 100644 --- a/src/main/java/electrosphere/server/physics/fluid/manager/ServerFluidManager.java +++ b/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; diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/JSChunkGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/JSChunkGenerator.java index 300ef58b..7cc6e697 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/JSChunkGenerator.java +++ b/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; diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/TestGenerationChunkGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/TestGenerationChunkGenerator.java index 704644e7..914a087f 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/TestGenerationChunkGenerator.java +++ b/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; diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/continentphase/ErosionSimulation.java b/src/main/java/electrosphere/server/physics/terrain/generation/continentphase/ErosionSimulation.java index 59c7b0df..90b80516 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/continentphase/ErosionSimulation.java +++ b/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 diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/interfaces/GenerationContext.java b/src/main/java/electrosphere/server/physics/terrain/generation/interfaces/GenerationContext.java index b38b3843..74c9977e 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/interfaces/GenerationContext.java +++ b/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. diff --git a/src/main/java/electrosphere/server/physics/terrain/manager/ServerTerrainManager.java b/src/main/java/electrosphere/server/physics/terrain/manager/ServerTerrainManager.java index bbec2826..e97c1d7c 100644 --- a/src/main/java/electrosphere/server/physics/terrain/manager/ServerTerrainManager.java +++ b/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; diff --git a/src/main/java/electrosphere/game/terrain/processing/TerrainInterpolator.java b/src/main/java/electrosphere/server/physics/terrain/processing/TerrainInterpolator.java similarity index 99% rename from src/main/java/electrosphere/game/terrain/processing/TerrainInterpolator.java rename to src/main/java/electrosphere/server/physics/terrain/processing/TerrainInterpolator.java index 8e17d8f7..9695fb4c 100644 --- a/src/main/java/electrosphere/game/terrain/processing/TerrainInterpolator.java +++ b/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 { diff --git a/src/main/java/electrosphere/server/player/PlayerActions.java b/src/main/java/electrosphere/server/player/PlayerActions.java index e5123e6a..b01c1327 100644 --- a/src/main/java/electrosphere/server/player/PlayerActions.java +++ b/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; diff --git a/src/main/java/electrosphere/server/saves/SaveUtils.java b/src/main/java/electrosphere/server/saves/SaveUtils.java index 2d8cd0f4..1efb37c7 100644 --- a/src/main/java/electrosphere/server/saves/SaveUtils.java +++ b/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; diff --git a/src/main/java/electrosphere/server/simulation/MacroSimulation.java b/src/main/java/electrosphere/server/simulation/MacroSimulation.java index 93f191b2..c5eb5856 100644 --- a/src/main/java/electrosphere/server/simulation/MacroSimulation.java +++ b/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; diff --git a/src/main/java/electrosphere/util/worldviewer/TerrainViewer.java b/src/main/java/electrosphere/util/worldviewer/TerrainViewer.java index d66a3394..0ef1aa84 100644 --- a/src/main/java/electrosphere/util/worldviewer/TerrainViewer.java +++ b/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;