Skip to content

Commit

Permalink
Improve piranha part hitbox
Browse files Browse the repository at this point in the history
  • Loading branch information
@WenXin20
WenXin20 committed Jan 24, 2025
1 parent b0dc44c commit 689e14a
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 97 deletions.
149 changes: 54 additions & 95 deletions src/main/java/com/wenxin2/marioverse/entities/PiranhaPlantEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import net.minecraft.world.entity.MoverType;
import net.minecraft.world.entity.Pose;
import net.minecraft.world.entity.ai.attributes.AttributeInstance;
import net.minecraft.world.entity.ai.attributes.AttributeMap;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.entity.ai.goal.MeleeAttackGoal;
import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal;
Expand Down Expand Up @@ -68,8 +69,6 @@ public class PiranhaPlantEntity extends Monster implements GeoEntity {
private Direction attachedSide;
private PiranhaPlantPart[] subEntities;
public PiranhaPlantPart head;
private float lastWidth = 1.0F;
private float lastHeight = 1.0F;

@Nullable private BlockPos targetPosition;

Expand Down Expand Up @@ -176,12 +175,10 @@ public void addAdditionalSaveData(CompoundTag tag) {

@Override
public void tick() {
float currentWidth = getWidthAttribute();
float currentHeight = getHeightAttribute();

super.tick();
this.checkForCollisions();
this.hideInBlock();
// this.hideInBlock();

if (this.isInWaterOrBubble())
this.ejectPassengers();
Expand Down Expand Up @@ -229,6 +226,7 @@ public void baseTick() {
public void aiStep() {
super.aiStep();
Direction attachedSide = this.getAttachedSide();

if (attachedSide != null) {
Vec3 offset = calculateHitboxOffset(attachedSide);
this.tickPart(this.head, offset.x, offset.y, offset.z);
Expand All @@ -253,66 +251,31 @@ protected EntityDimensions getDefaultDimensions(Pose pose) {
@Override
public AABB makeBoundingBox() {
Direction facing = this.getAttachedSide();
if (facing == null) {
double height = this.getHeightAttribute();
double width = this.getWidthAttribute();

if (facing == null)
facing = Direction.UP;
}

return switch (facing) {
case UP ->
new AABB(
this.getX() - 0.5, // min X
this.getY(), // min Y (start from current Y)
this.getZ() - 0.5, // min Z
this.getX() + 0.5, // max X
this.getY() + 2.0, // max Y (increase height for DOWN)
this.getZ() + 0.5 // max Z
);
case DOWN ->
// When facing DOWN, adjust the height of the bounding box
new AABB(
this.getX() - 0.5, // min X
this.getY() - 1.0, // min Y (start from current Y)
this.getZ() - 0.5, // min Z
this.getX() + 0.5, // max X
this.getY() + 1.0, // max Y (increase height for DOWN)
this.getZ() + 0.5 // max Z
);
case NORTH ->
// When facing NORTH or SOUTH, adjust the depth of the bounding box
new AABB(
this.getX() - 0.5, // min X
this.getY(), // min Y (no change to height)
this.getZ() - 1.0, // min Z
this.getX() + 0.5, // max X
this.getY() + 1.0, // max Y (adjust height for NORTH/SOUTH)
this.getZ() + 1.0 // max Z (adjust depth)
);
case SOUTH ->
// When facing NORTH or SOUTH, adjust the depth of the bounding box
new AABB(
this.getX() - 0.5, // min X
this.getY(), // min Y (no change to height)
this.getZ() - 0.5, // min Z
this.getX() + 0.5, // max X
this.getY() + 1.0, // max Y (adjust height for NORTH/SOUTH)
this.getZ() + 2.0 // max Z (adjust depth)
);
case UP -> new AABB(
this.getX() - 0.5 * width, this.getY(), this.getZ() - 0.5 * width,
this.getX() + 0.5 * width, this.getY() + 2.3125 * height, this.getZ() + 0.5 * width);
case DOWN -> new AABB(
this.getX() - 0.5 * width, this.getY() - 1.3125, this.getZ() - 0.5 * width,
this.getX() + 0.5 * width, this.getY() + 1.0 * height, this.getZ() + 0.5 * width);
case NORTH -> new AABB(
this.getX() - 0.5 * width, this.getY(), this.getZ() - 1.8125 * width,
this.getX() + 0.5 * width, this.getY() + 1.0 * height, this.getZ() + 0.5 * width);
case SOUTH -> new AABB(
this.getX() - 0.5 * width, this.getY(), this.getZ() - 0.5 * width,
this.getX() + 0.5 * width, this.getY() + 1.0 * height, this.getZ() + 1.8125 * width);
case EAST -> new AABB(
this.getX() - 1.0, // min X
this.getY(), // min Y (no change to height)
this.getZ() - 0.5, // min Z
this.getX() + 1.0, // max X (increase width for EAST/WEST)
this.getY() + 2.0, // max Y (adjust height)
this.getZ() + 0.5 // max Z (no change to Z)
);
this.getX() - 0.5 * width, this.getY(), this.getZ() - 0.5 * width,
this.getX() + 1.8125 * width, this.getY() + 1.0 * height, this.getZ() + 0.5 * width);
case WEST -> new AABB(
this.getX() - 0.5, // min X
this.getY(), // min Y (no change to height)
this.getZ() - 0.5, // min Z
this.getX() + 1.0, // max X (increase width for EAST/WEST)
this.getY() + 1.0, // max Y (adjust height)
this.getZ() + 0.5 // max Z (no change to Z)
);
this.getX() - 1.8125 * width, this.getY(), this.getZ() - 0.5 * width,
this.getX() + 0.5 * width, this.getY() + 1.0 * height, this.getZ() + 0.5 * width);
};
}

Expand Down Expand Up @@ -391,14 +354,12 @@ public void recreateFromPacket(ClientboundAddEntityPacket packet) {
private void tickPart(PiranhaPlantPart part, double offsetX, double offsetY, double offsetZ) {
double width = part.getBbWidth() / 2.0;
double height = part.getBbHeight();
part.setPos(this.getX() + offsetX, this.getY() + offsetY, this.getZ() + offsetZ);
part.setBoundingBox(new AABB((this.getX() + offsetX) - width, this.getY() + offsetY, (this.getZ() + offsetZ) - width,
(this.getX() + offsetX) + width, (this.getY() + offsetY) + height, (this.getZ() + offsetZ) + width));
}
double heightScale = this.getHeightAttribute();
double widthScale = this.getWidthAttribute();

private void recreateHeadPart(float width, float height) {
this.head = new PiranhaPlantPart(this, "head", width, height);
this.subEntities = new PiranhaPlantPart[]{this.head};
part.setPos(this.getX() + offsetX, this.getY() + offsetY, this.getZ() + offsetZ);
part.setBoundingBox(new AABB(this.getX() + offsetX - width, this.getY() + offsetY, this.getZ() + offsetZ - width,
this.getX() + (offsetX + width * widthScale), this.getY() + (offsetY + height * heightScale), this.getZ() + (offsetZ + width * widthScale)));
}

private Vec3 calculateHitboxOffset(Direction attachedSide) {
Expand All @@ -420,12 +381,18 @@ private Vec3 calculateHitboxOffset(Direction attachedSide) {
return new Vec3(offsetX, offsetY, offsetZ);
}

private float getWidthAttribute() {
return (float) this.getAttributeValue(AttributesRegistry.WIDTH_SCALE);
private float getHeightAttribute() {
AttributeMap attributeMap = this.getAttributes();
if (attributeMap != null)
return (float) this.getAttributeValue(AttributesRegistry.HEIGHT_SCALE);
else return 1.0F;
}

private float getHeightAttribute() {
return (float) this.getAttributeValue(AttributesRegistry.HEIGHT_SCALE);
private float getWidthAttribute() {
AttributeMap attributeMap = this.getAttributes();
if (attributeMap != null)
return (float) this.getAttributeValue(AttributesRegistry.WIDTH_SCALE);
else return 1.0F;
}

public Direction getAttachedSide() {
Expand All @@ -446,7 +413,6 @@ public void setAttachedBlockPos(BlockPos pos) {

public void attachToBlock(BlockPos blockPos, Direction direction) {
this.attachedBlockPos = blockPos;
this.attachedSide = side;
this.attachedSide = direction;
this.setNoGravity(true);
this.setDeltaMovement(Vec3.ZERO);
Expand All @@ -458,7 +424,6 @@ public void detachFromBlock() {
this.setNoGravity(false);
}

private BlockPos findValidBlockPos() {
public BlockPos findValidBlockPos() {
BlockPos entityPos = this.blockPosition();
for (Direction direction : Direction.values()) {
Expand All @@ -473,7 +438,6 @@ public BlockPos findValidBlockPos() {
return null;
}

private Direction determineAttachmentSide(BlockPos blockPos) {
public Direction determineAttachmentSide(BlockPos blockPos) {
BlockPos entityPos = this.blockPosition();
for (Direction direction : Direction.values()) {
Expand Down Expand Up @@ -528,21 +492,20 @@ public void hideInBlock() {

}

if (this.isHiding() && !state.is(TagRegistry.PIRANHA_PLANTS_CAN_HIDE)
&& !stateBelow.is(TagRegistry.PIRANHA_PLANTS_CAN_HIDE)
&& !state.hasProperty(BlockStateProperties.FACING)
&& !stateBelow.hasProperty(BlockStateProperties.FACING)) {
this.stopHiding();
return;
}
// if (this.isHiding() && !state.is(TagRegistry.PIRANHA_PLANTS_CAN_HIDE)
// && !stateBelow.is(TagRegistry.PIRANHA_PLANTS_CAN_HIDE)
// && !state.hasProperty(BlockStateProperties.FACING)
// && !stateBelow.hasProperty(BlockStateProperties.FACING)) {
// this.stopHiding();
// return;
// }

Direction[] prioritizedDirections = new Direction[]{Direction.UP, Direction.DOWN, Direction.NORTH, Direction.SOUTH, Direction.EAST, Direction.WEST};

if (this.isHiding()) {
// Handle emerging from hiding
for (Direction direction : prioritizedDirections) {
BlockPos offsetPos = pos.relative(direction.getOpposite());
BlockState offsetState = world.getBlockState(offsetPos);
BlockPos offsetPos = pos.relative(direction);

// Check if the block has a FACING property or proceed without it
if (state.hasProperty(BlockStateProperties.FACING)
Expand All @@ -554,6 +517,7 @@ public void hideInBlock() {
double deltaX = offsetPos.getX() - this.getX();
double deltaY = offsetPos.getY() - this.getY();
double deltaZ = offsetPos.getZ() - this.getZ();
double deltaZ = oppositePos.getZ() - this.getZ();
double distance = Math.sqrt(deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ);

this.setNoGravity(false);
Expand All @@ -567,17 +531,14 @@ public void hideInBlock() {
}
}

if (!state.is(TagRegistry.PIRANHA_PLANTS_CAN_HIDE)
&& !offsetState.is(TagRegistry.PIRANHA_PLANTS_CAN_HIDE)) {
this.stopHiding();
return;
}
// if (!state.is(TagRegistry.PIRANHA_PLANTS_CAN_HIDE)
}
} else {
} else if (world.getGameTime() % ConfigRegistry.PIRANHA_PLANT_HIDE_DURATION.get() == 0L) {
// Handle hiding logic
for (Direction direction : prioritizedDirections) {
BlockPos offsetPos = pos.relative(direction.getOpposite());
BlockState offsetState = world.getBlockState(offsetPos);
BlockPos offsetPos = pos.relative(direction);
BlockPos oppositePos = pos.relative(direction.getOpposite());

// Check if the block has a FACING property or proceed without it
if (offsetState.hasProperty(BlockStateProperties.FACING)
Expand All @@ -589,15 +550,13 @@ public void hideInBlock() {
double deltaX = offsetPos.getX() - this.getX();
double deltaY = offsetPos.getY() - this.getY();
double deltaZ = offsetPos.getZ() - this.getZ();
double deltaY = (oppositePos.getY() + 0.5) - this.getY();
// double distance = Math.sqrt(deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ);
double distance = Math.abs(deltaY);;
double distance = Math.abs(deltaY);

if (distance > 0) {
this.setDeltaMovement(0, (deltaY / distance) * speed, 0);
// this.setDeltaMovement((deltaX / distance) * speed, (deltaY / distance) * speed, (deltaZ / distance) * speed);
}
this.setNoGravity(true);
this.noPhysics = true;
// this.setDeltaMovement((deltaX / distance) * speed, (deltaY / distance) * speed, (deltaZ / distance) * speed);
this.tryToHide();
}
}
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/com/wenxin2/marioverse/entities/part_entities/PiranhaPlantPart.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
public class PiranhaPlantPart extends PartEntity<PiranhaPlantEntity> implements Leashable {
public final PiranhaPlantEntity parentMob;
public final String name;
private final EntityDimensions size;
private EntityDimensions size;
private Leashable.LeashData leashData;

public PiranhaPlantPart(PiranhaPlantEntity parentMob, String name, float width, float height) {
super(parentMob);
this.size = EntityDimensions.scalable(width, height);
this.refreshDimensions();
this.parentMob = parentMob;
this.name = name;
this.refreshDimensions();
}

@Override
Expand Down Expand Up @@ -78,6 +78,12 @@ public Packet<ClientGamePacketListener> getAddEntityPacket(ServerEntity entity)
return new ClientboundAddEntityPacket(this, entity);
}

@NotNull
@Override
public AABB makeBoundingBox() {
return super.makeBoundingBox();
}

@NotNull
@Override
public EntityDimensions getDimensions(Pose pose) {
Expand Down

0 comments on commit 689e14a

Please sign in to comment.