studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename client fall tree
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
austin 2024-09-04 21:37:29 -04:00
parent 4571adc4a7
commit f457decb5f
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java
View File

@ -10,7 +10,7 @@ import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem;
import electrosphere.entity.state.collidable.Impulse; import electrosphere.entity.state.collidable.Impulse;
import electrosphere.entity.state.equip.ClientEquipState; import electrosphere.entity.state.equip.ClientEquipState;
import electrosphere.entity.state.hitbox.HitboxCollectionState; import electrosphere.entity.state.hitbox.HitboxCollectionState;
import electrosphere.entity.state.movement.fall.FallTree; import electrosphere.entity.state.movement.fall.ClientFallTree;
import electrosphere.entity.state.movement.jump.ClientJumpTree; import electrosphere.entity.state.movement.jump.ClientJumpTree;
import electrosphere.entity.state.rotator.RotatorTree; import electrosphere.entity.state.rotator.RotatorTree;
import electrosphere.entity.types.attach.AttachUtils; import electrosphere.entity.types.attach.AttachUtils;
@ -408,8 +408,8 @@ public class ClientAttackTree implements BehaviorTree {
return false; return false;
} }
} }
if(FallTree.getFallTree(parent) != null){ if(ClientFallTree.getFallTree(parent) != null){
FallTree fallTree = FallTree.getFallTree(parent); ClientFallTree fallTree = ClientFallTree.getFallTree(parent);
if(fallTree.isFalling()){ if(fallTree.isFalling()){
return false; return false;
} }

10
src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java
View File

@ -14,7 +14,7 @@ import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.collidable.Impulse; import electrosphere.entity.state.collidable.Impulse;
import electrosphere.entity.state.movement.fall.FallTree; import electrosphere.entity.state.movement.fall.ClientFallTree;
import electrosphere.entity.state.movement.jump.ClientJumpTree; import electrosphere.entity.state.movement.jump.ClientJumpTree;
import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.parser.net.message.EntityMessage;
import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SyncedField;
@ -101,8 +101,8 @@ public class ClientGravityTree implements BehaviorTree {
if((jumpTree = ClientJumpTree.getClientJumpTree(parent))!=null){ if((jumpTree = ClientJumpTree.getClientJumpTree(parent))!=null){
jumpTree.land(); jumpTree.land();
} }
FallTree fallTree; ClientFallTree fallTree;
if((fallTree = FallTree.getFallTree(parent))!=null){ if((fallTree = ClientFallTree.getFallTree(parent))!=null){
fallTree.land(); fallTree.land();
} }
frameCurrent = 0; frameCurrent = 0;
@ -110,8 +110,8 @@ public class ClientGravityTree implements BehaviorTree {
//animation nonsense //animation nonsense
frameCurrent++; frameCurrent++;
if(frameCurrent == fallFrame){ if(frameCurrent == fallFrame){
FallTree fallTree; ClientFallTree fallTree;
if((fallTree = FallTree.getFallTree(parent))!=null){ if((fallTree = ClientFallTree.getFallTree(parent))!=null){
fallTree.start(); fallTree.start();
} }
} }

8
src/main/java/electrosphere/entity/state/movement/fall/FallTree.java → src/main/java/electrosphere/entity/state/movement/fall/ClientFallTree.java
View File

@ -18,7 +18,7 @@ import electrosphere.renderer.actor.Actor;
/** /**
* Behavior tree for playing animations when an entity is falling/landing * Behavior tree for playing animations when an entity is falling/landing
*/ */
public class FallTree implements BehaviorTree { public class ClientFallTree implements BehaviorTree {
/** /**
* The state of the fall tree * The state of the fall tree
@ -43,7 +43,7 @@ public class FallTree implements BehaviorTree {
//The state transition util //The state transition util
StateTransitionUtil stateTransitionUtil; StateTransitionUtil stateTransitionUtil;
public FallTree(Entity parent, FallMovementSystem fallMovementSystem){ public ClientFallTree(Entity parent, FallMovementSystem fallMovementSystem){
this.parent = parent; this.parent = parent;
this.fallMovementSystem = fallMovementSystem; this.fallMovementSystem = fallMovementSystem;
stateTransitionUtil = StateTransitionUtil.create( stateTransitionUtil = StateTransitionUtil.create(
@ -117,8 +117,8 @@ public class FallTree implements BehaviorTree {
* @param parent the entity * @param parent the entity
* @return the state * @return the state
*/ */
public static FallTree getFallTree(Entity parent){ public static ClientFallTree getFallTree(Entity parent){
return (FallTree)parent.getData(EntityDataStrings.FALL_TREE); return (ClientFallTree)parent.getData(EntityDataStrings.FALL_TREE);
} }
/** /**

6
src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
View File

@ -17,7 +17,7 @@ import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.AnimationPriorities; import electrosphere.entity.state.AnimationPriorities;
import electrosphere.entity.state.client.firstPerson.FirstPersonTree; import electrosphere.entity.state.client.firstPerson.FirstPersonTree;
import electrosphere.entity.state.movement.fall.FallTree; import electrosphere.entity.state.movement.fall.ClientFallTree;
import electrosphere.entity.state.movement.jump.ClientJumpTree; import electrosphere.entity.state.movement.jump.ClientJumpTree;
import electrosphere.entity.state.movement.jump.ClientJumpTree.JumpState; import electrosphere.entity.state.movement.jump.ClientJumpTree.JumpState;
import electrosphere.entity.state.movement.sprint.ClientSprintTree; import electrosphere.entity.state.movement.sprint.ClientSprintTree;
@ -89,7 +89,7 @@ public class ClientGroundMovementTree implements BehaviorTree {
ClientSprintTree sprintTree; ClientSprintTree sprintTree;
ClientJumpTree jumpTree; ClientJumpTree jumpTree;
FallTree fallTree; ClientFallTree fallTree;
GroundMovementSystem groundMovementData; GroundMovementSystem groundMovementData;
@ -459,7 +459,7 @@ public class ClientGroundMovementTree implements BehaviorTree {
this.jumpTree = jumpTree; this.jumpTree = jumpTree;
} }
public void setClientFallTree(FallTree fallTree){ public void setClientFallTree(ClientFallTree fallTree){
this.fallTree = fallTree; this.fallTree = fallTree;
} }

8
src/main/java/electrosphere/entity/types/creature/CreatureUtils.java
View File

@ -34,7 +34,7 @@ import electrosphere.entity.state.inventory.ServerInventoryState;
import electrosphere.entity.state.inventory.UnrelationalInventoryState; import electrosphere.entity.state.inventory.UnrelationalInventoryState;
import electrosphere.entity.state.life.ClientLifeTree; import electrosphere.entity.state.life.ClientLifeTree;
import electrosphere.entity.state.life.ServerLifeTree; import electrosphere.entity.state.life.ServerLifeTree;
import electrosphere.entity.state.movement.fall.FallTree; import electrosphere.entity.state.movement.fall.ClientFallTree;
import electrosphere.entity.state.movement.fall.ServerFallTree; import electrosphere.entity.state.movement.fall.ServerFallTree;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree;
import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree; import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree;
@ -181,15 +181,15 @@ public class CreatureUtils {
if(CreatureUtils.clientGetEntityMovementTree(rVal) != null && CreatureUtils.clientGetEntityMovementTree(rVal) instanceof ClientGroundMovementTree){ if(CreatureUtils.clientGetEntityMovementTree(rVal) != null && CreatureUtils.clientGetEntityMovementTree(rVal) instanceof ClientGroundMovementTree){
((ClientGroundMovementTree)CreatureUtils.clientGetEntityMovementTree(rVal)).setClientJumpTree(jumpTree); ((ClientGroundMovementTree)CreatureUtils.clientGetEntityMovementTree(rVal)).setClientJumpTree(jumpTree);
} }
if(FallTree.getFallTree(rVal)!=null){ if(ClientFallTree.getFallTree(rVal)!=null){
FallTree.getFallTree(rVal).setJumpTree(jumpTree); ClientFallTree.getFallTree(rVal).setJumpTree(jumpTree);
} }
break; break;
// //
// Falling // Falling
case FallMovementSystem.FALL_MOVEMENT_SYSTEM: case FallMovementSystem.FALL_MOVEMENT_SYSTEM:
FallMovementSystem fallMovementSystem = (FallMovementSystem)movementSystem; FallMovementSystem fallMovementSystem = (FallMovementSystem)movementSystem;
FallTree fallTree = new FallTree(rVal, fallMovementSystem); ClientFallTree fallTree = new ClientFallTree(rVal, fallMovementSystem);
if(CreatureUtils.clientGetEntityMovementTree(rVal) != null && CreatureUtils.clientGetEntityMovementTree(rVal) instanceof ClientGroundMovementTree){ if(CreatureUtils.clientGetEntityMovementTree(rVal) != null && CreatureUtils.clientGetEntityMovementTree(rVal) instanceof ClientGroundMovementTree){
((ClientGroundMovementTree)CreatureUtils.clientGetEntityMovementTree(rVal)).setClientFallTree(fallTree); ((ClientGroundMovementTree)CreatureUtils.clientGetEntityMovementTree(rVal)).setClientFallTree(fallTree);
} }