mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-19 16:29:39 +00:00
Launch from Anchor Point Setting
This commit is contained in:
1 parent
6f1a837296
commit
b1d7082584
5 files changed
+46
-4
No files matched your search
+16
-1
@@ -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;
|
||||
}
|
||||
}
|
||||
+19
@@ -787,6 +787,14 @@ public abstract class AbilityEnergyProjectile<E extends EntityEnergyProjectile>
|
||||
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<E extends EntityEnergyProjectile>
|
||||
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<E extends EntityEnergyProjectile>
|
||||
).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)
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user