Anvilcraft/HexCasting
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

started setting up tick scheduling and tracking for depowering circle components.

Browse source
This commit is contained in:
Talia-12 2023-04-03 14:47:33 +10:00
parent 0ec2a53f29
commit 60ca7659f2
4 changed files with 85 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Common/src/main/java/at/petrak/hexcasting/api/block/circle/BlockAbstractImpetus.java
View file

@ -67,7 +67,8 @@ public abstract class BlockAbstractImpetus extends BlockCircleComponent implemen
public void onRemove(BlockState pState, Level pLevel, BlockPos pPos, BlockState pNewState, boolean pIsMoving) {
if (!pNewState.is(pState.getBlock())
&& pLevel.getBlockEntity(pPos) instanceof BlockEntityAbstractImpetus impetus) {
// impetus.stopCasting(); TODO: Determine if this was important
impetus.endExecution(); // TODO: Determine if this was important
// TODO: Fix this, it should make all the glowy circle components stop glowing.
}
super.onRemove(pState, pLevel, pPos, pNewState, pIsMoving);
}

28
Common/src/main/java/at/petrak/hexcasting/api/casting/circles/BlockEntityAbstractImpetus.java
View file

@ -94,6 +94,9 @@ public abstract class BlockEntityAbstractImpetus extends HexBlockEntity implemen
//region execution
public void tickExecution() {
if (this.level == null)
return;
var state = this.getExecutionState();
if (state == null) {
return;
@ -101,8 +104,19 @@ public abstract class BlockEntityAbstractImpetus extends HexBlockEntity implemen
var shouldContinue = state.tick(this);
if (!shouldContinue)
if (!shouldContinue) {
this.endExecution();
this.executionState = null;
}
else
this.level.scheduleTick(this.getBlockPos(), this.getBlockState().getBlock(), state.getTickSpeed());
}
public void endExecution() {
if (this.executionState == null)
return;
this.executionState.endExecution(this);
}
/**
@ -127,11 +141,19 @@ public abstract class BlockEntityAbstractImpetus extends HexBlockEntity implemen
return; // TODO: error here?
if (this.level.isClientSide)
return; // TODO: error here?
if (this.executionState != null) {
return;
}
this.executionState = CircleExecutionState.createNew(this, player);
if (this.executionState == null)
return;
var serverLevel = (ServerLevel) this.level;
serverLevel.scheduleTick(this.getBlockPos(), this.getBlockState().getBlock(), this.executionState.getTickSpeed());
serverLevel.setBlockAndUpdate(this.getBlockPos(), this.getBlockState().setValue(BlockCircleComponent.ENERGIZED, true));
}

54
Common/src/main/java/at/petrak/hexcasting/api/casting/circles/CircleExecutionState.java
View file

@ -27,6 +27,7 @@ import java.util.*;
public class CircleExecutionState {
public static final String
TAG_KNOWN_POSITIONS = "known_positions",
TAG_REACHED_POSITIONS = "reached_positions",
TAG_CURRENT_POS = "current_pos",
TAG_ENTERED_FROM = "entered_from",
TAG_IMAGE = "image",
@ -34,6 +35,7 @@ public class CircleExecutionState {
// Does contain the starting impetus
public final Set<BlockPos> knownPositions;
public final List<BlockPos> reachedPositions;
public BlockPos currentPos;
public Direction enteredFrom;
public CastingImage currentImage;
@ -43,9 +45,11 @@ public class CircleExecutionState {
public @Nullable UUID caster;
protected CircleExecutionState(Set<BlockPos> knownPositions, BlockPos currentPos, Direction enteredFrom,
CastingImage currentImage, @Nullable UUID caster) {
protected CircleExecutionState(Set<BlockPos> knownPositions, List<BlockPos> reachedPositions,
BlockPos currentPos, Direction enteredFrom,
CastingImage currentImage, @Nullable UUID caster) {
this.knownPositions = knownPositions;
this.reachedPositions = reachedPositions;
this.currentPos = currentPos;
this.enteredFrom = enteredFrom;
this.currentImage = currentImage;
@ -99,9 +103,9 @@ public class CircleExecutionState {
var start = seenGoodPositions.get(0);
if (caster == null)
return new CircleExecutionState(new HashSet<>(seenGoodPositions), start, impetus.getStartDirection(), new CastingImage(), null);
return new CircleExecutionState(new HashSet<>(seenGoodPositions), List.of(impetus.getBlockPos()), start, impetus.getStartDirection(), new CastingImage(), null);
else
return new CircleExecutionState(new HashSet<>(seenGoodPositions), start, impetus.getStartDirection(), new CastingImage(), caster.getUUID());
return new CircleExecutionState(new HashSet<>(seenGoodPositions), List.of(impetus.getBlockPos()), start, impetus.getStartDirection(), new CastingImage(), caster.getUUID());
}
public CompoundTag save() {
@ -112,6 +116,12 @@ public class CircleExecutionState {
knownTag.add(NbtUtils.writeBlockPos(bp));
}
out.put(TAG_KNOWN_POSITIONS, knownTag);
var reachedTag = new ListTag();
for (var bp : this.reachedPositions) {
reachedTag.add(NbtUtils.writeBlockPos(bp));
}
out.put(TAG_REACHED_POSITIONS, reachedTag);
out.put(TAG_CURRENT_POS, NbtUtils.writeBlockPos(this.currentPos));
out.putByte(TAG_ENTERED_FROM, (byte) this.enteredFrom.ordinal());
@ -129,6 +139,11 @@ public class CircleExecutionState {
for (var tag : knownTag) {
knownPositions.add(NbtUtils.readBlockPos(HexUtils.downcast(tag, CompoundTag.TYPE)));
}
var reachedPositions = new ArrayList<BlockPos>();
var reachedTag = nbt.getList(TAG_REACHED_POSITIONS, Tag.TAG_COMPOUND);
for (var tag : reachedTag) {
reachedPositions.add(NbtUtils.readBlockPos(HexUtils.downcast(tag, CompoundTag.TYPE)));
}
var currentPos = NbtUtils.readBlockPos(nbt.getCompound(TAG_CURRENT_POS));
var enteredFrom = Direction.values()[nbt.getByte(TAG_ENTERED_FROM)];
@ -138,7 +153,7 @@ public class CircleExecutionState {
if (nbt.hasUUID(TAG_CASTER))
caster = nbt.getUUID(TAG_CASTER);
return new CircleExecutionState(knownPositions, currentPos, enteredFrom, image, caster);
return new CircleExecutionState(knownPositions, reachedPositions, currentPos, enteredFrom, image, caster);
}
/**
@ -198,10 +213,37 @@ public class CircleExecutionState {
Component.literal(this.currentPos.toShortString()).withStyle(ChatFormatting.RED)),
new ItemStack(Items.OAK_SIGN));
halt = true;
} else {
// A single valid exit position has been found.
knownPositions.add(found.getFirst());
currentPos = found.getFirst();
enteredFrom = found.getSecond();
currentImage = cont.update;
}
}
return !halt;
}
/**
* How many ticks should pass between activations, given the number of blocks encountered so far.
*/
protected int getTickSpeed() {
return Math.max(2, 10 - (this.reachedPositions.size() - 1) / 3);
}
public void endExecution(BlockEntityAbstractImpetus impetus) {
var world = (ServerLevel) impetus.getLevel();
if (world == null)
return; // TODO: error here?
for (var pos : this.reachedPositions) {
var there = world.getBlockState(pos);
if (there instanceof ICircleComponent cc) {
}
}
}
}

11
Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/BlockSlate.java
View file

@ -34,7 +34,9 @@ import net.minecraft.world.phys.shapes.VoxelShape;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
// When on the floor or ceiling FACING is the direction the *bottom* of the pattern points
// (or which way is "down").
@ -74,7 +76,14 @@ public class BlockSlate extends BlockCircleComponent implements EntityBlock, Sim
@Override
public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Direction enterDir, BlockPos pos, BlockState bs, ServerLevel world) {
return null;
// TODO: Do something here actually with imageIn
var exitDirsSet = this.possibleExitDirections(pos, bs, world);
exitDirsSet.remove(enterDir);
var exitDirs = exitDirsSet.stream().map((dir) -> this.exitPositionFromDirection(pos, dir));
return new ControlFlow.Continue(imageIn, exitDirs.toList());
}
@Override