This commit is contained in:
Kam committed 2024-02-08 05:31:06 -05:00
commit 4081153c79
4 files changed
+37 -45

No files matched your search

@@ -32,6 +32,7 @@ public class ClientEventHandler {
public static final RenderCNPCPlayer renderCNPCPlayer = new RenderCNPCPlayer();
public static HashMap<Integer,Long> disabledButtonTimes = new HashMap<>();
public static float partialHandTicks;
public static boolean firstPersonAnimation;
public static float partialRenderTick;
public static RendererLivingEntity renderer;
@@ -197,30 +198,6 @@ public class ClientEventHandler {
}
}
@SubscribeEvent
public void onRenderHand(RenderHandEvent event) {
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
if (ConfigMixin.FirstPersonAnimationMixin && ClientCacheHandler.playerAnimations.containsKey(player.getUniqueID())) {
Render playerRenderer = RenderManager.instance.getEntityRenderObject(player);
if (playerRenderer instanceof RendererLivingEntity) {
ClientEventHandler.renderer = (RendererLivingEntity) playerRenderer;
}
ClientEventHandler.renderingPlayer = player;
ClientEventHandler.partialRenderTick = Minecraft.getMinecraft().timer.renderPartialTicks;
partialHandTicks = event.partialTicks;
AnimationData animData = ClientCacheHandler.playerAnimations.get(player.getUniqueID());
if (animData != null && animData.isActive()) {
Frame frame = (Frame) animData.animation.currentFrame();
if (frame.frameParts.containsKey(EnumAnimationPart.FULL_MODEL)) {
FramePart part = frame.frameParts.get(EnumAnimationPart.FULL_MODEL);
part.interpolateOffset();
part.interpolateAngles();
}
}
}
}
public static boolean hasOverlays(EntityPlayer player) {
return ClientCacheHandler.skinOverlays.containsKey(player.getUniqueID()) && ClientCacheHandler.skinOverlays.get(player.getUniqueID()).values().size() > 0;
}
@@ -53,13 +53,34 @@ public class MixinItemRenderer {
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
Render renderer = RenderManager.instance.getEntityRenderObject(player);
if (renderer instanceof RendererLivingEntity && ((RendererLivingEntity) renderer).mainModel instanceof ModelBiped) {
Render playerRenderer = RenderManager.instance.getEntityRenderObject(player);
if (playerRenderer instanceof RendererLivingEntity) {
ClientEventHandler.renderer = (RendererLivingEntity) playerRenderer;
}
ClientEventHandler.partialRenderTick = Minecraft.getMinecraft().timer.renderPartialTicks;
ClientEventHandler.partialHandTicks = p_78440_1_;
ClientEventHandler.renderingPlayer = player;
ClientEventHandler.firstPersonAnimation = true;
if (mixin_renderFirstPersonAnimation(p_78440_1_, player, (ModelBiped) ((RendererLivingEntity) renderer).mainModel)) {
callbackInfo.cancel();
}
ClientEventHandler.firstPersonAnimation = false;
ClientEventHandler.renderingPlayer = null;
}
}
private boolean mixin_renderFirstPersonAnimation(float partialRenderTick, EntityPlayer player, ModelBiped model) {
AnimationData animData = ClientCacheHandler.playerAnimations.get(player.getUniqueID());
if (animData != null && animData.isActive()) {
Frame frame = (Frame) animData.animation.currentFrame();
if (frame.frameParts.containsKey(EnumAnimationPart.FULL_MODEL)) {
FramePart part = frame.frameParts.get(EnumAnimationPart.FULL_MODEL);
part.interpolateOffset();
part.interpolateAngles();
}
}
ModelRenderer[] parts = new ModelRenderer[]{model.bipedRightArm, model.bipedLeftArm, model.bipedRightLeg, model.bipedLeftLeg};
EnumAnimationPart[] enumParts = new EnumAnimationPart[]{EnumAnimationPart.RIGHT_ARM, EnumAnimationPart.LEFT_ARM, EnumAnimationPart.RIGHT_LEG, EnumAnimationPart.LEFT_LEG};
Frame frame;
@@ -82,7 +82,7 @@ public abstract class MixinModelRenderer {
float prevAngleY = this.rotateAngleY;
float prevAngleZ = this.rotateAngleZ;
this.setAnimationValues();
this.setAnimationValues(p_78785_1_);
GL11.glTranslatef(this.offsetX, this.offsetY, this.offsetZ);
int i;
@@ -165,7 +165,7 @@ public abstract class MixinModelRenderer {
}
}
private void setAnimationValues() {
private void setAnimationValues(float p_78785_1_) {
float prevPointX = this.rotationPointX;
float prevPointY = this.rotationPointY;
float prevPointZ = this.rotationPointZ;
@@ -194,23 +194,12 @@ public abstract class MixinModelRenderer {
}
}
if (ClientEventHandler.renderingPlayer != null) {
ClientEventHandler.playerModel = ((ModelRenderer) (Object) this).baseModel;
}
if (ClientEventHandler.renderingPlayer != null && ClientCacheHandler.playerAnimations.containsKey(ClientEventHandler.renderingPlayer.getUniqueID())) {
ClientEventHandler.playerModel = ((ModelRenderer) (Object) this).baseModel;
AnimationData animData = ClientCacheHandler.playerAnimations.get(ClientEventHandler.renderingPlayer.getUniqueID());
EnumAnimationPart partType = null;
EnumAnimationPart mainPartType = null;
try{
EnumAnimationPart pivotEqualPart = null;
mainPartType = this.getPlayerPartType((ModelRenderer) (Object) this);
if (mainPartType == null) {
pivotEqualPart = this.pivotEqualPart((ModelRenderer) (Object) this);
}
partType = mainPartType != null ? mainPartType : pivotEqualPart;
}
catch (Exception ignored){}
EnumAnimationPart mainPartType = this.getPlayerPartType((ModelRenderer) (Object) this);
EnumAnimationPart partType = mainPartType != null ? mainPartType : this.pivotEqualPart((ModelRenderer) (Object) this);
if (partType != null && animData != null && animData.animation != null) {
boolean animDataActive = animData.isActive();
@@ -221,6 +210,7 @@ public abstract class MixinModelRenderer {
part.rotation = new float[]{prevAngleX, prevAngleY, prevAngleZ};
ClientEventHandler.originalValues.put((ModelRenderer) (Object) this, part);
}
FramePart originalPart = ClientEventHandler.originalValues.get((ModelRenderer) (Object) this);
Frame frame = (Frame) animData.animation.currentFrame();
if (!animDataActive && animData.finishedFrame >= 0 && animData.finishedFrame < animData.animation.frames.size()) {
@@ -243,7 +233,8 @@ public abstract class MixinModelRenderer {
part.prevRotations[2] = part.prevRotations[2] * (1.0F - speed) + (this.rotateAngleZ * speed);
}
if (animDataActive || (partType != EnumAnimationPart.HEAD && ClientEventHandler.renderingPlayer.getAge() - animData.finishedTime < 20)) {
if (animDataActive || (partType != EnumAnimationPart.HEAD
&& ClientEventHandler.renderingPlayer.getAge() - animData.finishedTime < 20)) {
this.rotationPointX = originalPart.pivot[0] + part.prevPivots[0];
this.rotationPointY = originalPart.pivot[1] + part.prevPivots[1];
this.rotationPointZ = originalPart.pivot[2] + part.prevPivots[2];
@@ -4,6 +4,9 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.client.renderer.entity.RendererLivingEntity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.controllers.data.AnimationData;
import noppes.npcs.client.ClientCacheHandler;
import noppes.npcs.constants.EnumAnimationPart;
@@ -19,11 +22,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
public class MixinRenderPlayer {
@SideOnly(Side.CLIENT)
@Inject(method = "renderLivingAt", at = @At(value = "TAIL"))
protected void modelDataRotations(AbstractClientPlayer p_77039_1_, double p_77039_2_, double p_77039_4_, double p_77039_6_, CallbackInfo callbackInfo)
@Inject(method = "rotateCorpse*", at = @At(value = "TAIL"))
protected void modelDataRotations(AbstractClientPlayer p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_, CallbackInfo callbackInfo)
{
if (ClientCacheHandler.playerAnimations.containsKey(p_77039_1_.getUniqueID())) {
AnimationData animData = ClientCacheHandler.playerAnimations.get(p_77039_1_.getUniqueID());
if (ClientCacheHandler.playerAnimations.containsKey(p_77043_1_.getUniqueID())) {
AnimationData animData = ClientCacheHandler.playerAnimations.get(p_77043_1_.getUniqueID());
if (animData != null && animData.isActive()) {
Frame frame = (Frame) animData.animation.currentFrame();
if (frame.frameParts.containsKey(EnumAnimationPart.FULL_MODEL)) {