server class refactoring

docs/src/progress/renderertodo.md

@@ -1505,6 +1505,9 @@ Fix dig script function
 Fix shovel functionality
 Terrain editing/saving work
 
+(04/16/2025)
+Refactoring server classes under physics package
+
 
 
 

src/main/java/electrosphere/client/block/BlockChunkData.java

@@ -2,7 +2,7 @@ package electrosphere.client.block;
 
 import org.joml.Vector3i;
 
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 /**
  * Stores data about a chunk of blocks

src/main/java/electrosphere/client/block/ClientBlockManager.java

@@ -19,8 +19,8 @@ import electrosphere.entity.Entity;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.renderer.meshgen.BlockMeshgen.BlockMeshData;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
-import electrosphere.server.terrain.manager.ServerTerrainManager;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainManager;
 import electrosphere.util.math.HashUtils;
 
 

src/main/java/electrosphere/client/block/cells/BlockDrawCell.java

@@ -10,7 +10,7 @@ import electrosphere.entity.ClientEntityUtils;
 import electrosphere.entity.Entity;
 import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.types.terrain.BlockChunkEntity;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 import electrosphere.util.ds.octree.WorldOctTree.WorldOctTreeNode;
 import electrosphere.util.math.GeomUtils;
 

src/main/java/electrosphere/client/fluid/cache/FluidChunkData.java

@@ -7,7 +7,7 @@ import java.nio.FloatBuffer;
 import org.joml.Vector3i;
 import org.lwjgl.BufferUtils;
 
-import electrosphere.server.fluid.manager.ServerFluidChunk;
+import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
 
 /**
  * A container of data about a chunk of fluid

src/main/java/electrosphere/client/fluid/cells/FluidCell.java

@@ -13,8 +13,8 @@ import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.types.fluid.FluidChunk;
 import electrosphere.renderer.shader.VisualShader;
-import electrosphere.server.fluid.manager.ServerFluidChunk;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 /**
  *

src/main/java/electrosphere/client/fluid/cells/FluidCellManager.java

@@ -14,7 +14,7 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.EntityUtils;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.renderer.shader.VisualShader;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 /**
  *

src/main/java/electrosphere/client/fluid/manager/ClientFluidManager.java

@@ -19,8 +19,8 @@ import electrosphere.logger.LoggerInterface;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.renderer.meshgen.FluidChunkModelGeneration;
 import electrosphere.renderer.model.Model;
-import electrosphere.server.fluid.manager.ServerFluidChunk;
-import electrosphere.server.terrain.manager.ServerTerrainManager;
+import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainManager;
 
 /**
  * Manages fluid storage and access on the client

src/main/java/electrosphere/client/scene/ClientWorldData.java

@@ -4,7 +4,7 @@ import org.joml.Vector3d;
 import org.joml.Vector3f;
 import org.joml.Vector3i;
 
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 /**
  * Client's data on the world

src/main/java/electrosphere/client/script/ScriptClientVoxelUtils.java

@@ -9,7 +9,7 @@ import electrosphere.client.terrain.editing.TerrainEditing;
 import electrosphere.collision.CollisionEngine;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 /**
  * Utilities for interacting with voxels from the client

src/main/java/electrosphere/client/terrain/cache/ChunkData.java

@@ -5,7 +5,7 @@ import java.util.Set;
 
 import org.joml.Vector3i;
 
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 /**
  * A container of data about a chunk of terrain

src/main/java/electrosphere/client/terrain/cells/DrawCell.java

@@ -14,7 +14,7 @@ import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.types.terrain.TerrainChunk;
 import electrosphere.renderer.meshgen.TransvoxelModelGeneration;
 import electrosphere.renderer.meshgen.TransvoxelModelGeneration.TransvoxelChunkData;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 import electrosphere.util.ds.octree.WorldOctTree.WorldOctTreeNode;
 import electrosphere.util.math.GeomUtils;
 

src/main/java/electrosphere/client/terrain/cells/DrawCellManager.java

@@ -17,7 +17,7 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.EntityUtils;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.renderer.shader.VisualShader;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 @Deprecated
 /**

src/main/java/electrosphere/client/terrain/foliage/FoliageCell.java

@@ -16,8 +16,8 @@ import electrosphere.entity.ClientEntityUtils;
 import electrosphere.entity.Entity;
 import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.renderer.buffer.HomogenousUniformBuffer.HomogenousBufferTypes;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 import electrosphere.renderer.buffer.ShaderAttribute;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
 import electrosphere.util.ds.octree.WorldOctTree.WorldOctTreeNode;
 import electrosphere.util.math.GeomUtils;
 

src/main/java/electrosphere/client/terrain/foliage/FoliageCellManager.java

@@ -13,7 +13,7 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.EntityUtils;
 import electrosphere.game.data.foliage.type.FoliageType;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 import electrosphere.util.ds.octree.WorldOctTree;
 import electrosphere.util.ds.octree.WorldOctTree.WorldOctTreeNode;
 import electrosphere.util.math.GeomUtils;

src/main/java/electrosphere/client/terrain/foliage/FoliageModel.java

@@ -28,7 +28,7 @@ import electrosphere.entity.types.common.CommonEntityUtils;
 import electrosphere.game.data.foliage.type.FoliageType;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.renderer.actor.instance.TextureInstancedActor;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 /**
  * Generates a foliage model

src/main/java/electrosphere/client/terrain/manager/ClientTerrainManager.java

@@ -30,8 +30,8 @@ import electrosphere.logger.LoggerInterface;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.renderer.meshgen.TransvoxelModelGeneration;
 import electrosphere.renderer.model.Model;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
-import electrosphere.server.terrain.manager.ServerTerrainManager;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainManager;
 import electrosphere.util.math.HashUtils;
 
 /**

src/main/java/electrosphere/client/ui/menu/debug/ImGuiFluidMonitor.java

@@ -5,8 +5,8 @@ import electrosphere.client.fluid.manager.ClientFluidManager;
 import electrosphere.engine.Globals;
 import electrosphere.renderer.ui.imgui.ImGuiWindow;
 import electrosphere.renderer.ui.imgui.ImGuiWindow.ImGuiWindowCallback;
-import electrosphere.server.fluid.manager.ServerFluidChunk;
-import electrosphere.server.fluid.manager.ServerFluidManager;
+import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
+import electrosphere.server.physics.fluid.manager.ServerFluidManager;
 import imgui.ImGui;
 
 /**

src/main/java/electrosphere/client/ui/menu/debug/ImGuiTestGen.java

@@ -5,8 +5,8 @@ import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.renderer.ui.imgui.ImGuiWindow;
 import electrosphere.renderer.ui.imgui.ImGuiWindow.ImGuiWindowCallback;
 import electrosphere.server.datacell.gridded.GriddedDataCellManager;
-import electrosphere.server.terrain.generation.TestGenerationChunkGenerator;
-import electrosphere.server.terrain.models.TerrainModel;
+import electrosphere.server.physics.terrain.generation.TestGenerationChunkGenerator;
+import electrosphere.server.physics.terrain.models.TerrainModel;
 import imgui.ImGui;
 import imgui.type.ImInt;
 

src/main/java/electrosphere/client/ui/menu/debug/ImGuiWindowMacros.java

@@ -11,7 +11,7 @@ import electrosphere.renderer.ui.imgui.ImGuiLinePlot;
 import electrosphere.renderer.ui.imgui.ImGuiWindow;
 import electrosphere.renderer.ui.imgui.ImGuiLinePlot.ImGuiLinePlotDataset;
 import electrosphere.renderer.ui.imgui.ImGuiWindow.ImGuiWindowCallback;
-import electrosphere.server.terrain.generation.TestGenerationChunkGenerator;
+import electrosphere.server.physics.terrain.generation.TestGenerationChunkGenerator;
 import imgui.ImGui;
 
 /**

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

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

src/main/java/electrosphere/engine/loadingthreads/ChunkGenerationTestLoading.java

@@ -13,8 +13,8 @@ import electrosphere.logger.LoggerInterface;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.net.server.ServerConnectionHandler;
 import electrosphere.renderer.ui.elements.Window;
+import electrosphere.server.physics.terrain.generation.TestGenerationChunkGenerator;
 import electrosphere.server.saves.SaveUtils;
-import electrosphere.server.terrain.generation.TestGenerationChunkGenerator;
 
 /**
  * Loads the chunk generation testing realm

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

@@ -3,7 +3,7 @@ package electrosphere.entity.scene;
 import java.util.Objects;
 
 import electrosphere.server.datacell.gridded.GriddedDataCellManager;
-import electrosphere.server.terrain.generation.TestGenerationChunkGenerator;
+import electrosphere.server.physics.terrain.generation.TestGenerationChunkGenerator;
 
 /**
  * Generates scene files where appropriate (ie, if playing the procedurally generated level)

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

@@ -12,8 +12,8 @@ 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.terrain.generation.DefaultChunkGenerator;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.generation.DefaultChunkGenerator;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 import electrosphere.util.FileUtils;
 
 /**

src/main/java/electrosphere/game/data/voxel/sampler/SamplerFile.java

@@ -4,9 +4,9 @@ import java.io.File;
 import java.util.LinkedList;
 import java.util.List;
 
-import electrosphere.server.terrain.generation.noise.NoiseContainer;
-import electrosphere.server.terrain.generation.noise.NoiseSampler;
-import electrosphere.server.terrain.generation.noise.operators.NoiseOperoatorInvoke;
+import electrosphere.server.physics.terrain.generation.noise.NoiseContainer;
+import electrosphere.server.physics.terrain.generation.noise.NoiseSampler;
+import electrosphere.server.physics.terrain.generation.noise.operators.NoiseOperoatorInvoke;
 import electrosphere.util.FileUtils;
 
 /**

src/main/java/electrosphere/game/server/world/ServerWorldData.java

@@ -1,14 +1,14 @@
 package electrosphere.game.server.world;
 
 import electrosphere.client.block.BlockChunkData;
-import electrosphere.server.block.manager.ServerBlockManager;
-import electrosphere.server.fluid.generation.DefaultFluidGenerator;
-import electrosphere.server.fluid.manager.ServerFluidManager;
-import electrosphere.server.terrain.generation.DefaultChunkGenerator;
-import electrosphere.server.terrain.generation.TestGenerationChunkGenerator;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
-import electrosphere.server.terrain.manager.ServerTerrainManager;
-import electrosphere.server.terrain.models.TerrainModel;
+import electrosphere.server.physics.block.manager.ServerBlockManager;
+import electrosphere.server.physics.fluid.generation.DefaultFluidGenerator;
+import electrosphere.server.physics.fluid.manager.ServerFluidManager;
+import electrosphere.server.physics.terrain.generation.DefaultChunkGenerator;
+import electrosphere.server.physics.terrain.generation.TestGenerationChunkGenerator;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainManager;
+import electrosphere.server.physics.terrain.models.TerrainModel;
 import electrosphere.util.FileUtils;
 
 import org.joml.Vector3d;

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

@@ -18,9 +18,9 @@ import electrosphere.net.server.ServerConnectionHandler;
 import electrosphere.net.server.player.Player;
 import electrosphere.net.template.ServerProtocolTemplate;
 import electrosphere.server.datacell.Realm;
-import electrosphere.server.fluid.manager.ServerFluidChunk;
-import electrosphere.server.terrain.editing.TerrainEditing;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
+import electrosphere.server.physics.terrain.editing.TerrainEditing;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 /**
  * Server handling for terrain network messages

src/main/java/electrosphere/renderer/meshgen/FluidChunkModelGeneration.java

@@ -16,7 +16,7 @@ import electrosphere.renderer.model.Material;
 import electrosphere.renderer.model.Mesh;
 import electrosphere.renderer.model.Model;
 import electrosphere.renderer.shader.VisualShader;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 import static org.lwjgl.opengl.GL30.glBindVertexArray;
 

src/main/java/electrosphere/renderer/meshgen/TerrainChunkModelGeneration.java

@@ -18,7 +18,7 @@ import electrosphere.engine.Globals;
 import electrosphere.renderer.model.Material;
 import electrosphere.renderer.model.Mesh;
 import electrosphere.renderer.model.Model;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 public class TerrainChunkModelGeneration {
 

src/main/java/electrosphere/renderer/meshgen/TransvoxelModelGeneration.java

@@ -18,7 +18,7 @@ import electrosphere.mem.VectorPool;
 import electrosphere.renderer.model.Material;
 import electrosphere.renderer.model.Mesh;
 import electrosphere.renderer.model.Model;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 /**
  * Utility functions for generating transvoxel based meshes

src/main/java/electrosphere/server/content/ServerContentGenerator.java

@@ -11,7 +11,7 @@ import electrosphere.game.data.biome.BiomeData;
 import electrosphere.game.data.biome.BiomeFoliageDescription;
 import electrosphere.server.datacell.Realm;
 import electrosphere.server.datacell.ServerDataCell;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 import io.github.studiorailgun.NoiseUtils;
 
 /**

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

@@ -15,11 +15,11 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.game.server.world.ServerWorldData;
 import electrosphere.net.server.player.Player;
-import electrosphere.server.chemistry.ServerChemistryCollisionCallback;
-import electrosphere.server.collision.ServerHitboxResolutionCallback;
 import electrosphere.server.content.ServerContentManager;
 import electrosphere.server.datacell.gridded.GriddedDataCellManager;
-import electrosphere.server.fluid.simulator.FluidAcceleratedSimulator;
+import electrosphere.server.physics.chemistry.ServerChemistryCollisionCallback;
+import electrosphere.server.physics.collision.ServerHitboxResolutionCallback;
+import electrosphere.server.physics.fluid.simulator.FluidAcceleratedSimulator;
 
 /**
  * Manages all realms for the engine. Should be a singleton

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

@@ -29,7 +29,6 @@ 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.block.manager.ServerBlockManager;
 import electrosphere.server.content.ServerContentManager;
 import electrosphere.server.content.serialization.ContentSerialization;
 import electrosphere.server.datacell.Realm;
@@ -37,12 +36,13 @@ 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.fluid.manager.ServerFluidChunk;
-import electrosphere.server.fluid.manager.ServerFluidManager;
-import electrosphere.server.terrain.manager.ServerTerrainManager;
-import electrosphere.server.terrain.models.TerrainModel;
+import electrosphere.server.physics.block.manager.ServerBlockManager;
+import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
+import electrosphere.server.physics.fluid.manager.ServerFluidManager;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainManager;
+import electrosphere.server.physics.terrain.models.TerrainModel;
 import electrosphere.util.math.HashUtils;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
 
 /**
  * Implementation of DataCellManager that lays out cells in a logical grid (array). Useful for eg 3d terrain gridded world.

src/main/java/electrosphere/server/datacell/interfaces/VoxelCellManager.java

@@ -3,8 +3,8 @@ package electrosphere.server.datacell.interfaces;
 import org.joml.Vector3i;
 
 import electrosphere.client.block.BlockChunkData;
-import electrosphere.server.fluid.manager.ServerFluidChunk;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 /**
  * Extension of a DataCellManager that provides voxel terrain access and editing functions

src/main/java/electrosphere/server/datacell/physics/DataCellPhysicsManager.java

@@ -3,7 +3,7 @@ package electrosphere.server.datacell.physics;
 import electrosphere.engine.Globals;
 import electrosphere.renderer.shader.VisualShader;
 import electrosphere.server.datacell.Realm;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 import java.util.HashMap;
 import java.util.HashSet;

src/main/java/electrosphere/server/datacell/physics/PhysicsDataCell.java

@@ -11,7 +11,7 @@ import electrosphere.entity.types.terrain.TerrainChunk;
 import electrosphere.renderer.meshgen.BlockMeshgen;
 import electrosphere.renderer.meshgen.BlockMeshgen.BlockMeshData;
 import electrosphere.server.datacell.Realm;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 import org.joml.Vector3i;
 import org.ode4j.ode.DBody;

src/main/java/electrosphere/server/entitygroup/EntityGroup.java

@@ -1,24 +0,0 @@
-package electrosphere.server.entitygroup;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import electrosphere.entity.Entity;
-
-public class EntityGroup {
-    
-    List<Entity> members;
-    
-    public EntityGroup(){
-        members = new LinkedList<Entity>();
-    }
-
-    public void addMember(Entity newMember){
-        members.add(newMember);
-    }
-
-    public List<Entity> getMemebers(){
-        return members;
-    }
-
-}

src/main/java/electrosphere/server/pathfinding/ChunkMeshList.java

@@ -1,7 +1,7 @@
 package electrosphere.server.pathfinding;
 
 import electrosphere.server.pathfinding.navmesh.NavMesh;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 import java.util.LinkedList;
 import java.util.List;

src/main/java/electrosphere/server/pathfinding/NavMeshManager.java

@@ -3,7 +3,7 @@ package electrosphere.server.pathfinding;
 import electrosphere.server.pathfinding.blocker.NavBlocker;
 import electrosphere.server.pathfinding.blocker.NavTerrainBlockerCache;
 import electrosphere.server.pathfinding.navmesh.NavMesh;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 import java.util.HashMap;
 import java.util.LinkedList;

src/main/java/electrosphere/server/pathfinding/NavMeshUtils.java

@@ -6,7 +6,7 @@ import electrosphere.server.pathfinding.blocker.NavBlocker;
 import electrosphere.server.pathfinding.navmesh.NavCube;
 import electrosphere.server.pathfinding.navmesh.NavMesh;
 import electrosphere.server.pathfinding.navmesh.NavShape;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 import java.util.LinkedList;
 import java.util.List;

src/main/java/electrosphere/server/pathfinding/blocker/NavBlocker.java

@@ -1,6 +1,6 @@
 package electrosphere.server.pathfinding.blocker;
 
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 /**
  * 

src/main/java/electrosphere/server/physics/block/diskmap/ServerBlockChunkDiskMap.java

@@ -1,4 +1,4 @@
-package electrosphere.server.block.diskmap;
+package electrosphere.server.physics.block.diskmap;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

src/main/java/electrosphere/server/physics/block/editing/ServerBlockEditing.java

@@ -1,4 +1,4 @@
-package electrosphere.server.block.editing;
+package electrosphere.server.physics.block.editing;
 
 import org.joml.Vector3i;
 

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

@@ -1,4 +1,4 @@
-package electrosphere.server.block.manager;
+package electrosphere.server.physics.block.manager;
 
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
@@ -7,7 +7,7 @@ import electrosphere.client.block.BlockChunkCache;
 import electrosphere.client.block.BlockChunkData;
 import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.server.block.diskmap.ServerBlockChunkDiskMap;
+import electrosphere.server.physics.block.diskmap.ServerBlockChunkDiskMap;
 
 /**
  * A job that fetches a chunk, either by generating it or by reading it from disk

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

@@ -1,10 +1,10 @@
-package electrosphere.server.block.manager;
+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.block.diskmap.ServerBlockChunkDiskMap;
+import electrosphere.server.physics.block.diskmap.ServerBlockChunkDiskMap;
 import electrosphere.util.annotation.Exclude;
 
 import java.util.concurrent.ExecutorService;

src/main/java/electrosphere/server/physics/chemistry/ServerChemistryCollisionCallback.java

@@ -1,4 +1,4 @@
-package electrosphere.server.chemistry;
+package electrosphere.server.physics.chemistry;
 
 import org.joml.Vector3d;
 import org.ode4j.ode.DContactGeom;

src/main/java/electrosphere/server/physics/collision/ServerHitboxResolutionCallback.java

@@ -1,4 +1,4 @@
-package electrosphere.server.collision;
+package electrosphere.server.physics.collision;
 
 import org.joml.Vector3d;
 import org.ode4j.ode.DContactGeom;

src/main/java/electrosphere/server/physics/fluid/diskmap/FluidDiskMap.java

@@ -1,4 +1,4 @@
-package electrosphere.server.fluid.diskmap;
+package electrosphere.server.physics.fluid.diskmap;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -11,8 +11,8 @@ import java.util.zip.InflaterOutputStream;
 
 import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.server.fluid.manager.ServerFluidChunk;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 import electrosphere.util.FileUtils;
 
 /**

src/main/java/electrosphere/server/physics/fluid/generation/DefaultFluidGenerator.java

@@ -1,7 +1,7 @@
-package electrosphere.server.fluid.generation;
+package electrosphere.server.physics.fluid.generation;
 
-import electrosphere.server.fluid.manager.ServerFluidChunk;
-import electrosphere.server.fluid.models.FluidModel;
+import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
+import electrosphere.server.physics.fluid.models.FluidModel;
 
 public class DefaultFluidGenerator implements FluidGenerator {
 

src/main/java/electrosphere/server/physics/fluid/generation/FluidGenerator.java

@@ -1,7 +1,7 @@
-package electrosphere.server.fluid.generation;
+package electrosphere.server.physics.fluid.generation;
 
-import electrosphere.server.fluid.manager.ServerFluidChunk;
-import electrosphere.server.fluid.models.FluidModel;
+import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
+import electrosphere.server.physics.fluid.models.FluidModel;
 
 /**
  * Generates fluid

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

@@ -1,4 +1,4 @@
-package electrosphere.server.fluid.manager;
+package electrosphere.server.physics.fluid.manager;
 
 
 import java.nio.ByteBuffer;

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

@@ -1,15 +1,15 @@
-package electrosphere.server.fluid.manager;
+package electrosphere.server.physics.fluid.manager;
 
 
 import electrosphere.engine.Globals;
 import electrosphere.game.server.world.ServerWorldData;
-import electrosphere.server.fluid.diskmap.FluidDiskMap;
-import electrosphere.server.fluid.generation.FluidGenerator;
-import electrosphere.server.fluid.models.FluidModel;
-import electrosphere.server.fluid.simulator.FluidAcceleratedSimulator;
-import electrosphere.server.fluid.simulator.ServerFluidSimulator;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
-import electrosphere.server.terrain.manager.ServerTerrainManager;
+import electrosphere.server.physics.fluid.diskmap.FluidDiskMap;
+import electrosphere.server.physics.fluid.generation.FluidGenerator;
+import electrosphere.server.physics.fluid.models.FluidModel;
+import electrosphere.server.physics.fluid.simulator.FluidAcceleratedSimulator;
+import electrosphere.server.physics.fluid.simulator.ServerFluidSimulator;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainManager;
 import electrosphere.util.FileUtils;
 import electrosphere.util.annotation.Exclude;
 

src/main/java/electrosphere/server/physics/fluid/models/FluidModel.java

@@ -1,4 +1,4 @@
-package electrosphere.server.fluid.models;
+package electrosphere.server.physics.fluid.models;
 
 import electrosphere.util.annotation.Exclude;
 

src/main/java/electrosphere/server/physics/fluid/simulator/FluidAcceleratedSimulator.java

@@ -1,10 +1,10 @@
-package electrosphere.server.fluid.simulator;
+package electrosphere.server.physics.fluid.simulator;
 
 import java.io.File;
 import java.util.List;
 
 import electrosphere.logger.LoggerInterface;
-import electrosphere.server.fluid.manager.ServerFluidChunk;
+import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
 
 /**
  * A c-accelerated fluid simulator

src/main/java/electrosphere/server/physics/fluid/simulator/FluidCellularAutomataSimulator.java

@@ -1,8 +1,8 @@
-package electrosphere.server.fluid.simulator;
+package electrosphere.server.physics.fluid.simulator;
 
 import java.util.List;
 
-import electrosphere.server.fluid.manager.ServerFluidChunk;
+import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
 
 /**
  * Simulates server fluid chunks via cellular automata

src/main/java/electrosphere/server/physics/fluid/simulator/ServerFluidSimulator.java

@@ -1,8 +1,8 @@
-package electrosphere.server.fluid.simulator;
+package electrosphere.server.physics.fluid.simulator;
 
 import java.util.List;
 
-import electrosphere.server.fluid.manager.ServerFluidChunk;
+import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
 
 /**
  * A system capable of simulating a server fluid chunk for a single frame

src/main/java/electrosphere/server/physics/terrain/diskmap/ChunkDiskMap.java

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.diskmap;
+package electrosphere.server.physics.terrain.diskmap;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -16,8 +16,8 @@ import java.util.zip.InflaterOutputStream;
 import electrosphere.client.terrain.cache.ChunkData;
 import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 import electrosphere.server.saves.SaveUtils;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
 import electrosphere.util.FileUtils;
 import electrosphere.util.annotation.Exclude;
 

src/main/java/electrosphere/server/physics/terrain/editing/TerrainEditing.java

@@ -1,11 +1,11 @@
-package electrosphere.server.terrain.editing;
+package electrosphere.server.physics.terrain.editing;
 
 import org.joml.Vector3d;
 import org.joml.Vector3i;
 
 import electrosphere.server.datacell.Realm;
 import electrosphere.server.datacell.interfaces.VoxelCellManager;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 /**
  * Provides utilities for editing terrain (particularly brushes, etc)

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

@@ -1,10 +1,10 @@
-package electrosphere.server.terrain.generation;
+package electrosphere.server.physics.terrain.generation;
 
 import electrosphere.client.terrain.cache.ChunkData;
 import electrosphere.entity.scene.RealmDescriptor;
-import electrosphere.server.terrain.generation.interfaces.ChunkGenerator;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
-import electrosphere.server.terrain.models.TerrainModel;
+import electrosphere.server.physics.terrain.generation.interfaces.ChunkGenerator;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.models.TerrainModel;
 
 /**
  * An arena terrain chunk generator

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

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation;
+package electrosphere.server.physics.terrain.generation;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -11,19 +11,19 @@ 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.terrain.generation.heightmap.EmptySkyGen;
-import electrosphere.server.terrain.generation.heightmap.HeightmapGenerator;
-import electrosphere.server.terrain.generation.heightmap.HillsGen;
-import electrosphere.server.terrain.generation.heightmap.MountainGen;
-import electrosphere.server.terrain.generation.heightmap.PlainsGen;
-import electrosphere.server.terrain.generation.interfaces.ChunkGenerator;
-import electrosphere.server.terrain.generation.interfaces.GeneratedVoxel;
-import electrosphere.server.terrain.generation.voxelphase.AnimeMountainsGen;
-import electrosphere.server.terrain.generation.voxelphase.HillsVoxelGen;
-import electrosphere.server.terrain.generation.voxelphase.MountainVoxelGen;
-import electrosphere.server.terrain.generation.voxelphase.VoxelGenerator;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
-import electrosphere.server.terrain.models.TerrainModel;
+import electrosphere.server.physics.terrain.generation.heightmap.EmptySkyGen;
+import electrosphere.server.physics.terrain.generation.heightmap.HeightmapGenerator;
+import electrosphere.server.physics.terrain.generation.heightmap.HillsGen;
+import electrosphere.server.physics.terrain.generation.heightmap.MountainGen;
+import electrosphere.server.physics.terrain.generation.heightmap.PlainsGen;
+import electrosphere.server.physics.terrain.generation.interfaces.ChunkGenerator;
+import electrosphere.server.physics.terrain.generation.interfaces.GeneratedVoxel;
+import electrosphere.server.physics.terrain.generation.voxelphase.AnimeMountainsGen;
+import electrosphere.server.physics.terrain.generation.voxelphase.HillsVoxelGen;
+import electrosphere.server.physics.terrain.generation.voxelphase.MountainVoxelGen;
+import electrosphere.server.physics.terrain.generation.voxelphase.VoxelGenerator;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.models.TerrainModel;
 
 /**
  * Dedicated script-based chunk generator

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

@@ -1,12 +1,12 @@
-package electrosphere.server.terrain.generation;
+package electrosphere.server.physics.terrain.generation;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import electrosphere.client.terrain.cache.ChunkData;
-import electrosphere.server.terrain.generation.interfaces.ChunkGenerator;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
-import electrosphere.server.terrain.models.TerrainModel;
+import electrosphere.server.physics.terrain.generation.interfaces.ChunkGenerator;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.models.TerrainModel;
 
 /**
  * Chunk generator for overworld chunks

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

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation;
+package electrosphere.server.physics.terrain.generation;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -10,22 +10,22 @@ 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.terrain.generation.heightmap.EmptySkyGen;
-import electrosphere.server.terrain.generation.heightmap.HeightmapGenerator;
-import electrosphere.server.terrain.generation.heightmap.HeightmapNoiseGen;
-import electrosphere.server.terrain.generation.heightmap.HillsGen;
-import electrosphere.server.terrain.generation.heightmap.MountainGen;
-import electrosphere.server.terrain.generation.heightmap.PlainsGen;
-import electrosphere.server.terrain.generation.interfaces.ChunkGenerator;
-import electrosphere.server.terrain.generation.interfaces.GeneratedVoxel;
-import electrosphere.server.terrain.generation.interfaces.GenerationContext;
-import electrosphere.server.terrain.generation.voxelphase.AnimeMountainsGen;
-import electrosphere.server.terrain.generation.voxelphase.HillsVoxelGen;
-import electrosphere.server.terrain.generation.voxelphase.MountainVoxelGen;
-import electrosphere.server.terrain.generation.voxelphase.NoiseVoxelGen;
-import electrosphere.server.terrain.generation.voxelphase.VoxelGenerator;
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
-import electrosphere.server.terrain.models.TerrainModel;
+import electrosphere.server.physics.terrain.generation.heightmap.EmptySkyGen;
+import electrosphere.server.physics.terrain.generation.heightmap.HeightmapGenerator;
+import electrosphere.server.physics.terrain.generation.heightmap.HeightmapNoiseGen;
+import electrosphere.server.physics.terrain.generation.heightmap.HillsGen;
+import electrosphere.server.physics.terrain.generation.heightmap.MountainGen;
+import electrosphere.server.physics.terrain.generation.heightmap.PlainsGen;
+import electrosphere.server.physics.terrain.generation.interfaces.ChunkGenerator;
+import electrosphere.server.physics.terrain.generation.interfaces.GeneratedVoxel;
+import electrosphere.server.physics.terrain.generation.interfaces.GenerationContext;
+import electrosphere.server.physics.terrain.generation.voxelphase.AnimeMountainsGen;
+import electrosphere.server.physics.terrain.generation.voxelphase.HillsVoxelGen;
+import electrosphere.server.physics.terrain.generation.voxelphase.MountainVoxelGen;
+import electrosphere.server.physics.terrain.generation.voxelphase.NoiseVoxelGen;
+import electrosphere.server.physics.terrain.generation.voxelphase.VoxelGenerator;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.models.TerrainModel;
 import electrosphere.util.noise.OpenSimplex2S;
 import io.github.studiorailgun.MathUtils;
 

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

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.continentphase;
+package electrosphere.server.physics.terrain.generation.continentphase;
 
 /**
  * Contains information about a continent

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

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.continentphase;
+package electrosphere.server.physics.terrain.generation.continentphase;
 
 import java.util.Random;
 import java.util.concurrent.CountDownLatch;

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

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.continentphase;
+package electrosphere.server.physics.terrain.generation.continentphase;
 
 /**
  *

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

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.continentphase;
+package electrosphere.server.physics.terrain.generation.continentphase;
 
 import java.awt.Color;
 import java.awt.Graphics;

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

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.continentphase;
+package electrosphere.server.physics.terrain.generation.continentphase;
 
 /**
  *

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

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.continentphase;
+package electrosphere.server.physics.terrain.generation.continentphase;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -154,7 +154,7 @@ class TectonicSimulation {
         for(int x = 0; x < DIMENSION; x++){
             for(int y = 0; y < DIMENSION; y++){
                 if(asthenosphereHeat[x][y] > 25){
-                    if(electrosphere.server.terrain.generation.continentphase.Utilities.random_Integer(1, 10, rand) == 10){
+                    if(electrosphere.server.physics.terrain.generation.continentphase.Utilities.random_Integer(1, 10, rand) == 10){
                         elevation[x][y] = elevation[x][y] + 1;
                         if(elevation[x][y] > 100){
                             elevation[x][y] = 100;

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

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.continentphase;
+package electrosphere.server.physics.terrain.generation.continentphase;
 
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
@@ -14,7 +14,7 @@ import java.util.Random;
 import javax.swing.JFrame;
 
 import electrosphere.logger.LoggerInterface;
-import electrosphere.server.terrain.models.TerrainModel;
+import electrosphere.server.physics.terrain.models.TerrainModel;
 
 /**
  *

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

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.continentphase;
+package electrosphere.server.physics.terrain.generation.continentphase;
 
 import java.awt.Point;
 import java.io.BufferedReader;

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

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.continentphase;
+package electrosphere.server.physics.terrain.generation.continentphase;
 
 /**
  * Int based 2 dimension vector

src/main/java/electrosphere/server/physics/terrain/generation/heightmap/EmptySkyGen.java

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.heightmap;
+package electrosphere.server.physics.terrain.generation.heightmap;
 
 public class EmptySkyGen implements HeightmapGenerator {
 

src/main/java/electrosphere/server/physics/terrain/generation/heightmap/HeightmapGenerator.java

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.heightmap;
+package electrosphere.server.physics.terrain.generation.heightmap;
 
 /**
  * Generates height values for terrain

src/main/java/electrosphere/server/physics/terrain/generation/heightmap/HeightmapNoiseGen.java

@@ -1,7 +1,7 @@
-package electrosphere.server.terrain.generation.heightmap;
+package electrosphere.server.physics.terrain.generation.heightmap;
 
 import electrosphere.game.data.voxel.sampler.SamplerFile;
-import electrosphere.server.terrain.generation.noise.NoiseSampler;
+import electrosphere.server.physics.terrain.generation.noise.NoiseSampler;
 
 /**
  * Generates a heightmap using a noise definition

src/main/java/electrosphere/server/physics/terrain/generation/heightmap/HillsGen.java

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.heightmap;
+package electrosphere.server.physics.terrain.generation.heightmap;
 
 import electrosphere.engine.Globals;
 import electrosphere.util.noise.OpenSimplex2S;

src/main/java/electrosphere/server/physics/terrain/generation/heightmap/MountainGen.java

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.heightmap;
+package electrosphere.server.physics.terrain.generation.heightmap;
 
 import electrosphere.util.noise.OpenSimplex2S;
 import io.github.studiorailgun.NoiseUtils;

src/main/java/electrosphere/server/physics/terrain/generation/heightmap/PlainsGen.java

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.heightmap;
+package electrosphere.server.physics.terrain.generation.heightmap;
 
 import electrosphere.util.noise.OpenSimplex2S;
 

src/main/java/electrosphere/server/physics/terrain/generation/heightmap/SeaFloorGen.java

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.heightmap;
+package electrosphere.server.physics.terrain.generation.heightmap;
 
 import electrosphere.util.noise.OpenSimplex2S;
 

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

@@ -1,7 +1,7 @@
-package electrosphere.server.terrain.generation.interfaces;
+package electrosphere.server.physics.terrain.generation.interfaces;
 
-import electrosphere.server.terrain.manager.ServerTerrainChunk;
-import electrosphere.server.terrain.models.TerrainModel;
+import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
+import electrosphere.server.physics.terrain.models.TerrainModel;
 
 /**
  * An interface for generating chunks. Used to isolate different algorithms for getting chunks from one another.

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

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.interfaces;
+package electrosphere.server.physics.terrain.generation.interfaces;
 
 import org.graalvm.polyglot.HostAccess.Export;
 

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

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.interfaces;
+package electrosphere.server.physics.terrain.generation.interfaces;
 
 import electrosphere.game.server.world.ServerWorldData;
 

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

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.interfaces;
+package electrosphere.server.physics.terrain.generation.interfaces;
 
 import electrosphere.game.data.biome.BiomeData;
 

src/main/java/electrosphere/server/physics/terrain/generation/macro/DefaultMacroGenerator.java

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.macro;
+package electrosphere.server.physics.terrain.generation.macro;
 
 import java.util.List;
 import java.util.Random;
@@ -6,7 +6,7 @@ import java.util.Random;
 import electrosphere.engine.Globals;
 import electrosphere.game.data.biome.BiomeData;
 import electrosphere.game.data.biome.BiomeTypeMap;
-import electrosphere.server.terrain.models.TerrainModel;
+import electrosphere.server.physics.terrain.models.TerrainModel;
 
 /**
  * The default approach to generating macro data

src/main/java/electrosphere/server/physics/terrain/generation/macro/HomogenousMacroGenerator.java

@@ -1,9 +1,9 @@
-package electrosphere.server.terrain.generation.macro;
+package electrosphere.server.physics.terrain.generation.macro;
 
 import electrosphere.engine.Globals;
 import electrosphere.game.data.biome.BiomeData;
 import electrosphere.game.data.biome.BiomeTypeMap;
-import electrosphere.server.terrain.models.TerrainModel;
+import electrosphere.server.physics.terrain.models.TerrainModel;
 
 /**
  * Generates a world that is a single biome

src/main/java/electrosphere/server/physics/terrain/generation/macro/MacroGenerator.java

@@ -1,6 +1,6 @@
-package electrosphere.server.terrain.generation.macro;
+package electrosphere.server.physics.terrain.generation.macro;
 
-import electrosphere.server.terrain.models.TerrainModel;
+import electrosphere.server.physics.terrain.models.TerrainModel;
 
 /**
  * Populates a terrain model's macro data

src/main/java/electrosphere/server/physics/terrain/generation/noise/NoiseContainer.java

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.noise;
+package electrosphere.server.physics.terrain.generation.noise;
 
 import java.util.Collection;
 

src/main/java/electrosphere/server/physics/terrain/generation/noise/NoiseModuleSerializer.java

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.noise;
+package electrosphere.server.physics.terrain.generation.noise;
 
 import java.lang.reflect.Type;
 
@@ -7,14 +7,14 @@ import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 
-import electrosphere.server.terrain.generation.noise.operators.NoiseOperatorAdd;
-import electrosphere.server.terrain.generation.noise.operators.NoiseOperatorClamp;
-import electrosphere.server.terrain.generation.noise.operators.NoiseOperatorConst;
-import electrosphere.server.terrain.generation.noise.operators.NoiseOperatorDomainWarp;
-import electrosphere.server.terrain.generation.noise.operators.NoiseOperatorMul;
-import electrosphere.server.terrain.generation.noise.operators.NoiseOperatorOpenSimplex;
-import electrosphere.server.terrain.generation.noise.operators.NoiseOperatorVoronoi;
-import electrosphere.server.terrain.generation.noise.operators.NoiseOperoatorInvoke;
+import electrosphere.server.physics.terrain.generation.noise.operators.NoiseOperatorAdd;
+import electrosphere.server.physics.terrain.generation.noise.operators.NoiseOperatorClamp;
+import electrosphere.server.physics.terrain.generation.noise.operators.NoiseOperatorConst;
+import electrosphere.server.physics.terrain.generation.noise.operators.NoiseOperatorDomainWarp;
+import electrosphere.server.physics.terrain.generation.noise.operators.NoiseOperatorMul;
+import electrosphere.server.physics.terrain.generation.noise.operators.NoiseOperatorOpenSimplex;
+import electrosphere.server.physics.terrain.generation.noise.operators.NoiseOperatorVoronoi;
+import electrosphere.server.physics.terrain.generation.noise.operators.NoiseOperoatorInvoke;
 
 /**
  * Deserializes noise modules

src/main/java/electrosphere/server/physics/terrain/generation/noise/NoiseOctaveSampler.java

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.noise;
+package electrosphere.server.physics.terrain.generation.noise;
 
 /**
  * A noce function that can be sampled in octaves

src/main/java/electrosphere/server/physics/terrain/generation/noise/NoiseSampler.java

@@ -1,4 +1,4 @@
-package electrosphere.server.terrain.generation.noise;
+package electrosphere.server.physics.terrain.generation.noise;
 
 /**
  * A noise module that can sample values

src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorAdd.java

@@ -1,10 +1,10 @@
-package electrosphere.server.terrain.generation.noise.operators;
+package electrosphere.server.physics.terrain.generation.noise.operators;
 
 import java.util.Arrays;
 import java.util.Collection;
 
-import electrosphere.server.terrain.generation.noise.NoiseContainer;
-import electrosphere.server.terrain.generation.noise.NoiseSampler;
+import electrosphere.server.physics.terrain.generation.noise.NoiseContainer;
+import electrosphere.server.physics.terrain.generation.noise.NoiseSampler;
 
 public class NoiseOperatorAdd implements NoiseContainer {
 

src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorClamp.java

@@ -1,10 +1,10 @@
-package electrosphere.server.terrain.generation.noise.operators;
+package electrosphere.server.physics.terrain.generation.noise.operators;
 
 import java.util.Arrays;
 import java.util.Collection;
 
-import electrosphere.server.terrain.generation.noise.NoiseContainer;
-import electrosphere.server.terrain.generation.noise.NoiseSampler;
+import electrosphere.server.physics.terrain.generation.noise.NoiseContainer;
+import electrosphere.server.physics.terrain.generation.noise.NoiseSampler;
 import io.github.studiorailgun.MathUtils;
 
 /**

src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorConst.java

@@ -1,6 +1,6 @@
-package electrosphere.server.terrain.generation.noise.operators;
+package electrosphere.server.physics.terrain.generation.noise.operators;
 
-import electrosphere.server.terrain.generation.noise.NoiseSampler;
+import electrosphere.server.physics.terrain.generation.noise.NoiseSampler;
 
 /**
  * Gets a constant value

src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorDomainWarp.java

@@ -1,10 +1,10 @@
-package electrosphere.server.terrain.generation.noise.operators;
+package electrosphere.server.physics.terrain.generation.noise.operators;
 
 import java.util.Arrays;
 import java.util.Collection;
 
-import electrosphere.server.terrain.generation.noise.NoiseContainer;
-import electrosphere.server.terrain.generation.noise.NoiseSampler;
+import electrosphere.server.physics.terrain.generation.noise.NoiseContainer;
+import electrosphere.server.physics.terrain.generation.noise.NoiseSampler;
 
 /**
  * The warp operator

src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorMul.java

@@ -1,10 +1,10 @@
-package electrosphere.server.terrain.generation.noise.operators;
+package electrosphere.server.physics.terrain.generation.noise.operators;
 
 import java.util.Arrays;
 import java.util.Collection;
 
-import electrosphere.server.terrain.generation.noise.NoiseContainer;
-import electrosphere.server.terrain.generation.noise.NoiseSampler;
+import electrosphere.server.physics.terrain.generation.noise.NoiseContainer;
+import electrosphere.server.physics.terrain.generation.noise.NoiseSampler;
 
 /**
  * Multiplies one noise source by another

src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorOpenSimplex.java

@@ -1,6 +1,6 @@
-package electrosphere.server.terrain.generation.noise.operators;
+package electrosphere.server.physics.terrain.generation.noise.operators;
 
-import electrosphere.server.terrain.generation.noise.NoiseOctaveSampler;
+import electrosphere.server.physics.terrain.generation.noise.NoiseOctaveSampler;
 import electrosphere.util.noise.OpenSimplex2S;
 
 /**

src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorVoronoi.java

@@ -1,6 +1,6 @@
-package electrosphere.server.terrain.generation.noise.operators;
+package electrosphere.server.physics.terrain.generation.noise.operators;
 
-import electrosphere.server.terrain.generation.noise.NoiseOctaveSampler;
+import electrosphere.server.physics.terrain.generation.noise.NoiseOctaveSampler;
 import io.github.studiorailgun.NoiseUtils;
 
 /**

src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperoatorInvoke.java

@@ -1,10 +1,10 @@
-package electrosphere.server.terrain.generation.noise.operators;
+package electrosphere.server.physics.terrain.generation.noise.operators;
 
 import java.util.Arrays;
 import java.util.Collection;
 
-import electrosphere.server.terrain.generation.noise.NoiseContainer;
-import electrosphere.server.terrain.generation.noise.NoiseSampler;
+import electrosphere.server.physics.terrain.generation.noise.NoiseContainer;
+import electrosphere.server.physics.terrain.generation.noise.NoiseSampler;
 
 /**
  * Invokes another sample definition file

src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/AnimeMountainsGen.java

@@ -1,10 +1,10 @@
-package electrosphere.server.terrain.generation.voxelphase;
+package electrosphere.server.physics.terrain.generation.voxelphase;
 
 import electrosphere.engine.Globals;
 import electrosphere.game.data.biome.BiomeData;
 import electrosphere.game.data.biome.BiomeSurfaceGenerationParams;
-import electrosphere.server.terrain.generation.interfaces.GeneratedVoxel;
-import electrosphere.server.terrain.generation.interfaces.GenerationContext;
+import electrosphere.server.physics.terrain.generation.interfaces.GeneratedVoxel;
+import electrosphere.server.physics.terrain.generation.interfaces.GenerationContext;
 import io.github.studiorailgun.MathUtils;
 import io.github.studiorailgun.RandUtils;
 

src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/HillsVoxelGen.java

@@ -1,10 +1,10 @@
-package electrosphere.server.terrain.generation.voxelphase;
+package electrosphere.server.physics.terrain.generation.voxelphase;
 
 import electrosphere.engine.Globals;
 import electrosphere.game.data.biome.BiomeData;
 import electrosphere.game.data.biome.BiomeSurfaceGenerationParams;
-import electrosphere.server.terrain.generation.interfaces.GeneratedVoxel;
-import electrosphere.server.terrain.generation.interfaces.GenerationContext;
+import electrosphere.server.physics.terrain.generation.interfaces.GeneratedVoxel;
+import electrosphere.server.physics.terrain.generation.interfaces.GenerationContext;
 
 /**
  * Generates voxels for a hill

src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/MountainVoxelGen.java

@@ -1,10 +1,10 @@
-package electrosphere.server.terrain.generation.voxelphase;
+package electrosphere.server.physics.terrain.generation.voxelphase;
 
 import electrosphere.engine.Globals;
 import electrosphere.game.data.biome.BiomeData;
 import electrosphere.game.data.biome.BiomeSurfaceGenerationParams;
-import electrosphere.server.terrain.generation.interfaces.GeneratedVoxel;
-import electrosphere.server.terrain.generation.interfaces.GenerationContext;
+import electrosphere.server.physics.terrain.generation.interfaces.GeneratedVoxel;
+import electrosphere.server.physics.terrain.generation.interfaces.GenerationContext;
 
 public class MountainVoxelGen  implements VoxelGenerator {