diff --git a/src/api b/src/api index c8ee84008..30a6c3727 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit c8ee840082c1fda50cbef778d4d0260cb7900224 +Subproject commit 30a6c3727798e93f2795e1deb96571a1ffd5e59f diff --git a/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java b/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java index b57073fc5..bbc23fdc0 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java @@ -9,6 +9,7 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.entity.Entity; @@ -134,7 +135,22 @@ public class RenderCNPCPlayer extends RenderPlayer { return -1; } - protected void passSpecialRender(EntityLivingBase p_77033_1_, double p_77033_2_, double p_77033_4_, double p_77033_6_) {} + public void passSpecialRender(EntityLivingBase p_77033_1_, double p_77033_2_, double p_77033_4_, double p_77033_6_) { + Render render = RenderManager.instance.getEntityRenderObject(p_77033_1_); + if (render instanceof RenderPlayer) { + RenderPlayer renderPlayer = (RenderPlayer) render; + renderPlayer.passSpecialRender(p_77033_1_, p_77033_2_, p_77033_4_, p_77033_6_); + } + } + + @Override + public void rotateCorpse(EntityLivingBase p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_) { + Render render = RenderManager.instance.getEntityRenderObject(p_77043_1_); + if (render instanceof RenderPlayer) { + RenderPlayer renderPlayer = (RenderPlayer) render; + renderPlayer.rotateCorpse(p_77043_1_, p_77043_2_, p_77043_3_, p_77043_4_); + } + } protected void func_96449_a(AbstractClientPlayer p_96449_1_, double p_96449_2_, double p_96449_4_, double p_96449_6_, String p_96449_8_, float p_96449_9_, double p_96449_10_) {} diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java index 35d2c656e..a92ca67b1 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java @@ -190,7 +190,7 @@ public class RenderNPCInterface extends RenderLiving{ } @Override - protected void passSpecialRender(EntityLivingBase par1EntityLivingBase, double par2, double par4, double par6){ + public void passSpecialRender(EntityLivingBase par1EntityLivingBase, double par2, double par4, double par6){ renderName((EntityNPCInterface)par1EntityLivingBase, par2, par4, par6); } diff --git a/src/main/resources/META-INF/customnpcs_at.cfg b/src/main/resources/META-INF/customnpcs_at.cfg index 31d46a398..bf26fcdaf 100644 --- a/src/main/resources/META-INF/customnpcs_at.cfg +++ b/src/main/resources/META-INF/customnpcs_at.cfg @@ -10,5 +10,8 @@ public net.minecraft.client.Minecraft field_71428_T # timer public net.minecraft.entity.Entity field_70148_d # firstUpdate #RendererLivingEntity public net.minecraft.client.renderer.entity.RendererLivingEntity field_77045_g # mainModel +public net.minecraft.client.renderer.entity.RendererLivingEntity func_77033_b(Lnet/minecraft/entity/EntityLivingBase;DDD)V # passSpecialRender #ItemRenderer -public net.minecraft.client.renderer.ItemRenderer field_78453_b # itemToRender \ No newline at end of file +public net.minecraft.client.renderer.ItemRenderer field_78453_b # itemToRender +#RenderPlayer +public net.minecraft.client.renderer.entity.RenderPlayer func_77043_a(Lnet/minecraft/entity/EntityLivingBase;FFF)V # rotateCorpse