moving files around

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

@@ -48,9 +48,9 @@ import electrosphere.net.monitor.NetMonitor;
 import electrosphere.net.server.Server;
 import electrosphere.net.server.player.Player;
 import electrosphere.net.server.player.PlayerManager;
-import electrosphere.net.synchronization.ClientSynchronizationManager;
-import electrosphere.net.synchronization.EntityValueTrackingService;
-import electrosphere.net.synchronization.ServerSynchronizationManager;
+import electrosphere.net.synchronization.client.ClientSynchronizationManager;
+import electrosphere.net.synchronization.server.EntityValueTrackingService;
+import electrosphere.net.synchronization.server.ServerSynchronizationManager;
 import electrosphere.renderer.RenderUtils;
 import electrosphere.renderer.RenderingEngine;
 import electrosphere.renderer.actor.instance.InstanceManager;

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

@@ -1,8 +1,6 @@
 package electrosphere.entity.state.attack;
 
 
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
-
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
@@ -24,6 +22,7 @@ import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizableEnum;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;

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

@@ -1,8 +1,6 @@
 package electrosphere.entity.state.attack;
 
 
-import electrosphere.net.synchronization.FieldIdEnums;
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
 import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
 import electrosphere.net.parser.net.message.SynchronizationMessage;
 import electrosphere.server.datacell.utils.DataCellSearchUtils;
@@ -33,6 +31,8 @@ import electrosphere.logger.LoggerInterface;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
+import electrosphere.net.synchronization.enums.FieldIdEnums;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.server.datacell.Realm;
 import electrosphere.util.math.MathUtils;

src/main/java/electrosphere/entity/state/block/ClientBlockTree.java

