Skip to content

Fix issues with circle bounds #1233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Robotgiggle wants to merge 3 commits into
base: 1.21
Choose a base branch
from
Open

Fix issues with circle bounds #1233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0b5c35
Fix off-by-one error in spell circle bounds
Robotgiggle Aug 3, 2026
0382ff8
Fix fold reflections not giving the center of the corner block
Robotgiggle Aug 3, 2026
bd83c44
Update fold reflection lang to describe actual behavior
Robotgiggle Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Common/src/main/java/at/petrak/hexcasting/api/casting/circles/CircleExecutionState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public class CircleExecutionState {

protected CircleExecutionState(BlockPos impetusPos, Direction impetusDir, HashSet<BlockPos> reachedPositions,
BlockPos currentPos, Direction enteredFrom, CastingImage currentImage, @Nullable UUID caster,
@Nullable FrozenPigment casterPigment, Long reachedSlate, BlockPos greaterCorner, BlockPos lesserPos) {
@Nullable FrozenPigment casterPigment, Long reachedSlate, BlockPos greaterCorner, BlockPos lesserCorner) {
this.impetusPos = impetusPos;
this.impetusDir = impetusDir;
this.reachedPositions = reachedPositions;
Expand All @@ -72,8 +72,8 @@ protected CircleExecutionState(BlockPos impetusPos, Direction impetusDir, HashSe
this.reachedSlate = reachedSlate;

this.greaterCorner = greaterCorner;
this.lesserCorner = lesserPos;
this.bounds = new BlockBox(greaterCorner, lesserPos);
this.lesserCorner = lesserCorner;
this.bounds = new BlockBox(greaterCorner, lesserCorner);
}

public @Nullable ServerPlayer getCaster(ServerLevel world) {
Expand Down Expand Up @@ -165,7 +165,7 @@ protected CircleExecutionState(BlockPos impetusPos, Direction impetusDir, HashSe
new CircleExecutionState(impetus.getBlockPos(), impetus.getStartDirection(),
reachedPositions, impetus.getBlockPos().offset(impetus.getStartDirection().getNormal()),
impetus.getStartDirection(), new CastingImage(), casterUUID, colorizer, 0L,
positiveBlock.move(1,1,1), negativeBlock));
positiveBlock, negativeBlock));
}

public CompoundTag save() {
Expand Down
6 changes: 3 additions & 3 deletions Common/src/main/java/at/petrak/hexcasting/common/casting/actions/circles/OpCircleBounds.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ class OpCircleBounds(val max: Boolean) : ConstMediaAction {
throw MishapNoSpellCircle()
val circle = env.impetus ?: throw MishapNoSpellCircle()

val aabb = circle.executionState!!.bounds // the circle should have an execution state since it's executing this.
val boundsBox = circle.executionState!!.bounds // the circle should have an execution state since it's executing this.

return if (max)
aabb.aabb().maxPosition.asActionResult
boundsBox.max().asActionResult
else
aabb.aabb().minPosition.asActionResult
boundsBox.min().asActionResult
}
}
4 changes: 2 additions & 2 deletions Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2029,8 +2029,8 @@

"circle/impetus_pos": "Returns the position of the $(l:greatwork/impetus)$(item)Impetus/$ of this spell circle.",
"circle/impetus_dir": "Returns the direction the $(l:greatwork/impetus)$(item)Impetus/$ of this spell circle is facing as a unit vector.",
"circle/bounds/min": "Returns the position of the lower-north-west corner of the bounds of this spell circle.",
"circle/bounds/max": "Returns the position of the upper-south-east corner of the bounds of this spell circle.",
"circle/bounds/min": "Returns the position of the block at the lower-north-west corner of this spell circle's bounds.",
"circle/bounds/max": "Returns the position of the block at the upper-south-east corner of this spell circle's bounds.",
},

akashic_patterns: {
Expand Down
Loading