diff --git a/src/main/java/electrosphere/engine/Globals.java b/src/main/java/electrosphere/engine/Globals.java index 39b98efb..1a8dc875 100644 --- a/src/main/java/electrosphere/engine/Globals.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java index 994ad94a..41f35277 100644 --- a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java index 73a578b7..b1555ad0 100644 --- a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java b/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java index 1365fc77..9e0b4390 100644 --- a/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java +++ b/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") /** diff --git a/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java b/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java index 9d9d95b4..802343a9 100644 --- a/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java +++ b/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") /** diff --git a/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java b/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java index b96c7139..de9a7bc8 100644 --- a/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java b/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java index 9dab563a..9d23871a 100644 --- a/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java b/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java index 2965d5f0..aa3640c9 100644 --- a/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java +++ b/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") /** diff --git a/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java b/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java index 7c32f4bd..a21be73d 100644 --- a/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java +++ b/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") /** diff --git a/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java b/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java index 298ecafc..a486a34d 100644 --- a/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java b/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java index a598dc1d..d4160383 100644 --- a/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java b/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java index c216e98f..98549322 100644 --- a/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java +++ b/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") /** diff --git a/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java b/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java index 578e8100..4ff8bbb1 100644 --- a/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java +++ b/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") /** diff --git a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java index 6373163f..fbcb981f 100644 --- a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java index bfd0d4f5..3fdc83cf 100644 --- a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java b/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java index 461e4c5c..7bb2e46a 100644 --- a/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java +++ b/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( diff --git a/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java b/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java index 038bf714..19008a74 100644 --- a/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java +++ b/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") diff --git a/src/main/java/electrosphere/net/synchronization/ClientSynchronizationManager.java b/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java similarity index 98% rename from src/main/java/electrosphere/net/synchronization/ClientSynchronizationManager.java rename to src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java index 3e5e42e4..e56aef47 100644 --- a/src/main/java/electrosphere/net/synchronization/ClientSynchronizationManager.java +++ b/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 diff --git a/src/main/java/electrosphere/net/synchronization/BehaviorTreeIdEnums.java b/src/main/java/electrosphere/net/synchronization/enums/BehaviorTreeIdEnums.java similarity index 95% rename from src/main/java/electrosphere/net/synchronization/BehaviorTreeIdEnums.java rename to src/main/java/electrosphere/net/synchronization/enums/BehaviorTreeIdEnums.java index 20638b7d..6ca36056 100644 --- a/src/main/java/electrosphere/net/synchronization/BehaviorTreeIdEnums.java +++ b/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. diff --git a/src/main/java/electrosphere/net/synchronization/FieldIdEnums.java b/src/main/java/electrosphere/net/synchronization/enums/FieldIdEnums.java similarity index 97% rename from src/main/java/electrosphere/net/synchronization/FieldIdEnums.java rename to src/main/java/electrosphere/net/synchronization/enums/FieldIdEnums.java index f865d9ad..f2ad959a 100644 --- a/src/main/java/electrosphere/net/synchronization/FieldIdEnums.java +++ b/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. diff --git a/src/main/java/electrosphere/net/synchronization/EntityValueTrackingService.java b/src/main/java/electrosphere/net/synchronization/server/EntityValueTrackingService.java similarity index 97% rename from src/main/java/electrosphere/net/synchronization/EntityValueTrackingService.java rename to src/main/java/electrosphere/net/synchronization/server/EntityValueTrackingService.java index 1bedb86c..40d5daf2 100644 --- a/src/main/java/electrosphere/net/synchronization/EntityValueTrackingService.java +++ b/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; diff --git a/src/main/java/electrosphere/net/synchronization/ServerSynchronizationManager.java b/src/main/java/electrosphere/net/synchronization/server/ServerSynchronizationManager.java similarity index 96% rename from src/main/java/electrosphere/net/synchronization/ServerSynchronizationManager.java rename to src/main/java/electrosphere/net/synchronization/server/ServerSynchronizationManager.java index 0251ca90..d3ce30c8 100644 --- a/src/main/java/electrosphere/net/synchronization/ServerSynchronizationManager.java +++ b/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; /**