diff --git a/src/main/java/electrosphere/controls/ControlHandler.java b/src/main/java/electrosphere/controls/ControlHandler.java index 06d13aa1..e2840c9e 100644 --- a/src/main/java/electrosphere/controls/ControlHandler.java +++ b/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; diff --git a/src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java b/src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java index 7e38a03b..7849de46 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/Scene.java b/src/main/java/electrosphere/entity/Scene.java index a9da56e0..2bc49cb8 100644 --- a/src/main/java/electrosphere/entity/Scene.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/BehaviorTree.java b/src/main/java/electrosphere/entity/btree/BehaviorTree.java similarity index 86% rename from src/main/java/electrosphere/entity/state/BehaviorTree.java rename to src/main/java/electrosphere/entity/btree/BehaviorTree.java index 9ffd78d1..d1f233f9 100644 --- a/src/main/java/electrosphere/entity/state/BehaviorTree.java +++ b/src/main/java/electrosphere/entity/btree/BehaviorTree.java @@ -1,4 +1,4 @@ -package electrosphere.entity.state; +package electrosphere.entity.btree; /** * A behavior tree diff --git a/src/main/java/electrosphere/entity/state/ParticleTree.java b/src/main/java/electrosphere/entity/state/ParticleTree.java index 8a070be3..55ccb1dc 100644 --- a/src/main/java/electrosphere/entity/state/ParticleTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/ambientaudio/ClientAmbientAudioTree.java b/src/main/java/electrosphere/entity/state/ambientaudio/ClientAmbientAudioTree.java index 8e9c7379..b44a36f2 100644 --- a/src/main/java/electrosphere/entity/state/ambientaudio/ClientAmbientAudioTree.java +++ b/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; /** diff --git a/src/main/java/electrosphere/entity/state/attack/AttackTree.java b/src/main/java/electrosphere/entity/state/attack/AttackTree.java index 252045a3..12b11bc0 100644 --- a/src/main/java/electrosphere/entity/state/attack/AttackTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java index ed9275dc..a135b8e0 100644 --- a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/attack/ShooterTree.java b/src/main/java/electrosphere/entity/state/attack/ShooterTree.java index 0fd22dce..3ecd12c5 100644 --- a/src/main/java/electrosphere/entity/state/attack/ShooterTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/collidable/ClientCollidableTree.java b/src/main/java/electrosphere/entity/state/collidable/ClientCollidableTree.java index 8d27aa31..6c260f3c 100644 --- a/src/main/java/electrosphere/entity/state/collidable/ClientCollidableTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/collidable/ServerCollidableTree.java b/src/main/java/electrosphere/entity/state/collidable/ServerCollidableTree.java index e0dd3909..912c230c 100644 --- a/src/main/java/electrosphere/entity/state/collidable/ServerCollidableTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/foliage/AmbientFoliage.java b/src/main/java/electrosphere/entity/state/foliage/AmbientFoliage.java index d6e54979..5819f378 100644 --- a/src/main/java/electrosphere/entity/state/foliage/AmbientFoliage.java +++ b/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; /** diff --git a/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java b/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java index 6ce57495..712e3921 100644 --- a/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java b/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java index f60d167b..f5749639 100644 --- a/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/idle/IdleTree.java b/src/main/java/electrosphere/entity/state/idle/IdleTree.java index d2baaf2f..534bea6c 100644 --- a/src/main/java/electrosphere/entity/state/idle/IdleTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java b/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java index 1efb3ce6..5fc63333 100644 --- a/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/inventory/InventoryState.java b/src/main/java/electrosphere/entity/state/inventory/InventoryState.java index 84f20bbd..67be7703 100644 --- a/src/main/java/electrosphere/entity/state/inventory/InventoryState.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/inventory/ServerInventoryState.java b/src/main/java/electrosphere/entity/state/inventory/ServerInventoryState.java index eaa81d9d..e858532e 100644 --- a/src/main/java/electrosphere/entity/state/inventory/ServerInventoryState.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/ironsight/IronSightTree.java b/src/main/java/electrosphere/entity/state/ironsight/IronSightTree.java index af110909..6207052d 100644 --- a/src/main/java/electrosphere/entity/state/ironsight/IronSightTree.java +++ b/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 { diff --git a/src/main/java/electrosphere/entity/state/life/LifeState.java b/src/main/java/electrosphere/entity/state/life/LifeState.java index 28020df8..cd941316 100644 --- a/src/main/java/electrosphere/entity/state/life/LifeState.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/movement/AirplaneMovementTree.java b/src/main/java/electrosphere/entity/state/movement/AirplaneMovementTree.java index c87f645c..573ba9a8 100644 --- a/src/main/java/electrosphere/entity/state/movement/AirplaneMovementTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/movement/ApplyRotationTree.java b/src/main/java/electrosphere/entity/state/movement/ApplyRotationTree.java index 4222bc3d..b6537bca 100644 --- a/src/main/java/electrosphere/entity/state/movement/ApplyRotationTree.java +++ b/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 { diff --git a/src/main/java/electrosphere/entity/state/movement/FallTree.java b/src/main/java/electrosphere/entity/state/movement/FallTree.java index 61b6e50d..ef80367d 100644 --- a/src/main/java/electrosphere/entity/state/movement/FallTree.java +++ b/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 { diff --git a/src/main/java/electrosphere/entity/state/movement/JumpTree.java b/src/main/java/electrosphere/entity/state/movement/JumpTree.java index 22c74ce5..9af87117 100644 --- a/src/main/java/electrosphere/entity/state/movement/JumpTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/movement/ProjectileTree.java b/src/main/java/electrosphere/entity/state/movement/ProjectileTree.java index 341d68bd..95b99e03 100644 --- a/src/main/java/electrosphere/entity/state/movement/ProjectileTree.java +++ b/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 { diff --git a/src/main/java/electrosphere/entity/state/movement/ServerFallTree.java b/src/main/java/electrosphere/entity/state/movement/ServerFallTree.java index ba589cc8..4af60a03 100644 --- a/src/main/java/electrosphere/entity/state/movement/ServerFallTree.java +++ b/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 { diff --git a/src/main/java/electrosphere/entity/state/movement/ServerJumpTree.java b/src/main/java/electrosphere/entity/state/movement/ServerJumpTree.java index 02abd935..62311330 100644 --- a/src/main/java/electrosphere/entity/state/movement/ServerJumpTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/movement/ServerSprintTree.java b/src/main/java/electrosphere/entity/state/movement/ServerSprintTree.java index 80e4ad40..ff7e6ef5 100644 --- a/src/main/java/electrosphere/entity/state/movement/ServerSprintTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/movement/SprintTree.java b/src/main/java/electrosphere/entity/state/movement/SprintTree.java index d87c61ea..799229d4 100644 --- a/src/main/java/electrosphere/entity/state/movement/SprintTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/movement/groundmove/GroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/groundmove/GroundMovementTree.java index 6d28c9b2..58235b37 100644 --- a/src/main/java/electrosphere/entity/state/movement/groundmove/GroundMovementTree.java +++ b/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; 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 6c39f618..067389fb 100644 --- a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/rotator/RotatorTree.java b/src/main/java/electrosphere/entity/state/rotator/RotatorTree.java index 9e8242f2..1947cb88 100644 --- a/src/main/java/electrosphere/entity/state/rotator/RotatorTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/rotator/ServerRotatorTree.java b/src/main/java/electrosphere/entity/state/rotator/ServerRotatorTree.java index 01655589..3c5d9768 100644 --- a/src/main/java/electrosphere/entity/state/rotator/ServerRotatorTree.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/types/camera/CameraEntityUtils.java b/src/main/java/electrosphere/entity/types/camera/CameraEntityUtils.java index 93027fb6..1e323e2e 100644 --- a/src/main/java/electrosphere/entity/types/camera/CameraEntityUtils.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java b/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java index d75ba883..72f8e285 100644 --- a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/types/object/ObjectUtils.java b/src/main/java/electrosphere/entity/types/object/ObjectUtils.java index b952ff4f..d69a3faa 100644 --- a/src/main/java/electrosphere/entity/types/object/ObjectUtils.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java b/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java index 1145bab2..fe8800db 100644 --- a/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java +++ b/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; diff --git a/src/main/java/electrosphere/server/datacell/utils/ServerBehaviorTreeUtils.java b/src/main/java/electrosphere/server/datacell/utils/ServerBehaviorTreeUtils.java index 9dc9fa32..06ba0856 100644 --- a/src/main/java/electrosphere/server/datacell/utils/ServerBehaviorTreeUtils.java +++ b/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; /** diff --git a/src/main/java/electrosphere/server/simulation/MicroSimulation.java b/src/main/java/electrosphere/server/simulation/MicroSimulation.java index 6321c4d0..59e4470e 100644 --- a/src/main/java/electrosphere/server/simulation/MicroSimulation.java +++ b/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;