From e8601b78c747cebc5cddea663900116d215e8c22 Mon Sep 17 00:00:00 2001
From: austin <austin@austinhoover.net>
Date: Thu, 15 May 2025 13:32:30 -0400
Subject: [PATCH] entity tracking to serverState

---
 docs/src/progress/renderertodo.md                         | 1 +
 src/main/java/electrosphere/engine/Globals.java           | 8 --------
 .../entity/state/attack/ClientAttackTree.java             | 4 ++--
 .../entity/state/attack/ServerAttackTree.java             | 4 ++--
 .../electrosphere/entity/state/block/ClientBlockTree.java | 4 ++--
 .../electrosphere/entity/state/block/ServerBlockTree.java | 4 ++--
 .../entity/state/equip/ClientEquipState.java              | 4 ++--
 .../entity/state/equip/ClientToolbarState.java            | 4 ++--
 .../entity/state/equip/ServerEquipState.java              | 4 ++--
 .../entity/state/equip/ServerToolbarState.java            | 4 ++--
 .../entity/state/furniture/ClientDoorState.java           | 4 ++--
 .../entity/state/furniture/ServerDoorState.java           | 4 ++--
 .../entity/state/gravity/ClientGravityTree.java           | 4 ++--
 .../entity/state/gravity/ServerGravityTree.java           | 4 ++--
 .../entity/state/growth/ClientGrowthComponent.java        | 4 ++--
 .../entity/state/growth/ServerGrowthComponent.java        | 4 ++--
 .../electrosphere/entity/state/idle/ClientIdleTree.java   | 4 ++--
 .../electrosphere/entity/state/idle/ServerIdleTree.java   | 4 ++--
 .../entity/state/item/ClientChargeState.java              | 4 ++--
 .../entity/state/item/ServerChargeState.java              | 4 ++--
 .../electrosphere/entity/state/life/ClientLifeTree.java   | 4 ++--
 .../electrosphere/entity/state/life/ServerLifeTree.java   | 4 ++--
 .../state/movement/editor/ClientEditorMovementTree.java   | 4 ++--
 .../state/movement/editor/ServerEditorMovementTree.java   | 4 ++--
 .../movement/groundmove/ClientGroundMovementTree.java     | 4 ++--
 .../movement/groundmove/ServerGroundMovementTree.java     | 4 ++--
 .../entity/state/movement/jump/ClientJumpTree.java        | 4 ++--
 .../entity/state/movement/jump/ServerJumpTree.java        | 4 ++--
 .../entity/state/movement/sprint/ClientSprintTree.java    | 4 ++--
 .../entity/state/movement/sprint/ServerSprintTree.java    | 4 ++--
 .../entity/state/movement/walk/ClientWalkTree.java        | 4 ++--
 .../entity/state/movement/walk/ServerWalkTree.java        | 4 ++--
 .../entity/state/stance/ClientStanceComponent.java        | 4 ++--
 .../entity/state/stance/ServerStanceComponent.java        | 4 ++--
 .../net/synchronization/transport/StateCollection.java    | 4 ++--
 src/main/java/electrosphere/server/ServerState.java       | 6 ++++++
 36 files changed, 73 insertions(+), 74 deletions(-)

diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md
index d882377d..c8dfb345 100644
--- a/docs/src/progress/renderertodo.md
+++ b/docs/src/progress/renderertodo.md
@@ -1814,6 +1814,7 @@ Move lots of global state to clientState
 Create ServerState global
 Move realmManager to serverState
 Move characterService to serverState
+Move entityValueTrackingService to serverState
 
 
 
diff --git a/src/main/java/electrosphere/engine/Globals.java b/src/main/java/electrosphere/engine/Globals.java
index 1c4b0c0e..6944be1d 100644
--- a/src/main/java/electrosphere/engine/Globals.java
+++ b/src/main/java/electrosphere/engine/Globals.java
@@ -42,7 +42,6 @@ import electrosphere.logger.LoggerInterface;
 import electrosphere.net.config.NetConfig;
 import electrosphere.net.monitor.NetMonitor;
 import electrosphere.net.server.player.PlayerManager;
