diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 1c5022dc..7a7c7ec9 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1647,6 +1647,7 @@ New AI behaviors Fix bug where sync messages eternally bounce if the entity was already deleted Fix blocks not saving to disk when being ejected from cache Block chunk memory pooling +Rename MoveToTree diff --git a/src/main/java/electrosphere/server/ai/trees/creature/AcquireItemTree.java b/src/main/java/electrosphere/server/ai/trees/creature/AcquireItemTree.java index 8b76f57c..36ffc109 100644 --- a/src/main/java/electrosphere/server/ai/trees/creature/AcquireItemTree.java +++ b/src/main/java/electrosphere/server/ai/trees/creature/AcquireItemTree.java @@ -44,7 +44,7 @@ public class AcquireItemTree { new SourcingTypeNode(SourcingType.PICKUP, BlackboardKeys.ITEM_TARGET_CATEGORY), //logic to pick up the item new TargetEntityCategoryNode(BlackboardKeys.ITEM_TARGET_CATEGORY), - MoveToTarget.create(CollisionEngine.DEFAULT_INTERACT_DISTANCE, BlackboardKeys.ENTITY_TARGET), + MoveToTree.create(CollisionEngine.DEFAULT_INTERACT_DISTANCE, BlackboardKeys.ENTITY_TARGET), new CollectItemNode(), new RunnerNode(null) ), @@ -60,7 +60,7 @@ public class AcquireItemTree { //check if we should be sourcing this from harvesting foliage new SourcingTypeNode(SourcingType.HARVEST, blackboardKey), new TargetEntityCategoryNode(BlackboardKeys.HARVEST_TARGET_TYPE), - MoveToTarget.create(CollisionEngine.DEFAULT_INTERACT_DISTANCE, BlackboardKeys.ENTITY_TARGET), + MoveToTree.create(CollisionEngine.DEFAULT_INTERACT_DISTANCE, BlackboardKeys.ENTITY_TARGET), new HarvestNode(), new RunnerNode(null) ), diff --git a/src/main/java/electrosphere/server/ai/trees/creature/MoveToTarget.java b/src/main/java/electrosphere/server/ai/trees/creature/MoveToTree.java similarity index 98% rename from src/main/java/electrosphere/server/ai/trees/creature/MoveToTarget.java rename to src/main/java/electrosphere/server/ai/trees/creature/MoveToTree.java index cbe3ee90..9e79166f 100644 --- a/src/main/java/electrosphere/server/ai/trees/creature/MoveToTarget.java +++ b/src/main/java/electrosphere/server/ai/trees/creature/MoveToTree.java @@ -14,7 +14,7 @@ import electrosphere.server.ai.nodes.meta.decorators.SucceederNode; /** * Moves to a target */ -public class MoveToTarget { +public class MoveToTree { /** * Name of the tree diff --git a/src/main/java/electrosphere/server/ai/trees/creature/melee/FellTree.java b/src/main/java/electrosphere/server/ai/trees/creature/melee/FellTree.java index 09ba3132..b101657b 100644 --- a/src/main/java/electrosphere/server/ai/trees/creature/melee/FellTree.java +++ b/src/main/java/electrosphere/server/ai/trees/creature/melee/FellTree.java @@ -16,7 +16,7 @@ import electrosphere.server.ai.nodes.meta.debug.PublishStatusNode; import electrosphere.server.ai.nodes.meta.decorators.RunnerNode; import electrosphere.server.ai.nodes.meta.decorators.TimerNode; import electrosphere.server.ai.nodes.meta.decorators.UntilNode; -import electrosphere.server.ai.trees.creature.MoveToTarget; +import electrosphere.server.ai.trees.creature.MoveToTree; import electrosphere.server.ai.trees.creature.inventory.EquipToolbarTree; /** @@ -68,7 +68,7 @@ public class FellTree { ), //move to target - MoveToTarget.create(FellTree.FELL_RANGE, targetKey), + MoveToTree.create(FellTree.FELL_RANGE, targetKey), //movement succeeded, but failed to attack -- tree is currently running new RunnerNode(null) diff --git a/src/main/java/electrosphere/server/ai/trees/struct/BuildStructureTree.java b/src/main/java/electrosphere/server/ai/trees/struct/BuildStructureTree.java index f6a0cdfa..0d28e5a2 100644 --- a/src/main/java/electrosphere/server/ai/trees/struct/BuildStructureTree.java +++ b/src/main/java/electrosphere/server/ai/trees/struct/BuildStructureTree.java @@ -13,7 +13,7 @@ import electrosphere.server.ai.nodes.meta.debug.PublishStatusNode; import electrosphere.server.ai.nodes.meta.decorators.SucceederNode; import electrosphere.server.ai.nodes.solvers.SolveBuildMaterialNode; import electrosphere.server.ai.trees.creature.AcquireItemTree; -import electrosphere.server.ai.trees.creature.MoveToTarget; +import electrosphere.server.ai.trees.creature.MoveToTree; /** * A tree to build whatever the current structure target is @@ -44,7 +44,7 @@ public class BuildStructureTree { //if we're within range to place the material new SequenceNode( //not in range, move to within range - MoveToTarget.create(CollisionEngine.DEFAULT_INTERACT_DISTANCE, BlackboardKeys.STRUCTURE_TARGET), + MoveToTree.create(CollisionEngine.DEFAULT_INTERACT_DISTANCE, BlackboardKeys.STRUCTURE_TARGET), //equip the type of block to place EquipToolbarNode.equipBlock(BlackboardKeys.BUILDING_MATERIAL_CURRENT), //in range, place block