refactor btree interface location

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

@@ -81,7 +81,7 @@ 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.btree.BehaviorTree;
 import electrosphere.entity.state.attack.AttackTree;
 import electrosphere.entity.state.attack.ShooterTree;
 import electrosphere.entity.state.equip.EquipState;

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

@@ -25,7 +25,7 @@ import electrosphere.entity.Entity;
 import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.movement.ApplyRotationTree;
 import electrosphere.entity.types.camera.CameraEntityUtils;
 import electrosphere.entity.types.tree.ProceduralTree;

src/main/java/electrosphere/entity/Scene.java

@@ -1,7 +1,7 @@
 package electrosphere.entity;
 
 import electrosphere.engine.Globals;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.logger.LoggerInterface;
 

src/main/java/electrosphere/entity/btree/BehaviorTree.java

@@ -1,4 +1,4 @@
-package electrosphere.entity.state;
+package electrosphere.entity.btree;
 
 /**
  * A behavior tree

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

@@ -3,6 +3,7 @@ package electrosphere.entity.state;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
+import electrosphere.entity.btree.BehaviorTree;
 
 import org.joml.Vector3d;
 import org.joml.Vector3f;

src/main/java/electrosphere/entity/state/ambientaudio/ClientAmbientAudioTree.java

@@ -8,7 +8,7 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.game.data.foliage.type.AmbientAudio;
 
 /**

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

@@ -7,7 +7,7 @@ import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.ServerEntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.collidable.Impulse;
 import electrosphere.entity.state.equip.EquipState;
 import electrosphere.entity.state.movement.groundmove.GroundMovementTree;

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

@@ -7,7 +7,7 @@ import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.ServerEntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.collidable.Impulse;
 import electrosphere.entity.state.equip.EquipState;
 import electrosphere.entity.state.movement.groundmove.GroundMovementTree;

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

@@ -6,7 +6,7 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.projectile.ProjectileUtils;
 import electrosphere.server.datacell.Realm;

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

@@ -15,7 +15,7 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.gravity.ClientGravityTree;
 import electrosphere.entity.types.collision.CollisionObjUtils;
 import electrosphere.entity.types.item.ItemUtils;

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

@@ -6,7 +6,7 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.gravity.ServerGravityTree;
 import electrosphere.entity.types.collision.CollisionObjUtils;
 import electrosphere.entity.types.creature.CreatureUtils;

src/main/java/electrosphere/entity/state/foliage/AmbientFoliage.java

@@ -7,7 +7,7 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.types.camera.CameraEntityUtils;
 
 /**

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

@@ -18,7 +18,7 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.collidable.ClientCollidableTree;
 import electrosphere.entity.state.collidable.Impulse;
 import electrosphere.entity.state.movement.FallTree;

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

@@ -21,7 +21,7 @@ import electrosphere.collision.collidable.Collidable;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.collidable.Impulse;
 import electrosphere.entity.state.collidable.ServerCollidableTree;
 import electrosphere.entity.state.gravity.ClientGravityTree.GravityTreeState;

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

@@ -2,8 +2,6 @@ package electrosphere.entity.state.idle;
 
 
 import electrosphere.net.synchronization.BehaviorTreeIdEnums;
-
-import electrosphere.entity.state.BehaviorTree;
 import electrosphere.entity.state.attack.AttackTree;
 import electrosphere.entity.state.movement.AirplaneMovementTree;
 import electrosphere.entity.state.movement.groundmove.GroundMovementTree;
@@ -12,6 +10,7 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizableEnum;

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

@@ -1,6 +1,5 @@
 package electrosphere.entity.state.idle;
 
-import electrosphere.entity.state.BehaviorTree;
 import electrosphere.entity.state.attack.ServerAttackTree;
 import electrosphere.entity.state.attack.ServerAttackTree.AttackTreeState;
 import electrosphere.entity.state.idle.IdleTree.IdleTreeState;
@@ -11,6 +10,7 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.parser.net.message.SynchronizationMessage;

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

@@ -5,7 +5,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.equip.EquipState;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.game.data.creature.type.equip.EquipPoint;

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

@@ -5,7 +5,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.equip.EquipState;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.game.data.creature.type.equip.EquipPoint;

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

@@ -5,7 +5,7 @@ import org.joml.Vector3f;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.types.camera.CameraEntityUtils;
 
 public class IronSightTree implements BehaviorTree {

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

@@ -8,7 +8,7 @@ import electrosphere.engine.Globals;
 import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.game.data.creature.type.CreatureType;
 import electrosphere.game.data.creature.type.HealthSystem;

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

@@ -12,7 +12,7 @@ import electrosphere.engine.Globals;
 import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.collidable.Impulse;
 import electrosphere.entity.types.camera.CameraEntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;

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

@@ -5,7 +5,7 @@ import org.joml.Quaternionf;
 
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 
 public class ApplyRotationTree implements BehaviorTree {
     

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

@@ -3,7 +3,7 @@ package electrosphere.entity.state.movement;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.renderer.actor.Actor;
 
 public class FallTree implements BehaviorTree {

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

@@ -6,7 +6,7 @@ import electrosphere.collision.collidable.Collidable;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.collidable.Impulse;
 import electrosphere.entity.state.gravity.GravityUtils;
 import electrosphere.entity.types.collision.CollisionObjUtils;

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

@@ -7,7 +7,7 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
 
 public class ProjectileTree implements BehaviorTree {

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

@@ -3,7 +3,7 @@ package electrosphere.entity.state.movement;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.renderer.actor.Actor;
 
 public class ServerFallTree implements BehaviorTree {

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

@@ -6,7 +6,7 @@ import electrosphere.collision.collidable.Collidable;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.collidable.Impulse;
 import electrosphere.entity.state.gravity.GravityUtils;
 import electrosphere.entity.types.collision.CollisionObjUtils;

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

@@ -2,7 +2,7 @@ package electrosphere.entity.state.movement;
 
 import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree;
 import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree.MovementTreeState;
 

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

@@ -2,7 +2,7 @@ package electrosphere.entity.state.movement;
 
 import electrosphere.engine.Main;
 import electrosphere.entity.Entity;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.movement.groundmove.GroundMovementTree;
 import electrosphere.entity.state.movement.groundmove.GroundMovementTree.MovementTreeState;
 

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

@@ -13,7 +13,7 @@ import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.attack.AttackTree;
 import electrosphere.entity.state.attack.AttackTree.AttackTreeState;
 import electrosphere.entity.state.movement.FallTree;

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

@@ -12,7 +12,7 @@ import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.attack.ServerAttackTree;
 import electrosphere.entity.state.attack.ServerAttackTree.AttackTreeState;
 import electrosphere.entity.state.movement.ServerFallTree;

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

@@ -12,7 +12,7 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.view.ViewUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.renderer.actor.Actor;

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

@@ -12,7 +12,7 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.view.ViewUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.renderer.actor.Actor;

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

@@ -5,7 +5,7 @@ import electrosphere.entity.Entity;
 import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 
 import org.joml.Matrix4f;
 import org.joml.Quaternionf;

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

@@ -18,7 +18,7 @@ import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityTags;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.attack.AttackTree;
 import electrosphere.entity.state.attack.ServerAttackTree;
 import electrosphere.entity.state.attack.ShooterTree;

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

@@ -16,7 +16,7 @@ import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityTags;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.collidable.ClientCollidableTree;
 import electrosphere.entity.state.collidable.ServerCollidableTree;
 import electrosphere.entity.state.gravity.ClientGravityTree;

src/main/java/electrosphere/entity/types/tree/ProceduralTree.java

@@ -28,7 +28,7 @@ import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityTags;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.instance.InstanceTemplate;
 import electrosphere.entity.types.instance.InstancedEntityUtils;

src/main/java/electrosphere/server/datacell/utils/ServerBehaviorTreeUtils.java

@@ -6,7 +6,7 @@ import java.util.Map;
 import java.util.Set;
 
 import electrosphere.entity.Entity;
-import electrosphere.entity.state.BehaviorTree;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.server.datacell.ServerDataCell;
 
 /**

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

@@ -8,8 +8,8 @@ import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityTags;
 import electrosphere.entity.EntityUtils;
+import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.scene.EntityDescriptor;
-import electrosphere.entity.state.BehaviorTree;
 import electrosphere.entity.state.ParticleTree;
 import electrosphere.entity.state.attack.AttackTree;
 import electrosphere.entity.state.collidable.ClientCollidableTree;