-import electrosphere.net.synchronization.server.EntityValueTrackingService;
 import electrosphere.renderer.RenderUtils;
 import electrosphere.renderer.RenderingEngine;
 import electrosphere.renderer.actor.instance.InstanceManager;
@@ -195,11 +194,6 @@ public class Globals {
     //Camera handler stuff
     //
     public static CameraHandler cameraHandler = new CameraHandler();
-
-    //
-    //behavior tree tracking service
-    //
-    public static EntityValueTrackingService entityValueTrackingService;
     
     //
     //Player manager
@@ -425,8 +419,6 @@ public class Globals {
         Globals.clientState.clientSelectedVoxelType = (VoxelType)gameConfigCurrent.getVoxelData().getTypes().toArray()[1];
         //player manager
         playerManager = new PlayerManager();
-        //behavior tree tracking service
-        entityValueTrackingService = new EntityValueTrackingService();
         //net monitor
         if(Globals.userSettings.getNetRunNetMonitor()){
             netMonitor = new NetMonitor();
diff --git a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java
index 6b4e14aa..920949c2 100644
--- a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java
+++ b/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java
@@ -637,7 +637,7 @@ public class ClientAttackTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_CLIENTATTACKTREE, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTATTACKTREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTATTACKTREE_ID);
         return rVal;
     }
 
@@ -650,7 +650,7 @@ public class ClientAttackTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTATTACKTREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTATTACKTREE_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java
index ca123dd7..3d72c334 100644
--- a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java
+++ b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java
@@ -718,7 +718,7 @@ public class ServerAttackTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVERATTACKTREE, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERATTACKTREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERATTACKTREE_ID);
         return rVal;
     }
 
