Bug fixes, closes #58 #57 #54 #53

This commit is contained in:
John Yorke committed 2018-01-28 13:15:52 -04:00
1 parent 091eff5b88
commit a6cdb42d64
21 files changed
+128 -107

No files matched your search

@@ -2,13 +2,12 @@ package taintedmagic.client;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.MinecraftForge;
import taintedmagic.client.handler.EquipmentItemRenderHandler;
import taintedmagic.client.handler.ClientHandler;
import taintedmagic.client.handler.HUDHandler;
import taintedmagic.client.renderer.RenderEntityDiffusion;
import taintedmagic.client.renderer.RenderEntityGlowpet;
@@ -31,7 +30,7 @@ public class ClientProxy extends CommonProxy
public void registerClientHandlers ()
{
MinecraftForge.EVENT_BUS.register(new HUDHandler());
MinecraftForge.EVENT_BUS.register(new EquipmentItemRenderHandler());
MinecraftForge.EVENT_BUS.register(new ClientHandler());
}
@Override
@@ -13,12 +13,15 @@ import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraftforge.client.event.RenderPlayerEvent;
import net.minecraftforge.event.entity.living.LivingEvent;
import taintedmagic.api.IEquipmentItemRenderer;
import taintedmagic.api.IRenderInventoryItem;
import taintedmagic.common.helper.TaintedMagicHelper;
import taintedmagic.common.items.tools.ItemKatana;
public class EquipmentItemRenderHandler
public class ClientHandler
{
/*
* Render items implementing IRenderInventoryItem
*/
@SubscribeEvent
public void onPlayerRender (RenderPlayerEvent.Specials.Post event)
{
@@ -30,9 +33,9 @@ public class EquipmentItemRenderHandler
for (int i = 0; i < 36; i++)
{
ItemStack s = inv[i];
if (s != null && s.getItem() instanceof IEquipmentItemRenderer && !rendering.contains(s.getItem()))
if (s != null && s.getItem() instanceof IRenderInventoryItem && !rendering.contains(s.getItem()))
{
((IEquipmentItemRenderer) s.getItem()).render(p, s, event.partialRenderTick);
((IRenderInventoryItem) s.getItem()).render(p, s, event.partialRenderTick);
rendering.add(s.getItem());
}
if (i == 36) rendering.clear();