Refactoring client location in codebased

src/main/java/electrosphere/client/player/ClientPlayerData.java

@@ -1,4 +1,4 @@
-package electrosphere.game.client.player;
+package electrosphere.client.player;
 
 import org.joml.Vector3i;
 

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

@@ -1,4 +1,4 @@
-package electrosphere.game.client.world;
+package electrosphere.client.scene;
 
 import electrosphere.game.server.world.*;
 import electrosphere.server.datacell.ServerDataCell;

src/main/java/electrosphere/client/sim/ClientFunctions.java

@@ -1,9 +1,9 @@
-package electrosphere.game.client;
+package electrosphere.client.sim;
 
+import electrosphere.client.terrain.manager.ClientTerrainManager;
 import electrosphere.engine.Globals;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.types.camera.CameraEntityUtils;
-import electrosphere.game.client.terrain.manager.ClientTerrainManager;
 
 import org.joml.Vector3d;
 import org.joml.Vector3f;

src/main/java/electrosphere/client/sim/ClientSimulation.java

@@ -1,5 +1,6 @@
 package electrosphere.client.sim;
 
+import electrosphere.client.targeting.crosshair.Crosshair;
 import electrosphere.engine.Globals;
 import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
@@ -10,7 +11,6 @@ import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.hitbox.HitboxUtils;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.entity.types.particle.ParticleUtils;
-import electrosphere.game.client.targeting.crosshair.Crosshair;
 import electrosphere.renderer.actor.Actor;
 
 public class ClientSimulation {

src/main/java/electrosphere/client/targeting/crosshair/Crosshair.java

@@ -1,4 +1,4 @@
-package electrosphere.game.client.targeting.crosshair;
+package electrosphere.client.targeting.crosshair;
 
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;

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

@@ -1,4 +1,4 @@
-package electrosphere.game.client.terrain.cache;
+package electrosphere.client.terrain.cache;
 
 /**
  *

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

@@ -1,6 +1,6 @@
-package electrosphere.game.client.terrain.cache;
+package electrosphere.client.terrain.cache;
 
-import electrosphere.game.client.world.ClientWorldData;
+import electrosphere.client.scene.ClientWorldData;
 import electrosphere.game.terrain.processing.TerrainInterpolator;
 import electrosphere.server.terrain.models.TerrainModel;
 

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

@@ -1,6 +1,6 @@
-package electrosphere.game.client.terrain.cache;
+package electrosphere.client.terrain.cache;
 
-import electrosphere.game.client.world.ClientWorldData;
+import electrosphere.client.scene.ClientWorldData;
 import electrosphere.game.terrain.processing.TerrainInterpolator;
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package electrosphere.game.client.terrain.cache;
+package electrosphere.client.terrain.cache;
 
 import java.util.Collection;
 import java.util.HashMap;

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

@@ -1,4 +1,4 @@
-package electrosphere.game.client.cells;
+package electrosphere.client.terrain.cells;
 
 import electrosphere.entity.Entity;
 import java.util.LinkedList;

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

@@ -1,4 +1,4 @@
-package electrosphere.game.client.cells;
+package electrosphere.client.terrain.cells;
 
 import electrosphere.collision.dispatch.CollisionObject;
 import electrosphere.dynamics.RigidBody;

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

@@ -1,9 +1,9 @@
-package electrosphere.game.client.cells;
+package electrosphere.client.terrain.cells;
 
+import electrosphere.client.scene.ClientWorldData;
+import electrosphere.client.terrain.manager.ClientTerrainManager;
 import electrosphere.engine.Globals;
-import electrosphere.game.client.terrain.manager.ClientTerrainManager;
 import electrosphere.game.terrain.processing.TerrainInterpolator;
-import electrosphere.game.client.world.ClientWorldData;
 import electrosphere.game.collision.CommonWorldData;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.renderer.ShaderProgram;

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

@@ -1,11 +1,11 @@
-package electrosphere.game.client.terrain.manager;
+package electrosphere.client.terrain.manager;
 
+import electrosphere.client.scene.ClientWorldData;
+import electrosphere.client.terrain.cache.ClientTerrainCache;
+import electrosphere.client.terrain.cache.LoadingChunk;
+import electrosphere.client.terrain.cache.LoadingChunkCache;
 import electrosphere.engine.Globals;
 import electrosphere.entity.types.terrain.TerrainChunkData;
-import electrosphere.game.client.terrain.cache.ClientTerrainCache;
-import electrosphere.game.client.terrain.cache.LoadingChunk;
-import electrosphere.game.client.terrain.cache.LoadingChunkCache;
-import electrosphere.game.client.world.ClientWorldData;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.renderer.Model;

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

@@ -1,4 +1,4 @@
-package electrosphere.game.client.terrain.manager;
+package electrosphere.client.terrain.manager;
 
 import electrosphere.entity.types.terrain.TerrainChunkData;
 

src/main/java/electrosphere/controls/CameraHandler.java

@@ -4,11 +4,11 @@ import org.joml.Quaternionf;
 import org.joml.Vector3d;
 import org.joml.Vector3f;
 
+import electrosphere.client.targeting.crosshair.Crosshair;
 import electrosphere.engine.Globals;
 import electrosphere.engine.Main;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.types.camera.CameraEntityUtils;
-import electrosphere.game.client.targeting.crosshair.Crosshair;
 import electrosphere.renderer.ui.events.MouseEvent;
 
 public class CameraHandler {

src/main/java/electrosphere/controls/ControlHandler.java

@@ -72,6 +72,7 @@ import org.joml.Vector3f;
 import org.lwjgl.glfw.GLFW;
 
 import electrosphere.audio.AudioUtils;
+import electrosphere.client.targeting.crosshair.Crosshair;
 import electrosphere.controls.Control.ControlMethod;
 import electrosphere.controls.Control.ControlType;
 import electrosphere.engine.Globals;
@@ -91,7 +92,6 @@ import electrosphere.entity.state.movement.JumpTree;
 import electrosphere.entity.state.movement.SprintTree;
 import electrosphere.entity.types.camera.CameraEntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
-import electrosphere.game.client.targeting.crosshair.Crosshair;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.menu.MenuGenerators;
 import electrosphere.menu.MenuGeneratorsDebug;

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

@@ -13,8 +13,12 @@ import electrosphere.audio.AudioEngine;
 import electrosphere.auth.AuthenticationManager;
 import electrosphere.client.culling.ClientEntityCullingManager;
 import electrosphere.client.foliagemanager.ClientFoliageManager;
+import electrosphere.client.player.ClientPlayerData;
 import electrosphere.client.scene.ClientSceneWrapper;
+import electrosphere.client.scene.ClientWorldData;
 import electrosphere.client.sim.ClientSimulation;
+import electrosphere.client.terrain.cells.DrawCellManager;
+import electrosphere.client.terrain.manager.ClientTerrainManager;
 import electrosphere.collision.dispatch.CollisionObject;
 import electrosphere.controls.CameraHandler;
 import electrosphere.controls.ControlCallback;
@@ -26,10 +30,6 @@ import electrosphere.engine.loadingthreads.LoadingThread;
 import electrosphere.entity.Entity;
 import electrosphere.entity.Scene;
 import electrosphere.entity.types.hitbox.HitboxManager;
-import electrosphere.game.client.cells.DrawCellManager;
-import electrosphere.game.client.player.ClientPlayerData;
-import electrosphere.game.client.terrain.manager.ClientTerrainManager;
-import electrosphere.game.client.world.ClientWorldData;
 import electrosphere.game.collision.CollisionEngine;
 import electrosphere.game.collision.CommonWorldData;
 import electrosphere.game.config.UserSettings;

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

@@ -7,10 +7,10 @@ import static org.lwjgl.glfw.GLFW.glfwWindowShouldClose;
 import java.util.concurrent.TimeUnit;
 
 import electrosphere.audio.AudioEngine;
+import electrosphere.client.sim.ClientFunctions;
 import electrosphere.controls.ControlHandler;
 import electrosphere.engine.cli.CLIParser;
 import electrosphere.engine.loadingthreads.LoadingThread;
-import electrosphere.game.client.ClientFunctions;
 import electrosphere.game.config.UserSettings;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.net.parser.net.message.TerrainMessage;

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

@@ -11,8 +11,6 @@ import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.movement.ApplyRotationTree;
 import electrosphere.entity.types.camera.CameraEntityUtils;
-import electrosphere.game.client.cells.DrawCellManager;
-import electrosphere.game.client.targeting.crosshair.Crosshair;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.menu.MenuGenerators;
 import electrosphere.menu.MenuGeneratorsMultiplayer;
@@ -24,6 +22,8 @@ import electrosphere.renderer.ui.Window;
 import electrosphere.client.culling.ClientEntityCullingManager;
 import electrosphere.client.foliagemanager.ClientFoliageManager;
 import electrosphere.client.sim.ClientSimulation;
+import electrosphere.client.targeting.crosshair.Crosshair;
+import electrosphere.client.terrain.cells.DrawCellManager;
 import electrosphere.controls.ControlHandler;
 
 public class ClientLoading {

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

@@ -5,9 +5,9 @@ import java.util.concurrent.TimeUnit;
 import org.joml.Vector3f;
 
 import electrosphere.auth.AuthenticationManager;
+import electrosphere.client.targeting.crosshair.Crosshair;
 import electrosphere.engine.Globals;
 import electrosphere.entity.types.camera.CameraEntityUtils;
-import electrosphere.game.client.targeting.crosshair.Crosshair;
 import electrosphere.game.server.world.ServerWorldData;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.menu.MenuGenerators;

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

@@ -12,6 +12,7 @@ import org.joml.Vector3f;
 import org.joml.Vector3i;
 
 import electrosphere.auth.AuthenticationManager;
+import electrosphere.client.terrain.cells.DrawCellManager;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
@@ -19,7 +20,6 @@ import electrosphere.entity.ServerEntityUtils;
 import electrosphere.entity.state.movement.ApplyRotationTree;
 import electrosphere.entity.types.creature.CreatureTemplate;
 import electrosphere.entity.types.creature.CreatureUtils;
-import electrosphere.game.client.cells.DrawCellManager;
 import electrosphere.game.collision.CommonWorldData;
 import electrosphere.game.data.creature.type.CreatureType;
 import electrosphere.game.data.creature.type.visualattribute.VisualAttribute;

src/main/java/electrosphere/entity/state/equip/EquipState.java

@@ -7,6 +7,7 @@ import java.util.Map;
 
 import org.joml.Vector3d;
 
+import electrosphere.client.targeting.crosshair.Crosshair;
 import electrosphere.collision.dispatch.CollisionObject;
 import electrosphere.dynamics.RigidBody;
 import electrosphere.engine.Globals;
@@ -21,7 +22,6 @@ import electrosphere.entity.state.inventory.UnrelationalInventoryState;
 import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.game.client.targeting.crosshair.Crosshair;
 import electrosphere.game.collision.collidable.Collidable;
 import electrosphere.game.data.creature.type.equip.EquipPoint;
 import electrosphere.game.data.item.type.EquipWhitelist;

src/main/java/electrosphere/entity/types/terrain/TerrainChunk.java

@@ -3,13 +3,13 @@ package electrosphere.entity.types.terrain;
 import org.joml.Vector3d;
 import org.joml.Vector3f;
 
+import electrosphere.client.terrain.manager.ClientTerrainManager;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.ServerEntityUtils;
-import electrosphere.game.client.terrain.manager.ClientTerrainManager;
 import electrosphere.game.collision.PhysicsUtils;
 import electrosphere.renderer.Model;
 import electrosphere.renderer.meshgen.TerrainChunkModelGeneration;

src/main/java/electrosphere/game/collision/CommonWorldData.java

@@ -1,7 +1,7 @@
 package electrosphere.game.collision;
 
-import electrosphere.game.client.terrain.manager.ClientTerrainManager;
-import electrosphere.game.client.world.ClientWorldData;
+import electrosphere.client.scene.ClientWorldData;
+import electrosphere.client.terrain.manager.ClientTerrainManager;
 import electrosphere.game.server.world.ServerWorldData;
 import electrosphere.server.terrain.manager.ServerTerrainManager;
 

src/main/java/electrosphere/net/client/protocol/ClientProtocol.java

@@ -1,11 +1,11 @@
 package electrosphere.net.client.protocol;
 
+import electrosphere.client.scene.ClientWorldData;
 import electrosphere.engine.Globals;
 import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
-import electrosphere.game.client.world.ClientWorldData;
 import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.logger.LoggerInterface;

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

@@ -4,8 +4,8 @@ import javax.vecmath.Vector3d;
 
 import org.joml.Vector3f;
 
+import electrosphere.client.scene.ClientWorldData;
 import electrosphere.engine.Globals;
-import electrosphere.game.client.world.ClientWorldData;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.net.parser.net.message.TerrainMessage;
 

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

@@ -1,9 +1,9 @@
 package electrosphere.server.datacell.physics;
 
+import electrosphere.client.scene.ClientWorldData;
+import electrosphere.client.terrain.manager.ClientTerrainManager;
 import electrosphere.engine.Globals;
-import electrosphere.game.client.terrain.manager.ClientTerrainManager;
 import electrosphere.game.terrain.processing.TerrainInterpolator;
-import electrosphere.game.client.world.ClientWorldData;
 import electrosphere.game.collision.CommonWorldData;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.renderer.ShaderProgram;

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

@@ -1,6 +1,7 @@
 package electrosphere.server.simulation;
 
 import electrosphere.entity.types.attach.AttachUtils;
+import electrosphere.client.targeting.crosshair.Crosshair;
 import electrosphere.engine.Globals;
 import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
@@ -24,7 +25,6 @@ import electrosphere.entity.state.life.LifeState;
 import electrosphere.entity.state.life.LifeUtils;
 import electrosphere.entity.state.movement.SprintTree;
 import electrosphere.entity.types.particle.ParticleUtils;
-import electrosphere.game.client.targeting.crosshair.Crosshair;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.server.datacell.ServerDataCell;