Refactoring parts of code

.vscode/launch.json

@@ -14,14 +14,14 @@
             "type": "java",
             "name": "Launch Main",
             "request": "launch",
-            "mainClass": "electrosphere.main.Main",
+            "mainClass": "electrosphere.engine.Main",
             "projectName": "Renderer"
         },
         {
             "type": "java",
             "name": "Launch Main (macos)",
             "request": "launch",
-            "mainClass": "electrosphere.main.Main",
+            "mainClass": "electrosphere.engine.Main",
             "projectName": "Renderer",
             "vmArgs": "-XstartOnFirstThread"
         },
@@ -29,7 +29,7 @@
             "type": "java",
             "name": "Launch Main (Headless)",
             "request": "launch",
-            "mainClass": "electrosphere.main.Main",
+            "mainClass": "electrosphere.engine.Main",
             "projectName": "Renderer",
             "args" : "--headless"
         }

assets/Scenes/testscene1/testscene1.json

@@ -21,17 +21,6 @@
             "rotY": 0,
             "rotZ": 0,
             "rotW": 0.7071068
-        },
-        {
-            "type": "creature",
-            "subtype": "fighter",
-            "posX": 2,
-            "posY": 1,
-            "posZ": 2,
-            "rotX": -0.7071068,
-            "rotY": 0,
-            "rotZ": 0,
-            "rotW": 0.7071068
         }
     ],
     "scriptPaths": [

pom.xml

@@ -241,7 +241,7 @@
                         <configuration>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>electrosphere.main.Main</mainClass>
+                                    <mainClass>electrosphere.engine.Main</mainClass>
                                 </transformer>
                             </transformers>
                         </configuration>
@@ -278,24 +278,24 @@
                     <executable>java</executable>
                     <includeProjectDependencies>false</includeProjectDependencies>
                     <includePluginDependencies>true</includePluginDependencies>
-                    <mainClass>electrosphere.main.Main</mainClass>
+                    <mainClass>electrosphere.engine.Main</mainClass>
                     <!-- <classpathScope>compile</classpathScope> -->
                     <arguments>
                         <argument>-cp</argument>
                         <argument>target/classes;target/Renderer-0.1-jar-with-dependencies.jar</argument>
-                        <argument>electrosphere.main.Main</argument>
+                        <argument>electrosphere.engine.Main</argument>
                     </arguments>
                     <!-- <classesDirectory>${project.basedir}/target/classes</classesDirectory> -->
                 </configuration>
             </plugin>
-            <plugin>
+            <!-- <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.12.4</version>
                 <configuration>
                     <argLine>-XstartOnFirstThread</argLine>
                 </configuration>
-            </plugin>
+            </plugin> -->
         </plugins>
     </build>
 </project>

src/main/java/electrosphere/audio/AudioUtils.java

@@ -1,7 +1,7 @@
 package electrosphere.audio;
 
+import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
 import electrosphere.util.FileUtils;
 
 import org.joml.Vector3f;

src/main/java/electrosphere/auth/AuthenticationManager.java

@@ -9,10 +9,10 @@ import java.util.Base64;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
 
-import electrosphere.game.server.db.DatabaseResult;
-import electrosphere.game.server.db.DatabaseResultRow;
+import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
+import electrosphere.server.db.DatabaseResult;
+import electrosphere.server.db.DatabaseResultRow;
 
 public class AuthenticationManager {
     

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.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.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.renderer.ui.events.MouseEvent;
 
 public class CameraHandler {

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

@@ -74,6 +74,8 @@ import org.lwjgl.glfw.GLFW;
 import electrosphere.audio.AudioUtils;
 import electrosphere.controls.Control.ControlMethod;
 import electrosphere.controls.Control.ControlType;
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.state.BehaviorTree;
 import electrosphere.entity.state.attack.AttackTree;
@@ -91,8 +93,6 @@ 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.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.menu.MenuGenerators;
 import electrosphere.menu.MenuGeneratorsDebug;
 import electrosphere.menu.MenuGeneratorsInventory;

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

@@ -1,4 +1,4 @@
-package electrosphere.main;
+package electrosphere.engine;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -16,7 +16,6 @@ import electrosphere.controls.CameraHandler;
 import electrosphere.controls.ControlCallback;
 import electrosphere.controls.ControlHandler;
 import electrosphere.controls.MouseCallback;
-import electrosphere.engine.LoadingThread;
 import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.engine.assetmanager.AssetManager;
 import electrosphere.entity.Entity;
@@ -29,16 +28,10 @@ import electrosphere.game.client.world.ClientWorldData;
 import electrosphere.game.collision.CollisionEngine;
 import electrosphere.game.collision.CommonWorldData;
 import electrosphere.game.config.UserSettings;
-import electrosphere.game.server.ai.AIManager;
-import electrosphere.game.server.datacell.DataCellManager;
-import electrosphere.game.server.db.DatabaseController;
-import electrosphere.game.server.pathfinding.NavMeshManager;
 import electrosphere.game.server.structure.virtual.StructureManager;
 import electrosphere.game.server.terrain.manager.ServerTerrainManager;
 import electrosphere.game.server.world.MacroData;
 import electrosphere.game.server.world.ServerWorldData;
-import electrosphere.game.simulation.MacroSimulation;
-import electrosphere.game.simulation.MicroSimulation;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.menu.WindowUtils;
 import electrosphere.net.client.ClientNetworking;
@@ -59,6 +52,12 @@ import electrosphere.renderer.ui.elements.ImagePanel;
 import electrosphere.renderer.ui.font.FontUtils;
 import electrosphere.renderer.ui.font.RawFontMap;
 import electrosphere.script.ScriptEngine;
+import electrosphere.server.ai.AIManager;
+import electrosphere.server.datacell.DataCellManager;
+import electrosphere.server.db.DatabaseController;
+import electrosphere.server.pathfinding.NavMeshManager;
+import electrosphere.server.simulation.MacroSimulation;
+import electrosphere.server.simulation.MicroSimulation;
 import electrosphere.util.FileUtils;
 
 /**

src/main/java/electrosphere/engine/LoadingThread.java

@@ -29,16 +29,11 @@ import electrosphere.game.client.terrain.manager.ClientTerrainManager;
 import electrosphere.game.collision.CommonWorldData;
 import electrosphere.game.data.creature.type.CreatureType;
 import electrosphere.game.data.creature.type.visualattribute.VisualAttribute;
-import electrosphere.game.server.datacell.DataCellManager;
-import electrosphere.game.server.saves.SaveUtils;
 import electrosphere.game.server.terrain.manager.ServerTerrainManager;
 import electrosphere.game.server.town.Town;
 import electrosphere.game.server.world.MacroData;
 import electrosphere.game.server.world.ServerWorldData;
-import electrosphere.game.simulation.MacroSimulation;
-import electrosphere.game.simulation.MicroSimulation;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
 import electrosphere.menu.MenuGenerators;
 import electrosphere.menu.MenuGeneratorsMultiplayer;
 import electrosphere.menu.WindowStrings;
@@ -48,6 +43,10 @@ import electrosphere.net.client.ClientNetworking;
 import electrosphere.net.server.Server;
 import electrosphere.net.server.player.Player;
 import electrosphere.renderer.ui.Window;
+import electrosphere.server.datacell.DataCellManager;
+import electrosphere.server.saves.SaveUtils;
+import electrosphere.server.simulation.MacroSimulation;
+import electrosphere.server.simulation.MicroSimulation;
 import electrosphere.util.FileUtils;
 
 /**

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

@@ -1,4 +1,4 @@
-package electrosphere.main;
+package electrosphere.engine;
 
 import static org.lwjgl.glfw.GLFW.glfwGetTime;
 import static org.lwjgl.glfw.GLFW.glfwTerminate;
@@ -8,7 +8,6 @@ import java.util.concurrent.TimeUnit;
 
 import electrosphere.audio.AudioEngine;
 import electrosphere.controls.ControlHandler;
-import electrosphere.engine.LoadingThread;
 import electrosphere.engine.cli.CLIParser;
 import electrosphere.game.client.ClientFunctions;
 import electrosphere.game.config.UserSettings;

src/main/java/electrosphere/engine/cli/CLIParser.java

@@ -3,7 +3,7 @@ package electrosphere.engine.cli;
 import java.util.Arrays;
 import java.util.List;
 
-import electrosphere.main.Globals;
+import electrosphere.engine.Globals;
 
 public class CLIParser {
     

src/main/java/electrosphere/entity/Entity.java

@@ -1,10 +1,11 @@
 package electrosphere.entity;
 
-import electrosphere.main.Globals;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 
+import electrosphere.engine.Globals;
+
 /**
  *
  * @author amaterasu

src/main/java/electrosphere/entity/EntityManager.java

@@ -1,9 +1,10 @@
 package electrosphere.entity;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.state.BehaviorTree;
 import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
+
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;

src/main/java/electrosphere/entity/EntityUtils.java

@@ -5,16 +5,16 @@
  */
 package electrosphere.entity;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.state.collidable.CollidableTree;
 import electrosphere.entity.state.movement.GroundMovementTree;
 import electrosphere.entity.types.collision.CollisionObjUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.game.server.datacell.ServerDataCell;
 import electrosphere.renderer.Model;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.renderer.actor.ActorUtils;
-import electrosphere.main.Globals;
+import electrosphere.server.datacell.ServerDataCell;
 
 import org.joml.Quaternionf;
 import org.joml.Vector3d;

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

@@ -1,11 +1,12 @@
 package electrosphere.entity.scene;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.entity.types.object.ObjectUtils;
-import electrosphere.main.Globals;
+import electrosphere.server.datacell.ServerDataCell;
 import electrosphere.util.FileUtils;
 
 /**
@@ -17,7 +18,8 @@ public class SceneLoader {
      * Loads a scene file on the server
      * @param path The path in the assets directory to a scene file
      */
-    public void serverInstantiateSceneFile(String path){
+    public ServerDataCell serverInstantiateSceneFile(String path){
+        ServerDataCell rVal = Globals.dataCellManager.createNewCell();
         SceneFile file = FileUtils.loadObjectFromAssetPath(path, SceneFile.class);
         //spawn initial entities
         for(EntityDescriptor descriptor : file.getEntities()){
@@ -28,18 +30,21 @@ public class SceneLoader {
                     Entity newEntity = CreatureUtils.spawnBasicCreature(descriptor.subtype, null);
                     EntityUtils.getPosition(newEntity).set(descriptor.posX,descriptor.posY,descriptor.posZ);
                     EntityUtils.getRotation(newEntity).set((float)descriptor.rotX, (float)descriptor.rotY, (float)descriptor.rotZ, (float)descriptor.rotW);
+                    rVal.initializeEntityForNewPlayers(newEntity, rVal);
                 } break;
 
                 case EntityDescriptor.TYPE_ITEM: {
                     Entity newEntity = ItemUtils.spawnBasicItem(descriptor.subtype);
                     EntityUtils.getPosition(newEntity).set(descriptor.posX,descriptor.posY,descriptor.posZ);
                     EntityUtils.getRotation(newEntity).set((float)descriptor.rotX, (float)descriptor.rotY, (float)descriptor.rotZ, (float)descriptor.rotW);
+                    rVal.initializeEntityForNewPlayers(newEntity, rVal);
                 } break;
 
                 case EntityDescriptor.TYPE_OBJECT: {
                     Entity newEntity = ObjectUtils.spawnBasicObject(descriptor.subtype);
                     EntityUtils.getPosition(newEntity).set(descriptor.posX,descriptor.posY,descriptor.posZ);
                     EntityUtils.getRotation(newEntity).set((float)descriptor.rotX, (float)descriptor.rotY, (float)descriptor.rotZ, (float)descriptor.rotW);
+                    rVal.initializeEntityForNewPlayers(newEntity, rVal);
                 } break;
                 default:
                 throw new UnsupportedOperationException();
@@ -50,6 +55,8 @@ public class SceneLoader {
             Globals.scriptEngine.loadScript(scriptPath);
         }
         Globals.scriptEngine.runScript(file.getInitScriptPath());
+
+        return rVal;
     }
 
 }

src/main/java/electrosphere/entity/state/IdleTree.java

@@ -4,12 +4,12 @@ import electrosphere.entity.state.attack.AttackTree;
 import electrosphere.entity.state.attack.AttackTree.AttackTreeState;
 import electrosphere.entity.state.movement.AirplaneMovementTree;
 import electrosphere.entity.state.movement.GroundMovementTree;
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.movement.GroundMovementTree.MovementTreeState;
 import electrosphere.entity.types.creature.CreatureUtils;
-import electrosphere.main.Globals;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.renderer.anim.Animation;

src/main/java/electrosphere/entity/state/ParticleTree.java

@@ -1,8 +1,9 @@
 package electrosphere.entity.state;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
-import electrosphere.main.Globals;
+
 import org.joml.Vector3d;
 import org.joml.Vector3f;
 

src/main/java/electrosphere/entity/state/attack/AttackTree.java

@@ -1,5 +1,7 @@
 package electrosphere.entity.state.attack;
 
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
@@ -17,8 +19,6 @@ import electrosphere.entity.types.projectile.ProjectileUtils;
 import electrosphere.game.collision.collidable.Collidable;
 import electrosphere.game.data.creature.type.attack.AttackMove;
 import electrosphere.game.data.creature.type.equip.EquipPoint;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.renderer.anim.Animation;

src/main/java/electrosphere/entity/state/collidable/CollidableTree.java

@@ -1,6 +1,7 @@
 package electrosphere.entity.state.collidable;
 
 import electrosphere.collision.dispatch.CollisionObject;
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
@@ -12,7 +13,6 @@ import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.game.collision.PhysicsUtils;
 import electrosphere.game.collision.collidable.Collidable;
 import electrosphere.game.data.creature.type.CollidableTemplate;
-import electrosphere.main.Globals;
 
 import org.joml.Matrix4f;
 import org.joml.Quaterniond;

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

@@ -9,6 +9,7 @@ import org.joml.Vector3d;
 
 import electrosphere.collision.dispatch.CollisionObject;
 import electrosphere.dynamics.RigidBody;
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
@@ -23,14 +24,13 @@ 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;
-import electrosphere.game.server.datacell.ServerDataCell;
-import electrosphere.main.Globals;
 import electrosphere.net.parser.net.message.InventoryMessage;
 import electrosphere.net.parser.net.message.NetworkMessage;
 import electrosphere.net.server.player.Player;
 import electrosphere.net.server.protocol.InventoryProtocol;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.renderer.actor.ActorMeshMask;
+import electrosphere.server.datacell.ServerDataCell;
 
 /**
  *

src/main/java/electrosphere/entity/state/gravity/GravityTree.java

@@ -8,6 +8,7 @@ import org.joml.Vector3d;
 import org.joml.Vector3f;
 
 import electrosphere.collision.dispatch.CollisionObject;
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.collidable.CollidableTree;
@@ -15,7 +16,6 @@ import electrosphere.entity.state.collidable.Impulse;
 import electrosphere.entity.state.movement.FallTree;
 import electrosphere.entity.state.movement.JumpTree;
 import electrosphere.game.collision.collidable.Collidable;
-import electrosphere.main.Globals;
 import electrosphere.net.parser.net.message.EntityMessage;
 
 /**

src/main/java/electrosphere/entity/state/inventory/InventoryState.java

@@ -2,12 +2,12 @@ package electrosphere.entity.state.inventory;
 
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.state.BehaviorTree;
 import electrosphere.entity.state.equip.EquipState;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.game.data.creature.type.equip.EquipPoint;
-import electrosphere.main.Globals;
 import electrosphere.menu.WindowStrings;
 import electrosphere.menu.WindowUtils;
 import electrosphere.net.parser.net.message.InventoryMessage;

src/main/java/electrosphere/entity/state/inventory/InventoryUtils.java

@@ -3,6 +3,7 @@ package electrosphere.entity.state.inventory;
 import org.joml.Vector3d;
 import org.joml.Vector3f;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
@@ -10,12 +11,11 @@ import electrosphere.entity.state.equip.EquipState;
 import electrosphere.entity.state.gravity.GravityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.game.server.datacell.ServerDataCell;
-import electrosphere.main.Globals;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.parser.net.message.InventoryMessage;
 import electrosphere.net.parser.net.message.NetworkMessage;
 import electrosphere.net.server.player.Player;
+import electrosphere.server.datacell.ServerDataCell;
 import electrosphere.util.Utilities;
 
 public class InventoryUtils {

src/main/java/electrosphere/entity/state/ironsight/IronSightTree.java

@@ -2,11 +2,11 @@ package electrosphere.entity.state.ironsight;
 
 import org.joml.Vector3f;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.state.BehaviorTree;
 import electrosphere.entity.types.camera.CameraEntityUtils;
-import electrosphere.main.Globals;
 
 public class IronSightTree implements BehaviorTree {
 

src/main/java/electrosphere/entity/state/life/LifeState.java

@@ -4,14 +4,14 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.joml.Vector3d;
 
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.BehaviorTree;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.game.data.creature.type.CreatureType;
 import electrosphere.game.data.creature.type.HealthSystem;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.net.parser.net.message.CharacterMessage;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.renderer.actor.Actor;

src/main/java/electrosphere/entity/state/movement/AirplaneMovementTree.java

@@ -6,6 +6,8 @@ import org.joml.Quaternionf;
 import org.joml.Vector3d;
 import org.joml.Vector3f;
 
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.BehaviorTree;
@@ -13,8 +15,6 @@ import electrosphere.entity.state.collidable.Impulse;
 import electrosphere.entity.types.camera.CameraEntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.game.collision.collidable.Collidable;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.renderer.anim.Animation;

src/main/java/electrosphere/entity/state/movement/GroundMovementTree.java

@@ -5,6 +5,8 @@ import electrosphere.entity.state.gravity.GravityTree;
 import electrosphere.entity.state.gravity.GravityUtils;
 import electrosphere.collision.dispatch.CollisionObject;
 import electrosphere.dynamics.RigidBody;
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.entity.types.camera.CameraEntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.Entity;
@@ -17,8 +19,6 @@ import electrosphere.entity.state.movement.SprintTree.SprintTreeState;
 import electrosphere.game.collision.CollisionEngine;
 import electrosphere.game.collision.PhysicsUtils;
 import electrosphere.game.collision.collidable.Collidable;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.net.NetUtils;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.renderer.anim.Animation;

src/main/java/electrosphere/entity/state/movement/ProjectileTree.java

@@ -3,11 +3,11 @@ package electrosphere.entity.state.movement;
 import org.joml.Vector3d;
 import org.joml.Vector3f;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.BehaviorTree;
-import electrosphere.main.Globals;
 
 public class ProjectileTree implements BehaviorTree {
 

src/main/java/electrosphere/entity/state/rotator/RotatorTree.java

@@ -7,13 +7,13 @@ import org.joml.Quaternionf;
 import org.joml.Vector3d;
 import org.joml.Vector3f;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.BehaviorTree;
 import electrosphere.entity.state.view.ViewUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
-import electrosphere.main.Globals;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.renderer.actor.ActorBoneRotator;
 

src/main/java/electrosphere/entity/types/attach/AttachUtils.java

@@ -1,10 +1,10 @@
 package electrosphere.entity.types.attach;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
-import electrosphere.main.Globals;
 import electrosphere.renderer.Model;
 import electrosphere.renderer.actor.Actor;
 

src/main/java/electrosphere/entity/types/camera/CameraEntityUtils.java

@@ -1,10 +1,11 @@
 package electrosphere.entity.types.camera;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.BehaviorTree;
-import electrosphere.main.Globals;
+
 import org.joml.Matrix4f;
 import org.joml.Quaternionf;
 import org.joml.Vector3d;

src/main/java/electrosphere/entity/types/collision/CollisionObjUtils.java

@@ -2,13 +2,13 @@ package electrosphere.entity.types.collision;
 
 import electrosphere.collision.dispatch.CollisionObject;
 import electrosphere.collision.shapes.CylinderShape;
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.game.collision.PhysicsUtils;
 import electrosphere.game.collision.collidable.Collidable;
-import electrosphere.main.Globals;
 
 import org.joml.Matrix4f;
 import org.joml.Quaternionf;

src/main/java/electrosphere/entity/types/creature/CreatureUtils.java

@@ -2,6 +2,8 @@ package electrosphere.entity.types.creature;
 
 import electrosphere.collision.dispatch.CollisionObject;
 import electrosphere.dynamics.RigidBody;
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
@@ -44,10 +46,7 @@ import electrosphere.game.data.creature.type.rotator.RotatorItem;
 import electrosphere.game.data.creature.type.rotator.RotatorSystem;
 import electrosphere.game.data.creature.type.visualattribute.AttributeVariant;
 import electrosphere.game.data.creature.type.visualattribute.VisualAttribute;
-import electrosphere.game.server.datacell.ServerDataCell;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.net.NetUtils;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.parser.net.message.NetworkMessage;
@@ -59,6 +58,7 @@ import electrosphere.renderer.actor.ActorStaticMorph;
 import electrosphere.renderer.actor.ActorUtils;
 import electrosphere.renderer.light.PointLight;
 import electrosphere.renderer.loading.ModelLoader;
+import electrosphere.server.datacell.ServerDataCell;
 import electrosphere.util.Utilities;
 
 import java.util.LinkedList;

src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java

@@ -1,6 +1,7 @@
 package electrosphere.entity.types.foliage;
 
 import electrosphere.collision.dispatch.CollisionObject;
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
@@ -10,7 +11,6 @@ import electrosphere.game.collision.PhysicsUtils;
 import electrosphere.game.collision.collidable.Collidable;
 import electrosphere.game.data.foliage.type.FoliageType;
 import electrosphere.game.data.foliage.type.PhysicsObject;
-import electrosphere.main.Globals;
 import electrosphere.renderer.actor.ActorUtils;
 
 import java.util.List;

src/main/java/electrosphere/entity/types/hitbox/HitboxUtils.java

@@ -1,5 +1,6 @@
 package electrosphere.entity.types.hitbox;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
@@ -11,7 +12,6 @@ import electrosphere.entity.state.life.LifeState;
 import electrosphere.entity.state.life.LifeUtils;
 import electrosphere.entity.state.movement.ProjectileTree;
 import electrosphere.game.server.effects.ParticleEffects;
-import electrosphere.main.Globals;
 
 import java.util.List;
 

src/main/java/electrosphere/entity/types/item/ItemUtils.java

@@ -1,6 +1,7 @@
 package electrosphere.entity.types.item;
 
 import electrosphere.collision.dispatch.CollisionObject;
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
@@ -18,7 +19,6 @@ import electrosphere.game.data.creature.type.CreatureType;
 import electrosphere.game.data.item.type.EquipWhitelist;
 import electrosphere.game.data.item.type.Item;
 import electrosphere.game.data.item.type.WeaponData;
-import electrosphere.main.Globals;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.parser.net.message.NetworkMessage;
 import electrosphere.net.server.player.Player;

src/main/java/electrosphere/entity/types/object/ObjectUtils.java

@@ -4,6 +4,7 @@ import org.joml.Matrix4f;
 import org.joml.Vector3f;
 
 import electrosphere.collision.dispatch.CollisionObject;
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
@@ -20,7 +21,6 @@ import electrosphere.game.collision.PhysicsUtils;
 import electrosphere.game.collision.collidable.Collidable;
 import electrosphere.game.data.creature.type.CollidableTemplate;
 import electrosphere.game.data.object.type.ObjectData;
-import electrosphere.main.Globals;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.renderer.actor.ActorUtils;
 

src/main/java/electrosphere/entity/types/particle/ParticleUtils.java

@@ -1,11 +1,12 @@
 package electrosphere.entity.types.particle;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.ParticleTree;
 import electrosphere.entity.types.camera.CameraEntityUtils;
-import electrosphere.main.Globals;
+
 import org.joml.AxisAngle4f;
 import org.joml.Matrix4f;
 import org.joml.Quaternionf;

src/main/java/electrosphere/entity/types/projectile/ProjectileUtils.java

@@ -9,13 +9,13 @@ import org.joml.Quaternionfc;
 import org.joml.Vector3d;
 import org.joml.Vector3f;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.movement.ProjectileTree;
 import electrosphere.entity.types.hitbox.HitboxUtils;
 import electrosphere.entity.types.hitbox.HitboxUtils.HitboxPositionCallback;
 import electrosphere.game.data.projectile.ProjectileType;
-import electrosphere.main.Globals;
 
 public class ProjectileUtils {
     

src/main/java/electrosphere/entity/types/structure/StructureUtils.java

@@ -1,5 +1,6 @@
 package electrosphere.entity.types.structure;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
@@ -7,7 +8,6 @@ import electrosphere.entity.types.collision.CollisionObjUtils;
 import electrosphere.game.collision.collidable.Collidable;
 import electrosphere.game.data.structure.type.model.CollisionObjectTemplate;
 import electrosphere.game.data.structure.type.model.StructureType;
-import electrosphere.main.Globals;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.parser.net.message.NetworkMessage;
 import electrosphere.net.server.player.Player;

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

@@ -1,8 +1,8 @@
 package electrosphere.game.client;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.types.camera.CameraEntityUtils;
-import electrosphere.main.Globals;
 
 import org.joml.Vector3d;
 import org.joml.Vector3f;

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

@@ -2,6 +2,7 @@ package electrosphere.game.client.cells;
 
 import electrosphere.collision.dispatch.CollisionObject;
 import electrosphere.dynamics.RigidBody;
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
@@ -9,7 +10,6 @@ import electrosphere.game.collision.PhysicsUtils;
 import electrosphere.game.collision.collidable.Collidable;
 import electrosphere.game.terrain.processing.TerrainInterpolator;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
 import electrosphere.renderer.Mesh;
 import electrosphere.renderer.Model;
 import electrosphere.renderer.ModelUtils;

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

@@ -1,11 +1,11 @@
 package electrosphere.game.client.cells;
 
+import electrosphere.engine.Globals;
 import electrosphere.game.client.terrain.manager.ClientTerrainManager;
 import electrosphere.game.server.terrain.manager.ServerTerrainManager;
 import electrosphere.game.terrain.processing.TerrainInterpolator;
 import electrosphere.game.client.world.ClientWorldData;
 import electrosphere.game.collision.CommonWorldData;
-import electrosphere.main.Globals;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.renderer.ShaderProgram;
 import java.util.Arrays;

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

@@ -1,9 +1,10 @@
 package electrosphere.game.client.targeting.crosshair;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.types.camera.CameraEntityUtils;
-import electrosphere.main.Globals;
+
 import org.joml.Vector3d;
 
 /**

src/main/java/electrosphere/game/client/world/ClientWorldData.java

@@ -1,8 +1,9 @@
 package electrosphere.game.client.world;
 
 import electrosphere.game.server.world.*;
+import electrosphere.server.datacell.ServerDataCell;
 import electrosphere.game.server.terrain.manager.ServerTerrainManager;
-import electrosphere.game.server.datacell.ServerDataCell;
+
 import java.util.List;
 import org.joml.Vector2f;
 import org.joml.Vector3f;

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

@@ -8,13 +8,14 @@ import electrosphere.collision.shapes.IndexedMesh;
 import electrosphere.collision.shapes.TriangleIndexVertexArray;
 import electrosphere.dynamics.RigidBody;
 import electrosphere.dynamics.RigidBodyConstructionInfo;
+import electrosphere.engine.Globals;
 import electrosphere.linearmath.DefaultMotionState;
 import electrosphere.linearmath.Transform;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.game.collision.collidable.Collidable;
-import electrosphere.main.Globals;
+
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.FloatBuffer;

src/main/java/electrosphere/game/config/UserSettings.java

@@ -1,7 +1,7 @@
 package electrosphere.game.config;
 
+import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
 import electrosphere.util.FileUtils;
 
 /**

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

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

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

@@ -1,10 +1,12 @@
 package electrosphere.game.server.structure.virtual;
 
 import com.google.gson.Gson;
-import electrosphere.game.server.db.DatabaseResult;
-import electrosphere.game.server.db.DatabaseResultRow;
+
+import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
+import electrosphere.server.db.DatabaseResult;
+import electrosphere.server.db.DatabaseResultRow;
+
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.LinkedList;

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

@@ -1,8 +1,8 @@
 package electrosphere.game.server.structure.virtual;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.types.structure.StructureUtils;
 import electrosphere.game.data.structure.type.model.StructureType;
-import electrosphere.main.Globals;
 import electrosphere.game.server.character.Character;
 import java.util.LinkedList;
 import java.util.List;

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

@@ -2,7 +2,7 @@ package electrosphere.game.server.terrain.manager;
 
 import com.google.gson.Gson;
 import electrosphere.game.terrain.processing.TerrainInterpolator;
-import electrosphere.main.Globals;
+import electrosphere.engine.Globals;
 import electrosphere.game.server.terrain.generation.TerrainGen;
 import electrosphere.game.server.terrain.models.ModificationList;
 import electrosphere.game.server.terrain.models.TerrainModel;

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

@@ -1,12 +1,13 @@
 package electrosphere.game.server.town;
 
-import electrosphere.game.server.db.DatabaseResult;
 import electrosphere.game.server.structure.virtual.Structure;
 import electrosphere.game.server.structure.virtual.VirtualStructureUtils;
 import electrosphere.game.server.terrain.manager.ServerTerrainChunk;
+import electrosphere.engine.Globals;
 import electrosphere.game.server.character.Character;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
+import electrosphere.server.db.DatabaseResult;
+
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.LinkedList;

src/main/java/electrosphere/game/server/unit/UnitUtils.java

@@ -6,7 +6,7 @@ import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.collision.CollisionObjUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.game.server.ai.creature.MillAbout;
+import electrosphere.server.ai.creature.MillAbout;
 
 import org.joml.Quaterniond;
 import org.joml.Quaternionf;

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

@@ -2,6 +2,8 @@ package electrosphere.game.server.world;
 
 import java.util.LinkedList;
 import java.util.List;
+
+import electrosphere.engine.Globals;
 import electrosphere.game.server.character.Character;
 import electrosphere.game.server.character.CharacterDataStrings;
 import electrosphere.game.server.character.CharacterUtils;
@@ -12,7 +14,7 @@ import electrosphere.game.server.race.model.RaceMap;
 import electrosphere.game.server.structure.virtual.Structure;
 import electrosphere.game.server.symbolism.model.Symbol;
 import electrosphere.game.server.town.Town;
-import electrosphere.main.Globals;
+
 import java.util.Random;
 import org.joml.Vector2i;
 

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

@@ -1,7 +1,8 @@
 package electrosphere.game.server.world;
 
 import electrosphere.game.server.terrain.manager.ServerTerrainManager;
-import electrosphere.game.server.datacell.ServerDataCell;
+import electrosphere.server.datacell.ServerDataCell;
+
 import java.util.List;
 import org.joml.Vector3f;
 

src/main/java/electrosphere/menu/MenuCallbacks.java

@@ -4,14 +4,14 @@ import electrosphere.audio.AudioSource;
 import electrosphere.audio.AudioUtils;
 import electrosphere.controls.ControlHandler;
 import electrosphere.controls.ControlHandler.ControlsState;
+import electrosphere.engine.Globals;
 import electrosphere.engine.LoadingThread;
-import electrosphere.game.server.saves.SaveUtils;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
+import electrosphere.engine.Main;
 import electrosphere.net.NetUtils;
 import electrosphere.net.client.ClientNetworking;
 import electrosphere.renderer.ui.DrawableElement;
 import electrosphere.renderer.ui.elements.Label;
+import electrosphere.server.saves.SaveUtils;
 
 import org.joml.Vector3f;
 

src/main/java/electrosphere/menu/MenuGenerators.java

@@ -6,7 +6,9 @@ import org.joml.Vector3f;
 
 import electrosphere.auth.AuthenticationManager;
 import electrosphere.controls.ControlHandler.ControlsState;
+import electrosphere.engine.Globals;
 import electrosphere.engine.LoadingThread;
+import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
@@ -14,9 +16,6 @@ import electrosphere.entity.types.camera.CameraEntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.game.data.creature.type.CreatureType;
 import electrosphere.game.data.creature.type.visualattribute.VisualAttribute;
-import electrosphere.game.server.saves.SaveUtils;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.net.NetUtils;
 import electrosphere.renderer.Model;
 import electrosphere.renderer.RenderingEngine;
@@ -40,6 +39,7 @@ import electrosphere.renderer.ui.events.ClickEvent;
 import electrosphere.renderer.ui.events.NavigationEvent;
 import electrosphere.renderer.ui.events.ValueChangeEvent;
 import electrosphere.renderer.ui.form.FormElement;
+import electrosphere.server.saves.SaveUtils;
 
 /**
  *

src/main/java/electrosphere/menu/MenuGeneratorsArena.java

@@ -1,8 +1,8 @@
 package electrosphere.menu;
 
 import electrosphere.auth.AuthenticationManager;
+import electrosphere.engine.Globals;
 import electrosphere.engine.LoadingThread;
-import electrosphere.main.Globals;
 import electrosphere.net.NetUtils;
 import electrosphere.renderer.ui.ClickableElement;
 import electrosphere.renderer.ui.Element;

src/main/java/electrosphere/menu/MenuGeneratorsDebug.java

@@ -3,7 +3,7 @@ package electrosphere.menu;
 import java.util.LinkedList;
 import java.util.List;
 
-import electrosphere.main.Globals;
+import electrosphere.engine.Globals;
 import electrosphere.renderer.debug.DebugRendering;
 import electrosphere.renderer.ui.ClickableElement;
 import electrosphere.renderer.ui.ContainerElement;

src/main/java/electrosphere/menu/MenuGeneratorsInventory.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import electrosphere.audio.AudioUtils;
 import electrosphere.controls.ControlHandler.ControlsState;
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.state.equip.EquipState;
@@ -12,7 +13,6 @@ import electrosphere.entity.state.inventory.InventoryUtils;
 import electrosphere.entity.state.inventory.RelationalInventoryState;
 import electrosphere.entity.state.inventory.UnrelationalInventoryState;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.main.Globals;
 import electrosphere.renderer.ui.DraggableElement.DragEventCallback;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.ImagePanel;

src/main/java/electrosphere/menu/MenuGeneratorsMultiplayer.java

@@ -6,12 +6,12 @@ import java.util.List;
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.types.camera.CameraEntityUtils;
 import electrosphere.entity.types.creature.CreatureTemplate;
 import electrosphere.game.data.creature.type.CreatureType;
 import electrosphere.game.data.creature.type.visualattribute.AttributeVariant;
 import electrosphere.game.data.creature.type.visualattribute.VisualAttribute;
-import electrosphere.main.Globals;
 import electrosphere.net.parser.net.message.CharacterMessage;
 import electrosphere.renderer.Model;
 import electrosphere.renderer.RenderingEngine;

src/main/java/electrosphere/menu/WindowUtils.java

@@ -1,9 +1,9 @@
 package electrosphere.menu;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.state.inventory.InventoryUtils;
 import electrosphere.entity.state.inventory.RelationalInventoryState;
 import electrosphere.entity.state.inventory.UnrelationalInventoryState;
-import electrosphere.main.Globals;
 import electrosphere.renderer.ui.ContainerElement;
 import electrosphere.renderer.ui.DrawableElement;
 import electrosphere.renderer.ui.Element;

src/main/java/electrosphere/net/client/ClientNetworking.java

@@ -1,11 +1,11 @@
 package electrosphere.net.client;
 
 import electrosphere.entity.types.creature.CreatureUtils;
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.net.client.protocol.ClientProtocol;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.parser.net.message.NetworkMessage;

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

@@ -1,7 +1,7 @@
 package electrosphere.net.client.protocol;
 
+import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
 import electrosphere.net.parser.net.message.AuthMessage;
 import electrosphere.net.parser.net.message.CharacterMessage;
 import electrosphere.net.parser.net.message.LoreMessage;

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

@@ -1,7 +1,7 @@
 package electrosphere.net.client.protocol;
 
+import electrosphere.engine.Globals;
 import electrosphere.engine.LoadingThread;
-import electrosphere.main.Globals;
 import electrosphere.net.parser.net.message.CharacterMessage;
 import electrosphere.net.parser.net.message.TerrainMessage;
 

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

@@ -1,5 +1,7 @@
 package electrosphere.net.client.protocol;
 
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
@@ -7,8 +9,6 @@ import electrosphere.game.client.world.ClientWorldData;
 import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.net.parser.net.message.AuthMessage;
 import electrosphere.net.parser.net.message.CharacterMessage;
 import electrosphere.net.parser.net.message.EntityMessage;

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

@@ -4,6 +4,8 @@ import org.joml.Quaterniond;
 import org.joml.Quaternionf;
 import org.joml.Vector3d;
 
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.types.attach.AttachUtils;
@@ -11,8 +13,6 @@ import electrosphere.entity.types.creature.CreatureTemplate;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.util.Utilities;
 

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

@@ -1,5 +1,6 @@
 package electrosphere.net.client.protocol;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.state.equip.EquipState;
 import electrosphere.entity.state.inventory.InventoryState;
@@ -7,7 +8,6 @@ import electrosphere.entity.state.inventory.InventoryUtils;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.game.data.creature.type.equip.EquipPoint;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
 import electrosphere.net.parser.net.message.InventoryMessage;
 
 public class InventoryProtocol {

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

@@ -4,7 +4,7 @@ import java.util.List;
 
 import com.google.gson.Gson;
 
-import electrosphere.main.Globals;
+import electrosphere.engine.Globals;
 import electrosphere.net.parser.net.message.LoreMessage;
 
 public class LoreProtocol {

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

@@ -1,8 +1,8 @@
 package electrosphere.net.client.protocol;
 
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.net.parser.net.message.PlayerMessage;
 import electrosphere.net.server.player.Player;
 

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

@@ -1,6 +1,6 @@
 package electrosphere.net.client.protocol;
 
-import electrosphere.main.Globals;
+import electrosphere.engine.Globals;
 import electrosphere.net.parser.net.message.ServerMessage;
 
 public class ServerProtocol {

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

@@ -4,9 +4,9 @@ import javax.vecmath.Vector3d;
 
 import org.joml.Vector3f;
 
+import electrosphere.engine.Globals;
 import electrosphere.game.client.world.ClientWorldData;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
 import electrosphere.net.parser.net.message.TerrainMessage;
 
 public class TerrainProtocol {

src/main/java/electrosphere/net/server/Server.java

@@ -1,10 +1,11 @@
 package electrosphere.net.server;
 
-import electrosphere.game.server.saves.SaveUtils;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.net.NetUtils;
 import electrosphere.net.parser.net.message.NetworkMessage;
+import electrosphere.server.saves.SaveUtils;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

src/main/java/electrosphere/net/server/ServerConnectionHandler.java

@@ -2,6 +2,8 @@ package electrosphere.net.server;
 
 import electrosphere.entity.types.creature.CreatureTemplate;
 import electrosphere.entity.types.creature.CreatureUtils;
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.ironsight.IronSightTree;
@@ -9,8 +11,6 @@ import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.collision.CollisionObjUtils;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.net.NetUtils;
 import electrosphere.net.parser.net.message.AuthMessage;
 import electrosphere.net.parser.net.message.EntityMessage;

src/main/java/electrosphere/net/server/player/Player.java

@@ -1,7 +1,7 @@
 package electrosphere.net.server.player;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
-import electrosphere.main.Globals;
 import electrosphere.net.parser.net.message.NetworkMessage;
 import electrosphere.net.server.ServerConnectionHandler;
 

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

@@ -1,6 +1,6 @@
 package electrosphere.net.server.protocol;
 
-import electrosphere.main.Globals;
+import electrosphere.engine.Globals;
 import electrosphere.net.parser.net.message.AuthMessage;
 import electrosphere.net.parser.net.message.PlayerMessage;
 import electrosphere.net.server.ServerConnectionHandler;

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

@@ -3,14 +3,14 @@ package electrosphere.net.server.protocol;
 import org.joml.Vector3d;
 import org.joml.Vector3f;
 
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.ironsight.IronSightTree;
 import electrosphere.entity.types.collision.CollisionObjUtils;
 import electrosphere.entity.types.creature.CreatureTemplate;
 import electrosphere.entity.types.creature.CreatureUtils;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.net.parser.net.message.CharacterMessage;
 import electrosphere.net.parser.net.message.PlayerMessage;
 import electrosphere.net.parser.net.message.TerrainMessage;

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

@@ -1,13 +1,13 @@
 package electrosphere.net.server.protocol;
 
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.net.NetUtils;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.server.ServerConnectionHandler;

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

@@ -1,5 +1,6 @@
 package electrosphere.net.server.protocol;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.state.equip.EquipState;
 import electrosphere.entity.state.inventory.InventoryUtils;
@@ -7,7 +8,6 @@ import electrosphere.entity.state.inventory.UnrelationalInventoryState;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.game.data.creature.type.equip.EquipPoint;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
 import electrosphere.net.parser.net.message.InventoryMessage;
 import electrosphere.net.server.ServerConnectionHandler;
 

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

@@ -2,7 +2,7 @@ package electrosphere.net.server.protocol;
 
 import java.util.List;
 
-import electrosphere.main.Globals;
+import electrosphere.engine.Globals;
 import electrosphere.net.parser.net.message.LoreMessage;
 import electrosphere.net.server.ServerConnectionHandler;
 import electrosphere.util.Utilities;

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

@@ -2,6 +2,8 @@ package electrosphere.net.server.protocol;
 
 import org.joml.Vector3f;
 
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.ironsight.IronSightTree;
@@ -12,8 +14,6 @@ import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.game.server.terrain.manager.ServerTerrainChunk;
 import electrosphere.game.server.terrain.models.TerrainModification;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.net.NetUtils;
 import electrosphere.net.parser.net.message.AuthMessage;
 import electrosphere.net.parser.net.message.CharacterMessage;

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

@@ -1,8 +1,8 @@
 package electrosphere.net.server.protocol;
 
+import electrosphere.engine.Globals;
 import electrosphere.game.server.terrain.manager.ServerTerrainChunk;
 import electrosphere.game.server.terrain.models.TerrainModification;
-import electrosphere.main.Globals;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.net.server.Server;
 import electrosphere.net.server.ServerConnectionHandler;

src/main/java/electrosphere/renderer/Material.java

@@ -5,7 +5,7 @@
  */
 package electrosphere.renderer;
 
-import electrosphere.main.Globals;
+import electrosphere.engine.Globals;
 import electrosphere.renderer.texture.Texture;
 import org.lwjgl.PointerBuffer;
 import org.lwjgl.assimp.AIMaterial;

src/main/java/electrosphere/renderer/Mesh.java

@@ -1,9 +1,9 @@
 package electrosphere.renderer;
 
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.entity.types.camera.CameraEntityUtils;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.renderer.actor.ActorTextureMask;
 import electrosphere.renderer.light.LightManager;
 import electrosphere.renderer.loading.ModelPretransforms;

src/main/java/electrosphere/renderer/Model.java

@@ -11,8 +11,9 @@ import electrosphere.renderer.anim.Animation;
 import electrosphere.renderer.loading.ModelPretransforms;
 import electrosphere.renderer.loading.ModelPretransforms.MeshMetadata;
 import electrosphere.renderer.anim.AnimNode;
+import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;

src/main/java/electrosphere/renderer/ModelUtils.java

@@ -1,6 +1,6 @@
 package electrosphere.renderer;
 
-import electrosphere.main.Globals;
+import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.renderer.texture.Texture;
 import java.nio.FloatBuffer;

src/main/java/electrosphere/renderer/RenderUtils.java

@@ -1,5 +1,6 @@
 package electrosphere.renderer;
 
+import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.entity.types.camera.CameraEntityUtils;
 
@@ -10,7 +11,6 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import electrosphere.main.Globals;
 import electrosphere.renderer.actor.ActorTextureMask;
 import electrosphere.renderer.texture.Texture;
 

src/main/java/electrosphere/renderer/RenderingEngine.java

@@ -72,6 +72,7 @@ import org.lwjgl.opengl.GL20;
 
 import electrosphere.controls.ControlCallback;
 import electrosphere.controls.MouseCallback;
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
@@ -79,11 +80,7 @@ import electrosphere.entity.types.camera.CameraEntityUtils;
 import electrosphere.entity.types.hitbox.HitboxData;
 import electrosphere.entity.types.hitbox.HitboxUtils;
 import electrosphere.game.data.creature.type.CollidableTemplate;
-import electrosphere.game.server.pathfinding.navmesh.NavCube;
-import electrosphere.game.server.pathfinding.navmesh.NavMesh;
-import electrosphere.game.server.pathfinding.navmesh.NavShape;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.renderer.debug.DebugRendering;
 import electrosphere.renderer.framebuffer.Framebuffer;
@@ -93,6 +90,9 @@ import electrosphere.renderer.light.LightManager;
 import electrosphere.renderer.texture.Texture;
 import electrosphere.renderer.ui.DrawableElement;
 import electrosphere.renderer.ui.Element;
+import electrosphere.server.pathfinding.navmesh.NavCube;
+import electrosphere.server.pathfinding.navmesh.NavMesh;
+import electrosphere.server.pathfinding.navmesh.NavShape;
 
 public class RenderingEngine {
     

src/main/java/electrosphere/renderer/ShaderProgram.java

@@ -29,8 +29,8 @@ import javax.management.RuntimeErrorException;
 
 import org.lwjgl.opengl.GL20;
 
+import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
 import electrosphere.util.FileUtils;
 
 /**

src/main/java/electrosphere/renderer/actor/Actor.java

@@ -1,6 +1,6 @@
 package electrosphere.renderer.actor;
 
-import electrosphere.main.Globals;
+import electrosphere.engine.Globals;
 import electrosphere.renderer.Bone;
 import electrosphere.renderer.Model;
 import electrosphere.renderer.texture.Texture;

src/main/java/electrosphere/renderer/actor/ActorMeshMask.java

@@ -6,7 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Semaphore;
 
-import electrosphere.main.Globals;
+import electrosphere.engine.Globals;
 import electrosphere.renderer.Mesh;
 import electrosphere.renderer.Model;
 

src/main/java/electrosphere/renderer/actor/ActorUtils.java

@@ -1,8 +1,8 @@
 package electrosphere.renderer.actor;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
-import electrosphere.main.Globals;
 
 /**
  *

src/main/java/electrosphere/renderer/debug/DebugRendering.java

@@ -9,8 +9,8 @@ import static org.lwjgl.opengl.GL11.glPolygonMode;
 
 import org.joml.Vector3f;
 
+import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
 import electrosphere.renderer.Model;
 import electrosphere.renderer.RenderingEngine;
 import electrosphere.renderer.ShaderProgram;

src/main/java/electrosphere/renderer/framebuffer/FramebufferUtils.java

@@ -1,7 +1,7 @@
 package electrosphere.renderer.framebuffer;
 
+import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
 import electrosphere.renderer.texture.Texture;
 
 import java.nio.IntBuffer;

src/main/java/electrosphere/renderer/light/LightEntityUtils.java

@@ -1,8 +1,9 @@
 package electrosphere.renderer.light;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
-import electrosphere.main.Globals;
+
 import org.joml.Vector3d;
 import org.joml.Vector3f;
 

src/main/java/electrosphere/renderer/light/LightManager.java

@@ -10,8 +10,8 @@ import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL30;
 import org.lwjgl.opengl.GL31;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.types.camera.CameraEntityUtils;
-import electrosphere.main.Globals;
 
 /**
  *

src/main/java/electrosphere/renderer/loading/ModelLoader.java

@@ -1,8 +1,8 @@
 package electrosphere.renderer.loading;
 
+import electrosphere.engine.Globals;
+import electrosphere.engine.Main;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
-import electrosphere.main.Main;
 import electrosphere.renderer.Material;
 import electrosphere.renderer.Mesh;
 import electrosphere.renderer.Model;

src/main/java/electrosphere/renderer/texture/Texture.java

@@ -5,7 +5,7 @@
  */
 package electrosphere.renderer.texture;
 
-import electrosphere.main.Main;
+import electrosphere.engine.Main;
 import electrosphere.util.FileUtils;
 import java.awt.Color;
 import java.awt.image.BufferedImage;

src/main/java/electrosphere/renderer/ui/WidgetUtils.java

@@ -1,7 +1,7 @@
 package electrosphere.renderer.ui;
 
 import electrosphere.controls.ControlHandler;
-import electrosphere.main.Globals;
+import electrosphere.engine.Globals;
 import electrosphere.renderer.ui.elements.Button;
 import electrosphere.renderer.ui.elements.Label;
 

src/main/java/electrosphere/renderer/ui/Window.java

@@ -12,8 +12,8 @@ import java.util.List;
 
 import org.joml.Vector3f;
 
+import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.main.Globals;
 import electrosphere.renderer.Material;
 import electrosphere.renderer.Model;
 import electrosphere.renderer.debug.DebugRendering;