diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 65701d06..4cfef5a5 100644 --- a/docs/src/progress/renderertodo.md +++ b/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 + diff --git a/src/main/java/electrosphere/client/block/BlockChunkData.java b/src/main/java/electrosphere/client/block/BlockChunkData.java index df99c8de..8bffdc85 100644 --- a/src/main/java/electrosphere/client/block/BlockChunkData.java +++ b/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 diff --git a/src/main/java/electrosphere/client/block/ClientBlockManager.java b/src/main/java/electrosphere/client/block/ClientBlockManager.java index a24fdc34..b237b871 100644 --- a/src/main/java/electrosphere/client/block/ClientBlockManager.java +++ b/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; diff --git a/src/main/java/electrosphere/client/block/cells/BlockDrawCell.java b/src/main/java/electrosphere/client/block/cells/BlockDrawCell.java index 6405f820..87023f44 100644 --- a/src/main/java/electrosphere/client/block/cells/BlockDrawCell.java +++ b/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; diff --git a/src/main/java/electrosphere/client/fluid/cache/FluidChunkData.java b/src/main/java/electrosphere/client/fluid/cache/FluidChunkData.java index b5ad2801..11de23e3 100644 --- a/src/main/java/electrosphere/client/fluid/cache/FluidChunkData.java +++ b/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 diff --git a/src/main/java/electrosphere/client/fluid/cells/FluidCell.java b/src/main/java/electrosphere/client/fluid/cells/FluidCell.java index 4fe4b737..92f5992d 100644 --- a/src/main/java/electrosphere/client/fluid/cells/FluidCell.java +++ b/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; /** * diff --git a/src/main/java/electrosphere/client/fluid/cells/FluidCellManager.java b/src/main/java/electrosphere/client/fluid/cells/FluidCellManager.java index 4e130ca6..a87748a4 100644 --- a/src/main/java/electrosphere/client/fluid/cells/FluidCellManager.java +++ b/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; /** * diff --git a/src/main/java/electrosphere/client/fluid/manager/ClientFluidManager.java b/src/main/java/electrosphere/client/fluid/manager/ClientFluidManager.java index b2291bde..0222419b 100644 --- a/src/main/java/electrosphere/client/fluid/manager/ClientFluidManager.java +++ b/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 diff --git a/src/main/java/electrosphere/client/scene/ClientWorldData.java b/src/main/java/electrosphere/client/scene/ClientWorldData.java index a38ca7dd..bc1f3ab9 100644 --- a/src/main/java/electrosphere/client/scene/ClientWorldData.java +++ b/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 diff --git a/src/main/java/electrosphere/client/script/ScriptClientVoxelUtils.java b/src/main/java/electrosphere/client/script/ScriptClientVoxelUtils.java index e2217a05..fc9b73eb 100644 --- a/src/main/java/electrosphere/client/script/ScriptClientVoxelUtils.java +++ b/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 diff --git a/src/main/java/electrosphere/client/terrain/cache/ChunkData.java b/src/main/java/electrosphere/client/terrain/cache/ChunkData.java index 64e015fa..89031960 100644 --- a/src/main/java/electrosphere/client/terrain/cache/ChunkData.java +++ b/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 diff --git a/src/main/java/electrosphere/client/terrain/cells/DrawCell.java b/src/main/java/electrosphere/client/terrain/cells/DrawCell.java index 6b5840b8..2cc052bb 100644 --- a/src/main/java/electrosphere/client/terrain/cells/DrawCell.java +++ b/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; diff --git a/src/main/java/electrosphere/client/terrain/cells/DrawCellManager.java b/src/main/java/electrosphere/client/terrain/cells/DrawCellManager.java index 10db9936..df444bdb 100644 --- a/src/main/java/electrosphere/client/terrain/cells/DrawCellManager.java +++ b/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 /** diff --git a/src/main/java/electrosphere/client/terrain/foliage/FoliageCell.java b/src/main/java/electrosphere/client/terrain/foliage/FoliageCell.java index 1f915576..ce12319f 100644 --- a/src/main/java/electrosphere/client/terrain/foliage/FoliageCell.java +++ b/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; diff --git a/src/main/java/electrosphere/client/terrain/foliage/FoliageCellManager.java b/src/main/java/electrosphere/client/terrain/foliage/FoliageCellManager.java index 165fb801..5317b1b5 100644 --- a/src/main/java/electrosphere/client/terrain/foliage/FoliageCellManager.java +++ b/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; diff --git a/src/main/java/electrosphere/client/terrain/foliage/FoliageModel.java b/src/main/java/electrosphere/client/terrain/foliage/FoliageModel.java index d8e66b3f..9bb91e6a 100644 --- a/src/main/java/electrosphere/client/terrain/foliage/FoliageModel.java +++ b/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 diff --git a/src/main/java/electrosphere/client/terrain/manager/ClientTerrainManager.java b/src/main/java/electrosphere/client/terrain/manager/ClientTerrainManager.java index e80ba36a..25c78186 100644 --- a/src/main/java/electrosphere/client/terrain/manager/ClientTerrainManager.java +++ b/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; /** diff --git a/src/main/java/electrosphere/client/ui/menu/debug/ImGuiFluidMonitor.java b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiFluidMonitor.java index 41374d38..ff9ab79c 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/ImGuiFluidMonitor.java +++ b/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; /** diff --git a/src/main/java/electrosphere/client/ui/menu/debug/ImGuiTestGen.java b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiTestGen.java index 30e52bbb..cf256fd0 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/ImGuiTestGen.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/menu/debug/ImGuiWindowMacros.java b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiWindowMacros.java index 0821fc75..8de2a590 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/ImGuiWindowMacros.java +++ b/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; /** diff --git a/src/main/java/electrosphere/collision/CollisionWorldData.java b/src/main/java/electrosphere/collision/CollisionWorldData.java index 396cb752..5320d6da 100644 --- a/src/main/java/electrosphere/collision/CollisionWorldData.java +++ b/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; diff --git a/src/main/java/electrosphere/engine/loadingthreads/ChunkGenerationTestLoading.java b/src/main/java/electrosphere/engine/loadingthreads/ChunkGenerationTestLoading.java index 777029a3..a4a3cc75 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/ChunkGenerationTestLoading.java +++ b/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 diff --git a/src/main/java/electrosphere/entity/scene/SceneGenerator.java b/src/main/java/electrosphere/entity/scene/SceneGenerator.java index 40f53a66..92b14ebc 100644 --- a/src/main/java/electrosphere/entity/scene/SceneGenerator.java +++ b/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) diff --git a/src/main/java/electrosphere/entity/scene/SceneLoader.java b/src/main/java/electrosphere/entity/scene/SceneLoader.java index 4286febc..c6d6945d 100644 --- a/src/main/java/electrosphere/entity/scene/SceneLoader.java +++ b/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; /** diff --git a/src/main/java/electrosphere/game/data/voxel/sampler/SamplerFile.java b/src/main/java/electrosphere/game/data/voxel/sampler/SamplerFile.java index 4438fb18..6de0908e 100644 --- a/src/main/java/electrosphere/game/data/voxel/sampler/SamplerFile.java +++ b/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; /** diff --git a/src/main/java/electrosphere/game/server/world/ServerWorldData.java b/src/main/java/electrosphere/game/server/world/ServerWorldData.java index 35b83388..b434f7c4 100644 --- a/src/main/java/electrosphere/game/server/world/ServerWorldData.java +++ b/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; diff --git a/src/main/java/electrosphere/net/server/protocol/TerrainProtocol.java b/src/main/java/electrosphere/net/server/protocol/TerrainProtocol.java index a2e7f324..ae971bc7 100644 --- a/src/main/java/electrosphere/net/server/protocol/TerrainProtocol.java +++ b/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 diff --git a/src/main/java/electrosphere/renderer/meshgen/FluidChunkModelGeneration.java b/src/main/java/electrosphere/renderer/meshgen/FluidChunkModelGeneration.java index d73ac475..1d57ee85 100644 --- a/src/main/java/electrosphere/renderer/meshgen/FluidChunkModelGeneration.java +++ b/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; diff --git a/src/main/java/electrosphere/renderer/meshgen/TerrainChunkModelGeneration.java b/src/main/java/electrosphere/renderer/meshgen/TerrainChunkModelGeneration.java index 27c842c8..baa88334 100644 --- a/src/main/java/electrosphere/renderer/meshgen/TerrainChunkModelGeneration.java +++ b/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 { diff --git a/src/main/java/electrosphere/renderer/meshgen/TransvoxelModelGeneration.java b/src/main/java/electrosphere/renderer/meshgen/TransvoxelModelGeneration.java index eef3bc23..1711e0f8 100644 --- a/src/main/java/electrosphere/renderer/meshgen/TransvoxelModelGeneration.java +++ b/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 diff --git a/src/main/java/electrosphere/server/content/ServerContentGenerator.java b/src/main/java/electrosphere/server/content/ServerContentGenerator.java index 7f9a4c47..f6c17924 100644 --- a/src/main/java/electrosphere/server/content/ServerContentGenerator.java +++ b/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; /** diff --git a/src/main/java/electrosphere/server/datacell/RealmManager.java b/src/main/java/electrosphere/server/datacell/RealmManager.java index a7dc1303..5d55cbed 100644 --- a/src/main/java/electrosphere/server/datacell/RealmManager.java +++ b/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 diff --git a/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java b/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java index 347bff58..cdf5d087 100644 --- a/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java +++ b/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. diff --git a/src/main/java/electrosphere/server/datacell/interfaces/VoxelCellManager.java b/src/main/java/electrosphere/server/datacell/interfaces/VoxelCellManager.java index cbb1d8ce..bc8e7000 100644 --- a/src/main/java/electrosphere/server/datacell/interfaces/VoxelCellManager.java +++ b/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 diff --git a/src/main/java/electrosphere/server/datacell/physics/DataCellPhysicsManager.java b/src/main/java/electrosphere/server/datacell/physics/DataCellPhysicsManager.java index 7dc83757..85f999f8 100644 --- a/src/main/java/electrosphere/server/datacell/physics/DataCellPhysicsManager.java +++ b/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; diff --git a/src/main/java/electrosphere/server/datacell/physics/PhysicsDataCell.java b/src/main/java/electrosphere/server/datacell/physics/PhysicsDataCell.java index 9372f707..d145f209 100644 --- a/src/main/java/electrosphere/server/datacell/physics/PhysicsDataCell.java +++ b/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; diff --git a/src/main/java/electrosphere/server/entitygroup/EntityGroup.java b/src/main/java/electrosphere/server/entitygroup/EntityGroup.java deleted file mode 100644 index 2ded4af9..00000000 --- a/src/main/java/electrosphere/server/entitygroup/EntityGroup.java +++ /dev/null @@ -1,24 +0,0 @@ -package electrosphere.server.entitygroup; - -import java.util.LinkedList; -import java.util.List; - -import electrosphere.entity.Entity; - -public class EntityGroup { - - List members; - - public EntityGroup(){ - members = new LinkedList(); - } - - public void addMember(Entity newMember){ - members.add(newMember); - } - - public List getMemebers(){ - return members; - } - -} diff --git a/src/main/java/electrosphere/server/pathfinding/ChunkMeshList.java b/src/main/java/electrosphere/server/pathfinding/ChunkMeshList.java index ee773296..ab03181a 100644 --- a/src/main/java/electrosphere/server/pathfinding/ChunkMeshList.java +++ b/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; diff --git a/src/main/java/electrosphere/server/pathfinding/NavMeshManager.java b/src/main/java/electrosphere/server/pathfinding/NavMeshManager.java index 8731d06c..dc9dbfde 100644 --- a/src/main/java/electrosphere/server/pathfinding/NavMeshManager.java +++ b/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; diff --git a/src/main/java/electrosphere/server/pathfinding/NavMeshUtils.java b/src/main/java/electrosphere/server/pathfinding/NavMeshUtils.java index f9257e14..aa938d81 100644 --- a/src/main/java/electrosphere/server/pathfinding/NavMeshUtils.java +++ b/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; diff --git a/src/main/java/electrosphere/server/pathfinding/blocker/NavBlocker.java b/src/main/java/electrosphere/server/pathfinding/blocker/NavBlocker.java index edc058e0..d213cb24 100644 --- a/src/main/java/electrosphere/server/pathfinding/blocker/NavBlocker.java +++ b/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; /** * diff --git a/src/main/java/electrosphere/server/block/diskmap/ServerBlockChunkDiskMap.java b/src/main/java/electrosphere/server/physics/block/diskmap/ServerBlockChunkDiskMap.java similarity index 99% rename from src/main/java/electrosphere/server/block/diskmap/ServerBlockChunkDiskMap.java rename to src/main/java/electrosphere/server/physics/block/diskmap/ServerBlockChunkDiskMap.java index 27464cc4..059c2a16 100644 --- a/src/main/java/electrosphere/server/block/diskmap/ServerBlockChunkDiskMap.java +++ b/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; diff --git a/src/main/java/electrosphere/server/block/editing/ServerBlockEditing.java b/src/main/java/electrosphere/server/physics/block/editing/ServerBlockEditing.java similarity index 97% rename from src/main/java/electrosphere/server/block/editing/ServerBlockEditing.java rename to src/main/java/electrosphere/server/physics/block/editing/ServerBlockEditing.java index 5e50bd43..35639e8e 100644 --- a/src/main/java/electrosphere/server/block/editing/ServerBlockEditing.java +++ b/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; diff --git a/src/main/java/electrosphere/server/block/manager/ServerBlockChunkGenerationThread.java b/src/main/java/electrosphere/server/physics/block/manager/ServerBlockChunkGenerationThread.java similarity index 97% rename from src/main/java/electrosphere/server/block/manager/ServerBlockChunkGenerationThread.java rename to src/main/java/electrosphere/server/physics/block/manager/ServerBlockChunkGenerationThread.java index 83eb7088..308d5238 100644 --- a/src/main/java/electrosphere/server/block/manager/ServerBlockChunkGenerationThread.java +++ b/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 diff --git a/src/main/java/electrosphere/server/block/manager/ServerBlockManager.java b/src/main/java/electrosphere/server/physics/block/manager/ServerBlockManager.java similarity index 98% rename from src/main/java/electrosphere/server/block/manager/ServerBlockManager.java rename to src/main/java/electrosphere/server/physics/block/manager/ServerBlockManager.java index 82a6333d..301bf8f5 100644 --- a/src/main/java/electrosphere/server/block/manager/ServerBlockManager.java +++ b/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; diff --git a/src/main/java/electrosphere/server/chemistry/ServerChemistryCollisionCallback.java b/src/main/java/electrosphere/server/physics/chemistry/ServerChemistryCollisionCallback.java similarity index 95% rename from src/main/java/electrosphere/server/chemistry/ServerChemistryCollisionCallback.java rename to src/main/java/electrosphere/server/physics/chemistry/ServerChemistryCollisionCallback.java index 8e73ab1b..5a54170d 100644 --- a/src/main/java/electrosphere/server/chemistry/ServerChemistryCollisionCallback.java +++ b/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; diff --git a/src/main/java/electrosphere/server/collision/ServerHitboxResolutionCallback.java b/src/main/java/electrosphere/server/physics/collision/ServerHitboxResolutionCallback.java similarity index 99% rename from src/main/java/electrosphere/server/collision/ServerHitboxResolutionCallback.java rename to src/main/java/electrosphere/server/physics/collision/ServerHitboxResolutionCallback.java index 0e442005..3d5a1fc6 100644 --- a/src/main/java/electrosphere/server/collision/ServerHitboxResolutionCallback.java +++ b/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; diff --git a/src/main/java/electrosphere/server/fluid/diskmap/FluidDiskMap.java b/src/main/java/electrosphere/server/physics/fluid/diskmap/FluidDiskMap.java similarity index 97% rename from src/main/java/electrosphere/server/fluid/diskmap/FluidDiskMap.java rename to src/main/java/electrosphere/server/physics/fluid/diskmap/FluidDiskMap.java index dbcb31db..80304e06 100644 --- a/src/main/java/electrosphere/server/fluid/diskmap/FluidDiskMap.java +++ b/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; /** diff --git a/src/main/java/electrosphere/server/fluid/generation/DefaultFluidGenerator.java b/src/main/java/electrosphere/server/physics/fluid/generation/DefaultFluidGenerator.java similarity index 71% rename from src/main/java/electrosphere/server/fluid/generation/DefaultFluidGenerator.java rename to src/main/java/electrosphere/server/physics/fluid/generation/DefaultFluidGenerator.java index 27054093..61b267a9 100644 --- a/src/main/java/electrosphere/server/fluid/generation/DefaultFluidGenerator.java +++ b/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 { diff --git a/src/main/java/electrosphere/server/fluid/generation/FluidGenerator.java b/src/main/java/electrosphere/server/physics/fluid/generation/FluidGenerator.java similarity index 73% rename from src/main/java/electrosphere/server/fluid/generation/FluidGenerator.java rename to src/main/java/electrosphere/server/physics/fluid/generation/FluidGenerator.java index 355258e2..35430142 100644 --- a/src/main/java/electrosphere/server/fluid/generation/FluidGenerator.java +++ b/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 diff --git a/src/main/java/electrosphere/server/fluid/manager/ServerFluidChunk.java b/src/main/java/electrosphere/server/physics/fluid/manager/ServerFluidChunk.java similarity index 99% rename from src/main/java/electrosphere/server/fluid/manager/ServerFluidChunk.java rename to src/main/java/electrosphere/server/physics/fluid/manager/ServerFluidChunk.java index 3ad9af5a..42e8ae80 100644 --- a/src/main/java/electrosphere/server/fluid/manager/ServerFluidChunk.java +++ b/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; diff --git a/src/main/java/electrosphere/server/fluid/manager/ServerFluidManager.java b/src/main/java/electrosphere/server/physics/fluid/manager/ServerFluidManager.java similarity index 96% rename from src/main/java/electrosphere/server/fluid/manager/ServerFluidManager.java rename to src/main/java/electrosphere/server/physics/fluid/manager/ServerFluidManager.java index 363e00df..b194975c 100644 --- a/src/main/java/electrosphere/server/fluid/manager/ServerFluidManager.java +++ b/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; diff --git a/src/main/java/electrosphere/server/fluid/models/FluidModel.java b/src/main/java/electrosphere/server/physics/fluid/models/FluidModel.java similarity index 99% rename from src/main/java/electrosphere/server/fluid/models/FluidModel.java rename to src/main/java/electrosphere/server/physics/fluid/models/FluidModel.java index c15f5665..3b9bad7c 100644 --- a/src/main/java/electrosphere/server/fluid/models/FluidModel.java +++ b/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; diff --git a/src/main/java/electrosphere/server/fluid/simulator/FluidAcceleratedSimulator.java b/src/main/java/electrosphere/server/physics/fluid/simulator/FluidAcceleratedSimulator.java similarity index 96% rename from src/main/java/electrosphere/server/fluid/simulator/FluidAcceleratedSimulator.java rename to src/main/java/electrosphere/server/physics/fluid/simulator/FluidAcceleratedSimulator.java index db49df25..4b27fbb8 100644 --- a/src/main/java/electrosphere/server/fluid/simulator/FluidAcceleratedSimulator.java +++ b/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 diff --git a/src/main/java/electrosphere/server/fluid/simulator/FluidCellularAutomataSimulator.java b/src/main/java/electrosphere/server/physics/fluid/simulator/FluidCellularAutomataSimulator.java similarity index 96% rename from src/main/java/electrosphere/server/fluid/simulator/FluidCellularAutomataSimulator.java rename to src/main/java/electrosphere/server/physics/fluid/simulator/FluidCellularAutomataSimulator.java index d2bfb943..17b06c27 100644 --- a/src/main/java/electrosphere/server/fluid/simulator/FluidCellularAutomataSimulator.java +++ b/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 diff --git a/src/main/java/electrosphere/server/fluid/simulator/ServerFluidSimulator.java b/src/main/java/electrosphere/server/physics/fluid/simulator/ServerFluidSimulator.java similarity index 75% rename from src/main/java/electrosphere/server/fluid/simulator/ServerFluidSimulator.java rename to src/main/java/electrosphere/server/physics/fluid/simulator/ServerFluidSimulator.java index 912423d7..77e9034a 100644 --- a/src/main/java/electrosphere/server/fluid/simulator/ServerFluidSimulator.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/diskmap/ChunkDiskMap.java b/src/main/java/electrosphere/server/physics/terrain/diskmap/ChunkDiskMap.java similarity index 98% rename from src/main/java/electrosphere/server/terrain/diskmap/ChunkDiskMap.java rename to src/main/java/electrosphere/server/physics/terrain/diskmap/ChunkDiskMap.java index 95c2119d..e4dce53d 100644 --- a/src/main/java/electrosphere/server/terrain/diskmap/ChunkDiskMap.java +++ b/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; diff --git a/src/main/java/electrosphere/server/terrain/editing/TerrainEditing.java b/src/main/java/electrosphere/server/physics/terrain/editing/TerrainEditing.java similarity index 98% rename from src/main/java/electrosphere/server/terrain/editing/TerrainEditing.java rename to src/main/java/electrosphere/server/physics/terrain/editing/TerrainEditing.java index b010085a..ccfbc3d3 100644 --- a/src/main/java/electrosphere/server/terrain/editing/TerrainEditing.java +++ b/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) diff --git a/src/main/java/electrosphere/server/terrain/generation/DefaultChunkGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/DefaultChunkGenerator.java similarity index 90% rename from src/main/java/electrosphere/server/terrain/generation/DefaultChunkGenerator.java rename to src/main/java/electrosphere/server/physics/terrain/generation/DefaultChunkGenerator.java index fc821acf..7d0e8cf5 100644 --- a/src/main/java/electrosphere/server/terrain/generation/DefaultChunkGenerator.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/JSChunkGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/JSChunkGenerator.java similarity index 90% rename from src/main/java/electrosphere/server/terrain/generation/JSChunkGenerator.java rename to src/main/java/electrosphere/server/physics/terrain/generation/JSChunkGenerator.java index f58039bb..300ef58b 100644 --- a/src/main/java/electrosphere/server/terrain/generation/JSChunkGenerator.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/OverworldChunkGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/OverworldChunkGenerator.java similarity index 93% rename from src/main/java/electrosphere/server/terrain/generation/OverworldChunkGenerator.java rename to src/main/java/electrosphere/server/physics/terrain/generation/OverworldChunkGenerator.java index a6d8c4e4..3b83f602 100644 --- a/src/main/java/electrosphere/server/terrain/generation/OverworldChunkGenerator.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/TestGenerationChunkGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/TestGenerationChunkGenerator.java similarity index 93% rename from src/main/java/electrosphere/server/terrain/generation/TestGenerationChunkGenerator.java rename to src/main/java/electrosphere/server/physics/terrain/generation/TestGenerationChunkGenerator.java index 58f392e7..704644e7 100644 --- a/src/main/java/electrosphere/server/terrain/generation/TestGenerationChunkGenerator.java +++ b/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; diff --git a/src/main/java/electrosphere/server/terrain/generation/continentphase/Continent.java b/src/main/java/electrosphere/server/physics/terrain/generation/continentphase/Continent.java similarity index 84% rename from src/main/java/electrosphere/server/terrain/generation/continentphase/Continent.java rename to src/main/java/electrosphere/server/physics/terrain/generation/continentphase/Continent.java index 33b69029..c7d858f5 100644 --- a/src/main/java/electrosphere/server/terrain/generation/continentphase/Continent.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/continentphase/ErosionSimulation.java b/src/main/java/electrosphere/server/physics/terrain/generation/continentphase/ErosionSimulation.java similarity index 99% rename from src/main/java/electrosphere/server/terrain/generation/continentphase/ErosionSimulation.java rename to src/main/java/electrosphere/server/physics/terrain/generation/continentphase/ErosionSimulation.java index 495b6c2c..59c7b0df 100644 --- a/src/main/java/electrosphere/server/terrain/generation/continentphase/ErosionSimulation.java +++ b/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; diff --git a/src/main/java/electrosphere/server/terrain/generation/continentphase/Hotspot.java b/src/main/java/electrosphere/server/physics/terrain/generation/continentphase/Hotspot.java similarity index 99% rename from src/main/java/electrosphere/server/terrain/generation/continentphase/Hotspot.java rename to src/main/java/electrosphere/server/physics/terrain/generation/continentphase/Hotspot.java index d7e6a372..06145a87 100644 --- a/src/main/java/electrosphere/server/terrain/generation/continentphase/Hotspot.java +++ b/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; /** * diff --git a/src/main/java/electrosphere/server/terrain/generation/continentphase/InterpolationDisplay.java b/src/main/java/electrosphere/server/physics/terrain/generation/continentphase/InterpolationDisplay.java similarity index 99% rename from src/main/java/electrosphere/server/terrain/generation/continentphase/InterpolationDisplay.java rename to src/main/java/electrosphere/server/physics/terrain/generation/continentphase/InterpolationDisplay.java index 275d6b21..7e0a9a3f 100644 --- a/src/main/java/electrosphere/server/terrain/generation/continentphase/InterpolationDisplay.java +++ b/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; diff --git a/src/main/java/electrosphere/server/terrain/generation/continentphase/Region.java b/src/main/java/electrosphere/server/physics/terrain/generation/continentphase/Region.java similarity index 84% rename from src/main/java/electrosphere/server/terrain/generation/continentphase/Region.java rename to src/main/java/electrosphere/server/physics/terrain/generation/continentphase/Region.java index d6645e3d..cfc10dba 100644 --- a/src/main/java/electrosphere/server/terrain/generation/continentphase/Region.java +++ b/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; /** * diff --git a/src/main/java/electrosphere/server/terrain/generation/continentphase/TectonicSimulation.java b/src/main/java/electrosphere/server/physics/terrain/generation/continentphase/TectonicSimulation.java similarity index 99% rename from src/main/java/electrosphere/server/terrain/generation/continentphase/TectonicSimulation.java rename to src/main/java/electrosphere/server/physics/terrain/generation/continentphase/TectonicSimulation.java index da958d34..e9fee2af 100644 --- a/src/main/java/electrosphere/server/terrain/generation/continentphase/TectonicSimulation.java +++ b/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; diff --git a/src/main/java/electrosphere/server/terrain/generation/continentphase/TerrainGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/continentphase/TerrainGenerator.java similarity index 99% rename from src/main/java/electrosphere/server/terrain/generation/continentphase/TerrainGenerator.java rename to src/main/java/electrosphere/server/physics/terrain/generation/continentphase/TerrainGenerator.java index f1b524c0..985d6a07 100644 --- a/src/main/java/electrosphere/server/terrain/generation/continentphase/TerrainGenerator.java +++ b/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; /** * diff --git a/src/main/java/electrosphere/server/terrain/generation/continentphase/Utilities.java b/src/main/java/electrosphere/server/physics/terrain/generation/continentphase/Utilities.java similarity index 99% rename from src/main/java/electrosphere/server/terrain/generation/continentphase/Utilities.java rename to src/main/java/electrosphere/server/physics/terrain/generation/continentphase/Utilities.java index 766091ce..9450725d 100644 --- a/src/main/java/electrosphere/server/terrain/generation/continentphase/Utilities.java +++ b/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; diff --git a/src/main/java/electrosphere/server/terrain/generation/continentphase/Vector.java b/src/main/java/electrosphere/server/physics/terrain/generation/continentphase/Vector.java similarity index 74% rename from src/main/java/electrosphere/server/terrain/generation/continentphase/Vector.java rename to src/main/java/electrosphere/server/physics/terrain/generation/continentphase/Vector.java index 02c6422d..1f59ba50 100644 --- a/src/main/java/electrosphere/server/terrain/generation/continentphase/Vector.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/heightmap/EmptySkyGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/heightmap/EmptySkyGen.java similarity index 85% rename from src/main/java/electrosphere/server/terrain/generation/heightmap/EmptySkyGen.java rename to src/main/java/electrosphere/server/physics/terrain/generation/heightmap/EmptySkyGen.java index f6c59798..cc987334 100644 --- a/src/main/java/electrosphere/server/terrain/generation/heightmap/EmptySkyGen.java +++ b/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 { diff --git a/src/main/java/electrosphere/server/terrain/generation/heightmap/HeightmapGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/heightmap/HeightmapGenerator.java similarity index 89% rename from src/main/java/electrosphere/server/terrain/generation/heightmap/HeightmapGenerator.java rename to src/main/java/electrosphere/server/physics/terrain/generation/heightmap/HeightmapGenerator.java index 32088a7f..ef9efe46 100644 --- a/src/main/java/electrosphere/server/terrain/generation/heightmap/HeightmapGenerator.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/heightmap/HeightmapNoiseGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/heightmap/HeightmapNoiseGen.java similarity index 87% rename from src/main/java/electrosphere/server/terrain/generation/heightmap/HeightmapNoiseGen.java rename to src/main/java/electrosphere/server/physics/terrain/generation/heightmap/HeightmapNoiseGen.java index 46c0db72..0c4895a1 100644 --- a/src/main/java/electrosphere/server/terrain/generation/heightmap/HeightmapNoiseGen.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/heightmap/HillsGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/heightmap/HillsGen.java similarity index 98% rename from src/main/java/electrosphere/server/terrain/generation/heightmap/HillsGen.java rename to src/main/java/electrosphere/server/physics/terrain/generation/heightmap/HillsGen.java index 6304f6a2..a9aec7b7 100644 --- a/src/main/java/electrosphere/server/terrain/generation/heightmap/HillsGen.java +++ b/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; diff --git a/src/main/java/electrosphere/server/terrain/generation/heightmap/MountainGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/heightmap/MountainGen.java similarity index 97% rename from src/main/java/electrosphere/server/terrain/generation/heightmap/MountainGen.java rename to src/main/java/electrosphere/server/physics/terrain/generation/heightmap/MountainGen.java index 0a9fc23b..ebc1b18d 100644 --- a/src/main/java/electrosphere/server/terrain/generation/heightmap/MountainGen.java +++ b/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; diff --git a/src/main/java/electrosphere/server/terrain/generation/heightmap/PlainsGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/heightmap/PlainsGen.java similarity index 96% rename from src/main/java/electrosphere/server/terrain/generation/heightmap/PlainsGen.java rename to src/main/java/electrosphere/server/physics/terrain/generation/heightmap/PlainsGen.java index 81c26d51..08385751 100644 --- a/src/main/java/electrosphere/server/terrain/generation/heightmap/PlainsGen.java +++ b/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; diff --git a/src/main/java/electrosphere/server/terrain/generation/heightmap/SeaFloorGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/heightmap/SeaFloorGen.java similarity index 91% rename from src/main/java/electrosphere/server/terrain/generation/heightmap/SeaFloorGen.java rename to src/main/java/electrosphere/server/physics/terrain/generation/heightmap/SeaFloorGen.java index edf0a3b4..ddac0f62 100644 --- a/src/main/java/electrosphere/server/terrain/generation/heightmap/SeaFloorGen.java +++ b/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; diff --git a/src/main/java/electrosphere/server/terrain/generation/interfaces/ChunkGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/interfaces/ChunkGenerator.java similarity index 83% rename from src/main/java/electrosphere/server/terrain/generation/interfaces/ChunkGenerator.java rename to src/main/java/electrosphere/server/physics/terrain/generation/interfaces/ChunkGenerator.java index 18659401..08823ada 100644 --- a/src/main/java/electrosphere/server/terrain/generation/interfaces/ChunkGenerator.java +++ b/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. diff --git a/src/main/java/electrosphere/server/terrain/generation/interfaces/GeneratedVoxel.java b/src/main/java/electrosphere/server/physics/terrain/generation/interfaces/GeneratedVoxel.java similarity index 81% rename from src/main/java/electrosphere/server/terrain/generation/interfaces/GeneratedVoxel.java rename to src/main/java/electrosphere/server/physics/terrain/generation/interfaces/GeneratedVoxel.java index d43d4e7e..0ece9262 100644 --- a/src/main/java/electrosphere/server/terrain/generation/interfaces/GeneratedVoxel.java +++ b/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; diff --git a/src/main/java/electrosphere/server/terrain/generation/interfaces/GenerationContext.java b/src/main/java/electrosphere/server/physics/terrain/generation/interfaces/GenerationContext.java similarity index 92% rename from src/main/java/electrosphere/server/terrain/generation/interfaces/GenerationContext.java rename to src/main/java/electrosphere/server/physics/terrain/generation/interfaces/GenerationContext.java index 7492193c..b38b3843 100644 --- a/src/main/java/electrosphere/server/terrain/generation/interfaces/GenerationContext.java +++ b/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; diff --git a/src/main/java/electrosphere/server/terrain/generation/interfaces/JSChunkGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/interfaces/JSChunkGenerator.java similarity index 93% rename from src/main/java/electrosphere/server/terrain/generation/interfaces/JSChunkGenerator.java rename to src/main/java/electrosphere/server/physics/terrain/generation/interfaces/JSChunkGenerator.java index fee6ad19..47c3fbb1 100644 --- a/src/main/java/electrosphere/server/terrain/generation/interfaces/JSChunkGenerator.java +++ b/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; diff --git a/src/main/java/electrosphere/server/terrain/generation/macro/DefaultMacroGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/macro/DefaultMacroGenerator.java similarity index 90% rename from src/main/java/electrosphere/server/terrain/generation/macro/DefaultMacroGenerator.java rename to src/main/java/electrosphere/server/physics/terrain/generation/macro/DefaultMacroGenerator.java index 7f89a002..a174bcb8 100644 --- a/src/main/java/electrosphere/server/terrain/generation/macro/DefaultMacroGenerator.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/macro/HomogenousMacroGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/macro/HomogenousMacroGenerator.java similarity index 90% rename from src/main/java/electrosphere/server/terrain/generation/macro/HomogenousMacroGenerator.java rename to src/main/java/electrosphere/server/physics/terrain/generation/macro/HomogenousMacroGenerator.java index 8575aa2f..08de5cc4 100644 --- a/src/main/java/electrosphere/server/terrain/generation/macro/HomogenousMacroGenerator.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/macro/MacroGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/macro/MacroGenerator.java similarity index 65% rename from src/main/java/electrosphere/server/terrain/generation/macro/MacroGenerator.java rename to src/main/java/electrosphere/server/physics/terrain/generation/macro/MacroGenerator.java index 9cf549a4..46de0de4 100644 --- a/src/main/java/electrosphere/server/terrain/generation/macro/MacroGenerator.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/noise/NoiseContainer.java b/src/main/java/electrosphere/server/physics/terrain/generation/noise/NoiseContainer.java similarity index 81% rename from src/main/java/electrosphere/server/terrain/generation/noise/NoiseContainer.java rename to src/main/java/electrosphere/server/physics/terrain/generation/noise/NoiseContainer.java index e59b9fe5..4f2b1dd0 100644 --- a/src/main/java/electrosphere/server/terrain/generation/noise/NoiseContainer.java +++ b/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; diff --git a/src/main/java/electrosphere/server/terrain/generation/noise/NoiseModuleSerializer.java b/src/main/java/electrosphere/server/physics/terrain/generation/noise/NoiseModuleSerializer.java similarity index 68% rename from src/main/java/electrosphere/server/terrain/generation/noise/NoiseModuleSerializer.java rename to src/main/java/electrosphere/server/physics/terrain/generation/noise/NoiseModuleSerializer.java index 82d89088..1a9db435 100644 --- a/src/main/java/electrosphere/server/terrain/generation/noise/NoiseModuleSerializer.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/noise/NoiseOctaveSampler.java b/src/main/java/electrosphere/server/physics/terrain/generation/noise/NoiseOctaveSampler.java similarity index 93% rename from src/main/java/electrosphere/server/terrain/generation/noise/NoiseOctaveSampler.java rename to src/main/java/electrosphere/server/physics/terrain/generation/noise/NoiseOctaveSampler.java index f27c8559..0e4d80c6 100644 --- a/src/main/java/electrosphere/server/terrain/generation/noise/NoiseOctaveSampler.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/noise/NoiseSampler.java b/src/main/java/electrosphere/server/physics/terrain/generation/noise/NoiseSampler.java similarity index 90% rename from src/main/java/electrosphere/server/terrain/generation/noise/NoiseSampler.java rename to src/main/java/electrosphere/server/physics/terrain/generation/noise/NoiseSampler.java index fa6adba7..d83b6204 100644 --- a/src/main/java/electrosphere/server/terrain/generation/noise/NoiseSampler.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorAdd.java b/src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorAdd.java similarity index 78% rename from src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorAdd.java rename to src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorAdd.java index 0d30660e..b17f2139 100644 --- a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorAdd.java +++ b/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 { diff --git a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorClamp.java b/src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorClamp.java similarity index 81% rename from src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorClamp.java rename to src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorClamp.java index d560a6e7..74c12b8d 100644 --- a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorClamp.java +++ b/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; /** diff --git a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorConst.java b/src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorConst.java similarity index 74% rename from src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorConst.java rename to src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorConst.java index 8323ba87..97cdde38 100644 --- a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorConst.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorDomainWarp.java b/src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorDomainWarp.java similarity index 87% rename from src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorDomainWarp.java rename to src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorDomainWarp.java index 2fbe2763..a513fc2f 100644 --- a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorDomainWarp.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorMul.java b/src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorMul.java similarity index 78% rename from src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorMul.java rename to src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorMul.java index 773a4173..75b64747 100644 --- a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorMul.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorOpenSimplex.java b/src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorOpenSimplex.java similarity index 91% rename from src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorOpenSimplex.java rename to src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorOpenSimplex.java index 077eb6b7..112014df 100644 --- a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorOpenSimplex.java +++ b/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; /** diff --git a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorVoronoi.java b/src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorVoronoi.java similarity index 91% rename from src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorVoronoi.java rename to src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperatorVoronoi.java index 51bb949c..c75901eb 100644 --- a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperatorVoronoi.java +++ b/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; /** diff --git a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperoatorInvoke.java b/src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperoatorInvoke.java similarity index 86% rename from src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperoatorInvoke.java rename to src/main/java/electrosphere/server/physics/terrain/generation/noise/operators/NoiseOperoatorInvoke.java index 528615ba..4fb9bea5 100644 --- a/src/main/java/electrosphere/server/terrain/generation/noise/operators/NoiseOperoatorInvoke.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/voxelphase/AnimeMountainsGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/AnimeMountainsGen.java similarity index 97% rename from src/main/java/electrosphere/server/terrain/generation/voxelphase/AnimeMountainsGen.java rename to src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/AnimeMountainsGen.java index 568de91f..37e9bf29 100644 --- a/src/main/java/electrosphere/server/terrain/generation/voxelphase/AnimeMountainsGen.java +++ b/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; diff --git a/src/main/java/electrosphere/server/terrain/generation/voxelphase/HillsVoxelGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/HillsVoxelGen.java similarity index 94% rename from src/main/java/electrosphere/server/terrain/generation/voxelphase/HillsVoxelGen.java rename to src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/HillsVoxelGen.java index 6186ba56..a683c635 100644 --- a/src/main/java/electrosphere/server/terrain/generation/voxelphase/HillsVoxelGen.java +++ b/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 diff --git a/src/main/java/electrosphere/server/terrain/generation/voxelphase/MountainVoxelGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/MountainVoxelGen.java similarity index 95% rename from src/main/java/electrosphere/server/terrain/generation/voxelphase/MountainVoxelGen.java rename to src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/MountainVoxelGen.java index e15a4188..1861498c 100644 --- a/src/main/java/electrosphere/server/terrain/generation/voxelphase/MountainVoxelGen.java +++ b/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 { diff --git a/src/main/java/electrosphere/server/terrain/generation/voxelphase/NoiseVoxelGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/NoiseVoxelGen.java similarity index 92% rename from src/main/java/electrosphere/server/terrain/generation/voxelphase/NoiseVoxelGen.java rename to src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/NoiseVoxelGen.java index 2d9de93a..a716da53 100644 --- a/src/main/java/electrosphere/server/terrain/generation/voxelphase/NoiseVoxelGen.java +++ b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/NoiseVoxelGen.java @@ -1,12 +1,12 @@ -package electrosphere.server.terrain.generation.voxelphase; +package electrosphere.server.physics.terrain.generation.voxelphase; import electrosphere.game.data.biome.BiomeData; import electrosphere.game.data.biome.BiomeFloorElement; import electrosphere.game.data.biome.BiomeSurfaceGenerationParams; import electrosphere.game.data.voxel.sampler.SamplerFile; -import electrosphere.server.terrain.generation.interfaces.GeneratedVoxel; -import electrosphere.server.terrain.generation.interfaces.GenerationContext; -import electrosphere.server.terrain.generation.noise.NoiseSampler; +import electrosphere.server.physics.terrain.generation.interfaces.GeneratedVoxel; +import electrosphere.server.physics.terrain.generation.interfaces.GenerationContext; +import electrosphere.server.physics.terrain.generation.noise.NoiseSampler; /** * Generates voxels based on a noise config diff --git a/src/main/java/electrosphere/server/terrain/generation/voxelphase/VoxelGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/VoxelGenerator.java similarity index 87% rename from src/main/java/electrosphere/server/terrain/generation/voxelphase/VoxelGenerator.java rename to src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/VoxelGenerator.java index 758c7c26..b36266ac 100644 --- a/src/main/java/electrosphere/server/terrain/generation/voxelphase/VoxelGenerator.java +++ b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/VoxelGenerator.java @@ -1,9 +1,9 @@ -package electrosphere.server.terrain.generation.voxelphase; +package electrosphere.server.physics.terrain.generation.voxelphase; 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; /** diff --git a/src/main/java/electrosphere/server/terrain/manager/ChunkGenerationThread.java b/src/main/java/electrosphere/server/physics/terrain/manager/ChunkGenerationThread.java similarity index 95% rename from src/main/java/electrosphere/server/terrain/manager/ChunkGenerationThread.java rename to src/main/java/electrosphere/server/physics/terrain/manager/ChunkGenerationThread.java index dc3dbdc5..11a8e5fe 100644 --- a/src/main/java/electrosphere/server/terrain/manager/ChunkGenerationThread.java +++ b/src/main/java/electrosphere/server/physics/terrain/manager/ChunkGenerationThread.java @@ -1,12 +1,12 @@ -package electrosphere.server.terrain.manager; +package electrosphere.server.physics.terrain.manager; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import electrosphere.engine.Globals; import electrosphere.logger.LoggerInterface; -import electrosphere.server.terrain.diskmap.ChunkDiskMap; -import electrosphere.server.terrain.generation.interfaces.ChunkGenerator; +import electrosphere.server.physics.terrain.diskmap.ChunkDiskMap; +import electrosphere.server.physics.terrain.generation.interfaces.ChunkGenerator; /** * A job that fetches a chunk, either by generating it or by reading it from disk diff --git a/src/main/java/electrosphere/server/terrain/manager/ServerChunkCache.java b/src/main/java/electrosphere/server/physics/terrain/manager/ServerChunkCache.java similarity index 98% rename from src/main/java/electrosphere/server/terrain/manager/ServerChunkCache.java rename to src/main/java/electrosphere/server/physics/terrain/manager/ServerChunkCache.java index 04204b43..fb5f9fc3 100644 --- a/src/main/java/electrosphere/server/terrain/manager/ServerChunkCache.java +++ b/src/main/java/electrosphere/server/physics/terrain/manager/ServerChunkCache.java @@ -1,4 +1,4 @@ -package electrosphere.server.terrain.manager; +package electrosphere.server.physics.terrain.manager; import java.util.Collection; import java.util.Collections; @@ -9,7 +9,7 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.Semaphore; -import electrosphere.server.terrain.diskmap.ChunkDiskMap; +import electrosphere.server.physics.terrain.diskmap.ChunkDiskMap; /** * Caches chunk data on the server diff --git a/src/main/java/electrosphere/server/terrain/manager/ServerTerrainChunk.java b/src/main/java/electrosphere/server/physics/terrain/manager/ServerTerrainChunk.java similarity index 98% rename from src/main/java/electrosphere/server/terrain/manager/ServerTerrainChunk.java rename to src/main/java/electrosphere/server/physics/terrain/manager/ServerTerrainChunk.java index 90013cb7..81db8ec1 100644 --- a/src/main/java/electrosphere/server/terrain/manager/ServerTerrainChunk.java +++ b/src/main/java/electrosphere/server/physics/terrain/manager/ServerTerrainChunk.java @@ -1,11 +1,11 @@ -package electrosphere.server.terrain.manager; +package electrosphere.server.physics.terrain.manager; import java.util.LinkedList; import java.util.List; import org.joml.Vector3i; -import electrosphere.server.terrain.models.TerrainModification; +import electrosphere.server.physics.terrain.models.TerrainModification; /** * Is a single chunk of terrain on the server diff --git a/src/main/java/electrosphere/server/terrain/manager/ServerTerrainManager.java b/src/main/java/electrosphere/server/physics/terrain/manager/ServerTerrainManager.java similarity index 95% rename from src/main/java/electrosphere/server/terrain/manager/ServerTerrainManager.java rename to src/main/java/electrosphere/server/physics/terrain/manager/ServerTerrainManager.java index 92a26763..bbec2826 100644 --- a/src/main/java/electrosphere/server/terrain/manager/ServerTerrainManager.java +++ b/src/main/java/electrosphere/server/physics/terrain/manager/ServerTerrainManager.java @@ -1,17 +1,17 @@ -package electrosphere.server.terrain.manager; +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.terrain.diskmap.ChunkDiskMap; -import electrosphere.server.terrain.generation.TestGenerationChunkGenerator; -import electrosphere.server.terrain.generation.interfaces.ChunkGenerator; -import electrosphere.server.terrain.generation.macro.DefaultMacroGenerator; -import electrosphere.server.terrain.generation.macro.HomogenousMacroGenerator; -import electrosphere.server.terrain.generation.macro.MacroGenerator; -import electrosphere.server.terrain.models.TerrainModel; -import electrosphere.server.terrain.models.TerrainModification; +import electrosphere.server.physics.terrain.diskmap.ChunkDiskMap; +import electrosphere.server.physics.terrain.generation.TestGenerationChunkGenerator; +import electrosphere.server.physics.terrain.generation.interfaces.ChunkGenerator; +import electrosphere.server.physics.terrain.generation.macro.DefaultMacroGenerator; +import electrosphere.server.physics.terrain.generation.macro.HomogenousMacroGenerator; +import electrosphere.server.physics.terrain.generation.macro.MacroGenerator; +import electrosphere.server.physics.terrain.models.TerrainModel; +import electrosphere.server.physics.terrain.models.TerrainModification; import electrosphere.util.FileUtils; import electrosphere.util.annotation.Exclude; diff --git a/src/main/java/electrosphere/server/terrain/models/TerrainModel.java b/src/main/java/electrosphere/server/physics/terrain/models/TerrainModel.java similarity index 97% rename from src/main/java/electrosphere/server/terrain/models/TerrainModel.java rename to src/main/java/electrosphere/server/physics/terrain/models/TerrainModel.java index fbc43402..a3247111 100644 --- a/src/main/java/electrosphere/server/terrain/models/TerrainModel.java +++ b/src/main/java/electrosphere/server/physics/terrain/models/TerrainModel.java @@ -1,9 +1,9 @@ -package electrosphere.server.terrain.models; +package electrosphere.server.physics.terrain.models; import electrosphere.engine.Globals; import electrosphere.game.data.biome.BiomeData; -import electrosphere.server.terrain.generation.TestGenerationChunkGenerator; -import electrosphere.server.terrain.manager.ServerTerrainChunk; +import electrosphere.server.physics.terrain.generation.TestGenerationChunkGenerator; +import electrosphere.server.physics.terrain.manager.ServerTerrainChunk; import electrosphere.util.annotation.Exclude; /** diff --git a/src/main/java/electrosphere/server/terrain/models/TerrainModification.java b/src/main/java/electrosphere/server/physics/terrain/models/TerrainModification.java similarity index 96% rename from src/main/java/electrosphere/server/terrain/models/TerrainModification.java rename to src/main/java/electrosphere/server/physics/terrain/models/TerrainModification.java index 57005c19..1f5cb397 100644 --- a/src/main/java/electrosphere/server/terrain/models/TerrainModification.java +++ b/src/main/java/electrosphere/server/physics/terrain/models/TerrainModification.java @@ -1,4 +1,4 @@ -package electrosphere.server.terrain.models; +package electrosphere.server.physics.terrain.models; import org.joml.Vector3i; diff --git a/src/main/java/electrosphere/server/player/PlayerActions.java b/src/main/java/electrosphere/server/player/PlayerActions.java index 30b3a701..e5123e6a 100644 --- a/src/main/java/electrosphere/server/player/PlayerActions.java +++ b/src/main/java/electrosphere/server/player/PlayerActions.java @@ -20,9 +20,9 @@ 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.block.editing.ServerBlockEditing; import electrosphere.server.datacell.Realm; 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 ff8edf43..2d8cd0f4 100644 --- a/src/main/java/electrosphere/server/saves/SaveUtils.java +++ b/src/main/java/electrosphere/server/saves/SaveUtils.java @@ -10,11 +10,11 @@ import electrosphere.game.server.world.ServerWorldData; import electrosphere.logger.LoggerInterface; import electrosphere.server.db.DatabaseController; import electrosphere.server.db.DatabaseUtils; -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.ServerTerrainManager; +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.ServerTerrainManager; import electrosphere.util.FileUtils; /** diff --git a/src/main/java/electrosphere/util/FileUtils.java b/src/main/java/electrosphere/util/FileUtils.java index 694ededd..0f285f3f 100644 --- a/src/main/java/electrosphere/util/FileUtils.java +++ b/src/main/java/electrosphere/util/FileUtils.java @@ -8,8 +8,8 @@ import electrosphere.game.data.creature.type.ai.AITreeDataSerializer; import electrosphere.game.data.creature.type.movement.MovementSystem; import electrosphere.game.data.creature.type.movement.MovementSystemSerializer; import electrosphere.logger.LoggerInterface; -import electrosphere.server.terrain.generation.noise.NoiseModuleSerializer; -import electrosphere.server.terrain.generation.noise.NoiseSampler; +import electrosphere.server.physics.terrain.generation.noise.NoiseModuleSerializer; +import electrosphere.server.physics.terrain.generation.noise.NoiseSampler; import electrosphere.util.annotation.AnnotationExclusionStrategy; import java.awt.image.BufferedImage; diff --git a/src/main/java/electrosphere/util/worldviewer/TerrainViewer.java b/src/main/java/electrosphere/util/worldviewer/TerrainViewer.java index 50990203..d66a3394 100644 --- a/src/main/java/electrosphere/util/worldviewer/TerrainViewer.java +++ b/src/main/java/electrosphere/util/worldviewer/TerrainViewer.java @@ -1,10 +1,10 @@ package electrosphere.util.worldviewer; import electrosphere.game.server.world.ServerWorldData; +import electrosphere.server.physics.terrain.generation.OverworldChunkGenerator; +import electrosphere.server.physics.terrain.manager.ServerTerrainManager; +import electrosphere.server.physics.terrain.models.TerrainModel; import electrosphere.server.simulation.MacroSimulation; -import electrosphere.server.terrain.generation.OverworldChunkGenerator; -import electrosphere.server.terrain.manager.ServerTerrainManager; -import electrosphere.server.terrain.models.TerrainModel; import java.util.Random; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/electrosphere/util/worldviewer/TerrainViewerJComponent.java b/src/main/java/electrosphere/util/worldviewer/TerrainViewerJComponent.java index d30c6eaa..c70b0e00 100644 --- a/src/main/java/electrosphere/util/worldviewer/TerrainViewerJComponent.java +++ b/src/main/java/electrosphere/util/worldviewer/TerrainViewerJComponent.java @@ -4,7 +4,7 @@ import java.awt.Color; import java.awt.Graphics; import javax.swing.JComponent; -import electrosphere.server.terrain.models.TerrainModel; +import electrosphere.server.physics.terrain.models.TerrainModel; /** * JComponent for hosting the terrain viewer debug tool diff --git a/src/test/java/electrosphere/client/terrain/cells/ClientDrawCellManagerTests.java b/src/test/java/electrosphere/client/terrain/cells/ClientDrawCellManagerTests.java index 1a42904c..b6e56eed 100644 --- a/src/test/java/electrosphere/client/terrain/cells/ClientDrawCellManagerTests.java +++ b/src/test/java/electrosphere/client/terrain/cells/ClientDrawCellManagerTests.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import electrosphere.client.scene.ClientWorldData; import electrosphere.engine.Globals; import electrosphere.engine.Main; -import electrosphere.server.terrain.manager.ServerTerrainChunk; +import electrosphere.server.physics.terrain.manager.ServerTerrainChunk; import electrosphere.test.annotations.UnitTest; import electrosphere.test.template.extensions.StateCleanupCheckerExtension; import electrosphere.util.ds.octree.WorldOctTree.WorldOctTreeNode; diff --git a/src/test/java/electrosphere/server/terrain/generation/voxelphase/HillsVoxelGenTests.java b/src/test/java/electrosphere/server/physics/terrain/generation/voxelphase/HillsVoxelGenTests.java similarity index 80% rename from src/test/java/electrosphere/server/terrain/generation/voxelphase/HillsVoxelGenTests.java rename to src/test/java/electrosphere/server/physics/terrain/generation/voxelphase/HillsVoxelGenTests.java index 62ec489a..f02233fb 100644 --- a/src/test/java/electrosphere/server/terrain/generation/voxelphase/HillsVoxelGenTests.java +++ b/src/test/java/electrosphere/server/physics/terrain/generation/voxelphase/HillsVoxelGenTests.java @@ -1,7 +1,8 @@ -package electrosphere.server.terrain.generation.voxelphase; +package electrosphere.server.physics.terrain.generation.voxelphase; import static org.junit.jupiter.api.Assertions.assertEquals; +import electrosphere.server.physics.terrain.generation.voxelphase.HillsVoxelGen; import electrosphere.test.annotations.FastTest; import electrosphere.test.annotations.UnitTest;