Skip to content

Discussion on explosion behavior change (1/2): Refactor to be ray-based instead of block bounds-based #925

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
EZForever wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −43
Open

Discussion on explosion behavior change (1/2): Refactor to be ray-based instead of block bounds-based #925

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
68 changes: 25 additions & 43 deletions common/src/main/java/dev/ryanhcode/sable/mixin/explosion/ExplosionMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,53 +102,35 @@ public class ExplosionMixin {

for (final SubLevel subLevel : subLevels) {
final Pose3d pose = subLevel.logicalPose();
final Vec3 localRayPosition = pose.transformPositionInverse(new Vec3(d4, d6, d8));
final Vec3 localExplosionPosition = pose.transformPositionInverse(new Vec3(this.x, this.y, this.z));

final BoundingBox3d localBounds = new BoundingBox3d();
globalBounds.transformInverse(pose, localBounds);
blockpos = BlockPos.containing(localRayPosition);
blockstate = this.level.getBlockState(blockpos);
fluidstate = this.level.getFluidState(blockpos);

final BoundingBox3i blockBounds = new BoundingBox3i(
Mth.floor(localBounds.minX()),
Mth.floor(localBounds.minY()),
Mth.floor(localBounds.minZ()),
Mth.floor(localBounds.maxX()),
Mth.floor(localBounds.maxY()),
Mth.floor(localBounds.maxZ())
);
final boolean canExplodeBefore = f > 0.0;

final Vec3 localExplosionPosition = pose.transformPositionInverse(new Vec3(this.x, this.y, this.z));
final Optional<Float> optional = this.damageCalculator.getBlockExplosionResistance(self, this.level, blockpos, blockstate, fluidstate);
if (optional.isPresent()) {
f -= (optional.get() + 0.3F) * 0.3F;
}

if (f > 0.0F && this.damageCalculator.shouldBlockExplode(self, this.level, blockpos, blockstate, f)) {
set.add(blockpos);
}

final boolean wind = this.source instanceof AbstractWindCharge && !blockstate.isAir();
if (canExplodeBefore && (f < 0.0f || wind) && explodedSet.get().add(blockpos)) {
explodedSet.get().add(blockpos);

if (subLevel instanceof final ServerSubLevel serverSubLevel) {
final SubLevelPhysicsSystem physicsSystem = ((ServerSubLevelContainer) container).physicsSystem();
final RigidBodyHandle handle = physicsSystem.getPhysicsHandle(serverSubLevel);

for (int x = blockBounds.minX(); x <= blockBounds.maxX(); x++) {
for (int z = blockBounds.minZ(); z <= blockBounds.maxZ(); z++) {
for (int y = blockBounds.minY(); y <= blockBounds.maxY(); y++) {
blockpos = new BlockPos(x, y, z);
blockstate = this.level.getBlockState(blockpos);
fluidstate = this.level.getFluidState(blockpos);

final boolean canExplodeBefore = f > 0.0;

final Optional<Float> optional = this.damageCalculator.getBlockExplosionResistance(self, this.level, blockpos, blockstate, fluidstate);
if (optional.isPresent()) {
f -= (optional.get() + 0.3F) * 0.3F;
}

if (f > 0.0F && this.damageCalculator.shouldBlockExplode(self, this.level, blockpos, blockstate, f)) {
set.add(blockpos);
}

final boolean wind = this.source instanceof AbstractWindCharge && !blockstate.isAir();
if (canExplodeBefore && (f < 0.0f || wind) && explodedSet.get().add(blockpos)) {
explodedSet.get().add(blockpos);

if (subLevel instanceof final ServerSubLevel serverSubLevel) {
final SubLevelPhysicsSystem physicsSystem = ((ServerSubLevelContainer) container).physicsSystem();
final RigidBodyHandle handle = physicsSystem.getPhysicsHandle(serverSubLevel);

final Vec3 pos = blockpos.getCenter();
final Vec3 force = pos.subtract(localExplosionPosition).normalize().scale(5.0);
handle.applyImpulseAtPoint(pos, force);
}
}
}
final Vec3 pos = blockpos.getCenter();
final Vec3 force = pos.subtract(localExplosionPosition).normalize().scale(5.0);
handle.applyImpulseAtPoint(pos, force);
}
}
}
Expand Down