From b1d7082584be943194bd0bfb90f859756c29af71 Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 1 Mar 2026 04:11:21 -0500 Subject: [PATCH] Launch from Anchor Point Setting --- src/api | 2 +- .../ability/data/energy/EnergyAnchorData.java | 17 ++++++++++++++++- .../type/energy/AbilityEnergyProjectile.java | 19 +++++++++++++++++++ .../npcs/entity/EntityEnergyProjectile.java | 10 ++++++++-- .../assets/customnpcs/lang/en_US.lang | 2 ++ 5 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/api b/src/api index b28a7a5c4..17e883360 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit b28a7a5c4d025ec3d5207cd8d4714f14c3a5de72 +Subproject commit 17e883360462326c04e3c9651e777346b34d47ec diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyAnchorData.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyAnchorData.java index b4ceb830f..f618ae3f7 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyAnchorData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyAnchorData.java @@ -9,6 +9,7 @@ public class EnergyAnchorData implements IEnergyAnchorData { public float anchorOffsetX = 0; public float anchorOffsetY = 0; public float anchorOffsetZ = 0; + public boolean launchFromAnchor = false; public EnergyAnchorData() { } @@ -83,11 +84,22 @@ public class EnergyAnchorData implements IEnergyAnchorData { this.anchorOffsetZ = anchorOffsetZ; } + @Override + public boolean getLaunchFromAnchor() { + return launchFromAnchor; + } + + @Override + public void setLaunchFromAnchor(boolean launchFromAnchor) { + this.launchFromAnchor = launchFromAnchor; + } + public void writeNBT(NBTTagCompound nbt) { nbt.setInteger("anchorPoint", anchorPoint.ordinal()); nbt.setFloat("anchorOffsetX", anchorOffsetX); nbt.setFloat("anchorOffsetY", anchorOffsetY); nbt.setFloat("anchorOffsetZ", anchorOffsetZ); + nbt.setBoolean("launchFromAnchor", launchFromAnchor); } public void readNBT(NBTTagCompound nbt) { @@ -95,9 +107,12 @@ public class EnergyAnchorData implements IEnergyAnchorData { this.anchorOffsetX = nbt.getFloat("anchorOffsetX"); this.anchorOffsetY = nbt.getFloat("anchorOffsetY"); this.anchorOffsetZ = nbt.getFloat("anchorOffsetZ"); + this.launchFromAnchor = nbt.getBoolean("launchFromAnchor"); } public EnergyAnchorData copy() { - return new EnergyAnchorData(anchorPoint, anchorOffsetX, anchorOffsetY, anchorOffsetZ); + EnergyAnchorData copy = new EnergyAnchorData(anchorPoint, anchorOffsetX, anchorOffsetY, anchorOffsetZ); + copy.launchFromAnchor = this.launchFromAnchor; + return copy; } } diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergyProjectile.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergyProjectile.java index 8d8949f07..91cf185b2 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergyProjectile.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergyProjectile.java @@ -787,6 +787,14 @@ public abstract class AbilityEnergyProjectile projectiles[0].anchor.anchorOffsetZ = z; } + public boolean getLaunchFromAnchor() { + return projectiles[0].anchor.launchFromAnchor; + } + + public void setLaunchFromAnchor(boolean launchFromAnchor) { + projectiles[0].anchor.launchFromAnchor = launchFromAnchor; + } + @Override public int getAnchorPoint() { return projectiles[0].anchor.anchorPoint.ordinal(); @@ -840,6 +848,14 @@ public abstract class AbilityEnergyProjectile projectiles[clampIndex(index)].anchor.anchorOffsetZ = offset; } + public boolean getLaunchFromAnchor(int index) { + return projectiles[clampIndex(index)].anchor.launchFromAnchor; + } + + public void setLaunchFromAnchor(int index, boolean launchFromAnchor) { + projectiles[clampIndex(index)].anchor.launchFromAnchor = launchFromAnchor; + } + // ==================== GUI FIELD DEFINITIONS ==================== @SideOnly(Side.CLIENT) @@ -889,6 +905,9 @@ public abstract class AbilityEnergyProjectile ).tab("ability.tab.visual").visibleWhen(() -> idx < projectileCount)); defs.add(FieldDef.floatField("ability.anchor.offsetZ", () -> projectiles[idx].anchor.anchorOffsetZ, v -> projectiles[idx].anchor.anchorOffsetZ = v) .tab("ability.tab.visual").visibleWhen(() -> idx < projectileCount).min(Float.NEGATIVE_INFINITY)); + defs.add(FieldDef.boolField("ability.launchFromAnchor", () -> projectiles[idx].anchor.launchFromAnchor, v -> projectiles[idx].anchor.launchFromAnchor = v) + .tab("ability.tab.visual").visibleWhen(() -> idx < projectileCount) + .hover("ability.hover.launchFromAnchor")); // Color override (only when multiple projectiles) defs.add(FieldDef.boolField("ability.colorOverride", () -> projectiles[idx].colorOverride, v -> projectiles[idx].colorOverride = v) diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java index fbfc91d79..ea1b64dfb 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java @@ -1436,10 +1436,16 @@ public abstract class EntityEnergyProjectile extends EntityEnergyAbility { } /** - * Only player-cast projectiles should be recentered to look-vector launch origin. - * NPC projectiles keep their anchor charge origin so casts originate from the configured anchor. + * Determines whether the projectile should snap to the look-vector launch origin on fire. + * By default, player-cast projectiles snap (launch from eye position along crosshair), + * and NPC projectiles keep their anchor charge origin. + * When {@code anchorData.launchFromAnchor} is true, snapping is disabled so the + * projectile launches from its configured anchor position instead. */ protected boolean shouldSnapLaunchToLookVector(EntityLivingBase owner) { + if (anchorData.launchFromAnchor) { + return false; + } return owner instanceof EntityPlayer; } diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index bdaa2abdc..4fc5f8aa7 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -1866,6 +1866,8 @@ ability.anchorPoint=Anchor Point ability.anchor.offsetX=Offset X ability.anchor.offsetY=Offset Y ability.anchor.offsetZ=Offset Z +ability.launchFromAnchor=Launch From Anchor +ability.hover.launchFromAnchor=When enabled, the projectile launches from its anchor position instead of snapping to the default eye/look-vector position. ability.vertical=Vertical ability.rotationSpeed=Rotation Speed