From b04a35efc4b79954296fb9f74328b7d2981c7ab3 Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Fri, 17 Mar 2023 04:34:14 -0500 Subject: [PATCH] Added armwear functions --- .../npcs/entity/data/ModelDataShared.java | 173 ++++++++++++++++++ 1 file changed, 173 insertions(+) diff --git a/src/main/java/noppes/npcs/entity/data/ModelDataShared.java b/src/main/java/noppes/npcs/entity/data/ModelDataShared.java index 5f2a8be1c..f7db2aa52 100644 --- a/src/main/java/noppes/npcs/entity/data/ModelDataShared.java +++ b/src/main/java/noppes/npcs/entity/data/ModelDataShared.java @@ -30,6 +30,7 @@ public class ModelDataShared implements IModelData { public byte headwear = 2; public byte bodywear = 0; + // Hide Arm/Legwear [0: None, 1: Both, 2: Right, 3: Left], public byte armwear = 0; public byte legwear = 0; @@ -175,6 +176,178 @@ public class ModelDataShared implements IModelData { return (1 - modelScale.legs.scaleY) * 0.75f; } + //0 - hidden, 1 - 2d, 2 - 3d + public void headWear(byte config) { + headwear = ValueUtil.clamp(config, (byte)0, (byte)2); + } + + public byte headWear() { + return this.headwear; + } + + //0 - hidden, 1 - 2d, 2 - 3d + public void bodyWear(byte config) { + bodywear = ValueUtil.clamp(config, (byte)0, (byte)2); + } + + public byte bodyWear() { + return this.bodywear; + } + + //0 - hidden, 1 - 2d, 2 - 3d + public void rightArmWear(byte config) { + config = ValueUtil.clamp(config, (byte)0, (byte)2); + + // Hide Arm/Legwear [0: None, 1: Both, 2: Right, 3: Left], + if (config == 1 || config == 2) { + if (armwear == 0) + armwear = 2; + else if (armwear == 3) + armwear = 1; + } else { + if (armwear == 1) + armwear = 3; + else if (armwear == 2) + armwear = 0; + } + + // Solid or normal arm/legwear [0: None, 1: Both, 2: Right, 3: Left] + if (config == 1) { + solidArmwear = 0; + } else if (config == 2) { + if (solidArmwear == 0) { + solidArmwear = 2; + } else if (solidArmwear == 3) { + solidArmwear = 1; + } + } + } + + public byte rightArmWear() { + if (armwear == 0 || armwear == 3) { + return 0; + } else if (solidArmwear == 1 || solidArmwear == 2) { + return 2; + } else { + return 1; + } + } + + //0 - hidden, 1 - 2d, 2 - 3d + public void leftArmWear(byte config) { + config = ValueUtil.clamp(config, (byte)0, (byte)2); + + // Hide Arm/Legwear [0: None, 1: Both, 2: Right, 3: Left], + if (config == 1 || config == 2) { + if (armwear == 0) + armwear = 3; + else if (armwear == 2) + armwear = 1; + } else { + if (armwear == 1) + armwear = 2; + else if (armwear == 3) + armwear = 0; + } + + // Solid or normal arm/legwear [0: None, 1: Both, 2: Right, 3: Left] + if (config == 1) { + solidArmwear = 0; + } else if (config == 2) { + if (solidArmwear == 0) { + solidArmwear = 3; + } else if (solidArmwear == 2) { + solidArmwear = 1; + } + } + } + + public byte leftArmWear() { + if (armwear == 0 || armwear == 2) { + return 0; + } else if (solidArmwear == 1 || solidArmwear == 3) { + return 2; + } else { + return 1; + } + } + + public void rightLegWear(byte config) { + config = ValueUtil.clamp(config, (byte)0, (byte)2); + + // Hide Arm/Legwear [0: None, 1: Both, 2: Right, 3: Left], + if (config == 1 || config == 2) { + if (legwear == 0) + legwear = 2; + else if (legwear == 3) + legwear = 1; + } else { + if (legwear == 1) + legwear = 3; + else if (legwear == 2) + legwear = 0; + } + + // Solid or normal arm/legwear [0: None, 1: Both, 2: Right, 3: Left] + if (config == 1) { + solidLegwear = 0; + } else if (config == 2) { + if (solidLegwear == 0) { + solidLegwear = 2; + } else if (solidLegwear == 3) { + solidLegwear = 1; + } + } + } + + public byte rightLegWear() { + if (legwear == 0 || legwear == 3) { + return 0; + } else if (solidLegwear == 1 || solidLegwear == 2) { + return 2; + } else { + return 1; + } + } + + public void leftLegWear(byte config) { + config = ValueUtil.clamp(config, (byte)0, (byte)2); + + // Hide Arm/Legwear [0: None, 1: Both, 2: Right, 3: Left], + if (config == 1 || config == 2) { + if (legwear == 0) + legwear = 3; + else if (legwear == 2) + legwear = 1; + } else { + if (legwear == 1) + legwear = 2; + else if (legwear == 3) + legwear = 0; + } + + // Solid or normal arm/legwear [0: None, 1: Both, 2: Right, 3: Left] + if (config == 1) { + solidLegwear = 0; + } else if (config == 2) { + if (solidLegwear == 0) { + solidLegwear = 3; + } else if (solidLegwear == 2) { + solidLegwear = 1; + } + } + } + + public byte leftLegWear() { + if (legwear == 0 || legwear == 2) { + return 0; + } else if (solidLegwear == 1 || solidLegwear == 3) { + return 2; + } else { + return 1; + } + } + public void hidePart(int part, byte hide) { part = ValueUtil.clamp(part,0,3); hide = part > 1 ? ValueUtil.clamp(hide,(byte) 0,(byte) 3) : ValueUtil.clamp(hide,(byte) 0,(byte) 1);