From 2262639182ff1b8c7bc0a11a916ea77700f9a46b Mon Sep 17 00:00:00 2001 From: KAMKEEL Date: Sat, 8 May 2021 03:51:29 -0400 Subject: [PATCH 1/2] Create Dev Branch Add Scripting for ModelType --- .../npcs/entity/EntityNPCInterface.java | 1 + .../java/noppes/npcs/scripted/ScriptNpc.java | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index d3a2ddcb2..e1f6e3956 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -1699,6 +1699,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti { return this.display.modelType; } + public void setModelType(int val) { this.display.modelType = val; diff --git a/src/main/java/noppes/npcs/scripted/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/ScriptNpc.java index 1a07d2f77..304b5eefc 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/ScriptNpc.java @@ -57,6 +57,25 @@ public class ScriptNpc extends ScriptLiving{ npc.display.modelSize = size; npc.script.clientNeedsUpdate = true; } + + /** + * @return Returns the current npcs modelType of the NPC + */ + public int getModelType(){ + return npc.display.modelType; + } + + /** + * @param modelType The modelType of the NPC. 0: Steve, 1: Steve64, 2: Alex + */ + public void setModelType(int modelType){ + if(modelType > 2) + modelType = 2; + else if(modelType < 0) + modelType = 0; + npc.display.modelType = modelType; + npc.script.clientNeedsUpdate = true; + } /** * @return The npcs name From 06df9e015e212c828e3d14ef962952ad6cb1bfb5 Mon Sep 17 00:00:00 2001 From: KAMKEEL Date: Sun, 9 May 2021 01:45:07 -0400 Subject: [PATCH 2/2] Correct Model holding items issue Issue with models holding item --- .../java/noppes/npcs/client/renderer/RenderNPCHumanMale.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java index 6ecd303d4..d88b5e488 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java @@ -38,6 +38,7 @@ public class RenderNPCHumanMale extends RenderNPCInterface protected ModelNPCMale modelArmorChestplate; protected ModelNPCMale modelArmor; + protected final ModelNPCMale originalBipedMain; protected final ModelMPM steve = new ModelMPM(0, false); protected final ModelMPM alex = new ModelMPM(0, true); @@ -45,6 +46,7 @@ public class RenderNPCHumanMale extends RenderNPCInterface { super(mainmodel, 0.5F); modelBipedMain = mainmodel; + originalBipedMain = mainmodel; modelArmorChestplate = armorChest; modelArmor = armor; } @@ -132,6 +134,7 @@ public class RenderNPCHumanMale extends RenderNPCInterface ((EntityCustomNpc) npc).modelData.armwear = 0; ((EntityCustomNpc) npc).modelData.legwear = 0; this.mainModel = originalModel; + this.modelBipedMain = originalBipedMain; } } }