From 4571adc4a7ae211ec148aba48b6b56e8d0922a8b Mon Sep 17 00:00:00 2001 From: austin Date: Wed, 4 Sep 2024 21:32:52 -0400 Subject: [PATCH] move tree package --- .../electrosphere/entity/state/attack/ClientAttackTree.java | 2 +- .../electrosphere/entity/state/attack/ServerAttackTree.java | 2 +- .../electrosphere/entity/state/gravity/ClientGravityTree.java | 2 +- .../electrosphere/entity/state/gravity/ServerGravityTree.java | 2 +- .../entity/state/movement/{ => fall}/FallTree.java | 2 +- .../entity/state/movement/{ => fall}/ServerFallTree.java | 2 +- .../state/movement/groundmove/ClientGroundMovementTree.java | 2 +- .../state/movement/groundmove/ServerGroundMovementTree.java | 2 +- .../electrosphere/entity/types/creature/CreatureUtils.java | 4 ++-- .../entity/state/attack/ServerAttackTreeTests.java | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) rename src/main/java/electrosphere/entity/state/movement/{ => fall}/FallTree.java (98%) rename src/main/java/electrosphere/entity/state/movement/{ => fall}/ServerFallTree.java (98%) diff --git a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java index 3df50aac..5cad3fdd 100644 --- a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java +++ b/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java @@ -10,7 +10,7 @@ import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem; import electrosphere.entity.state.collidable.Impulse; import electrosphere.entity.state.equip.ClientEquipState; import electrosphere.entity.state.hitbox.HitboxCollectionState; -import electrosphere.entity.state.movement.FallTree; +import electrosphere.entity.state.movement.fall.FallTree; import electrosphere.entity.state.movement.jump.ClientJumpTree; import electrosphere.entity.state.rotator.RotatorTree; import electrosphere.entity.types.attach.AttachUtils; diff --git a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java index d3d66df6..b1a80e86 100644 --- a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java +++ b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java @@ -17,7 +17,7 @@ import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeState; import electrosphere.entity.state.collidable.Impulse; import electrosphere.entity.state.equip.ServerEquipState; import electrosphere.entity.state.hitbox.HitboxCollectionState; -import electrosphere.entity.state.movement.ServerFallTree; +import electrosphere.entity.state.movement.fall.ServerFallTree; import electrosphere.entity.state.movement.jump.ServerJumpTree; import electrosphere.entity.state.rotator.ServerRotatorTree; import electrosphere.entity.types.attach.AttachUtils; diff --git a/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java b/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java index aa3640c9..d4623d35 100644 --- a/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java +++ b/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java @@ -14,7 +14,7 @@ import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.state.collidable.Impulse; -import electrosphere.entity.state.movement.FallTree; +import electrosphere.entity.state.movement.fall.FallTree; import electrosphere.entity.state.movement.jump.ClientJumpTree; import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.synchronization.annotation.SyncedField; diff --git a/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java b/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java index a21be73d..c4efac62 100644 --- a/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java +++ b/src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java @@ -22,7 +22,7 @@ import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.state.collidable.Impulse; import electrosphere.entity.state.collidable.ServerCollidableTree; import electrosphere.entity.state.gravity.ClientGravityTree.GravityTreeState; -import electrosphere.entity.state.movement.ServerFallTree; +import electrosphere.entity.state.movement.fall.ServerFallTree; import electrosphere.entity.state.movement.jump.ServerJumpTree; import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.synchronization.annotation.SyncedField; diff --git a/src/main/java/electrosphere/entity/state/movement/FallTree.java b/src/main/java/electrosphere/entity/state/movement/fall/FallTree.java similarity index 98% rename from src/main/java/electrosphere/entity/state/movement/FallTree.java rename to src/main/java/electrosphere/entity/state/movement/fall/FallTree.java index d919c893..e8700f47 100644 --- a/src/main/java/electrosphere/entity/state/movement/FallTree.java +++ b/src/main/java/electrosphere/entity/state/movement/fall/FallTree.java @@ -1,4 +1,4 @@ -package electrosphere.entity.state.movement; +package electrosphere.entity.state.movement.fall; import electrosphere.audio.movement.MovementAudioService.InteractionType; import electrosphere.client.terrain.sampling.ClientVoxelSampler; diff --git a/src/main/java/electrosphere/entity/state/movement/ServerFallTree.java b/src/main/java/electrosphere/entity/state/movement/fall/ServerFallTree.java similarity index 98% rename from src/main/java/electrosphere/entity/state/movement/ServerFallTree.java rename to src/main/java/electrosphere/entity/state/movement/fall/ServerFallTree.java index 150ea960..ca07cb79 100644 --- a/src/main/java/electrosphere/entity/state/movement/ServerFallTree.java +++ b/src/main/java/electrosphere/entity/state/movement/fall/ServerFallTree.java @@ -1,4 +1,4 @@ -package electrosphere.entity.state.movement; +package electrosphere.entity.state.movement.fall; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; 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 5940b7c0..8ae85723 100644 --- a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java @@ -17,7 +17,7 @@ import electrosphere.entity.EntityUtils; import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.state.AnimationPriorities; import electrosphere.entity.state.client.firstPerson.FirstPersonTree; -import electrosphere.entity.state.movement.FallTree; +import electrosphere.entity.state.movement.fall.FallTree; import electrosphere.entity.state.movement.jump.ClientJumpTree; import electrosphere.entity.state.movement.jump.ClientJumpTree.JumpState; import electrosphere.entity.state.movement.sprint.ClientSprintTree; 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 a2bbf4b2..e2df5c70 100644 --- a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java @@ -15,7 +15,7 @@ import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.state.AnimationPriorities; -import electrosphere.entity.state.movement.ServerFallTree; +import electrosphere.entity.state.movement.fall.ServerFallTree; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementRelativeFacing; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState; import electrosphere.entity.state.movement.jump.ServerJumpTree; diff --git a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java b/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java index a27308a9..cad5563e 100644 --- a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java +++ b/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java @@ -34,8 +34,8 @@ import electrosphere.entity.state.inventory.ServerInventoryState; import electrosphere.entity.state.inventory.UnrelationalInventoryState; import electrosphere.entity.state.life.ClientLifeTree; import electrosphere.entity.state.life.ServerLifeTree; -import electrosphere.entity.state.movement.FallTree; -import electrosphere.entity.state.movement.ServerFallTree; +import electrosphere.entity.state.movement.fall.FallTree; +import electrosphere.entity.state.movement.fall.ServerFallTree; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree; import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree; import electrosphere.entity.state.movement.jump.ClientJumpTree; diff --git a/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java b/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java index 66e28a0f..508d8c85 100644 --- a/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java +++ b/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java @@ -11,7 +11,7 @@ import electrosphere.entity.Entity; import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeState; import electrosphere.entity.state.equip.ServerEquipState; import electrosphere.entity.state.inventory.InventoryUtils; -import electrosphere.entity.state.movement.ServerFallTree; +import electrosphere.entity.state.movement.fall.ServerFallTree; import electrosphere.entity.types.creature.CreatureTemplate; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.item.ItemUtils;