From 1bff2eddfe7bf44d91d8f2dfdc775db78e893fd7 Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Wed, 11 Jan 2023 19:12:52 -0600 Subject: [PATCH] Moved NPC puppet data to display data. Improved mixin functionality, offsets and rotations always reset if the puppet "job" (not a job anymore, always in display) is disabled. --- java/noppes/npcs/api/entity/ICustomNpc.java | 3 +++ java/noppes/npcs/api/jobs/IJobPuppet.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/java/noppes/npcs/api/entity/ICustomNpc.java b/java/noppes/npcs/api/entity/ICustomNpc.java index 47875e7..0ff6e30 100644 --- a/java/noppes/npcs/api/entity/ICustomNpc.java +++ b/java/noppes/npcs/api/entity/ICustomNpc.java @@ -12,6 +12,7 @@ import noppes.npcs.api.handler.IOverlayHandler; import noppes.npcs.api.handler.data.IFaction; import noppes.npcs.api.item.IItemStack; import noppes.npcs.api.jobs.IJob; +import noppes.npcs.api.jobs.IJobPuppet; import noppes.npcs.api.roles.IRole; public interface ICustomNpc extends IEntityLiving { @@ -208,6 +209,8 @@ public interface ICustomNpc extends IEntityLiving { */ void reset(); + IJobPuppet getModelData(); + /** * @return Returns the npcs current role */ diff --git a/java/noppes/npcs/api/jobs/IJobPuppet.java b/java/noppes/npcs/api/jobs/IJobPuppet.java index 976e119..eb46527 100644 --- a/java/noppes/npcs/api/jobs/IJobPuppet.java +++ b/java/noppes/npcs/api/jobs/IJobPuppet.java @@ -4,6 +4,10 @@ import noppes.npcs.api.handler.data.IModelPart; public interface IJobPuppet extends IJob { + void setEnabled(boolean enabled); + + boolean enabled(); + IModelPart getPart(int part); void allEnabled(boolean enabled);