From 07d18b61265698fdf2bb0916ef45d3efc8923b8f Mon Sep 17 00:00:00 2001 From: austin Date: Wed, 31 Jul 2024 17:19:30 -0400 Subject: [PATCH] small cleanup --- .../entity/state/attack/ClientAttackTree.java | 31 +++++++------------ .../entity/state/attack/ServerAttackTree.java | 4 --- .../entity/state/block/ClientBlockTree.java | 18 ++++++++++- .../entity/state/block/ServerBlockTree.java | 4 --- .../entity/state/equip/ClientEquipState.java | 20 ++++++++++-- .../entity/state/equip/ServerEquipState.java | 8 +---- .../state/gravity/ClientGravityTree.java | 27 +--------------- .../state/gravity/ServerGravityTree.java | 4 --- .../entity/state/idle/ClientIdleTree.java | 2 +- .../entity/state/idle/ServerIdleTree.java | 4 --- .../entity/state/life/ClientLifeTree.java | 2 +- .../entity/state/life/ServerLifeTree.java | 4 --- .../groundmove/ClientGroundMovementTree.java | 1 - .../groundmove/ServerGroundMovementTree.java | 4 --- .../state/movement/jump/ClientJumpTree.java | 21 ++++++++----- .../state/movement/jump/ServerJumpTree.java | 4 --- 16 files changed, 65 insertions(+), 93 deletions(-) diff --git a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java index 39a085cf..e8d2d634 100644 --- a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java +++ b/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java @@ -1,6 +1,7 @@ package electrosphere.entity.state.attack; +import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.net.synchronization.BehaviorTreeIdEnums; import electrosphere.engine.Globals; @@ -111,26 +112,19 @@ public class ClientAttackTree implements BehaviorTree { } /** - * Starts an attack + *

Automatically generated

+ *

+ * Requests that the server start this btree + *

*/ public void start(){ - currentMoveCanHold = false; - currentMoveHasWindup = false; - stillHold = true; - firesProjectile = false; - projectileToFire = null; - currentWeapon = null; - attackingPoint = null; - //figure out attack type we should be doing - String attackType = getAttackType(); - //if we can attack, setup doing so - if(canAttack(attackType)){ - setAttackMoveTypeActive(attackType); - currentMoveset = getMoveset(attackType); - if(currentMoveset != null){ - Globals.clientConnection.queueOutgoingMessage(EntityMessage.constructstartAttackMessage()); - } - } + Globals.clientConnection.queueOutgoingMessage( + SynchronizationMessage.constructClientRequestBTreeActionMessage( + Globals.clientSceneWrapper.mapClientToServerId(parent.getId()), + BehaviorTreeIdEnums.BTREE_CLIENTGROUNDMOVEMENTTREE_ID, + 1 + ) + ); } public void release(){ @@ -455,7 +449,6 @@ public class ClientAttackTree implements BehaviorTree { } /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

diff --git a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java index a258f29c..d36bf463 100644 --- a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java +++ b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java @@ -511,7 +511,6 @@ public class ServerAttackTree implements BehaviorTree { } /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

@@ -521,9 +520,6 @@ public class ServerAttackTree implements BehaviorTree { */ public static ServerAttackTree attachTree(Entity parent, Object ... params){ ServerAttackTree rVal = new ServerAttackTree(parent,params); - //put manual code here (setting params, etc) - - //!!WARNING!! from here below should not be touched //This was generated automatically to properly alert various systems that the btree exists and should be tracked ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal); diff --git a/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java b/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java index 77b60823..9f82830d 100644 --- a/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java +++ b/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java @@ -1,6 +1,7 @@ package electrosphere.entity.state.block; +import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; @@ -123,7 +124,6 @@ public class ClientBlockTree implements BehaviorTree { } /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

@@ -225,4 +225,20 @@ public class ClientBlockTree implements BehaviorTree { public void setCurrentBlockVariant(String currentBlockVariant){ this.currentBlockVariant = currentBlockVariant; } + /** + *

Automatically generated

+ *

+ * Requests that the server start this btree + *

+ */ + public void start(){ + Globals.clientConnection.queueOutgoingMessage( + SynchronizationMessage.constructClientRequestBTreeActionMessage( + Globals.clientSceneWrapper.mapClientToServerId(parent.getId()), + BehaviorTreeIdEnums.BTREE_CLIENTGROUNDMOVEMENTTREE_ID, + 1 + ) + ); + } + } diff --git a/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java b/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java index a44e8c17..bb8d3396 100644 --- a/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java +++ b/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java @@ -150,7 +150,6 @@ public class ServerBlockTree implements BehaviorTree { } /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

@@ -160,9 +159,6 @@ public class ServerBlockTree implements BehaviorTree { */ public static ServerBlockTree attachTree(Entity parent, Object ... params){ ServerBlockTree rVal = new ServerBlockTree(parent,params); - //put manual code here (setting params, etc) - - //!!WARNING!! from here below should not be touched //This was generated automatically to properly alert various systems that the btree exists and should be tracked ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal); diff --git a/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java b/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java index 0bfade82..63fbf7b2 100644 --- a/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java +++ b/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java @@ -25,6 +25,7 @@ import electrosphere.game.data.item.type.EquipWhitelist; import electrosphere.logger.LoggerInterface; import electrosphere.net.parser.net.message.InventoryMessage; import electrosphere.net.parser.net.message.NetworkMessage; +import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; import electrosphere.renderer.actor.Actor; import electrosphere.renderer.actor.ActorMeshMask; @@ -50,7 +51,7 @@ public class ClientEquipState implements BehaviorTree { * @param equipPoints the list of available points */ private ClientEquipState(Entity parent, Object ... params){ - List equipPoints = (List)params[0]; + List equipPoints = (List)params[0]; this.parent = parent; for(EquipPoint point : equipPoints){ this.equipPoints.add(point); @@ -413,7 +414,6 @@ public class ClientEquipState implements BehaviorTree { /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

@@ -452,4 +452,20 @@ public class ClientEquipState implements BehaviorTree { return (ClientEquipState)entity.getData(EntityDataStrings.TREE_CLIENTEQUIPSTATE); } + /** + *

Automatically generated

+ *

+ * Requests that the server start this btree + *

+ */ + public void start(){ + Globals.clientConnection.queueOutgoingMessage( + SynchronizationMessage.constructClientRequestBTreeActionMessage( + Globals.clientSceneWrapper.mapClientToServerId(parent.getId()), + BehaviorTreeIdEnums.BTREE_CLIENTGROUNDMOVEMENTTREE_ID, + 1 + ) + ); + } + } diff --git a/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java b/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java index bdc87a7b..6c4db1ae 100644 --- a/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java +++ b/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java @@ -1,8 +1,6 @@ package electrosphere.entity.state.equip; -import electrosphere.net.synchronization.FieldIdEnums; -import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.net.synchronization.BehaviorTreeIdEnums; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; @@ -59,7 +57,7 @@ public class ServerEquipState implements BehaviorTree { Map equipMap = new HashMap(); public ServerEquipState(Entity parent, Object ... params){ - List equipPoints = (List)params[0]; + List equipPoints = (List)params[0]; this.parent = parent; for(EquipPoint point : equipPoints){ this.equipPoints.add(point); @@ -425,7 +423,6 @@ public class ServerEquipState implements BehaviorTree { /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

@@ -435,9 +432,6 @@ public class ServerEquipState implements BehaviorTree { */ public static ServerEquipState attachTree(Entity parent, Object ... params){ ServerEquipState rVal = new ServerEquipState(parent,params); - //put manual code here (setting params, etc) - - //!!WARNING!! from here below should not be touched //This was generated automatically to properly alert various systems that the btree exists and should be tracked ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal); diff --git a/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java b/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java index d6451614..b54e80ea 100644 --- a/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java +++ b/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java @@ -1,22 +1,18 @@ package electrosphere.entity.state.gravity; - +import electrosphere.net.parser.net.message.SynchronizationMessage; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.joml.Quaterniond; import org.joml.Vector3d; -import org.joml.Vector3f; import org.ode4j.ode.DBody; import electrosphere.collision.collidable.Collidable; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; -import electrosphere.entity.EntityUtils; import electrosphere.entity.btree.BehaviorTree; -import electrosphere.entity.state.collidable.ClientCollidableTree; import electrosphere.entity.state.collidable.Impulse; import electrosphere.entity.state.movement.FallTree; import electrosphere.entity.state.movement.jump.ClientJumpTree; @@ -75,13 +71,6 @@ public class ClientGravityTree implements BehaviorTree { return state; } - public void start(){ - //TODO: check if can start moving - state = GravityTreeState.ACTIVE; - if(state == GravityTreeState.NOT_ACTIVE){ - frameCurrent = 0; - } - } public void interrupt(){ state = GravityTreeState.NOT_ACTIVE; @@ -95,19 +84,6 @@ public class ClientGravityTree implements BehaviorTree { static final float linearDamping = 0.1f; public void simulate(float deltaTime){ -// float velocity = CreatureUtils.getVelocity(parent); -// float acceleration = CreatureUtils.getAcceleration(parent); -// float maxNaturalVelocity = CreatureUtils.getMaxNaturalVelocity(parent); -// Actor entityActor = EntityUtils.getActor(parent); - Vector3d position = EntityUtils.getPosition(parent); -// Vector3f movementVector = CreatureUtils.getMovementVector(parent); - Quaterniond rotation = EntityUtils.getRotation(parent); - Vector3f newPosition; - ClientCollidableTree collidableTree = null; - if(ClientCollidableTree.hasClientCollidableTree(parent)){ - collidableTree = ClientCollidableTree.getClientCollidableTree(parent); - } - //state machine switch(state){ @@ -192,7 +168,6 @@ public class ClientGravityTree implements BehaviorTree { /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

diff --git a/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java b/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java index 48a2a127..7c32f4bd 100644 --- a/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java +++ b/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java @@ -219,7 +219,6 @@ public class ServerGravityTree implements BehaviorTree { } /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

@@ -229,9 +228,6 @@ public class ServerGravityTree implements BehaviorTree { */ public static ServerGravityTree attachTree(Entity parent, Object ... params){ ServerGravityTree rVal = new ServerGravityTree(parent,params); - //put manual code here (setting params, etc) - - //!!WARNING!! from here below should not be touched //This was generated automatically to properly alert various systems that the btree exists and should be tracked ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal); diff --git a/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java b/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java index 4714a759..77c25519 100644 --- a/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java +++ b/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java @@ -1,6 +1,7 @@ package electrosphere.entity.state.idle; +import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.net.synchronization.BehaviorTreeIdEnums; import electrosphere.entity.state.client.firstPerson.FirstPersonTree; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree; @@ -128,7 +129,6 @@ public class ClientIdleTree implements BehaviorTree { /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

diff --git a/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java b/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java index bd2f43ee..a598dc1d 100644 --- a/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java +++ b/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java @@ -160,7 +160,6 @@ public class ServerIdleTree implements BehaviorTree { /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

@@ -170,9 +169,6 @@ public class ServerIdleTree implements BehaviorTree { */ public static ServerIdleTree attachTree(Entity parent, Object ... params){ ServerIdleTree rVal = new ServerIdleTree(parent,params); - //put manual code here (setting params, etc) - - //!!WARNING!! from here below should not be touched //This was generated automatically to properly alert various systems that the btree exists and should be tracked ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal); diff --git a/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java b/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java index 44a4f285..3dba02bd 100644 --- a/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java +++ b/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java @@ -1,6 +1,7 @@ package electrosphere.entity.state.life; +import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.net.synchronization.BehaviorTreeIdEnums; import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.StateTransitionUtil; @@ -73,7 +74,6 @@ public class ClientLifeTree implements BehaviorTree { /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

diff --git a/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java b/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java index 329898cc..578e8100 100644 --- a/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java +++ b/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java @@ -126,7 +126,6 @@ public class ServerLifeTree implements BehaviorTree { /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

@@ -136,9 +135,6 @@ public class ServerLifeTree implements BehaviorTree { */ public static ServerLifeTree attachTree(Entity parent, Object ... params){ ServerLifeTree rVal = new ServerLifeTree(parent,params); - //put manual code here (setting params, etc) - - //!!WARNING!! from here below should not be touched //This was generated automatically to properly alert various systems that the btree exists and should be tracked ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal); 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 a89c6e8a..40ac88f9 100644 --- a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java @@ -670,7 +670,6 @@ public class ClientGroundMovementTree implements BehaviorTree { /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

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 82cbf583..e2b47339 100644 --- a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java @@ -696,7 +696,6 @@ public class ServerGroundMovementTree implements BehaviorTree { /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

@@ -706,9 +705,6 @@ public class ServerGroundMovementTree implements BehaviorTree { */ public static ServerGroundMovementTree attachTree(Entity parent, Object ... params){ ServerGroundMovementTree rVal = new ServerGroundMovementTree(parent,params); - //put manual code here (setting params, etc) - - //!!WARNING!! from here below should not be touched //This was generated automatically to properly alert various systems that the btree exists and should be tracked ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal); 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 f45e5926..725cac6e 100644 --- a/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java +++ b/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java @@ -1,6 +1,7 @@ package electrosphere.entity.state.movement.jump; +import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.net.synchronization.BehaviorTreeIdEnums; import org.ode4j.math.DVector3C; import org.ode4j.ode.DBody; @@ -63,13 +64,20 @@ public class ClientJumpTree implements BehaviorTree { this.jumpForce = this.jumpData.getJumpForce(); } + /** + *

Automatically generated

+ *

+ * Requests that the server start this btree + *

+ */ public void start(){ - // if(state == JumpState.INACTIVE){ - state = JumpState.ACTIVE; - currentFrame = 0; - currentJumpForce = jumpForce; - GravityUtils.clientAttemptActivateGravity(parent); - // } + Globals.clientConnection.queueOutgoingMessage( + SynchronizationMessage.constructClientRequestBTreeActionMessage( + Globals.clientSceneWrapper.mapClientToServerId(parent.getId()), + BehaviorTreeIdEnums.BTREE_CLIENTGROUNDMOVEMENTTREE_ID, + 1 + ) + ); } @Override @@ -157,7 +165,6 @@ public class ClientJumpTree implements BehaviorTree { /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

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 3f69323d..dda62414 100644 --- a/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java +++ b/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java @@ -151,7 +151,6 @@ public class ServerJumpTree implements BehaviorTree { /** *

(initially) Automatically generated

- *

More parameters can be safely added to this method

*

* Attaches this tree to the entity. *

@@ -161,9 +160,6 @@ public class ServerJumpTree implements BehaviorTree { */ public static ServerJumpTree attachTree(Entity parent, Object ... params){ ServerJumpTree rVal = new ServerJumpTree(parent,params); - //put manual code here (setting params, etc) - - //!!WARNING!! from here below should not be touched //This was generated automatically to properly alert various systems that the btree exists and should be tracked ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal);