Skip to content

Commit

Permalink
More work on simplifying SimpleMovement
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexProgrammerDE committed Dec 11, 2024
1 parent b66e378 commit 83fdd28
Showing 1 changed file with 8 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public final class SimpleMovement extends GraphAction implements Cloneable {
// Mutable
private boolean requiresAgainstBlock = false;

private SimpleMovement(MovementDirection direction, MovementModifier modifier) {
private SimpleMovement(MovementDirection direction, MovementModifier modifier, SubscriptionConsumer blockSubscribers) {
this.direction = direction;
this.modifier = modifier;
this.diagonal = direction.isDiagonal();
Expand Down Expand Up @@ -100,19 +100,7 @@ private SimpleMovement(MovementDirection direction, MovementModifier modifier) {
unsafeToBreak = null;
noNeedToBreak = null;
}
}

public static void registerMovements(
Consumer<GraphAction> callback,
SubscriptionConsumer blockSubscribers) {
for (var direction : MovementDirection.VALUES) {
for (var modifier : MovementModifier.VALUES) {
callback.accept(new SimpleMovement(direction, modifier).registerMovement(blockSubscribers));
}
}
}

private SimpleMovement registerMovement(SubscriptionConsumer blockSubscribers) {
{
var blockId = 0;
for (var freeBlock : this.requiredFreeBlocks) {
Expand All @@ -137,8 +125,14 @@ private SimpleMovement registerMovement(SubscriptionConsumer blockSubscribers) {
this.registerRequiredSolidBlock(blockSubscribers);
this.registerDiagonalCollisionBlocks(blockSubscribers);
this.registerPossibleBlocksToPlaceAgainst(blockSubscribers);
}

return this;
public static void registerMovements(Consumer<GraphAction> callback, SubscriptionConsumer blockSubscribers) {
for (var direction : MovementDirection.VALUES) {
for (var modifier : MovementModifier.VALUES) {
callback.accept(new SimpleMovement(direction, modifier, blockSubscribers));
}
}
}

private int freeBlockIndex(SFVec3i block) {
Expand Down

0 comments on commit 83fdd28

Please sign in to comment.