mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2025-02-09 03:34:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '1.20.1/dev' into 1.21.1/dev

Browse source
This commit is contained in:
Jozufozu 2025-02-03 21:04:39 -08:00
commit c157389257
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/src/backend/java/dev/engine_room/flywheel/backend/engine/LightStorage.java
View file

@ -250,10 +250,9 @@ public class LightStorage implements Effect {
for (int x = -1; x < 17; x++) {
blockPos.set(xMin + x, yMin + y, zMin + z);
boolean isFullBlock = level.getBlockState(blockPos)
.isCollisionShapeFullBlock(level, blockPos);
var blockState = level.getBlockState(blockPos);
if (isFullBlock) {
if (blockState.canOcclude() && blockState.isCollisionShapeFullBlock(level, blockPos)) {
bitSet.set(index);
}

10
common/src/lib/java/dev/engine_room/flywheel/lib/transform/Rotate.java
View file

@ -99,8 +99,16 @@ public interface Rotate<Self extends Rotate<Self>> {
};
}
default Self rotateTo(float fromX, float fromY, float fromZ, float toX, float toY, float toZ) {
return rotate(new Quaternionf().rotateTo(fromX, fromY, fromZ, toX, toY, toZ));
}
default Self rotateTo(Vector3fc from, Vector3fc to) {
return rotate(new Quaternionf().rotateTo(from, to));
return rotateTo(from.x(), from.y(), from.z(), to.x(), to.y(), to.z());
}
default Self rotateTo(Direction from, Direction to) {
return rotateTo(from.getStepX(), from.getStepY(), from.getStepZ(), to.getStepX(), to.getStepY(), to.getStepZ());
}
@SuppressWarnings("unchecked")