Skip to content

Improvements to Portal interactions with Sublevels #874

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

Draft
WeatheredCopperLantern wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −5
Draft

Improvements to Portal interactions with Sublevels #874

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions common/src/main/java/dev/ryanhcode/sable/mixin/entity/entities_in_blocks/EntityMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package dev.ryanhcode.sable.mixin.entity.entities_in_blocks;

import dev.ryanhcode.sable.Sable;
import dev.ryanhcode.sable.api.SubLevelHelper;
import dev.ryanhcode.sable.companion.math.BoundingBox3d;
import dev.ryanhcode.sable.sublevel.SubLevel;
import net.minecraft.CrashReport;
Expand Down Expand Up @@ -36,12 +37,11 @@ public abstract class EntityMixin {
protected void checkInsideBlocks(final CallbackInfo ci) {
final AABB bounds = this.getBoundingBox();

final BoundingBox3d localBounds = new BoundingBox3d(bounds);
for (final SubLevel intersecting : Sable.HELPER.getAllIntersecting(this.level, new BoundingBox3d(bounds))) {
localBounds.set(bounds);
localBounds.transformInverse(intersecting.logicalPose(), localBounds);
final BlockPos minPos = BlockPos.containing(localBounds.minX + 1.0E-7, localBounds.minY + 1.0E-7, localBounds.minZ + 1.0E-7);
final BlockPos maxPos = BlockPos.containing(localBounds.maxX - 1.0E-7, localBounds.maxY - 1.0E-7, localBounds.maxZ - 1.0E-7);
SubLevelHelper.pushEntityLocal(intersecting, (Entity) (Object) this);

final BlockPos minPos = BlockPos.containing(this.getBoundingBox().minX + 1.0E-7, this.getBoundingBox().minY + 1.0E-7, this.getBoundingBox().minZ + 1.0E-7);
final BlockPos maxPos = BlockPos.containing(this.getBoundingBox().maxX - 1.0E-7, this.getBoundingBox().maxY - 1.0E-7, this.getBoundingBox().maxZ - 1.0E-7);

if (this.level.hasChunksAt(minPos, maxPos)) {
final BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
Expand All @@ -50,6 +50,7 @@ protected void checkInsideBlocks(final CallbackInfo ci) {
for (int j = minPos.getY(); j <= maxPos.getY(); j++) {
for (int k = minPos.getZ(); k <= maxPos.getZ(); k++) {
if (!this.isAlive()) {
SubLevelHelper.popEntityLocal(intersecting, (Entity) (Object) this);
return;
}

Expand All @@ -60,6 +61,7 @@ protected void checkInsideBlocks(final CallbackInfo ci) {
blockState.entityInside(this.level, mutableBlockPos, (Entity) (Object) this);
this.onInsideBlock(blockState);
} catch (final Throwable var12) {
SubLevelHelper.popEntityLocal(intersecting, (Entity) (Object) this);
final CrashReport crashReport = CrashReport.forThrowable(var12, "Colliding entity with block");
final CrashReportCategory crashReportCategory = crashReport.addCategory("Block being collided with");
CrashReportCategory.populateBlockDetails(crashReportCategory, this.level, mutableBlockPos, blockState);
Expand All @@ -69,6 +71,8 @@ protected void checkInsideBlocks(final CallbackInfo ci) {
}
}
}

SubLevelHelper.popEntityLocal(intersecting, (Entity) (Object) this);
}
}
}