@@ -731,7 +731,7 @@ public class ServerAttackTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERATTACKTREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERATTACKTREE_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java b/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java
index a66bbf4b..b2185c17 100644
--- a/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java
+++ b/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java
@@ -203,7 +203,7 @@ public class ClientBlockTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_CLIENTBLOCKTREE, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTBLOCKTREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTBLOCKTREE_ID);
         return rVal;
     }
     /**
@@ -215,7 +215,7 @@ public class ClientBlockTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTBLOCKTREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTBLOCKTREE_ID);
     }
     /**
      * <p>
diff --git a/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java b/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java
index b962e82c..10dbe65a 100644
--- a/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java
+++ b/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java
@@ -213,7 +213,7 @@ public class ServerBlockTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVERBLOCKTREE, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERBLOCKTREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERBLOCKTREE_ID);
         return rVal;
     }
     /**
@@ -225,7 +225,7 @@ public class ServerBlockTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERBLOCKTREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERBLOCKTREE_ID);
     }
     /**
      * <p>
diff --git a/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java b/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java
index 297b77c1..bbf85944 100644
--- a/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java
+++ b/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java
@@ -480,7 +480,7 @@ public class ClientEquipState implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_CLIENTEQUIPSTATE, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTEQUIPSTATE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTEQUIPSTATE_ID);
         return rVal;
     }
     /**
@@ -492,7 +492,7 @@ public class ClientEquipState implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTEQUIPSTATE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTEQUIPSTATE_ID);
     }
     /**
      * <p>
diff --git a/src/main/java/electrosphere/entity/state/equip/ClientToolbarState.java b/src/main/java/electrosphere/entity/state/equip/ClientToolbarState.java
index 0d8e78dd..34883036 100644
--- a/src/main/java/electrosphere/entity/state/equip/ClientToolbarState.java
+++ b/src/main/java/electrosphere/entity/state/equip/ClientToolbarState.java
@@ -330,7 +330,7 @@ public class ClientToolbarState implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_CLIENTTOOLBARSTATE, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTTOOLBARSTATE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTTOOLBARSTATE_ID);
         return rVal;
     }
 
@@ -343,7 +343,7 @@ public class ClientToolbarState implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTTOOLBARSTATE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTTOOLBARSTATE_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java b/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java
index f0db2d64..cccfafc6 100644
--- a/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java
+++ b/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java
@@ -479,7 +479,7 @@ public class ServerEquipState implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVEREQUIPSTATE, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVEREQUIPSTATE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVEREQUIPSTATE_ID);
         return rVal;
     }
     /**
@@ -491,7 +491,7 @@ public class ServerEquipState implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVEREQUIPSTATE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVEREQUIPSTATE_ID);
     }
     /**
      * <p>
diff --git a/src/main/java/electrosphere/entity/state/equip/ServerToolbarState.java b/src/main/java/electrosphere/entity/state/equip/ServerToolbarState.java
index b8ac42f0..ee9cdbf2 100644
--- a/src/main/java/electrosphere/entity/state/equip/ServerToolbarState.java
+++ b/src/main/java/electrosphere/entity/state/equip/ServerToolbarState.java
@@ -375,7 +375,7 @@ public class ServerToolbarState implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVERTOOLBARSTATE, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERTOOLBARSTATE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERTOOLBARSTATE_ID);
         return rVal;
     }
 
@@ -388,7 +388,7 @@ public class ServerToolbarState implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERTOOLBARSTATE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERTOOLBARSTATE_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/furniture/ClientDoorState.java b/src/main/java/electrosphere/entity/state/furniture/ClientDoorState.java
index c00cb96e..00ef44f0 100644
--- a/src/main/java/electrosphere/entity/state/furniture/ClientDoorState.java
+++ b/src/main/java/electrosphere/entity/state/furniture/ClientDoorState.java
@@ -134,7 +134,7 @@ public class ClientDoorState implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_CLIENTDOOR, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTDOOR_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTDOOR_ID);
         return rVal;
     }
 
@@ -147,7 +147,7 @@ public class ClientDoorState implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTDOOR_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTDOOR_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/furniture/ServerDoorState.java b/src/main/java/electrosphere/entity/state/furniture/ServerDoorState.java
index 055393f2..af6d5fd0 100644
--- a/src/main/java/electrosphere/entity/state/furniture/ServerDoorState.java
+++ b/src/main/java/electrosphere/entity/state/furniture/ServerDoorState.java
@@ -131,7 +131,7 @@ public class ServerDoorState implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVERDOOR, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERDOOR_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERDOOR_ID);
         return rVal;
     }
 
@@ -144,7 +144,7 @@ public class ServerDoorState implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERDOOR_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERDOOR_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java b/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java
index bbc679eb..8fda34b6 100644
--- a/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java
+++ b/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java
@@ -167,7 +167,7 @@ public class ClientGravityTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_CLIENTGRAVITY, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTGRAVITY_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTGRAVITY_ID);
         return rVal;
     }
     /**
@@ -179,7 +179,7 @@ public class ClientGravityTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTGRAVITY_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTGRAVITY_ID);
     }
     /**
      * <p>
diff --git a/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java b/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java
index d26a2547..7d444597 100644
--- a/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java
+++ b/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java
@@ -196,7 +196,7 @@ public class ServerGravityTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVERGRAVITY, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERGRAVITY_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERGRAVITY_ID);
         return rVal;
     }
     /**
@@ -208,7 +208,7 @@ public class ServerGravityTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERGRAVITY_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERGRAVITY_ID);
     }
     /**
      * <p>
diff --git a/src/main/java/electrosphere/entity/state/growth/ClientGrowthComponent.java b/src/main/java/electrosphere/entity/state/growth/ClientGrowthComponent.java
index 76c40443..40bdc885 100644
--- a/src/main/java/electrosphere/entity/state/growth/ClientGrowthComponent.java
+++ b/src/main/java/electrosphere/entity/state/growth/ClientGrowthComponent.java
@@ -66,7 +66,7 @@ public class ClientGrowthComponent implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_CLIENTGROWTH, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTGROWTH_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTGROWTH_ID);
         return rVal;
     }
 
@@ -79,7 +79,7 @@ public class ClientGrowthComponent implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTGROWTH_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTGROWTH_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/growth/ServerGrowthComponent.java b/src/main/java/electrosphere/entity/state/growth/ServerGrowthComponent.java
index 371bc7b7..2b3cf06e 100644
--- a/src/main/java/electrosphere/entity/state/growth/ServerGrowthComponent.java
+++ b/src/main/java/electrosphere/entity/state/growth/ServerGrowthComponent.java
@@ -90,7 +90,7 @@ public class ServerGrowthComponent implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVERGROWTH, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERGROWTH_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERGROWTH_ID);
         return rVal;
     }
 
@@ -103,7 +103,7 @@ public class ServerGrowthComponent implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERGROWTH_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERGROWTH_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java b/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java
index 8dc6a579..58131d2e 100644
--- a/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java
+++ b/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java
@@ -123,7 +123,7 @@ public class ClientIdleTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_IDLE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_IDLE_ID);
     }
 
     /**
@@ -141,7 +141,7 @@ public class ClientIdleTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_IDLE, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_IDLE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_IDLE_ID);
         return rVal;
     }
     /**
diff --git a/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java b/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java
index 260bdf8c..af5315b2 100644
--- a/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java
+++ b/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java
@@ -176,7 +176,7 @@ public class ServerIdleTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVERIDLE, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERIDLE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERIDLE_ID);
         return rVal;
     }
 
@@ -189,7 +189,7 @@ public class ServerIdleTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERIDLE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERIDLE_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/item/ClientChargeState.java b/src/main/java/electrosphere/entity/state/item/ClientChargeState.java
index 6f0a1163..09221fd9 100644
--- a/src/main/java/electrosphere/entity/state/item/ClientChargeState.java
+++ b/src/main/java/electrosphere/entity/state/item/ClientChargeState.java
@@ -58,7 +58,7 @@ public class ClientChargeState implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_CLIENTCHARGESTATE, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTCHARGESTATE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTCHARGESTATE_ID);
         return rVal;
     }
 
@@ -71,7 +71,7 @@ public class ClientChargeState implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTCHARGESTATE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTCHARGESTATE_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/item/ServerChargeState.java b/src/main/java/electrosphere/entity/state/item/ServerChargeState.java
index 388c4a3b..5148ba02 100644
--- a/src/main/java/electrosphere/entity/state/item/ServerChargeState.java
+++ b/src/main/java/electrosphere/entity/state/item/ServerChargeState.java
@@ -108,7 +108,7 @@ public class ServerChargeState implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVERCHARGESTATE, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERCHARGESTATE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERCHARGESTATE_ID);
         return rVal;
     }
 
@@ -121,7 +121,7 @@ public class ServerChargeState implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERCHARGESTATE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERCHARGESTATE_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java b/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java
index 6e030558..67dbf34f 100644
--- a/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java
+++ b/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java
@@ -86,7 +86,7 @@ public class ClientLifeTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_CLIENTLIFETREE, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTLIFETREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTLIFETREE_ID);
         return rVal;
     }
 
@@ -99,7 +99,7 @@ public class ClientLifeTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTLIFETREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTLIFETREE_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java b/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java
index 85f8f2bd..d175d241 100644
--- a/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java
+++ b/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java
@@ -316,7 +316,7 @@ public class ServerLifeTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVERLIFETREE, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERLIFETREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERLIFETREE_ID);
         return rVal;
     }
 
@@ -329,7 +329,7 @@ public class ServerLifeTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERLIFETREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERLIFETREE_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/movement/editor/ClientEditorMovementTree.java b/src/main/java/electrosphere/entity/state/movement/editor/ClientEditorMovementTree.java
index 994a597f..1ddfc11e 100644
--- a/src/main/java/electrosphere/entity/state/movement/editor/ClientEditorMovementTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/editor/ClientEditorMovementTree.java
@@ -525,7 +525,7 @@ public class ClientEditorMovementTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_CLIENTEDITORMOVEMENTTREE, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTEDITORMOVEMENTTREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTEDITORMOVEMENTTREE_ID);
         return rVal;
     }
 
@@ -538,7 +538,7 @@ public class ClientEditorMovementTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTEDITORMOVEMENTTREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTEDITORMOVEMENTTREE_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/movement/editor/ServerEditorMovementTree.java b/src/main/java/electrosphere/entity/state/movement/editor/ServerEditorMovementTree.java
index 26cc234f..644b878c 100644
--- a/src/main/java/electrosphere/entity/state/movement/editor/ServerEditorMovementTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/editor/ServerEditorMovementTree.java
@@ -507,7 +507,7 @@ public class ServerEditorMovementTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVEREDITORMOVEMENTTREE, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVEREDITORMOVEMENTTREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVEREDITORMOVEMENTTREE_ID);
         return rVal;
     }
 
@@ -520,7 +520,7 @@ public class ServerEditorMovementTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVEREDITORMOVEMENTTREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVEREDITORMOVEMENTTREE_ID);
     }
 
     /**
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 53e180fc..cf3da67e 100644
--- a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
@@ -821,7 +821,7 @@ public class ClientGroundMovementTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_CLIENTGROUNDMOVEMENTTREE, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTGROUNDMOVEMENTTREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTGROUNDMOVEMENTTREE_ID);
         return rVal;
     }
 
@@ -834,7 +834,7 @@ public class ClientGroundMovementTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTGROUNDMOVEMENTTREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTGROUNDMOVEMENTTREE_ID);
     }
 
     /**
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 0bcf46f5..0c253182 100644
--- a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java
@@ -820,7 +820,7 @@ public class ServerGroundMovementTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVERGROUNDMOVEMENTTREE, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERGROUNDMOVEMENTTREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERGROUNDMOVEMENTTREE_ID);
         return rVal;
     }
 
@@ -833,7 +833,7 @@ public class ServerGroundMovementTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERGROUNDMOVEMENTTREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERGROUNDMOVEMENTTREE_ID);
     }
 
     /**
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 24e7b815..b1a8b5e4 100644
--- a/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java
@@ -192,7 +192,7 @@ public class ClientJumpTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_CLIENTJUMPTREE, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTJUMPTREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTJUMPTREE_ID);
         return rVal;
     }
 
@@ -205,7 +205,7 @@ public class ClientJumpTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTJUMPTREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTJUMPTREE_ID);
     }
 
     /**
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 65be6826..16aa64de 100644
--- a/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java
@@ -176,7 +176,7 @@ public class ServerJumpTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVERJUMPTREE, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERJUMPTREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERJUMPTREE_ID);
         return rVal;
     }
 
@@ -189,7 +189,7 @@ public class ServerJumpTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERJUMPTREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERJUMPTREE_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java b/src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java
index 5dc74457..d0ff1d2c 100644
--- a/src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java
@@ -124,7 +124,7 @@ public class ClientSprintTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_CLIENTSPRINTTREE, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTSPRINTTREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTSPRINTTREE_ID);
         return rVal;
     }
 
@@ -137,7 +137,7 @@ public class ClientSprintTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTSPRINTTREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTSPRINTTREE_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/movement/sprint/ServerSprintTree.java b/src/main/java/electrosphere/entity/state/movement/sprint/ServerSprintTree.java
index 29281ce3..fab84437 100644
--- a/src/main/java/electrosphere/entity/state/movement/sprint/ServerSprintTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/sprint/ServerSprintTree.java
@@ -154,7 +154,7 @@ public class ServerSprintTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVERSPRINTTREE, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERSPRINTTREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERSPRINTTREE_ID);
         return rVal;
     }
 
@@ -167,7 +167,7 @@ public class ServerSprintTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERSPRINTTREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERSPRINTTREE_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/movement/walk/ClientWalkTree.java b/src/main/java/electrosphere/entity/state/movement/walk/ClientWalkTree.java
index ce52daab..1472f004 100644
--- a/src/main/java/electrosphere/entity/state/movement/walk/ClientWalkTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/walk/ClientWalkTree.java
@@ -92,7 +92,7 @@ public class ClientWalkTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_CLIENTWALKTREE, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTWALKTREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTWALKTREE_ID);
         return rVal;
     }
 
@@ -105,7 +105,7 @@ public class ClientWalkTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTWALKTREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTWALKTREE_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/movement/walk/ServerWalkTree.java b/src/main/java/electrosphere/entity/state/movement/walk/ServerWalkTree.java
index 04b33fa7..4296c26c 100644
--- a/src/main/java/electrosphere/entity/state/movement/walk/ServerWalkTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/walk/ServerWalkTree.java
@@ -107,7 +107,7 @@ public class ServerWalkTree implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVERWALKTREE, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERWALKTREE_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERWALKTREE_ID);
         return rVal;
     }
 
@@ -120,7 +120,7 @@ public class ServerWalkTree implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERWALKTREE_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERWALKTREE_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/stance/ClientStanceComponent.java b/src/main/java/electrosphere/entity/state/stance/ClientStanceComponent.java
index a3ed1861..cef9fb19 100644
--- a/src/main/java/electrosphere/entity/state/stance/ClientStanceComponent.java
+++ b/src/main/java/electrosphere/entity/state/stance/ClientStanceComponent.java
@@ -62,7 +62,7 @@ public class ClientStanceComponent implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         parent.putData(EntityDataStrings.TREE_CLIENTSTANCECOMPONENT, rVal);
         Globals.clientState.clientSceneWrapper.getScene().registerBehaviorTree(rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTSTANCECOMPONENT_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTSTANCECOMPONENT_ID);
         return rVal;
     }
 
@@ -75,7 +75,7 @@ public class ClientStanceComponent implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTSTANCECOMPONENT_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTSTANCECOMPONENT_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/entity/state/stance/ServerStanceComponent.java b/src/main/java/electrosphere/entity/state/stance/ServerStanceComponent.java
index a8cf5160..cf01fae5 100644
--- a/src/main/java/electrosphere/entity/state/stance/ServerStanceComponent.java
+++ b/src/main/java/electrosphere/entity/state/stance/ServerStanceComponent.java
@@ -47,7 +47,7 @@ public class ServerStanceComponent implements BehaviorTree {
         //This was generated automatically to properly alert various systems that the btree exists and should be tracked
         ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);
         parent.putData(EntityDataStrings.TREE_SERVERSTANCECOMPONENT, rVal);
-        Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERSTANCECOMPONENT_ID);
+        Globals.serverState.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERSTANCECOMPONENT_ID);
         return rVal;
     }
 
@@ -60,7 +60,7 @@ public class ServerStanceComponent implements BehaviorTree {
      * @param tree The behavior tree to detach
      */
     public static void detachTree(Entity entity, BehaviorTree tree){
-        Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERSTANCECOMPONENT_ID);
+        Globals.serverState.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERSTANCECOMPONENT_ID);
     }
 
     /**
diff --git a/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java b/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java
index f4a95e4e..aa553506 100644
--- a/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java
+++ b/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java
@@ -72,7 +72,7 @@ public class StateCollection {
      * @return true if it has a state collection, false otherwise
      */
     public static boolean hasStateCollection(Entity entity){
-        return Globals.entityValueTrackingService.getEntityTrees(entity) != null;
+        return Globals.serverState.entityValueTrackingService.getEntityTrees(entity) != null;
     }
 
     /**
@@ -85,7 +85,7 @@ public class StateCollection {
      */
     public static StateCollection getStateCollection(Entity entity){
         StateCollection collection = new StateCollection();
-        for(int treeId : Globals.entityValueTrackingService.getEntityTrees(entity)){
+        for(int treeId : Globals.serverState.entityValueTrackingService.getEntityTrees(entity)){
             switch(treeId){
                 case BehaviorTreeIdEnums.BTREE_SERVERATTACKTREE_ID: {
                     ServerAttackTree tree = ServerAttackTree.getServerAttackTree(entity);
diff --git a/src/main/java/electrosphere/server/ServerState.java b/src/main/java/electrosphere/server/ServerState.java
index 5b527dcd..ded96bc9 100644
--- a/src/main/java/electrosphere/server/ServerState.java
+++ b/src/main/java/electrosphere/server/ServerState.java
@@ -1,6 +1,7 @@
 package electrosphere.server;
 
 import electrosphere.net.server.Server;
+import electrosphere.net.synchronization.server.EntityValueTrackingService;
 import electrosphere.net.synchronization.server.ServerSynchronizationManager;
 import electrosphere.server.ai.AIManager;
 import electrosphere.server.datacell.EntityDataCellMapper;
@@ -48,4 +49,9 @@ public class ServerState {
      */
     public CharacterService characterService;
 
+    /**
+     * behavior tree tracking service
+     */
+    public EntityValueTrackingService entityValueTrackingService = new EntityValueTrackingService();
+
 }