Merge branch 'dev' of https://github.com/KAMKEEL/CustomNPC-Plus into dev

src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyTrajectoryData.java

@@ -1,46 +1,150 @@
 package kamkeel.npcs.controllers.data.ability.data;
 
-import net.minecraft.util.Vec3;
+import noppes.npcs.api.IPos;
 import noppes.npcs.api.ability.data.IEnergyTrajectoryData;
+import noppes.npcs.scripted.NpcAPI;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class EnergyTrajectoryData implements IEnergyTrajectoryData {
-    public float speed = 0.5f;
     public int currentPath = 0;
-    private List<Path> trajectory = new ArrayList<>();
+    private final List<Path> trajectory = new ArrayList<>();
 
+    public EnergyTrajectoryData() {}
+
+    public EnergyTrajectoryData(int startingPath, Path... paths) {
+        trajectory.addAll(Arrays.asList(paths));
+        this.currentPath = startingPath < trajectory.size() && startingPath >= 0 ? startingPath : 0;
+    }
+
+    @Override
+    public int getCurrentPath() {
+        return currentPath;
+    }
+
+    @Override
+    public void setCurrentPath(int currentPath) {
+        this.currentPath = currentPath;
+    }
+
+    @Override
     public int getDelay(int path) {
-        if (path < 0 || path >= trajectory.size()) return -1;
-        return trajectory.get(path).delayTicks;
+        if (getPath(path) == null) return -1;
+        return getPath(path).delayTicks;
     }
 
-    public Vec3 getVec(int path) {
-        if (path < 0 || path >= trajectory.size()) return null;
-        return trajectory.get(path).coords;
+    @Override
+    public void setDelay(int path, int ticks) {
+        if (getPath(path) == null) return;
+        getPath(path).delayTicks = ticks;
     }
 
+    @Override
+    public IPos getPos(int path) {
+        if (getPath(path) == null) return null;
+        return getPath(path).coords;
+    }
+
+    @Override
+    public void setPos(int path, IPos coords) {
+        if (getPath(path) == null) return;
+        getPath(path).coords = coords;
+    }
+
+    @Override
     public double getX(int path) {
-        if (getVec(path) == null) return 0;
-        return getVec(path).xCoord;
+        if (getPos(path) == null) return 0;
+        return getPos(path).getX();
     }
 
+    @Override
+    public void setX(int path, double x) {
+        if (getPos(path) == null) return;
+        setPos(path, NpcAPI.Instance().getIPos(x, getY(path), getZ(path)));
+    }
+
+    @Override
     public double getY(int path) {
-        if (getVec(path) == null) return 0;
-        return getVec(path).yCoord;
+        if (getPos(path) == null) return 0;
+        return getPos(path).getY();
     }
 
+    @Override
+    public void setY(int path, double y) {
+        if (getPos(path) == null) return;
+        setPos(path, NpcAPI.Instance().getIPos(getX(path), y, getZ(path)));
+    }
+
+    @Override
     public double getZ(int path) {
-        if (getVec(path) == null) return 0;
-        return getVec(path).zCoord;
+        if (getPos(path) == null) return 0;
+        return getPos(path).getZ();
     }
 
-    public static class Path {
-        public Vec3 coords;
+    @Override
+    public void setZ(int path, double z) {
+        if (getPos(path) == null) return;
+        setPos(path, NpcAPI.Instance().getIPos(getX(path), getY(path), z));
+    }
+
+    public Path getPath(int path) {
+        if (path < 0 || path >= trajectory.size()) return null;
+        return trajectory.get(path);
+    }
+
+    @Override
+    public void setPath(int path, IPos pos) {
+        setPath(path, pos, 0);
+    }
+
+    @Override
+    public void setPath(int path, IPos pos, int delay) {
+        setPath(path, pos.getX(), pos.getY(), pos.getZ(), delay);
+    }
+
+    @Override
+    public void setPath(int path, double x, double y, double z) {
+        setPath(path, x, y, z, 0);
+    }
+
+    @Override
+    public void setPath(int path, double x, double y, double z, int delay) {
+        Path newPath = (Path) createPath(x, y, z, delay);
+
+        if (trajectory.isEmpty()) {
+            trajectory.add(newPath);
+        } else {
+            trajectory.set(path, newPath);
+        }
+    }
+
+    @Override
+    public IPath createPath(IPos coords) {
+        return new Path(coords, 0);
+    }
+
+    @Override
+    public IPath createPath(IPos coords, int delay) {
+        return new Path(coords, delay);
+    }
+
+    @Override
+    public IPath createPath(double x, double y, double z) {
+        return createPath(x, y, z, 0);
+    }
+
+    @Override
+    public IPath createPath(double x, double y, double z, int delay) {
+        return new Path(NpcAPI.Instance().getIPos(x, y, z), delay);
+    }
+
+    public static class Path implements IEnergyTrajectoryData.IPath{
+        public IPos coords;
         public int delayTicks;
 
-        public Path(Vec3 coords, int delayTicks) {
+        public Path(IPos coords, int delayTicks) {
             this.coords = coords;
             this.delayTicks = delayTicks;
         }

src/main/java/kamkeel/npcs/entity/EntityAbilityProjectile.java

@@ -61,6 +61,9 @@ public abstract class EntityAbilityProjectile extends Entity implements IEnergyP
     // ==================== HOMING PROPERTIES ====================
     protected EnergyHomingData homingData = new EnergyHomingData();
 
+    // ==================== TRAJECTORY PROPERTIES ====================
+    protected EnergyTrajectoryData trajectoryData = new EnergyTrajectoryData();
+
     // ==================== TRACKING ====================
     protected double startX, startY, startZ;
     protected int ownerEntityId = -1;
@@ -576,10 +579,7 @@ public abstract class EntityAbilityProjectile extends Entity implements IEnergyP
     @Override
     public float getExplosionDamageFalloff() { return combatData.explosionDamageFalloff; }
 
-    // ==================== VISUAL GETTERS ====================
-
-    @Override
-    public float getSpeed() { return homingData.getSpeed(); }
+    // ==================== HOMING GETTERS ====================
 
     @Override
     public boolean isHoming() { return homingData.isHoming(); }
@@ -590,8 +590,15 @@ public abstract class EntityAbilityProjectile extends Entity implements IEnergyP
     @Override
     public float getHomingRange() { return homingData.getHomingRange(); }
 
+    // ==================== TRAJECTORY GETTERS ====================
+
+
+
     // ==================== ANCHOR GETTERS ====================
 
+    @Override
+    public float getSpeed() { return homingData.getSpeed(); }
+
     public AnchorPoint getAnchorPoint() { return anchorData.getAnchorPoint(); }
 
     @Override