From 8d6b4f71b8ad338267721909cc212db2ce2d9599 Mon Sep 17 00:00:00 2001 From: austin Date: Wed, 31 Jul 2024 17:30:30 -0400 Subject: [PATCH] cleanup autogen bug --- .../entity/state/attack/ClientAttackTree.java | 30 +++++++++++-------- .../entity/state/block/ClientBlockTree.java | 16 ---------- .../collidable/ClientCollidableTree.java | 22 +++++++------- .../entity/state/equip/ClientEquipState.java | 17 ----------- .../entity/state/gravity/GravityUtils.java | 2 +- .../protocol/SynchronizationProtocol.java | 2 +- 6 files changed, 31 insertions(+), 58 deletions(-) diff --git a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java index e8d2d634..df3a62b9 100644 --- a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java +++ b/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java @@ -1,7 +1,6 @@ package electrosphere.entity.state.attack; -import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.net.synchronization.BehaviorTreeIdEnums; import electrosphere.engine.Globals; @@ -112,19 +111,26 @@ public class ClientAttackTree implements BehaviorTree { } /** - *

Automatically generated

- *

- * Requests that the server start this btree - *

+ * Starts an attack */ public void start(){ - Globals.clientConnection.queueOutgoingMessage( - SynchronizationMessage.constructClientRequestBTreeActionMessage( - Globals.clientSceneWrapper.mapClientToServerId(parent.getId()), - BehaviorTreeIdEnums.BTREE_CLIENTGROUNDMOVEMENTTREE_ID, - 1 - ) - ); + 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()); + } + } } public void release(){ diff --git a/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java b/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java index 9f82830d..581007af 100644 --- a/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java +++ b/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java @@ -1,7 +1,6 @@ package electrosphere.entity.state.block; -import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; @@ -225,20 +224,5 @@ 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/collidable/ClientCollidableTree.java b/src/main/java/electrosphere/entity/state/collidable/ClientCollidableTree.java index 96a65ea3..6563fe9f 100644 --- a/src/main/java/electrosphere/entity/state/collidable/ClientCollidableTree.java +++ b/src/main/java/electrosphere/entity/state/collidable/ClientCollidableTree.java @@ -56,17 +56,17 @@ public class ClientCollidableTree implements BehaviorTree { // System.out.println("Impulse force: " + impulseForce); // System.out.println("Position: " + position); } - if(impulse.type.matches(Collidable.TYPE_ITEM)){ - if(ClientGravityTree.getClientGravityTree(parent)!=null){ - ClientGravityTree.getClientGravityTree(parent).start(); - } - } - if(impulse.type.matches(Collidable.TYPE_CREATURE)){ -// System.out.println(System.currentTimeMillis() + " creature hit!"); - if(ClientGravityTree.getClientGravityTree(parent)!=null){ - ClientGravityTree.getClientGravityTree(parent).start(); - } - } +// if(impulse.type.matches(Collidable.TYPE_ITEM)){ +// if(ClientGravityTree.getClientGravityTree(parent)!=null){ +// ClientGravityTree.getClientGravityTree(parent).start(); +// } +// } +// if(impulse.type.matches(Collidable.TYPE_CREATURE)){ +// // System.out.println(System.currentTimeMillis() + " creature hit!"); +// if(ClientGravityTree.getClientGravityTree(parent)!=null){ +// ClientGravityTree.getClientGravityTree(parent).start(); +// } +// } } //bound to world bounds if(newPosition.x < Globals.clientWorldData.getWorldBoundMin().x){ diff --git a/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java b/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java index 63fbf7b2..3bc772ee 100644 --- a/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java +++ b/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java @@ -25,7 +25,6 @@ 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; @@ -452,20 +451,4 @@ 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/gravity/GravityUtils.java b/src/main/java/electrosphere/entity/state/gravity/GravityUtils.java index 1103f1b4..a617351a 100644 --- a/src/main/java/electrosphere/entity/state/gravity/GravityUtils.java +++ b/src/main/java/electrosphere/entity/state/gravity/GravityUtils.java @@ -5,10 +5,10 @@ import electrosphere.entity.EntityDataStrings; public class GravityUtils { + @Deprecated public static void clientAttemptActivateGravity(Entity target){ if(target.containsKey(EntityDataStrings.GRAVITY_ENTITY)){ ClientGravityTree tree = ClientGravityTree.getClientGravityTree(target); - tree.start(); } } diff --git a/src/main/java/electrosphere/net/server/protocol/SynchronizationProtocol.java b/src/main/java/electrosphere/net/server/protocol/SynchronizationProtocol.java index cd0125b8..18a32913 100644 --- a/src/main/java/electrosphere/net/server/protocol/SynchronizationProtocol.java +++ b/src/main/java/electrosphere/net/server/protocol/SynchronizationProtocol.java @@ -33,7 +33,7 @@ public class SynchronizationProtocol implements ServerProtocolTemplate