Add Offsets to Barriers

This commit is contained in:
Kam committed 2026-02-27 00:47:45 -05:00
1 parent a7edf0e221
commit 936dc7f0cc
8 files changed
+100 -23

No files matched your search

@@ -30,6 +30,9 @@ public class EntityAbilityDome extends EntityAbilityBarrier {
protected float domeRadius = 5.0f;
protected float targetDomeRadius = 5.0f;
protected boolean followCaster = false;
protected float offsetX = 0.0f;
protected float offsetY = 0.0f;
protected float offsetZ = 0.0f;
// Server-side melee detection state
private boolean inTickMelee = false;
@@ -81,11 +84,11 @@ public class EntityAbilityDome extends EntityAbilityBarrier {
if (followCaster) {
Entity owner = ownerEntityId >= 0 ? worldObj.getEntityByID(ownerEntityId) : null;
if (owner != null) {
this.setPosition(owner.posX, owner.posY, owner.posZ);
this.setPosition(owner.posX + offsetX, owner.posY + offsetY, owner.posZ + offsetZ);
// Sync prevPos with owner's prevPos for smooth interpolation
this.prevPosX = owner.prevPosX;
this.prevPosY = owner.prevPosY;
this.prevPosZ = owner.prevPosZ;
this.prevPosX = owner.prevPosX + offsetX;
this.prevPosY = owner.prevPosY + offsetY;
this.prevPosZ = owner.prevPosZ + offsetZ;
}
}
@@ -589,6 +592,12 @@ public class EntityAbilityDome extends EntityAbilityBarrier {
this.followCaster = follow;
}
public void setOffsets(float x, float y, float z) {
this.offsetX = x;
this.offsetY = y;
this.offsetZ = z;
}
@Override
@SideOnly(Side.CLIENT)
public void setPositionAndRotation2(double x, double y, double z, float yaw, float pitch, int increments) {
@@ -631,6 +640,9 @@ public class EntityAbilityDome extends EntityAbilityBarrier {
nbt.setFloat("DomeRadius", domeRadius);
nbt.setFloat("TargetDomeRadius", targetDomeRadius);
nbt.setBoolean("FollowCaster", followCaster);
nbt.setFloat("OffsetX", offsetX);
nbt.setFloat("OffsetY", offsetY);
nbt.setFloat("OffsetZ", offsetZ);
}
@Override
@@ -639,5 +651,8 @@ public class EntityAbilityDome extends EntityAbilityBarrier {
this.setDomeRadius(sanitize(nbt.getFloat("DomeRadius"), 5.0f, MAX_ENTITY_RADIUS));
this.targetDomeRadius = sanitize(nbt.hasKey("TargetDomeRadius") ? nbt.getFloat("TargetDomeRadius") : domeRadius, 5.0f, MAX_ENTITY_RADIUS);
this.followCaster = nbt.hasKey("FollowCaster") && nbt.getBoolean("FollowCaster");
this.offsetX = nbt.hasKey("OffsetX") ? nbt.getFloat("OffsetX") : 0.0f;
this.offsetY = nbt.hasKey("OffsetY") ? nbt.getFloat("OffsetY") : 0.0f;
this.offsetZ = nbt.hasKey("OffsetZ") ? nbt.getFloat("OffsetZ") : 0.0f;
}
}