From 3d39244dd3fbe732f8f079b632ae5f30aa9aedf7 Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Sun, 8 Jan 2023 22:32:32 -0600 Subject: [PATCH] IJobPuppet: -Now restructured to use IModelPart to modify puppet parts. -Old functions have been marked as deprecated, but still work. --- .../npcs/api/handler/data/IModelPart.java | 52 +++++++++++++++++++ java/noppes/npcs/api/jobs/IJobPuppet.java | 38 +++++--------- 2 files changed, 65 insertions(+), 25 deletions(-) create mode 100644 java/noppes/npcs/api/handler/data/IModelPart.java diff --git a/java/noppes/npcs/api/handler/data/IModelPart.java b/java/noppes/npcs/api/handler/data/IModelPart.java new file mode 100644 index 0000000..7ae95bf --- /dev/null +++ b/java/noppes/npcs/api/handler/data/IModelPart.java @@ -0,0 +1,52 @@ +package noppes.npcs.api.handler.data; + +public interface IModelPart { + + void setEnabled(boolean bo); + + boolean isEnabled(); + + void setAnimated(boolean animated); + + boolean isAnimated(); + + void setInterpolated(boolean interpolate); + + boolean isInterpolated(); + + void setFullAngles(boolean limit); + + boolean fullAngles(); + + void setAnimRate(float animRate); + + float getAnimRate(); + + void setRotation(float rotationX, float rotationY, float rotationZ); + + void setRotationX(float rotation); + + void setRotationY(float rotation); + + void setRotationZ(float rotation); + + float getRotationX(); + + float getRotationY(); + + float getRotationZ(); + + void setOffset(float offsetX, float offsetY, float offsetZ); + + void setOffsetX(float offset); + + void setOffsetY(float offset); + + void setOffsetZ(float offset); + + float getOffsetX(); + + float getOffsetY(); + + float getOffsetZ(); +} diff --git a/java/noppes/npcs/api/jobs/IJobPuppet.java b/java/noppes/npcs/api/jobs/IJobPuppet.java index 83cbb00..d2ae37c 100644 --- a/java/noppes/npcs/api/jobs/IJobPuppet.java +++ b/java/noppes/npcs/api/jobs/IJobPuppet.java @@ -1,23 +1,19 @@ package noppes.npcs.api.jobs; +import noppes.npcs.api.handler.data.IModelPart; + public interface IJobPuppet extends IJob { - void setAnimated(boolean animated); + IModelPart getPart(int part); - boolean isAnimated(); + void setAnimated(boolean animated); void setInterpolated(boolean interpolate); - boolean isInterpolated(); - - void setFullAngles(boolean limit); - - boolean fullAngles(); + void setFullAngles(boolean fullAngles); void setAnimRate(float animRate); - float getAnimRate(); - void doWhileStanding(boolean whileStanding); boolean doWhileStanding(); @@ -30,35 +26,27 @@ public interface IJobPuppet extends IJob { boolean doWhileMoving(); - void setRotation(int part, float rotationX, float rotationY, float rotationZ); - + @Deprecated void setRotationX(int part, float rotation); + @Deprecated void setRotationY(int part, float rotation); + @Deprecated void setRotationZ(int part, float rotation); + @Deprecated float getRotationX(int part); + @Deprecated float getRotationY(int part); + @Deprecated float getRotationZ(int part); - void setOffset(int part, float offsetX, float offsetY, float offsetZ); - - void setOffsetX(int part, float offset); - - void setOffsetY(int part, float offset); - - void setOffsetZ(int part, float offset); - - float getOffsetX(int part); - - float getOffsetY(int part); - - float getOffsetZ(int part); - + @Deprecated boolean isEnabled(int part); + @Deprecated void setEnabled(int part, boolean bo); }