From 922708bf9774d3e07d854306ecffb45037f98ae8 Mon Sep 17 00:00:00 2001 From: luisc Date: Tue, 7 Dec 2021 23:52:57 -0600 Subject: [PATCH] Changed npc field in ScriptNpc to EntityNPCInterface --- .../npcs/scripted/entity/ScriptNpc.java | 52 +++++++++++-------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java index 02fcde002..879d0f96e 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java @@ -36,11 +36,11 @@ import java.util.ArrayList; import java.util.UUID; public class ScriptNpc extends ScriptLiving implements ICustomNpc { - public EntityCustomNpc npc; + public EntityNPCInterface npc; public ScriptNpc(T npc){ super(npc); - this.npc = (EntityCustomNpc)npc; + this.npc = npc; } /** @@ -789,35 +789,43 @@ public class ScriptNpc extends ScriptLiving imp } public void setHeadScale(float x, float y, float z){ - npc.modelData.head.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); - npc.modelData.head.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); - npc.modelData.head.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); - - npc.script.clientNeedsUpdate = true; + if(npc instanceof EntityCustomNpc) { + ((EntityCustomNpc) this.npc).modelData.head.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); + ((EntityCustomNpc) this.npc).modelData.head.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); + ((EntityCustomNpc) this.npc).modelData.head.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); + + npc.script.clientNeedsUpdate = true; + } } public void setBodyScale(float x, float y, float z){ - npc.modelData.body.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); - npc.modelData.body.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); - npc.modelData.body.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); - - npc.script.clientNeedsUpdate = true; + if(npc instanceof EntityCustomNpc) { + ((EntityCustomNpc) this.npc).modelData.body.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); + ((EntityCustomNpc) this.npc).modelData.body.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); + ((EntityCustomNpc) this.npc).modelData.body.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); + + npc.script.clientNeedsUpdate = true; + } } public void setArmsScale(float x, float y, float z){ - npc.modelData.arms.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); - npc.modelData.arms.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); - npc.modelData.arms.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); - - npc.script.clientNeedsUpdate = true; + if(npc instanceof EntityCustomNpc) { + ((EntityCustomNpc) this.npc).modelData.arms.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); + ((EntityCustomNpc) this.npc).modelData.arms.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); + ((EntityCustomNpc) this.npc).modelData.arms.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); + + npc.script.clientNeedsUpdate = true; + } } public void setLegsScale(float x, float y, float z){ - npc.modelData.legs.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); - npc.modelData.legs.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); - npc.modelData.legs.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); - - npc.script.clientNeedsUpdate = true; + if(npc instanceof EntityCustomNpc) { + ((EntityCustomNpc) this.npc).modelData.legs.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); + ((EntityCustomNpc) this.npc).modelData.legs.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); + ((EntityCustomNpc) this.npc).modelData.legs.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); + + npc.script.clientNeedsUpdate = true; + } } /**