-
-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
First work on implementing down digging movement
- Loading branch information
1 parent
d8a0421
commit 268016d
Showing
8 changed files
with
189 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 113 additions & 0 deletions
113
...in/java/net/pistonmaster/serverwrecker/pathfinding/graph/actions/updown/DownMovement.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| /* | ||
| * ServerWrecker | ||
| * | ||
| * Copyright (C) 2023 ServerWrecker | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public | ||
| * License along with this program. If not, see | ||
| * <http://www.gnu.org/licenses/gpl-3.0.html>. | ||
| */ | ||
| package net.pistonmaster.serverwrecker.pathfinding.graph.actions.updown; | ||
|
|
||
| import it.unimi.dsi.fastutil.objects.ObjectArrayList; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import net.pistonmaster.serverwrecker.pathfinding.BotEntityState; | ||
| import net.pistonmaster.serverwrecker.pathfinding.Costs; | ||
| import net.pistonmaster.serverwrecker.pathfinding.execution.BlockBreakAction; | ||
| import net.pistonmaster.serverwrecker.pathfinding.graph.actions.GraphAction; | ||
| import net.pistonmaster.serverwrecker.pathfinding.graph.actions.GraphInstructions; | ||
| import net.pistonmaster.serverwrecker.pathfinding.graph.actions.movement.MovementMiningCost; | ||
| import net.pistonmaster.serverwrecker.util.VectorHelper; | ||
| import org.cloudburstmc.math.vector.Vector3i; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class DownMovement implements GraphAction { | ||
| private static final Vector3i FEET_POSITION_RELATIVE_BLOCK = Vector3i.ZERO; | ||
| private final Vector3i targetToMineBlock; | ||
| @Getter | ||
| @Setter | ||
| private MovementMiningCost blockBreakCosts; | ||
| private double cost; | ||
| @Setter | ||
| @Getter | ||
| private boolean isImpossible = false; | ||
| @Getter | ||
| @Setter | ||
| private int closestBlockToFallOn = Integer.MIN_VALUE; | ||
|
|
||
| public DownMovement() { | ||
| this.targetToMineBlock = FEET_POSITION_RELATIVE_BLOCK.sub(0, 1, 0); | ||
| } | ||
|
|
||
| private DownMovement(DownMovement other) { | ||
| this.targetToMineBlock = other.targetToMineBlock; | ||
| this.cost = other.cost; | ||
| this.isImpossible = other.isImpossible; | ||
| this.blockBreakCosts = other.blockBreakCosts; | ||
| this.closestBlockToFallOn = other.closestBlockToFallOn; | ||
| } | ||
|
|
||
| public Vector3i blockToBreak() { | ||
| return targetToMineBlock; | ||
| } | ||
|
|
||
| public List<Vector3i> listSafetyCheckBlocks() { | ||
| List<Vector3i> requiredFreeBlocks = new ObjectArrayList<>(); | ||
|
|
||
| // Falls one block | ||
| requiredFreeBlocks.add(FEET_POSITION_RELATIVE_BLOCK.sub(0, 2, 0)); | ||
|
|
||
| // Falls two blocks | ||
| requiredFreeBlocks.add(FEET_POSITION_RELATIVE_BLOCK.sub(0, 3, 0)); | ||
|
|
||
| // Falls three blocks | ||
| requiredFreeBlocks.add(FEET_POSITION_RELATIVE_BLOCK.sub(0, 4, 0)); | ||
|
|
||
| return requiredFreeBlocks; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isImpossibleToComplete() { | ||
| return isImpossible || closestBlockToFallOn == Integer.MIN_VALUE; | ||
| } | ||
|
|
||
| @Override | ||
| public GraphInstructions getInstructions(BotEntityState previousEntityState) { | ||
| var absoluteMinedBlock = previousEntityState.positionBlock().add(targetToMineBlock); | ||
| var absoluteTargetFeetBlock = previousEntityState.positionBlock().add(0, closestBlockToFallOn + 1, 0); | ||
| var targetFeetDoublePosition = VectorHelper.middleOfBlockNormalize(absoluteTargetFeetBlock.toDouble()); | ||
|
|
||
| cost += switch (closestBlockToFallOn) { | ||
| case -2 -> Costs.FALL_1; | ||
| case -3 -> Costs.FALL_2; | ||
| case -4 -> Costs.FALL_3; | ||
| default -> throw new IllegalStateException("Unexpected value: " + closestBlockToFallOn); | ||
| }; | ||
|
|
||
| cost += blockBreakCosts.miningCost(); | ||
|
|
||
| return new GraphInstructions(new BotEntityState( | ||
| targetFeetDoublePosition, | ||
| absoluteTargetFeetBlock, | ||
| previousEntityState.levelState(), | ||
| previousEntityState.inventory() | ||
| ), cost, List.of(new BlockBreakAction(absoluteMinedBlock))); | ||
| } | ||
|
|
||
| @Override | ||
| public DownMovement copy(BotEntityState previousEntityState) { | ||
| return new DownMovement(this); | ||
| } | ||
| } |
25 changes: 0 additions & 25 deletions
25
...java/net/pistonmaster/serverwrecker/pathfinding/graph/actions/updown/UpDownDirection.java
This file was deleted.
Oops, something went wrong.
23 changes: 0 additions & 23 deletions
23
.../java/net/pistonmaster/serverwrecker/pathfinding/graph/actions/updown/UpDownMovement.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters