Added API classes to Energy Projectile

This commit is contained in:
Vidal committed 2026-02-03 17:20:36 -03:00
1 parent 7ee6c8aa53
commit bc4f82e55f
19 files changed
+506 -541

No files matched your search

@@ -35,16 +35,24 @@ public class EnergyAnchorData implements IEnergyAnchorData {
this.anchorOffsetZ = anchorOffsetZ;
}
@Override
public AnchorPoint getAnchorPoint() {
return anchorPoint;
}
@Override
public void setAnchorPoint(AnchorPoint anchorPoint) {
this.anchorPoint = anchorPoint;
}
@Override
public int getAnchor() {
return anchorPoint.ordinal();
}
@Override
public void setAnchor(int anchor) {
this.anchorPoint = AnchorPoint.fromOrdinal(anchor);
}
@Override
public float getAnchorOffsetX() {
return anchorOffsetX;
@@ -0,0 +1,83 @@
package kamkeel.npcs.controllers.data.ability.data;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.api.ability.data.IEnergyHomingData;
/**
* Groups homing/movement properties for energy projectile abilities.
* Used by Orb, Disc, and Beam (not Laser or Sweeper).
*/
public class EnergyHomingData implements IEnergyHomingData {
public float speed = 0.5f;
public boolean homing = true;
public float homingStrength = 0.15f;
public float homingRange = 20.0f;
public EnergyHomingData() {}
public EnergyHomingData(float speed, boolean homing, float homingStrength, float homingRange) {
this.speed = speed;
this.homing = homing;
this.homingStrength = homingStrength;
this.homingRange = homingRange;
}
@Override
public float getSpeed() {
return speed;
}
@Override
public void setSpeed(float speed) {
this.speed = speed;
}
@Override
public boolean isHoming() {
return homing;
}
@Override
public void setHoming(boolean homing) {
this.homing = homing;
}
@Override
public float getHomingStrength() {
return homingStrength;
}
@Override
public void setHomingStrength(float homingStrength) {
this.homingStrength = homingStrength;
}
@Override
public float getHomingRange() {
return homingRange;
}
@Override
public void setHomingRange(float homingRange) {
this.homingRange = homingRange;
}
public void writeNBT(NBTTagCompound nbt) {
nbt.setFloat("speed", speed);
nbt.setBoolean("homing", homing);
nbt.setFloat("homingStrength", homingStrength);
nbt.setFloat("homingRange", homingRange);
}
public void readNBT(NBTTagCompound nbt) {
speed = nbt.hasKey("speed") ? nbt.getFloat("speed") : 0.5f;
homing = !nbt.hasKey("homing") || nbt.getBoolean("homing");
homingStrength = nbt.hasKey("homingStrength") ? nbt.getFloat("homingStrength") : 0.15f;
homingRange = nbt.hasKey("homingRange") ? nbt.getFloat("homingRange") : 20.0f;
}
public EnergyHomingData copy() {
return new EnergyHomingData(speed, homing, homingStrength, homingRange);
}
}
@@ -1,82 +1,48 @@
package kamkeel.npcs.controllers.data.ability.data;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.Vec3;
import noppes.npcs.api.ability.data.IEnergyTrajectoryData;
/**
* Groups homing/movement properties for energy projectile abilities.
* Used by Orb, Disc, and Beam (not Laser or Sweeper).
*/
import java.util.ArrayList;
import java.util.List;
public class EnergyTrajectoryData implements IEnergyTrajectoryData {
public float speed = 0.5f;
public boolean homing = true;
public float homingStrength = 0.15f;
public float homingRange = 20.0f;
public int currentPath = 0;
private List<Path> trajectory = new ArrayList<>();
public EnergyTrajectoryData() {}
public EnergyTrajectoryData(float speed, boolean homing, float homingStrength, float homingRange) {
this.speed = speed;
this.homing = homing;
this.homingStrength = homingStrength;
this.homingRange = homingRange;
public int getDelay(int path) {
if (path < 0 || path >= trajectory.size()) return -1;
return trajectory.get(path).delayTicks;
}
@Override
public float getSpeed() {
return speed;
public Vec3 getVec(int path) {
if (path < 0 || path >= trajectory.size()) return null;
return trajectory.get(path).coords;
}
@Override
public void setSpeed(float speed) {
this.speed = speed;
public double getX(int path) {
if (getVec(path) == null) return 0;
return getVec(path).xCoord;
}
@Override
public boolean isHoming() {
return homing;
public double getY(int path) {
if (getVec(path) == null) return 0;
return getVec(path).yCoord;
}
@Override
public void setHoming(boolean homing) {
this.homing = homing;
public double getZ(int path) {
if (getVec(path) == null) return 0;
return getVec(path).zCoord;
}
@Override
public float getHomingStrength() {
return homingStrength;
}
public static class Path {
public Vec3 coords;
public int delayTicks;
@Override
public void setHomingStrength(float homingStrength) {
this.homingStrength = homingStrength;
}
@Override
public float getHomingRange() {
return homingRange;
}
@Override
public void setHomingRange(float homingRange) {
this.homingRange = homingRange;
}
public void writeNBT(NBTTagCompound nbt) {
nbt.setFloat("speed", speed);
nbt.setBoolean("homing", homing);
nbt.setFloat("homingStrength", homingStrength);
nbt.setFloat("homingRange", homingRange);
}
public void readNBT(NBTTagCompound nbt) {
speed = nbt.hasKey("speed") ? nbt.getFloat("speed") : 0.5f;
homing = !nbt.hasKey("homing") || nbt.getBoolean("homing");
homingStrength = nbt.hasKey("homingStrength") ? nbt.getFloat("homingStrength") : 0.15f;
homingRange = nbt.hasKey("homingRange") ? nbt.getFloat("homingRange") : 20.0f;
}
public EnergyTrajectoryData copy() {
return new EnergyTrajectoryData(speed, homing, homingStrength, homingRange);
public Path(Vec3 coords, int delayTicks) {
this.coords = coords;
this.delayTicks = delayTicks;
}
}
}
@@ -39,7 +39,7 @@ public class AbilityBeam extends Ability implements IAbilityEnergyBeam {
// Data classes
private EnergyDisplayData colorData = new EnergyDisplayData(0xFFFFFF, 0x00AAFF, true, 0.4f, 0.5f, 6.0f);
private EnergyCombatData combatData = new EnergyCombatData(10.0f, 1.5f, 0.2f, false, 4.0f, 0.5f);
private EnergyTrajectoryData homingData = new EnergyTrajectoryData(0.4f, true, 0.1f, 15.0f);
private EnergyHomingData homingData = new EnergyHomingData(0.4f, true, 0.1f, 15.0f);
private EnergyLightningData lightningData = new EnergyLightningData();
private EnergyLifespanData lifespanData = new EnergyLifespanData(25.0f, 200);
private EnergyAnchorData anchorData = new EnergyAnchorData(AnchorPoint.RIGHT_HAND);
@@ -37,7 +37,7 @@ public class AbilityBeamDual extends Ability {
new EnergyDisplayData(0xFFFFFF, 0xFF0000, true, 0.4f, 0.5f, 6.0f),
};
private EnergyCombatData combatData = new EnergyCombatData(10.0f, 1.5f, 0.2f, false, 4.0f, 0.5f);
private EnergyTrajectoryData homingData = new EnergyTrajectoryData(0.4f, true, 0.1f, 15.0f);
private EnergyHomingData homingData = new EnergyHomingData(0.4f, true, 0.1f, 15.0f);
private EnergyLightningData[] lightningData = new EnergyLightningData[]{
new EnergyLightningData(), new EnergyLightningData()
};
@@ -125,8 +125,8 @@ public class AbilityBeamDual extends Ability {
colorData[1], combatData, homingData, lightningData[1], lifespanData,
lockMovement.locksActive());
beamEntity.setSiblingUUID(beamEntity2.getPersistentID());
beamEntity2.setSiblingUUID(beamEntity.getPersistentID());
beamEntity.setSiblingEntityId(beamEntity2.getEntityId());
beamEntity2.setSiblingEntityId(beamEntity.getEntityId());
beamEntity.setupCharging(anchorData[0], windUpTicks, offsetDist);
beamEntity2.setupCharging(anchorData[1], windUpTicks, offsetDist);
@@ -42,7 +42,7 @@ public class AbilityDisc extends Ability implements IAbilityDisc {
// Energy data classes
private EnergyDisplayData colorData = new EnergyDisplayData(0xFFFFFF, 0xFF8800, true, 0.4f, 0.5f, 5.0f);
private EnergyCombatData combatData = new EnergyCombatData(8.0f, 1.2f, 0.15f, false, 3.0f, 0.5f);
private EnergyTrajectoryData homingData = new EnergyTrajectoryData(0.6f, true, 0.12f, 18.0f);
private EnergyHomingData homingData = new EnergyHomingData(0.6f, true, 0.12f, 18.0f);
private EnergyLightningData lightningData = new EnergyLightningData();
private EnergyLifespanData lifespanData = new EnergyLifespanData(35.0f, 200);
private EnergyAnchorData anchorData = new EnergyAnchorData(AnchorPoint.RIGHT_HAND);
@@ -45,7 +45,7 @@ public class AbilityDiscDual extends Ability {
new EnergyDisplayData(0xFFFFFF, 0x8800FF, true, 0.4f, 0.5f, 5.0f)
};
private EnergyCombatData combatData = new EnergyCombatData(8.0f, 1.2f, 0.15f, false, 3.0f, 0.5f);
private EnergyTrajectoryData homingData = new EnergyTrajectoryData(0.6f, true, 0.12f, 18.0f);
private EnergyHomingData homingData = new EnergyHomingData(0.6f, true, 0.12f, 18.0f);
public final EnergyLightningData[] lightningData = new EnergyLightningData[]{
new EnergyLightningData(), new EnergyLightningData()
};
@@ -131,8 +131,8 @@ public class AbilityDiscDual extends Ability {
colorData[1], combatData, homingData, lightningData[1], lifespanData,
boomerang, boomerangDelay);
discEntity.setSiblingUUID(discEntity2.getPersistentID());
discEntity2.setSiblingUUID(discEntity.getPersistentID());
discEntity.setSiblingEntityId(discEntity2.getEntityId());
discEntity2.setSiblingEntityId(discEntity.getEntityId());
discEntity.setupCharging(anchorData[0], windUpTicks);
discEntity2.setupCharging(anchorData[1], windUpTicks);
@@ -271,6 +271,8 @@ public class AbilityLaserShot extends Ability implements IAbilityLaserShot {
AbilityFieldDefs.effectsListField("ability.effects", this::getEffects, this::setEffects),
// Visual tab
FieldDef.enumField("ability.anchorPoint", AnchorPoint.class, this::getAnchorPointEnum, this::setAnchorPointEnum)
.tab("ability.tab.visual"),
FieldDef.section("ability.section.colors").tab("ability.tab.visual"),
FieldDef.colorSubGui("ability.innerColor", this::getInnerColor, this::setInnerColor).tab("ability.tab.visual"),
FieldDef.boolField("ability.outerEnabled", this::isOuterColorEnabled, this::setOuterColorEnabled).tab("ability.tab.visual"),
@@ -38,7 +38,7 @@ public class AbilityOrb extends Ability implements IAbilityOrb {
// Data classes for energy properties
private final EnergyDisplayData colorData = new EnergyDisplayData();
private final EnergyCombatData combatData = new EnergyCombatData();
private final EnergyTrajectoryData homingData = new EnergyTrajectoryData();
private final EnergyHomingData homingData = new EnergyHomingData();
private final EnergyLightningData lightningData = new EnergyLightningData();
private final EnergyLifespanData lifespanData = new EnergyLifespanData();
private final EnergyAnchorData anchorData = new EnergyAnchorData(AnchorPoint.RIGHT_HAND);
@@ -39,7 +39,7 @@ public class AbilityOrbBarrage extends Ability {
// Data classes for energy properties
private final EnergyDisplayData colorData = new EnergyDisplayData();
private final EnergyCombatData combatData = new EnergyCombatData(4.0f, 0.0f, 0.0f, false, 1.5f, 0.5f);
private final EnergyTrajectoryData homingData = new EnergyTrajectoryData();
private final EnergyHomingData homingData = new EnergyHomingData();
private final EnergyLightningData lightningData = new EnergyLightningData();
private final EnergyLifespanData lifespanData = new EnergyLifespanData();
private final EnergyAnchorData[] anchorData = new EnergyAnchorData[]{
@@ -36,7 +36,7 @@ public class AbilityOrbDual extends Ability {
new EnergyDisplayData(), new EnergyDisplayData()
};
public final EnergyCombatData combatData = new EnergyCombatData();
public final EnergyTrajectoryData homingData = new EnergyTrajectoryData();
public final EnergyHomingData homingData = new EnergyHomingData();
public final EnergyLightningData[] lightningData = new EnergyLightningData[]{
new EnergyLightningData(), new EnergyLightningData()
};
@@ -118,8 +118,8 @@ public class AbilityOrbDual extends Ability {
spawnPos2.xCoord, spawnPos2.yCoord, spawnPos2.zCoord, orbSize,
colorData[1], combatData, homingData, lightningData[1], lifespanData);
orbEntity.setSiblingUUID(orbEntity2.getPersistentID());
orbEntity2.setSiblingUUID(orbEntity.getPersistentID());
orbEntity.setSiblingEntityId(orbEntity2.getEntityId());
orbEntity2.setSiblingEntityId(orbEntity.getEntityId());
orbEntity.setupCharging(anchorData[0], windUpTicks);
orbEntity2.setupCharging(anchorData[1], windUpTicks);