mirror of
https://github.com/barkeser2002/CatServer.git
synced 2026-09-25 08:39:58 +03:00
39 lines
3.7 KiB
Diff
39 lines
3.7 KiB
Diff
--- ../src-base/minecraft/net/minecraft/client/renderer/entity/layers/LayerEntityOnShoulder.java
|
|
+++ ../src-work/minecraft/net/minecraft/client/renderer/entity/layers/LayerEntityOnShoulder.java
|
|
@@ -47,7 +47,7 @@
|
|
|
|
if (!nbttagcompound.hasNoTags())
|
|
{
|
|
- LayerEntityOnShoulder.DataHolder layerentityonshoulder$dataholder = this.renderEntityOnShoulder(entitylivingbaseIn, this.leftUniqueId, nbttagcompound, this.leftRenderer, this.leftModel, this.leftResource, this.leftEntityClass, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale, true);
|
|
+ DataHolder layerentityonshoulder$dataholder = this.renderEntityOnShoulder(entitylivingbaseIn, this.leftUniqueId, nbttagcompound, this.leftRenderer, this.leftModel, this.leftResource, this.leftEntityClass, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale, true);
|
|
this.leftUniqueId = layerentityonshoulder$dataholder.entityId;
|
|
this.leftRenderer = layerentityonshoulder$dataholder.renderer;
|
|
this.leftResource = layerentityonshoulder$dataholder.textureLocation;
|
|
@@ -59,7 +59,7 @@
|
|
|
|
if (!nbttagcompound1.hasNoTags())
|
|
{
|
|
- LayerEntityOnShoulder.DataHolder layerentityonshoulder$dataholder1 = this.renderEntityOnShoulder(entitylivingbaseIn, this.rightUniqueId, nbttagcompound1, this.rightRenderer, this.rightModel, this.rightResource, this.rightEntityClass, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale, false);
|
|
+ DataHolder layerentityonshoulder$dataholder1 = this.renderEntityOnShoulder(entitylivingbaseIn, this.rightUniqueId, nbttagcompound1, this.rightRenderer, this.rightModel, this.rightResource, this.rightEntityClass, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale, false);
|
|
this.rightUniqueId = layerentityonshoulder$dataholder1.entityId;
|
|
this.rightRenderer = layerentityonshoulder$dataholder1.renderer;
|
|
this.rightResource = layerentityonshoulder$dataholder1.textureLocation;
|
|
@@ -71,7 +71,7 @@
|
|
}
|
|
}
|
|
|
|
- private LayerEntityOnShoulder.DataHolder renderEntityOnShoulder(EntityPlayer p_192864_1_, @Nullable UUID p_192864_2_, NBTTagCompound p_192864_3_, RenderLivingBase <? extends EntityLivingBase > p_192864_4_, ModelBase p_192864_5_, ResourceLocation p_192864_6_, Class<?> p_192864_7_, float p_192864_8_, float p_192864_9_, float p_192864_10_, float p_192864_11_, float p_192864_12_, float p_192864_13_, float p_192864_14_, boolean p_192864_15_)
|
|
+ private DataHolder renderEntityOnShoulder(EntityPlayer p_192864_1_, @Nullable UUID p_192864_2_, NBTTagCompound p_192864_3_, RenderLivingBase <? extends EntityLivingBase > p_192864_4_, ModelBase p_192864_5_, ResourceLocation p_192864_6_, Class<?> p_192864_7_, float p_192864_8_, float p_192864_9_, float p_192864_10_, float p_192864_11_, float p_192864_12_, float p_192864_13_, float p_192864_14_, boolean p_192864_15_)
|
|
{
|
|
if (p_192864_2_ == null || !p_192864_2_.equals(p_192864_3_.getUniqueId("UUID")))
|
|
{
|
|
@@ -101,7 +101,7 @@
|
|
p_192864_5_.setRotationAngles(p_192864_8_, p_192864_9_, p_192864_11_, p_192864_12_, p_192864_13_, p_192864_14_, p_192864_1_);
|
|
p_192864_5_.render(p_192864_1_, p_192864_8_, p_192864_9_, p_192864_11_, p_192864_12_, p_192864_13_, p_192864_14_);
|
|
GlStateManager.popMatrix();
|
|
- return new LayerEntityOnShoulder.DataHolder(p_192864_2_, p_192864_4_, p_192864_5_, p_192864_6_, p_192864_7_);
|
|
+ return new DataHolder(p_192864_2_, p_192864_4_, p_192864_5_, p_192864_6_, p_192864_7_);
|
|
}
|
|
|
|
public boolean shouldCombineTextures()
|