From 4aae7b68b8a18cffb1873dd033bedb3728aca7ff Mon Sep 17 00:00:00 2001 From: austin Date: Sat, 5 Apr 2025 18:41:21 -0400 Subject: [PATCH] rename editor enum to prevent codegen conflict --- docs/src/progress/renderertodo.md | 1 + .../categories/ControlCategoryMainGame.java | 28 ++--- .../editor/ClientEditorMovementTree.java | 106 +++++++++++++++--- .../editor/ServerEditorMovementTree.java | 16 +-- .../client/ClientSynchronizationManager.java | 3 +- .../transport/StateCollection.java | 5 +- 6 files changed, 116 insertions(+), 43 deletions(-) diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 0a97fe5b..eb0c341a 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1454,6 +1454,7 @@ Cursor only for specific items Added shovel (works inversely of how you would expect currently) Script cache busting on file modification Block cursor +Rename editor enum to prevent type conflict diff --git a/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java b/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java index a783f28b..03cf2d30 100644 --- a/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java +++ b/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java @@ -141,7 +141,7 @@ public class ControlCategoryMainGame { } else if(ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity) != null){ ClientEditorMovementTree clientEditorMovementTree = ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity); CreatureUtils.setFacingVector(Globals.playerEntity, CameraEntityUtils.getFacingVec(Globals.playerCamera)); - clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementRelativeFacing.FORWARD); + clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.EditorMovementRelativeFacing.FORWARD); } } }}); @@ -163,7 +163,7 @@ public class ControlCategoryMainGame { } else if(ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity) != null){ ClientEditorMovementTree clientEditorMovementTree = ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity); CreatureUtils.setFacingVector(Globals.playerEntity, CameraEntityUtils.getFacingVec(Globals.playerCamera)); - clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementRelativeFacing.FORWARD); + clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.EditorMovementRelativeFacing.FORWARD); } } }}); @@ -202,7 +202,7 @@ public class ControlCategoryMainGame { } else if(ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity) != null){ ClientEditorMovementTree clientEditorMovementTree = ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity); CreatureUtils.setFacingVector(Globals.playerEntity, CameraEntityUtils.getFacingVec(Globals.playerCamera)); - clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementRelativeFacing.BACKWARD); + clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.EditorMovementRelativeFacing.BACKWARD); } } }}); @@ -225,7 +225,7 @@ public class ControlCategoryMainGame { } else if(ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity) != null){ ClientEditorMovementTree clientEditorMovementTree = ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity); CreatureUtils.setFacingVector(Globals.playerEntity, CameraEntityUtils.getFacingVec(Globals.playerCamera)); - clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementRelativeFacing.BACKWARD); + clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.EditorMovementRelativeFacing.BACKWARD); } } }}); @@ -262,7 +262,7 @@ public class ControlCategoryMainGame { Vector3d cameraEyeVector = CameraEntityUtils.getCameraEye(Globals.playerCamera); ClientEditorMovementTree clientEditorMovementTree = ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity); CreatureUtils.setFacingVector(Globals.playerEntity, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(Math.PI/2.0).normalize()); - clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementRelativeFacing.FORWARD); + clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.EditorMovementRelativeFacing.FORWARD); } } }}); @@ -283,7 +283,7 @@ public class ControlCategoryMainGame { Vector3d cameraEyeVector = CameraEntityUtils.getCameraEye(Globals.playerCamera); ClientEditorMovementTree clientEditorMovementTree = ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity); CreatureUtils.setFacingVector(Globals.playerEntity, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(Math.PI/2.0).normalize()); - clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementRelativeFacing.FORWARD); + clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.EditorMovementRelativeFacing.FORWARD); } } }}); @@ -320,7 +320,7 @@ public class ControlCategoryMainGame { Vector3d cameraEyeVector = CameraEntityUtils.getCameraEye(Globals.playerCamera); ClientEditorMovementTree clientEditorMovementTree = ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity); CreatureUtils.setFacingVector(Globals.playerEntity, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(-Math.PI/2.0).normalize()); - clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementRelativeFacing.FORWARD); + clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.EditorMovementRelativeFacing.FORWARD); } } }}); @@ -341,7 +341,7 @@ public class ControlCategoryMainGame { Vector3d cameraEyeVector = CameraEntityUtils.getCameraEye(Globals.playerCamera); ClientEditorMovementTree clientEditorMovementTree = ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity); CreatureUtils.setFacingVector(Globals.playerEntity, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(-Math.PI/2.0).normalize()); - clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementRelativeFacing.FORWARD); + clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.EditorMovementRelativeFacing.FORWARD); } } }}); @@ -386,7 +386,7 @@ public class ControlCategoryMainGame { } else if(ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity) != null){ ClientEditorMovementTree clientEditorMovementTree = ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity); CreatureUtils.setFacingVector(Globals.playerEntity, CameraEntityUtils.getFacingVec(Globals.playerCamera)); - clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementRelativeFacing.LEFT); + clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.EditorMovementRelativeFacing.LEFT); } } }}); @@ -406,7 +406,7 @@ public class ControlCategoryMainGame { } else if(ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity) != null){ ClientEditorMovementTree clientEditorMovementTree = ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity); CreatureUtils.setFacingVector(Globals.playerEntity, CameraEntityUtils.getFacingVec(Globals.playerCamera)); - clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementRelativeFacing.LEFT); + clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.EditorMovementRelativeFacing.LEFT); } } }}); @@ -442,7 +442,7 @@ public class ControlCategoryMainGame { } else if(ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity) != null){ ClientEditorMovementTree clientEditorMovementTree = ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity); CreatureUtils.setFacingVector(Globals.playerEntity, CameraEntityUtils.getFacingVec(Globals.playerCamera)); - clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementRelativeFacing.RIGHT); + clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.EditorMovementRelativeFacing.RIGHT); } } }}); @@ -462,7 +462,7 @@ public class ControlCategoryMainGame { } else if(ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity) != null){ ClientEditorMovementTree clientEditorMovementTree = ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity); CreatureUtils.setFacingVector(Globals.playerEntity, CameraEntityUtils.getFacingVec(Globals.playerCamera)); - clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementRelativeFacing.RIGHT); + clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.EditorMovementRelativeFacing.RIGHT); } } }}); @@ -490,7 +490,7 @@ public class ControlCategoryMainGame { jumpTree.start(); } else if(ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity) != null){ ClientEditorMovementTree clientEditorMovementTree = ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity); - clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementRelativeFacing.UP); + clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.EditorMovementRelativeFacing.UP); } } }}); @@ -510,7 +510,7 @@ public class ControlCategoryMainGame { if(Globals.playerEntity != null){ if(ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity) != null){ ClientEditorMovementTree clientEditorMovementTree = ClientEditorMovementTree.getClientEditorMovementTree(Globals.playerEntity); - clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementRelativeFacing.DOWN); + clientEditorMovementTree.start(electrosphere.entity.state.movement.editor.ClientEditorMovementTree.EditorMovementRelativeFacing.DOWN); } } }}); 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 7b0502f2..ae68b8d0 100644 --- a/src/main/java/electrosphere/entity/state/movement/editor/ClientEditorMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/editor/ClientEditorMovementTree.java @@ -51,7 +51,7 @@ public class ClientEditorMovementTree implements BehaviorTree { * (ie is it strafing, moveing straight forward, backpedaling, etc) */ @SynchronizableEnum - public static enum MovementRelativeFacing { + public static enum EditorMovementRelativeFacing { FORWARD, LEFT, RIGHT, @@ -82,7 +82,7 @@ public class ClientEditorMovementTree implements BehaviorTree { MovementTreeState state; @SyncedField - MovementRelativeFacing facing = MovementRelativeFacing.FORWARD; + EditorMovementRelativeFacing facing = EditorMovementRelativeFacing.FORWARD; ClientSprintTree sprintTree; ClientJumpTree jumpTree; @@ -132,7 +132,7 @@ public class ClientEditorMovementTree implements BehaviorTree { * Requests to the server that the entity start moving * @param facing The facing relative to the view direction that the entity should move in (ie strafe right vs walk straight forward) */ - public void start(MovementRelativeFacing facing){ + public void start(EditorMovementRelativeFacing facing){ if(canStartMoving()){ setFacing(facing); state = MovementTreeState.STARTUP; @@ -417,7 +417,7 @@ public class ClientEditorMovementTree implements BehaviorTree { * Gets facing. *

*/ - public MovementRelativeFacing getFacing(){ + public EditorMovementRelativeFacing getFacing(){ return facing; } @@ -429,7 +429,7 @@ public class ClientEditorMovementTree implements BehaviorTree { *

* @param facing The value to set facing to. */ - public void setFacing(MovementRelativeFacing facing){ + public void setFacing(EditorMovementRelativeFacing facing){ this.facing = facing; } @@ -452,7 +452,7 @@ public class ClientEditorMovementTree implements BehaviorTree { * @param enumVal The enum value * @return The short value */ - public static short getMovementRelativeFacingEnumAsShort(MovementRelativeFacing enumVal){ + public static short getMovementRelativeFacingEnumAsShort(EditorMovementRelativeFacing enumVal){ switch(enumVal){ case FORWARD: return 0; @@ -486,30 +486,30 @@ public class ClientEditorMovementTree implements BehaviorTree { * @param shortVal The short value * @return The enum value */ - public static MovementRelativeFacing getMovementRelativeFacingShortAsEnum(short shortVal){ + public static EditorMovementRelativeFacing getMovementRelativeFacingShortAsEnum(short shortVal){ switch(shortVal){ case 0: - return MovementRelativeFacing.FORWARD; + return EditorMovementRelativeFacing.FORWARD; case 1: - return MovementRelativeFacing.LEFT; + return EditorMovementRelativeFacing.LEFT; case 2: - return MovementRelativeFacing.RIGHT; + return EditorMovementRelativeFacing.RIGHT; case 3: - return MovementRelativeFacing.BACKWARD; + return EditorMovementRelativeFacing.BACKWARD; case 4: - return MovementRelativeFacing.FORWARD_LEFT; + return EditorMovementRelativeFacing.FORWARD_LEFT; case 5: - return MovementRelativeFacing.FORWARD_RIGHT; + return EditorMovementRelativeFacing.FORWARD_RIGHT; case 6: - return MovementRelativeFacing.BACKWARD_LEFT; + return EditorMovementRelativeFacing.BACKWARD_LEFT; case 7: - return MovementRelativeFacing.BACKWARD_RIGHT; + return EditorMovementRelativeFacing.BACKWARD_RIGHT; case 8: - return MovementRelativeFacing.UP; + return EditorMovementRelativeFacing.UP; case 9: - return MovementRelativeFacing.DOWN; + return EditorMovementRelativeFacing.DOWN; default: - return MovementRelativeFacing.FORWARD; + return EditorMovementRelativeFacing.FORWARD; } } /** @@ -554,4 +554,74 @@ public class ClientEditorMovementTree implements BehaviorTree { return entity.containsKey(EntityDataStrings.TREE_CLIENTEDITORMOVEMENTTREE); } + /** + *

Automatically generated

+ *

+ * Converts a short to the equivalent enum value + *

+ * @param shortVal The short value + * @return The enum value + */ + public static EditorMovementRelativeFacing getEditorMovementRelativeFacingShortAsEnum(short shortVal){ + switch(shortVal){ + case 0: + return EditorMovementRelativeFacing.FORWARD; + case 1: + return EditorMovementRelativeFacing.LEFT; + case 2: + return EditorMovementRelativeFacing.RIGHT; + case 3: + return EditorMovementRelativeFacing.BACKWARD; + case 4: + return EditorMovementRelativeFacing.FORWARD_LEFT; + case 5: + return EditorMovementRelativeFacing.FORWARD_RIGHT; + case 6: + return EditorMovementRelativeFacing.BACKWARD_LEFT; + case 7: + return EditorMovementRelativeFacing.BACKWARD_RIGHT; + case 8: + return EditorMovementRelativeFacing.UP; + case 9: + return EditorMovementRelativeFacing.DOWN; + default: + return EditorMovementRelativeFacing.FORWARD; + } + } + + /** + *

Automatically generated

+ *

+ * Converts this enum type to an equivalent short value + *

+ * @param enumVal The enum value + * @return The short value + */ + public static short getEditorMovementRelativeFacingEnumAsShort(EditorMovementRelativeFacing enumVal){ + switch(enumVal){ + case FORWARD: + return 0; + case LEFT: + return 1; + case RIGHT: + return 2; + case BACKWARD: + return 3; + case FORWARD_LEFT: + return 4; + case FORWARD_RIGHT: + return 5; + case BACKWARD_LEFT: + return 6; + case BACKWARD_RIGHT: + return 7; + case UP: + return 8; + case DOWN: + return 9; + default: + return 0; + } + } + } 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 902a9813..c9dfa2ef 100644 --- a/src/main/java/electrosphere/entity/state/movement/editor/ServerEditorMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/editor/ServerEditorMovementTree.java @@ -13,7 +13,7 @@ import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.state.attack.ServerAttackTree; -import electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementRelativeFacing; +import electrosphere.entity.state.movement.editor.ClientEditorMovementTree.EditorMovementRelativeFacing; import electrosphere.entity.state.movement.editor.ClientEditorMovementTree.MovementTreeState; import electrosphere.entity.state.movement.fall.ServerFallTree; import electrosphere.entity.state.movement.jump.ServerJumpTree; @@ -53,7 +53,7 @@ public class ServerEditorMovementTree implements BehaviorTree { MovementTreeState state; @SyncedField - MovementRelativeFacing facing; + EditorMovementRelativeFacing facing; //The data for the movement system EditorMovementSystem editorMovementSystem; @@ -75,7 +75,7 @@ public class ServerEditorMovementTree implements BehaviorTree { private ServerEditorMovementTree(Entity e, Object ... params){ //EditorMovementSystem system state = MovementTreeState.IDLE; - facing = MovementRelativeFacing.FORWARD; + facing = EditorMovementRelativeFacing.FORWARD; parent = e; this.editorMovementSystem = (EditorMovementSystem)params[0]; } @@ -88,7 +88,7 @@ public class ServerEditorMovementTree implements BehaviorTree { * Starts the server movement tree * @param facing The facing dir to start with */ - public void start(MovementRelativeFacing facing){ + public void start(EditorMovementRelativeFacing facing){ if(canStartMoving()){ setFacing(facing); state = MovementTreeState.STARTUP; @@ -465,7 +465,7 @@ public class ServerEditorMovementTree implements BehaviorTree { * @param editorMovementSystem * @return */ - public static float getMaximumVelocity(Entity entity, EditorMovementSystem editorMovementSystem, MovementRelativeFacing facing){ + public static float getMaximumVelocity(Entity entity, EditorMovementSystem editorMovementSystem, EditorMovementRelativeFacing facing){ float maxVelocity = ClientEditorMovementTree.EDITOR_MAX_VELOCITY; return maxVelocity; } @@ -476,7 +476,7 @@ public class ServerEditorMovementTree implements BehaviorTree { * Gets facing. *

*/ - public MovementRelativeFacing getFacing(){ + public EditorMovementRelativeFacing getFacing(){ return facing; } @@ -531,9 +531,9 @@ public class ServerEditorMovementTree implements BehaviorTree { *

* @param facing The value to set facing to. */ - public void setFacing(MovementRelativeFacing facing){ + public void setFacing(EditorMovementRelativeFacing facing){ this.facing = facing; - int value = ClientEditorMovementTree.getMovementRelativeFacingEnumAsShort(facing); + int value = ClientEditorMovementTree.getEditorMovementRelativeFacingEnumAsShort(facing); if(DataCellSearchUtils.getEntityDataCell(parent) != null){ DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStateMessage(parent.getId(), BehaviorTreeIdEnums.BTREE_SERVEREDITORMOVEMENTTREE_ID, FieldIdEnums.TREE_SERVEREDITORMOVEMENTTREE_SYNCEDFIELD_FACING_ID, value)); } diff --git a/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java b/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java index cd036201..37af878c 100644 --- a/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java +++ b/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java @@ -1,6 +1,7 @@ package electrosphere.net.synchronization.client; +import electrosphere.util.Utilities; import electrosphere.entity.state.movement.editor.ClientEditorMovementTree; import electrosphere.entity.state.equip.ClientToolbarState; import electrosphere.entity.state.stance.ClientStanceComponent; @@ -232,7 +233,7 @@ public class ClientSynchronizationManager { switch(message.getfieldId()){ case FieldIdEnums.TREE_SERVEREDITORMOVEMENTTREE_SYNCEDFIELD_FACING_ID:{ ClientEditorMovementTree tree = ClientEditorMovementTree.getClientEditorMovementTree(entity); - tree.setFacing(ClientEditorMovementTree.getMovementRelativeFacingShortAsEnum((short)message.getbTreeValue())); + tree.setFacing(ClientEditorMovementTree.getEditorMovementRelativeFacingShortAsEnum((short)message.getbTreeValue())); } break; } } break; diff --git a/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java b/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java index 5b3f82e4..95d5c957 100644 --- a/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java +++ b/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java @@ -1,6 +1,7 @@ package electrosphere.net.synchronization.transport; +import electrosphere.util.Utilities; import electrosphere.entity.state.movement.editor.ServerEditorMovementTree; import electrosphere.entity.state.movement.editor.ClientEditorMovementTree; import electrosphere.entity.state.equip.ServerToolbarState; @@ -105,7 +106,7 @@ public class StateCollection { } break; case BehaviorTreeIdEnums.BTREE_SERVEREDITORMOVEMENTTREE_ID: { ServerEditorMovementTree tree = ServerEditorMovementTree.getServerEditorMovementTree(entity); - collection.setValue(new SynchronizedFieldValue(BehaviorTreeIdEnums.BTREE_SERVEREDITORMOVEMENTTREE_ID,FieldIdEnums.TREE_SERVEREDITORMOVEMENTTREE_SYNCEDFIELD_FACING_ID,ClientEditorMovementTree.getMovementRelativeFacingEnumAsShort(tree.getFacing()))); + collection.setValue(new SynchronizedFieldValue(BehaviorTreeIdEnums.BTREE_SERVEREDITORMOVEMENTTREE_ID,FieldIdEnums.TREE_SERVEREDITORMOVEMENTTREE_SYNCEDFIELD_FACING_ID,ClientEditorMovementTree.getEditorMovementRelativeFacingEnumAsShort(tree.getFacing()))); } break; case BehaviorTreeIdEnums.BTREE_SERVERGROUNDMOVEMENTTREE_ID: { ServerGroundMovementTree tree = ServerGroundMovementTree.getServerGroundMovementTree(entity); @@ -211,7 +212,7 @@ public class StateCollection { ClientEditorMovementTree tree = ClientEditorMovementTree.getClientEditorMovementTree(entity); switch(syncedValue.getFieldId()){ case(FieldIdEnums.TREE_SERVEREDITORMOVEMENTTREE_SYNCEDFIELD_FACING_ID): { - tree.setFacing(ClientEditorMovementTree.getMovementRelativeFacingShortAsEnum(((Double)syncedValue.getValue()).shortValue())); + tree.setFacing(ClientEditorMovementTree.getEditorMovementRelativeFacingShortAsEnum(((Double)syncedValue.getValue()).shortValue())); } break; } } break;