@@ -9,11 +9,10 @@ import electrosphere.entity.btree.StateTransitionUtil;
 import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem;
 import electrosphere.game.data.creature.type.block.BlockSystem;
 import electrosphere.game.data.creature.type.block.BlockVariant;
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
-
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizableEnum;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
 
 @SynchronizedBehaviorTree(name = "clientBlockTree", isServer = false, correspondingTree="serverBlockTree")
 /**

src/main/java/electrosphere/entity/state/block/ServerBlockTree.java

@@ -1,15 +1,12 @@
 package electrosphere.entity.state.block;
 
 
-import electrosphere.net.synchronization.FieldIdEnums;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.btree.StateTransitionUtil;
 import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem;
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
-
 import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
 import electrosphere.net.parser.net.message.SynchronizationMessage;
 
@@ -19,6 +16,8 @@ import electrosphere.game.data.creature.type.block.BlockSystem;
 import electrosphere.game.data.creature.type.block.BlockVariant;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
+import electrosphere.net.synchronization.enums.FieldIdEnums;
 
 @SynchronizedBehaviorTree(name = "serverBlockTree", isServer = true, correspondingTree="clientBlockTree")
 /**

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

@@ -1,8 +1,6 @@
 package electrosphere.entity.state.equip;
 
 
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
-
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -30,6 +28,7 @@ import electrosphere.logger.LoggerInterface;
 import electrosphere.net.parser.net.message.InventoryMessage;
 import electrosphere.net.parser.net.message.NetworkMessage;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.renderer.actor.ActorMeshMask;
 

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

@@ -1,8 +1,6 @@
 package electrosphere.entity.state.equip;
 
 
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
-
 import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
 
 import java.util.HashMap;
@@ -38,6 +36,7 @@ import electrosphere.net.parser.net.message.NetworkMessage;
 import electrosphere.net.server.player.Player;
 import electrosphere.net.server.protocol.InventoryProtocol;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
 import electrosphere.server.datacell.Realm;
 import electrosphere.server.datacell.ServerDataCell;
 import electrosphere.server.datacell.utils.DataCellSearchUtils;

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

@@ -20,7 +20,7 @@ import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizableEnum;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
 
 @SynchronizedBehaviorTree(name = "clientGravity", isServer = false, correspondingTree="serverGravity")
 /**

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

@@ -1,10 +1,7 @@
 package electrosphere.entity.state.gravity;
 
 
-import electrosphere.net.synchronization.FieldIdEnums;
 import electrosphere.entity.EntityDataStrings;
-
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
 import electrosphere.net.parser.net.message.SynchronizationMessage;
 import electrosphere.server.datacell.utils.DataCellSearchUtils;
 import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
@@ -30,6 +27,8 @@ import electrosphere.entity.state.movement.jump.ServerJumpTree;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
+import electrosphere.net.synchronization.enums.FieldIdEnums;
 
 @SynchronizedBehaviorTree(name = "serverGravity", isServer = true, correspondingTree="clientGravity")
 /**

src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java

@@ -2,7 +2,6 @@ package electrosphere.entity.state.idle;
 
 
 import electrosphere.net.parser.net.message.SynchronizationMessage;
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
 import electrosphere.entity.state.client.firstPerson.FirstPersonTree;
 import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree;
 import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState;
@@ -17,6 +16,7 @@ import electrosphere.game.data.creature.type.IdleData;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizableEnum;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
 import electrosphere.renderer.actor.Actor;
 
 

src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java

@@ -1,7 +1,6 @@
 package electrosphere.entity.state.idle;
 
 
-import electrosphere.net.synchronization.FieldIdEnums;
 import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeState;
 import electrosphere.entity.state.attack.ServerAttackTree;
 import electrosphere.entity.state.idle.ClientIdleTree.IdleTreeState;
@@ -16,9 +15,10 @@ import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.game.data.creature.type.IdleData;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.parser.net.message.SynchronizationMessage;
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
+import electrosphere.net.synchronization.enums.FieldIdEnums;
 import electrosphere.server.datacell.utils.DataCellSearchUtils;
 import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
 import electrosphere.server.poseactor.PoseActor;

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

@@ -1,7 +1,6 @@
 package electrosphere.entity.state.life;
 
 
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
 import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.btree.StateTransitionUtil;
 import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem;
@@ -12,6 +11,7 @@ import electrosphere.engine.Globals;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizableEnum;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
 
 @SynchronizedBehaviorTree(name = "clientLifeTree", isServer = false, correspondingTree="serverLifeTree")
 /**

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

@@ -1,8 +1,6 @@
 package electrosphere.entity.state.life;
 
 
-import electrosphere.net.synchronization.FieldIdEnums;
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
 import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.btree.StateTransitionUtil;
 import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem;
@@ -17,6 +15,8 @@ import electrosphere.entity.state.life.ClientLifeTree.LifeStateEnum;
 import electrosphere.game.data.creature.type.HealthSystem;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
+import electrosphere.net.synchronization.enums.FieldIdEnums;
 
 @SynchronizedBehaviorTree(name = "serverLifeTree", isServer = true, correspondingTree="clientLifeTree")
 /**

src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java

@@ -1,8 +1,6 @@
 package electrosphere.entity.state.movement.groundmove;
 
 
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
-
 import electrosphere.entity.state.gravity.GravityUtils;
 import electrosphere.audio.movement.MovementAudioService.InteractionType;
 import electrosphere.client.terrain.sampling.ClientVoxelSampler;
@@ -29,6 +27,7 @@ import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizableEnum;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
 import electrosphere.renderer.anim.Animation;
 import electrosphere.util.math.MathUtils;
 import electrosphere.renderer.actor.Actor;

src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java

@@ -2,12 +2,7 @@ package electrosphere.entity.state.movement.groundmove;
 
 
 import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
-import electrosphere.net.synchronization.FieldIdEnums;
-
 import electrosphere.net.parser.net.message.SynchronizationMessage;
-
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
-
 import electrosphere.entity.state.gravity.GravityUtils;
 import electrosphere.collision.PhysicsEntityUtils;
 import electrosphere.collision.collidable.Collidable;
@@ -31,6 +26,8 @@ import electrosphere.entity.state.server.ServerPlayerViewDirTree;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
+import electrosphere.net.synchronization.enums.FieldIdEnums;
 import electrosphere.renderer.anim.Animation;
 import electrosphere.script.utils.AccessTransforms;
 import electrosphere.server.datacell.utils.DataCellSearchUtils;

src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java

@@ -2,8 +2,6 @@ package electrosphere.entity.state.movement.jump;
 
 
 import electrosphere.net.parser.net.message.SynchronizationMessage;
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
-import electrosphere.net.synchronization.ServerSynchronizationManager;
 
 import org.ode4j.math.DVector3C;
 import org.ode4j.ode.DBody;
@@ -22,6 +20,8 @@ import electrosphere.game.data.creature.type.movement.JumpMovementSystem;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizableEnum;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
+import electrosphere.net.synchronization.server.ServerSynchronizationManager;
 import electrosphere.renderer.actor.Actor;
 
 @SynchronizedBehaviorTree(

src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java

@@ -1,8 +1,6 @@
 package electrosphere.entity.state.movement.jump;
 
 
-import electrosphere.net.synchronization.FieldIdEnums;
-import electrosphere.net.synchronization.BehaviorTreeIdEnums;
 import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
 import electrosphere.net.parser.net.message.SynchronizationMessage;
 import electrosphere.server.datacell.utils.DataCellSearchUtils;
@@ -21,6 +19,8 @@ import electrosphere.entity.state.movement.jump.ClientJumpTree.JumpState;
 import electrosphere.game.data.creature.type.movement.JumpMovementSystem;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
+import electrosphere.net.synchronization.enums.FieldIdEnums;
 import electrosphere.server.poseactor.PoseActor;
 
 @SynchronizedBehaviorTree(name = "serverJumpTree", isServer = true, correspondingTree="clientJumpTree")

src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java

@@ -1,4 +1,4 @@
-package electrosphere.net.synchronization;
+package electrosphere.net.synchronization.client;
 
 
 import electrosphere.entity.state.equip.ClientEquipState;
@@ -20,6 +20,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.net.parser.net.message.SynchronizationMessage;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
+import electrosphere.net.synchronization.enums.FieldIdEnums;
 
 /**
  * Takes in raw behavior tree packets from server and pushes their values into respective behavior trees in entities

src/main/java/electrosphere/net/synchronization/enums/BehaviorTreeIdEnums.java

@@ -1,4 +1,4 @@
-package electrosphere.net.synchronization;
+package electrosphere.net.synchronization.enums;
 
 /**
  * List of enums for each automatically synchronized behavior tree.

src/main/java/electrosphere/net/synchronization/enums/FieldIdEnums.java

@@ -1,4 +1,4 @@
-package electrosphere.net.synchronization;
+package electrosphere.net.synchronization.enums;
 
 /**
  * List of enums of all fields and their associated ids.

src/main/java/electrosphere/net/synchronization/server/EntityValueTrackingService.java

@@ -1,4 +1,4 @@
-package electrosphere.net.synchronization;
+package electrosphere.net.synchronization.server;
 
 import java.util.HashMap;
 import java.util.LinkedList;

src/main/java/electrosphere/net/synchronization/server/ServerSynchronizationManager.java

@@ -1,4 +1,4 @@
-package electrosphere.net.synchronization;
+package electrosphere.net.synchronization.server;
 
 
 import java.util.LinkedList;
@@ -8,6 +8,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import electrosphere.entity.Entity;
 import electrosphere.entity.state.movement.jump.ServerJumpTree;
 import electrosphere.net.parser.net.message.SynchronizationMessage;
+import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
 import electrosphere.server.datacell.utils.EntityLookupUtils;
 
 /**