RenderCNPCPlayer changes in ClientEventHandler:

-Fixed cancelling an uncancellable armor render event.
-Only RenderPlayerEvent.Specials.Pre is cancelled, rather than trying to cancel both Pre & Post.

RenderCNPCPlayer:
-Now always returns -1 as a render pass.
This commit is contained in:
Luis C.M committed 2022-06-13 00:47:39 -05:00
1 parent 3c4b680bc1
commit 1293fabca9
2 files changed
+11 -9

No files matched your search

@@ -1,5 +1,6 @@
package noppes.npcs.client;
import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import net.minecraft.client.Minecraft;
@@ -37,15 +38,10 @@ public class ClientEventHandler {
}
@SubscribeEvent
public void cancelSpecials(RenderPlayerEvent.Specials event) {
if (event.renderer instanceof RenderCNPCPlayer)
event.setCanceled(true);
}
@SubscribeEvent
public void cancelSpecials(RenderPlayerEvent.SetArmorModel event) {
if (event.renderer instanceof RenderCNPCPlayer && event.stack != null && event.stack.getItem() instanceof ItemArmor)
public void cancelSpecials(RenderPlayerEvent.Specials.Pre event) {
if (event.renderer instanceof RenderCNPCPlayer) {
event.setCanceled(true);
}
}
@SubscribeEvent
@@ -2,6 +2,7 @@ package noppes.npcs.client.renderer;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.client.model.ModelBiped;
@@ -9,6 +10,7 @@ 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.RenderBiped;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.entity.Entity;
@@ -149,11 +151,15 @@ public class RenderCNPCPlayer extends RenderPlayer {
}
}
}
protected int shouldRenderPass(AbstractClientPlayer p_77032_1_, int p_77032_2_, float p_77032_3_)
{
return -1;
}
public void renderHand(float partialTicks, int renderPass) {
Minecraft mc = Minecraft.getMinecraft();
EntityRenderer entityRenderer = mc.entityRenderer;
EntityClientPlayerMP player = mc.thePlayer;
if (entityRenderer.debugViewDirection <= 0)
{