From af4b4679317e8dbd6166065ce5eec5dfcef8cfe6 Mon Sep 17 00:00:00 2001 From: "Luis C.M" Date: Tue, 17 May 2022 05:35:08 -0500 Subject: [PATCH] Updated the arrangement of interfaces and functions of ScriptParticle to be more readable for future javadoc filling. --- .../noppes/npcs/scripted/ScriptParticle.java | 182 +++++++----------- .../npcs/scripted/interfaces/IParticle.java | 62 ++---- 2 files changed, 93 insertions(+), 151 deletions(-) diff --git a/src/main/java/noppes/npcs/scripted/ScriptParticle.java b/src/main/java/noppes/npcs/scripted/ScriptParticle.java index dc3e3f862..5a70d91dc 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptParticle.java +++ b/src/main/java/noppes/npcs/scripted/ScriptParticle.java @@ -101,6 +101,30 @@ public class ScriptParticle implements IParticle { ); } + public void setFacePlayer(boolean facePlayer) { this.facePlayer = facePlayer; } + public boolean getFacePlayer() { return facePlayer; } + + public String getDirectory() { + return directory; + } + public void setDirectory(String directory) { + this.directory = directory; + } + + public void setAmount(int amount) { + this.amount = amount; + } + public int getAmount() { + return amount; + } + + public void setMaxAge(int maxAge) { + this.maxAge = maxAge; + } + public int getMaxAge() { + return maxAge; + } + public void setSize(int width, int height){ this.width = width; this.height = height; @@ -121,39 +145,16 @@ public class ScriptParticle implements IParticle { this.animStart = animStart; this.animEnd = animEnd; } - public void setAnimRate(int animRate) { this.animRate = animRate; } public int getAnimRate() { return animRate; } - public void setAnimLoop(boolean animLoop) { this.animLoop = animLoop; } public boolean getAnimLoop() { return animLoop; } - public void setAnimStart(int animStart) { this.animStart = animStart; } public int getAnimStart() { return animStart; } - public void setAnimEnd(int animEnd) { this.animEnd = animEnd; } public int getAnimEnd() { return animEnd; } - public boolean getFacePlayer() { return facePlayer; } - public void setFacePlayer(boolean facePlayer) { this.facePlayer = facePlayer; } - - public String getDirectory() { - return directory; + public void setPosition(double x, double y, double z){ + this.x = x; + this.y = y; + this.z = z; } - - @Deprecated - public void setHEXColor(int HEXColor) { - this.HEXColor = HEXColor; - } - @Deprecated - public int getHEXColor() { - return HEXColor; - } - - public int getAmount() { - return amount; - } - - public int getMaxAge() { - return maxAge; - } - public double getX() { return x; } @@ -164,6 +165,12 @@ public class ScriptParticle implements IParticle { return z; } + public void setMotion(double motionX, double motionY, double motionZ, float gravity){ + this.motionX = motionX; + this.motionY = motionY; + this.motionZ = motionZ; + this.gravity = gravity; + } public double getMotionX() { return motionX; } @@ -177,6 +184,12 @@ public class ScriptParticle implements IParticle { return gravity; } + public void setHEXColor(int HEXColor, int HEXColor2, float HEXColorRate, int HEXColorStart) { + this.HEXColor = HEXColor; + this.HEXColor2 = HEXColor2; + this.HEXColorRate = HEXColorRate; + this.HEXColorStart = HEXColorStart; + } public int getHEXColor1() { return HEXColor; } @@ -190,6 +203,12 @@ public class ScriptParticle implements IParticle { return HEXColorStart; } + public void setAlpha(float alpha1, float alpha2, float alphaRate, int alphaRateStart){ + this.alpha1 = alpha1; + this.alpha2 = alpha2; + this.alphaRate = alphaRate; + this.alphaRateStart = alphaRateStart; + } public float getAlpha1() { return alpha1; } @@ -203,6 +222,12 @@ public class ScriptParticle implements IParticle { return alphaRateStart; } + public void setScale(float scale1, float scale2, float scaleRate, int scaleRateStart){ + this.scale1 = scale1; + this.scale2 = scale2; + this.scaleRate = scaleRate; + this.scaleRateStart = scaleRateStart; + } public float getScale1() { return scale1; } @@ -216,94 +241,16 @@ public class ScriptParticle implements IParticle { return scaleRateStart; } - public float getRotationX1() {return rotationX1;} - public float getRotationX2() {return rotationX2;} - public float getRotationXRate() {return rotationXRate;} - public int getRotationXRateStart() {return rotationXRateStart;} - - public float getRotationY1() {return rotationY1;} - public float getRotationY2() {return rotationY2;} - public float getRotationYRate() {return rotationYRate;} - public int getRotationYRateStart() {return rotationYRateStart;} - - public float getRotationZ1() {return rotationZ1;} - public float getRotationZ2() {return rotationZ2;} - public float getRotationZRate() {return rotationZRate;} - public int getRotationZRateStart() {return rotationZRateStart;} - - public void setDirectory(String directory) { - this.directory = directory; - } - - public void setAmount(int amount) { - this.amount = amount; - } - - public void setMaxAge(int maxAge) { - this.maxAge = maxAge; - } - - public void setPosition(double x, double y, double z){ - this.x = x; - this.y = y; - this.z = z; - } - public void setX(double x) { - this.x = x; - } - public void setY(double y) { - this.y = y; - } - public void setZ(double z) { - this.z = z; - } - - public void setMotion(double motionX, double motionY, double motionZ, float gravity){ - this.motionX = motionX; - this.motionY = motionY; - this.motionZ = motionZ; - this.gravity = gravity; - } - public void setMotionX(double motionX) { - this.motionX = motionX; - } - public void setMotionY(double motionY) { - this.motionY = motionY; - } - public void setMotionZ(double motionZ) { - this.motionZ = motionZ; - } - public void setGravity(float gravity) { - this.gravity = gravity; - } - - public void setHEXColor(int HEXColor, int HEXColor2, float HEXColorRate, int HEXColorStart) { - this.HEXColor = HEXColor; - this.HEXColor2 = HEXColor2; - this.HEXColorRate = HEXColorRate; - this.HEXColorStart = HEXColorStart; - } - - public void setAlpha(float alpha1, float alpha2, float alphaRate, int alphaRateStart){ - this.alpha1 = alpha1; - this.alpha2 = alpha2; - this.alphaRate = alphaRate; - this.alphaRateStart = alphaRateStart; - } - - public void setScale(float scale1, float scale2, float scaleRate, int scaleRateStart){ - this.scale1 = scale1; - this.scale2 = scale2; - this.scaleRate = scaleRate; - this.scaleRateStart = scaleRateStart; - } - public void setRotationX(float rotationX1, float rotationX2, float rotationXRate, int rotationXRateStart){ this.rotationX1 = rotationX1; this.rotationX2 = rotationX2; this.rotationXRate = rotationXRate; this.rotationXRateStart = rotationXRateStart; } + public float getRotationX1() {return rotationX1;} + public float getRotationX2() {return rotationX2;} + public float getRotationXRate() {return rotationXRate;} + public int getRotationXRateStart() {return rotationXRateStart;} public void setRotationY(float rotationY1, float rotationY2, float rotationYRate, int rotationYRateStart){ this.rotationY1 = rotationY1; @@ -311,6 +258,10 @@ public class ScriptParticle implements IParticle { this.rotationYRate = rotationYRate; this.rotationYRateStart = rotationYRateStart; } + public float getRotationY1() {return rotationY1;} + public float getRotationY2() {return rotationY2;} + public float getRotationYRate() {return rotationYRate;} + public int getRotationYRateStart() {return rotationYRateStart;} public void setRotationZ(float rotationZ1, float rotationZ2, float rotationZRate, int rotationZRateStart){ this.rotationZ1 = rotationZ1; @@ -318,4 +269,17 @@ public class ScriptParticle implements IParticle { this.rotationZRate = rotationZRate; this.rotationZRateStart = rotationZRateStart; } + public float getRotationZ1() {return rotationZ1;} + public float getRotationZ2() {return rotationZ2;} + public float getRotationZRate() {return rotationZRate;} + public int getRotationZRateStart() {return rotationZRateStart;} + + @Deprecated + public void setHEXColor(int HEXColor) { + this.HEXColor = HEXColor; + } + @Deprecated + public int getHEXColor() { + return HEXColor; + } } diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IParticle.java b/src/main/java/noppes/npcs/scripted/interfaces/IParticle.java index 2a1d51513..228495ad9 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IParticle.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/IParticle.java @@ -12,6 +12,18 @@ public interface IParticle { void spawnInWorld(ScriptWorld world, double x, double y, double z); + void setFacePlayer(boolean facePlayer); + boolean getFacePlayer(); + + void setDirectory(String directory); + String getDirectory(); + + void setAmount(int amount); + int getAmount(); + + void setMaxAge(int maxAge); + int getMaxAge(); + void setSize(int width, int height); int getWidth(); int getHeight(); @@ -21,90 +33,56 @@ public interface IParticle { int getOffsetY(); void setAnim(int animRate, boolean animLoop, int animStart, int animEnd); - void setAnimRate(int animRate); int getAnimRate(); - void setAnimLoop(boolean animLoop); boolean getAnimLoop(); - void setAnimStart(int animStart); int getAnimStart(); - void setAnimEnd(int animEnd); int getAnimEnd(); - boolean getFacePlayer(); - void setFacePlayer(boolean facePlayer); - - String getDirectory(); - - int getAmount(); - - int getMaxAge(); - + void setPosition(double x, double y, double z); double getX(); double getY(); double getZ(); + void setMotion(double motionX, double motionY, double motionZ, float gravity); double getMotionX(); double getMotionY(); double getMotionZ(); float getGravity(); + void setHEXColor(int HEXColor, int HEXColor2, float HEXColorRate, int HEXColorStart); int getHEXColor1(); int getHEXColor2(); float getHEXColorRate(); int getHEXColorStart(); + void setAlpha(float alpha1, float alpha2, float alphaRate, int alphaRateStart); float getAlpha1(); float getAlpha2(); float getAlphaRate(); int getAlphaRateStart(); + void setScale(float scale1, float scale2, float scaleRate, int scaleRateStart); float getScale1(); float getScale2(); float getScaleRate(); int getScaleRateStart(); + void setRotationX(float rotationX1, float rotationX2, float rotationXRate, int rotationXRateStart); float getRotationX1(); float getRotationX2(); float getRotationXRate(); int getRotationXRateStart(); + void setRotationY(float rotationY1, float rotationY2, float rotationYRate, int rotationYRateStart); float getRotationY1(); float getRotationY2(); float getRotationYRate(); int getRotationYRateStart(); + void setRotationZ(float rotationZ1, float rotationZ2, float rotationZRate, int rotationZRateStart); float getRotationZ1(); float getRotationZ2(); float getRotationZRate(); int getRotationZRateStart(); - - void setDirectory(String directory); - - void setAmount(int amount); - - void setMaxAge(int maxAge); - - void setPosition(double x, double y, double z); - void setX(double x); - void setY(double y); - void setZ(double z); - - void setMotion(double motionX, double motionY, double motionZ, float gravity); - void setMotionX(double motionX); - void setMotionY(double motionY); - void setMotionZ(double motionZ); - void setGravity(float gravity); - - void setHEXColor(int HEXColor, int HEXColor2, float HEXColorRate, int HEXColorStart); - - void setAlpha(float alpha1, float alpha2, float alphaRate, int alphaRateStart); - - void setScale(float scale1, float scale2, float scaleRate, int scaleRateStart); - - void setRotationX(float rotationX1, float rotationX2, float rotationXRate, int rotationXRateStart); - - void setRotationY(float rotationY1, float rotationY2, float rotationYRate, int rotationYRateStart); - - void setRotationZ(float rotationZ1, float rotationZ2, float rotationZRate, int rotationZRateStart); }