diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 76455c90..f03ac1e8 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1475,6 +1475,8 @@ Inventory audio work Comment out script engine file watching for testing purposes Crafting panel recipe filtering by tag Stone Axe crafting +ClientSynchronizationManager null tree fix +Update ui test data diff --git a/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java b/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java index 136c7a8b..e57ffde1 100644 --- a/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java +++ b/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java @@ -161,15 +161,21 @@ public class ClientSynchronizationManager { switch(message.getfieldId()){ case FieldIdEnums.TREE_SERVERATTACKTREE_SYNCEDFIELD_STATE_ID:{ ClientAttackTree tree = ClientAttackTree.getClientAttackTree(entity); - tree.setState(ClientAttackTree.getAttackTreeStateShortAsEnum((short)message.getbTreeValue())); + if(tree != null){ + tree.setState(ClientAttackTree.getAttackTreeStateShortAsEnum((short)message.getbTreeValue())); + } } break; case FieldIdEnums.TREE_SERVERATTACKTREE_SYNCEDFIELD_DRIFTSTATE_ID:{ ClientAttackTree tree = ClientAttackTree.getClientAttackTree(entity); - tree.setDriftState(ClientAttackTree.getAttackTreeDriftStateShortAsEnum((short)message.getbTreeValue())); + if(tree != null){ + tree.setDriftState(ClientAttackTree.getAttackTreeDriftStateShortAsEnum((short)message.getbTreeValue())); + } } break; case FieldIdEnums.TREE_SERVERATTACKTREE_SYNCEDFIELD_CURRENTMOVEID_ID:{ ClientAttackTree tree = ClientAttackTree.getClientAttackTree(entity); - tree.setCurrentMoveId(message.getstringValue()); + if(tree != null){ + tree.setCurrentMoveId(message.getstringValue()); + } } break; } } break; @@ -177,11 +183,15 @@ public class ClientSynchronizationManager { switch(message.getfieldId()){ case FieldIdEnums.TREE_SERVERBLOCKTREE_SYNCEDFIELD_STATE_ID:{ ClientBlockTree tree = ClientBlockTree.getClientBlockTree(entity); - tree.setState(ClientBlockTree.getBlockStateShortAsEnum((short)message.getbTreeValue())); + if(tree != null){ + tree.setState(ClientBlockTree.getBlockStateShortAsEnum((short)message.getbTreeValue())); + } } break; case FieldIdEnums.TREE_SERVERBLOCKTREE_SYNCEDFIELD_CURRENTBLOCKVARIANT_ID:{ ClientBlockTree tree = ClientBlockTree.getClientBlockTree(entity); - tree.setCurrentBlockVariant(message.getstringValue()); + if(tree != null){ + tree.setCurrentBlockVariant(message.getstringValue()); + } } break; } } break; @@ -193,7 +203,9 @@ public class ClientSynchronizationManager { switch(message.getfieldId()){ case FieldIdEnums.TREE_SERVERTOOLBARSTATE_SYNCEDFIELD_SELECTEDSLOT_ID:{ ClientToolbarState tree = ClientToolbarState.getClientToolbarState(entity); - tree.setSelectedSlot(message.getintValue()); + if(tree != null){ + tree.setSelectedSlot(message.getintValue()); + } } break; } } break; @@ -201,7 +213,9 @@ public class ClientSynchronizationManager { switch(message.getfieldId()){ case FieldIdEnums.TREE_SERVERGRAVITY_SYNCEDFIELD_STATE_ID:{ ClientGravityTree tree = ClientGravityTree.getClientGravityTree(entity); - tree.setState(ClientGravityTree.getGravityTreeStateShortAsEnum((short)message.getbTreeValue())); + if(tree != null){ + tree.setState(ClientGravityTree.getGravityTreeStateShortAsEnum((short)message.getbTreeValue())); + } } break; } } break; @@ -209,7 +223,9 @@ public class ClientSynchronizationManager { switch(message.getfieldId()){ case FieldIdEnums.TREE_SERVERIDLE_SYNCEDFIELD_STATE_ID:{ ClientIdleTree tree = ClientIdleTree.getClientIdleTree(entity); - tree.setState(ClientIdleTree.getIdleTreeStateShortAsEnum((short)message.getbTreeValue())); + if(tree != null){ + tree.setState(ClientIdleTree.getIdleTreeStateShortAsEnum((short)message.getbTreeValue())); + } } break; } } break; @@ -217,7 +233,9 @@ public class ClientSynchronizationManager { switch(message.getfieldId()){ case FieldIdEnums.TREE_SERVERCHARGESTATE_SYNCEDFIELD_CHARGES_ID:{ ClientChargeState tree = ClientChargeState.getClientChargeState(entity); - tree.setCharges(message.getintValue()); + if(tree != null){ + tree.setCharges(message.getintValue()); + } } break; } } break; @@ -225,7 +243,9 @@ public class ClientSynchronizationManager { switch(message.getfieldId()){ case FieldIdEnums.TREE_SERVERLIFETREE_SYNCEDFIELD_STATE_ID:{ ClientLifeTree tree = ClientLifeTree.getClientLifeTree(entity); - tree.setState(ClientLifeTree.getLifeStateEnumShortAsEnum((short)message.getbTreeValue())); + if(tree != null){ + tree.setState(ClientLifeTree.getLifeStateEnumShortAsEnum((short)message.getbTreeValue())); + } } break; } } break; @@ -233,7 +253,9 @@ public class ClientSynchronizationManager { switch(message.getfieldId()){ case FieldIdEnums.TREE_SERVERSTANCECOMPONENT_SYNCEDFIELD_STATE_ID:{ ClientStanceComponent tree = ClientStanceComponent.getClientStanceComponent(entity); - tree.setState(ClientStanceComponent.getCombatStanceShortAsEnum((short)message.getbTreeValue())); + if(tree != null){ + tree.setState(ClientStanceComponent.getCombatStanceShortAsEnum((short)message.getbTreeValue())); + } } break; } } break; @@ -241,7 +263,9 @@ public class ClientSynchronizationManager { switch(message.getfieldId()){ case FieldIdEnums.TREE_SERVEREDITORMOVEMENTTREE_SYNCEDFIELD_FACING_ID:{ ClientEditorMovementTree tree = ClientEditorMovementTree.getClientEditorMovementTree(entity); - tree.setFacing(ClientEditorMovementTree.getEditorMovementRelativeFacingShortAsEnum((short)message.getbTreeValue())); + if(tree != null){ + tree.setFacing(ClientEditorMovementTree.getEditorMovementRelativeFacingShortAsEnum((short)message.getbTreeValue())); + } } break; } } break; @@ -249,7 +273,9 @@ public class ClientSynchronizationManager { switch(message.getfieldId()){ case FieldIdEnums.TREE_SERVERGROUNDMOVEMENTTREE_SYNCEDFIELD_FACING_ID:{ ClientGroundMovementTree tree = ClientGroundMovementTree.getClientGroundMovementTree(entity); - tree.setFacing(ClientGroundMovementTree.getMovementRelativeFacingShortAsEnum((short)message.getbTreeValue())); + if(tree != null){ + tree.setFacing(ClientGroundMovementTree.getMovementRelativeFacingShortAsEnum((short)message.getbTreeValue())); + } } break; } } break; @@ -257,15 +283,21 @@ public class ClientSynchronizationManager { switch(message.getfieldId()){ case FieldIdEnums.TREE_SERVERJUMPTREE_SYNCEDFIELD_STATE_ID:{ ClientJumpTree tree = ClientJumpTree.getClientJumpTree(entity); - tree.setState(ClientJumpTree.getJumpStateShortAsEnum((short)message.getbTreeValue())); + if(tree != null){ + tree.setState(ClientJumpTree.getJumpStateShortAsEnum((short)message.getbTreeValue())); + } } break; case FieldIdEnums.TREE_SERVERJUMPTREE_SYNCEDFIELD_CURRENTFRAME_ID:{ ClientJumpTree tree = ClientJumpTree.getClientJumpTree(entity); - tree.setCurrentFrame(message.getintValue()); + if(tree != null){ + tree.setCurrentFrame(message.getintValue()); + } } break; case FieldIdEnums.TREE_SERVERJUMPTREE_SYNCEDFIELD_CURRENTJUMPFORCE_ID:{ ClientJumpTree tree = ClientJumpTree.getClientJumpTree(entity); - tree.setCurrentJumpForce(message.getfloatValue()); + if(tree != null){ + tree.setCurrentJumpForce(message.getfloatValue()); + } } break; } } break; @@ -273,7 +305,9 @@ public class ClientSynchronizationManager { switch(message.getfieldId()){ case FieldIdEnums.TREE_SERVERSPRINTTREE_SYNCEDFIELD_STATE_ID:{ ClientSprintTree tree = ClientSprintTree.getClientSprintTree(entity); - tree.setState(ClientSprintTree.getSprintTreeStateShortAsEnum((short)message.getbTreeValue())); + if(tree != null){ + tree.setState(ClientSprintTree.getSprintTreeStateShortAsEnum((short)message.getbTreeValue())); + } } break; } } break; @@ -281,7 +315,9 @@ public class ClientSynchronizationManager { switch(message.getfieldId()){ case FieldIdEnums.TREE_SERVERWALKTREE_SYNCEDFIELD_STATE_ID:{ ClientWalkTree tree = ClientWalkTree.getClientWalkTree(entity); - tree.setState(ClientWalkTree.getWalkStateShortAsEnum((short)message.getbTreeValue())); + if(tree != null){ + tree.setState(ClientWalkTree.getWalkStateShortAsEnum((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 1d060b6b..327d16d4 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.item.ServerChargeState; import electrosphere.entity.state.item.ClientChargeState; import electrosphere.entity.state.movement.editor.ServerEditorMovementTree; diff --git a/test/java/renderer/ui/elements/button1.png b/test/java/renderer/ui/elements/button1.png index 053602a7..c29efbf6 100644 Binary files a/test/java/renderer/ui/elements/button1.png and b/test/java/renderer/ui/elements/button1.png differ diff --git a/test/java/renderer/ui/elements/label1.png b/test/java/renderer/ui/elements/label1.png index a3895c22..018d97c2 100644 Binary files a/test/java/renderer/ui/elements/label1.png and b/test/java/renderer/ui/elements/label1.png differ diff --git a/test/java/renderer/ui/elements/stringcarousel1.png b/test/java/renderer/ui/elements/stringcarousel1.png index eaee23ea..ccce9615 100644 Binary files a/test/java/renderer/ui/elements/stringcarousel1.png and b/test/java/renderer/ui/elements/stringcarousel1.png differ diff --git a/test/java/renderer/ui/elements/textbox1.png b/test/java/renderer/ui/elements/textbox1.png index 41a86053..0b7d1b16 100644 Binary files a/test/java/renderer/ui/elements/textbox1.png and b/test/java/renderer/ui/elements/textbox1.png differ diff --git a/test/java/renderer/ui/elements/textinput1.png b/test/java/renderer/ui/elements/textinput1.png index be1aa8ef..5d439011 100644 Binary files a/test/java/renderer/ui/elements/textinput1.png and b/test/java/renderer/ui/elements/textinput1.png differ diff --git a/test/java/renderer/ui/elements/window1.png b/test/java/renderer/ui/elements/window1.png index bd822dc0..186bfb4d 100644 Binary files a/test/java/renderer/ui/elements/window1.png and b/test/java/renderer/ui/elements/window1.png differ diff --git a/test/java/renderer/ui/elements/word1.png b/test/java/renderer/ui/elements/word1.png index 387a6f91..7b724ad1 100644 Binary files a/test/java/renderer/ui/elements/word1.png and b/test/java/renderer/ui/elements/word1.png differ diff --git a/test/java/renderer/ui/test_Screencapture_Match.png b/test/java/renderer/ui/test_Screencapture_Match.png index 6e1294db..5e8a8e58 100644 Binary files a/test/java/renderer/ui/test_Screencapture_Match.png and b/test/java/renderer/ui/test_Screencapture_Match.png differ