upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 07:17:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplified player animation rendering, similar to the NPC puppet part commit on dev.

Browse Source
This commit is contained in:
Luis C.M committed 2023-01-07 14:10:36 -06:00
1 parent cfd724edf6
commit 3b11ddb4b4
4 files changed
+13 -91
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/controllers/data/PlayerModelData.java
-7
View File
@@ -35,13 +35,6 @@ public class PlayerModelData implements IPlayerModelData {
public float modelRotPartialTicks;
public float[] modelRotations = {0,0,0};
public float[] bipedRotsHead = {0,0,0};
public float[] bipedRotsBody = {0,0,0};
public float[] bipedRotsLeftArm = {0,0,0};
public float[] bipedRotsRightArm = {0,0,0};
public float[] bipedRotsLeftLeg = {0,0,0};
public float[] bipedRotsRightLeg = {0,0,0};
public PlayerModelData(PlayerData parent) {
this.parent = parent;
this.player = parent.player;
src/main/java/noppes/npcs/mixin/MixinModelRenderer.java
+10 -77
View File
@@ -45,84 +45,17 @@ public class MixinModelRenderer {
PlayerModelData modelData = Client.playerModelData.get(ClientEventHandler.renderingPlayer.getUniqueID());
this.setModelParts(modelData);
if (modelData.enabled) {
if(isPart(modelData.head)){
this.rotateAngleX = modelData.bipedRotsHead[0];
this.rotateAngleY = modelData.bipedRotsHead[1];
this.rotateAngleZ = modelData.bipedRotsHead[2];
this.setInterpolatedAngles(modelData,modelData.head);
}
JobPuppet.PartConfig[] partConfigs = new JobPuppet.PartConfig[]{modelData.head,modelData.body,modelData.larm,modelData.rarm,modelData.lleg,modelData.rleg};
if(isPart(modelData.body)){
this.rotateAngleX = modelData.bipedRotsBody[0];
this.rotateAngleY = modelData.bipedRotsBody[1];
this.rotateAngleZ = modelData.bipedRotsBody[2];
this.setInterpolatedAngles(modelData,modelData.body);
}
if(isPart(modelData.larm)){
this.rotateAngleX = modelData.bipedRotsLeftArm[0];
this.rotateAngleY = modelData.bipedRotsLeftArm[1];
this.rotateAngleZ = modelData.bipedRotsLeftArm[2];
this.setInterpolatedAngles(modelData,modelData.larm);
}
if(isPart(modelData.rarm)){
this.rotateAngleX = modelData.bipedRotsRightArm[0];
this.rotateAngleY = modelData.bipedRotsRightArm[1];
this.rotateAngleZ = modelData.bipedRotsRightArm[2];
this.setInterpolatedAngles(modelData,modelData.rarm);
}
if(isPart(modelData.lleg)){
this.rotateAngleX = modelData.bipedRotsLeftLeg[0];
this.rotateAngleY = modelData.bipedRotsLeftLeg[1];
this.rotateAngleZ = modelData.bipedRotsLeftLeg[2];
this.setInterpolatedAngles(modelData,modelData.lleg);
}
if(isPart(modelData.rleg)){
this.rotateAngleX = modelData.bipedRotsRightLeg[0];
this.rotateAngleY = modelData.bipedRotsRightLeg[1];
this.rotateAngleZ = modelData.bipedRotsRightLeg[2];
this.setInterpolatedAngles(modelData,modelData.rleg);
}
if(isPart(modelData.head)){
this.addInterpolatedOffset(modelData, modelData.head);
}
if(isPart(modelData.body)){
this.addInterpolatedOffset(modelData, modelData.body);
}
if(isPart(modelData.larm)){
this.addInterpolatedOffset(modelData, modelData.larm);
}
if(isPart(modelData.rarm)){
this.addInterpolatedOffset(modelData, modelData.rarm);
}
if(isPart(modelData.lleg)){
this.addInterpolatedOffset(modelData, modelData.lleg);
}
if(isPart(modelData.rleg)){
this.addInterpolatedOffset(modelData, modelData.rleg);
}
if(isPart(modelData.head)) {
modelData.bipedRotsHead = new float[]{this.rotateAngleX, this.rotateAngleY, this.rotateAngleZ};
}
if(isPart(modelData.body)) {
modelData.bipedRotsBody = new float[]{this.rotateAngleX, this.rotateAngleY, this.rotateAngleZ};
}
if(isPart(modelData.larm)) {
modelData.bipedRotsLeftArm = new float[]{this.rotateAngleX, this.rotateAngleY, this.rotateAngleZ};
}
if(isPart(modelData.rarm)) {
modelData.bipedRotsRightArm = new float[]{this.rotateAngleX, this.rotateAngleY, this.rotateAngleZ};
}
if(isPart(modelData.lleg)) {
modelData.bipedRotsLeftLeg = new float[]{this.rotateAngleX, this.rotateAngleY, this.rotateAngleZ};
}
if(isPart(modelData.rleg)) {
modelData.bipedRotsRightLeg = new float[]{this.rotateAngleX, this.rotateAngleY, this.rotateAngleZ};
for (int i = 0; i < partConfigs.length; i++) {
if (isPart(partConfigs[i])) {
this.rotateAngleX = partConfigs[i].prevRotations[0];
this.rotateAngleY = partConfigs[i].prevRotations[1];
this.rotateAngleZ = partConfigs[i].prevRotations[2];
this.setInterpolatedAngles(modelData,partConfigs[i]);
this.addInterpolatedOffset(modelData,partConfigs[i]);
partConfigs[i].prevRotations = new float[]{this.rotateAngleX, this.rotateAngleY, this.rotateAngleZ};
}
}
}
}
src/main/java/noppes/npcs/roles/JobPuppet.java
+2 -6
View File
@@ -105,9 +105,8 @@ public class JobPuppet extends JobInterface{
public float pivotZ = 0f;
//Client-sided use
public float prevPivotX = 0f;
public float prevPivotY = 0f;
public float prevPivotZ = 0f;
public float[] prevRotations = new float[]{0,0,0};
public float[] prevPivots = new float[]{0,0,0};
public float partialRotationTick = 0f;
public float partialPivotTick = 0f;
@@ -119,9 +118,6 @@ public class JobPuppet extends JobInterface{
public float originalPivotY = 0f;
public float originalPivotZ = 0f;
public float[] prevRotations = new float[]{0,0,0};
public float[] prevPivots = new float[]{0,0,0};
public boolean disabled = false;
public NBTTagCompound writeNBT(){