From be2b66dddfb96ee9b33052a8e3a7859c0718391d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Jan 2016 18:25:31 -0600 Subject: [PATCH] Partially restore bauble rendering. Everything is probably in the wrong place, but should render. --- .../botania/api/item/IBaubleRender.java | 3 +- .../core/handler/BaubleRenderHandler.java | 44 +++++++++---------- .../core/handler/MiscellaneousIcons.java | 5 ++- .../client/core/proxy/ClientProxy.java | 8 +++- .../armor/terrasteel/ItemTerrasteelHelm.java | 34 ++++++-------- .../equipment/bauble/ItemBaubleCosmetic.java | 18 +++----- .../equipment/bauble/ItemBloodPendant.java | 9 ++-- .../item/equipment/bauble/ItemDivaCharm.java | 19 ++++---- .../equipment/bauble/ItemFlightTiara.java | 17 ++++--- .../equipment/bauble/ItemGoldenLaurel.java | 19 ++++---- .../item/equipment/bauble/ItemHolyCloak.java | 7 ++- .../item/equipment/bauble/ItemIcePendant.java | 5 +-- .../item/equipment/bauble/ItemItemFinder.java | 5 +-- .../equipment/bauble/ItemKnockbackBelt.java | 6 +-- .../equipment/bauble/ItemLavaPendant.java | 6 +-- .../item/equipment/bauble/ItemMonocle.java | 20 ++++----- .../bauble/ItemSuperLavaPendant.java | 6 +-- .../item/equipment/bauble/ItemTinyPlanet.java | 4 +- .../item/equipment/bauble/ItemTravelBelt.java | 5 +-- 19 files changed, 108 insertions(+), 132 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index 2ef376071..3802dfded 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -13,7 +13,6 @@ package vazkii.botania.api.item; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -34,7 +33,7 @@ public interface IBaubleRender { * has a cosmetic bauble attached to it. */ @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type); + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks); /** * A few helper methods for the render. diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index e0233a241..d4b83f80b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -14,12 +14,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.item.IBaubleRender.Helper; @@ -33,38 +33,37 @@ import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -public final class BaubleRenderHandler { +public final class BaubleRenderHandler implements LayerRenderer { - @SubscribeEvent - public void onPlayerRender(RenderPlayerEvent.Specials.Post event) { - if(!ConfigHandler.renderBaubles || event.entityLiving.getActivePotionEffect(Potion.invisibility) != null) + @Override + public void doRenderLayer(EntityPlayer player, float p_177141_2_, float p_177141_3_, float partialTicks, float p_177141_5_, float p_177141_6_, float p_177141_7_, float scale) { + if(!ConfigHandler.renderBaubles || player.getActivePotionEffect(Potion.invisibility) != null) return; - EntityPlayer player = event.entityPlayer; InventoryBaubles inv = PlayerHandler.getPlayerBaubles(player); - dispatchRenders(inv, event, RenderType.BODY); + dispatchRenders(inv, player, RenderType.BODY, partialTicks); if(inv.getStackInSlot(3) != null) - renderManaTablet(event); + renderManaTablet(player); - float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * event.partialRenderTick; - float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * event.partialRenderTick; - float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * event.partialRenderTick; + float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * partialTicks; + float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * partialTicks; + float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * partialTicks; GlStateManager.pushMatrix(); GlStateManager.rotate(yawOffset, 0, -1, 0); GlStateManager.rotate(yaw - 270, 0, 1, 0); GlStateManager.rotate(pitch, 0, 0, 1); - dispatchRenders(inv, event, RenderType.HEAD); + dispatchRenders(inv, player, RenderType.HEAD, partialTicks); ItemStack helm = player.inventory.armorItemInSlot(3); if(helm != null && helm.getItem() instanceof ItemTerrasteelHelm) - ItemTerrasteelHelm.renderOnPlayer(helm, event); + ItemTerrasteelHelm.renderOnPlayer(helm, player); GlStateManager.popMatrix(); } - private void dispatchRenders(InventoryBaubles inv, RenderPlayerEvent event, RenderType type) { + private void dispatchRenders(InventoryBaubles inv, EntityPlayer player, RenderType type, float partialTicks) { for(int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); if(stack != null) { @@ -82,7 +81,7 @@ public final class BaubleRenderHandler { if(cosmetic != null) { GlStateManager.pushMatrix(); GlStateManager.color(1F, 1F, 1F, 1F); - ((IBaubleRender) cosmetic.getItem()).onPlayerBaubleRender(cosmetic, event, type); + ((IBaubleRender) cosmetic.getItem()).onPlayerBaubleRender(cosmetic, player, type, partialTicks); GlStateManager.popMatrix(); continue; } @@ -91,24 +90,22 @@ public final class BaubleRenderHandler { if(item instanceof IBaubleRender) { GlStateManager.pushMatrix(); GlStateManager.color(1F, 1F, 1F, 1F); - ((IBaubleRender) stack.getItem()).onPlayerBaubleRender(stack, event, type); + ((IBaubleRender) stack.getItem()).onPlayerBaubleRender(stack, player, type, partialTicks); GlStateManager.popMatrix(); } } } } - private void renderManaTablet(RenderPlayerEvent event) { - EntityPlayer player = event.entityPlayer; + private void renderManaTablet(EntityPlayer player) { boolean renderedOne = false; for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stack = player.inventory.getStackInSlot(i); if(stack != null && stack.getItem() == ModItems.manaTablet) { - Item item = stack.getItem(); GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - Helper.rotateIfSneaking(event.entityPlayer); - boolean armor = event.entityPlayer.getCurrentArmor(1) != null; + Helper.rotateIfSneaking(player); + boolean armor = player.getCurrentArmor(1) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.25F, -0.85F, renderedOne ? armor ? 0.2F : 0.28F : armor ? -0.3F : -0.25F); @@ -129,5 +126,8 @@ public final class BaubleRenderHandler { } } - + @Override + public boolean shouldCombineTextures() { + return false; + } } diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index baa9a51d5..e14a6ccd5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -60,7 +60,8 @@ public class MiscellaneousIcons { corporeaIconStar, sparkWorldIcon, manaDetectorIcon, - runeAltarTriggerIcon; + runeAltarTriggerIcon, + terrasteelHelmWillIcon; public TextureAtlasSprite[] sparkUpgradeIcons; public TextureAtlasSprite[] kingKeyWeaponIcons; @@ -138,6 +139,8 @@ public class MiscellaneousIcons { for (int i = 0; i < tiaraWingIcons.length; i++) { tiaraWingIcons[i] = IconHelper.forName(evt.map, "flightTiara" + i, "items"); } + + terrasteelHelmWillIcon = IconHelper.forName(evt.map, "willFlame", "items"); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index d9f353f48..cde2ac25d 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -197,7 +197,6 @@ public class ClientProxy extends CommonProxy { if(ConfigHandler.boundBlockWireframe) MinecraftForge.EVENT_BUS.register(new BoundTileRenderer()); MinecraftForge.EVENT_BUS.register(new TooltipHandler()); - MinecraftForge.EVENT_BUS.register(new BaubleRenderHandler()); MinecraftForge.EVENT_BUS.register(new DebugHandler()); MinecraftForge.EVENT_BUS.register(new SubTileRadiusRenderHandler()); MinecraftForge.EVENT_BUS.register(new MultiblockRenderHandler()); @@ -274,10 +273,15 @@ public class ClientProxy extends CommonProxy { private void initAuxiliaryRender() { Map skinMap = Minecraft.getMinecraft().getRenderManager().getSkinMap(); - RenderPlayer render = skinMap.get("default"); + RenderPlayer render; + + render = skinMap.get("default"); render.addLayer(new ContributorFancinessHandler()); + render.addLayer(new BaubleRenderHandler()); + render = skinMap.get("slim"); render.addLayer(new ContributorFancinessHandler()); + render.addLayer(new BaubleRenderHandler()); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 7069ba26e..2d42480f9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -12,7 +12,10 @@ package vazkii.botania.common.item.equipment.armor.terrasteel; import java.util.List; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -20,15 +23,14 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.client.event.RenderPlayerEvent; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; import vazkii.botania.api.item.IAncientWillContainer; +import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaDiscountArmor; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; @@ -39,23 +41,15 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDiscountArmor, IAncientWillContainer, IManaGivingItem { private static final String TAG_ANCIENT_WILL = "AncientWill"; - static TextureAtlasSprite willIcon; public ItemTerrasteelHelm() { this(LibItemNames.TERRASTEEL_HELM); - MinecraftForge.EVENT_BUS.register(this); } public ItemTerrasteelHelm(String name) { super(0, name); } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent evt) { - willIcon = IconHelper.forName(evt.map, "willFlame", "items"); - } - @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { super.onArmorTick(world, player, stack); @@ -104,24 +98,22 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc } @SideOnly(Side.CLIENT) - public static void renderOnPlayer(ItemStack stack, RenderPlayerEvent event) { -/* + public static void renderOnPlayer(ItemStack stack, EntityPlayer player) { if(hasAnyWill(stack) && !((ItemTerrasteelArmor) stack.getItem()).hasPhantomInk(stack)) { GlStateManager.pushMatrix(); - float f = willIcon.getMinU(); - float f1 = willIcon.getMaxU(); - float f2 = willIcon.getMinV(); - float f3 = willIcon.getMaxV(); - Helper.translateToHeadLevel(event.entityPlayer); + float f = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMinU(); + float f1 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMaxU(); + float f2 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMinV(); + float f3 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMaxV(); + IBaubleRender.Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.26F, 0.15F, -0.39F); GlStateManager.scale(0.5F, 0.5F, 0.5F); - IconHelper.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, willIcon.getIconWidth(), willIcon.getIconHeight(), 1F / 16F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getIconWidth(), MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); } -*/ } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 87db7e0cb..88daee8d4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -14,13 +14,13 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; @@ -70,10 +70,10 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } @Override - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); if(type == RenderType.HEAD) { - Helper.translateToHeadLevel(event.entityPlayer); + Helper.translateToHeadLevel(player); switch(stack.getItemDamage()) { case 2: faceTranslate(); @@ -231,7 +231,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; } } else { - Helper.rotateIfSneaking(event.entityPlayer); + Helper.rotateIfSneaking(player); switch(stack.getItemDamage()) { case 0: chestTranslate(); @@ -314,13 +314,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } public void renderIcon(int i) { -/* - IIcon icon = icons[i]; - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); -*/ + ItemStack stack = new ItemStack(this, 1, i); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 9b4cef1b0..ffe53bbc2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -26,7 +26,6 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry; import net.minecraftforge.fml.common.registry.GameData; @@ -163,17 +162,17 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - Helper.rotateIfSneaking(event.entityPlayer); - boolean armor = event.entityPlayer.getCurrentArmor(2) != null; + Helper.rotateIfSneaking(player); + boolean armor = player.getCurrentArmor(2) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.26F, -0.4F, armor ? 0.2F : 0.15F); GlStateManager.scale(0.5F, 0.5F, 0.5F); for(int i = 2; i < 4; i++) { - /*IIcon icon = icons[i]; + /*IIcon icon = icons[i]; todo 1.8 float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index bb93acc2c..616f5b3b9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -13,6 +13,10 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; import com.google.common.base.Predicates; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.monster.EntityCreeper; @@ -20,7 +24,6 @@ import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; @@ -92,23 +95,17 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble @Override @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { -/* + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { - float f = itemIcon.getMinU(); - float f1 = itemIcon.getMaxU(); - float f2 = itemIcon.getMinV(); - float f3 = itemIcon.getMaxV(); - boolean armor = event.entityPlayer.getCurrentArmor(3) != null; - Helper.translateToHeadLevel(event.entityPlayer); + boolean armor = player.getCurrentArmor(3) != null; + Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.4F, 0.1F, armor ? -0.35F : -0.3F); GlStateManager.scale(0.5F, 0.5F, 0.5F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this, 1), ItemCameraTransforms.TransformType.THIRD_PERSON); } -*/ } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index ee8285029..7ea631c70 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -37,7 +37,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; @@ -330,17 +329,17 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @Override @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { int meta = stack.getItemDamage(); if(type == RenderType.BODY) { if(meta > 0 && meta <= MiscellaneousIcons.INSTANCE.tiaraWingIcons.length) { TextureAtlasSprite icon = MiscellaneousIcons.INSTANCE.tiaraWingIcons[meta - 1]; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - boolean flying = event.entityPlayer.capabilities.isFlying; + boolean flying = player.capabilities.isFlying; float rz = 120F; - float rx = 20F + (float) ((Math.sin((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * (flying ? 0.4F : 0.2F)) + 0.5F) * (flying ? 30F : 5F)); + float rx = 20F + (float) ((Math.sin((double) (player.ticksExisted + partialTicks) * (flying ? 0.4F : 0.2F)) + 0.5F) * (flying ? 30F : 5F)); float ry = 0F; float h = 0.2F; float i = 0.15F; @@ -374,7 +373,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub rz = 180F; h = 0.5F; rx = 20F; - ry = -(float) ((Math.sin((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * (flying ? 0.4F : 0.2F)) + 0.6F) * (flying ? 30F : 5F)); + ry = -(float) ((Math.sin((double) (player.ticksExisted + partialTicks) * (flying ? 0.4F : 0.2F)) + 0.6F) * (flying ? 30F : 5F)); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); break; } @@ -395,7 +394,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub rz = 0F; ry = -rx; rx = 0F; - GlStateManager.color(1F, 1F, 1F, 0.5F + (float) Math.cos((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * 0.3F) * 0.2F); + GlStateManager.color(1F, 1F, 1F, 0.5F + (float) Math.cos((double) (player.ticksExisted + partialTicks) * 0.3F) * 0.2F); break; } case 8 : { // Mega Ultra Chicken @@ -408,7 +407,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub rx = 0F; s = 1.5F; h = 1.2F; - GlStateManager.color(1F, 1F, 1F, 0.5F + (flying ? (float) Math.cos((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * 0.3F) * 0.25F + 0.25F : 0F)); + GlStateManager.color(1F, 1F, 1F, 0.5F + (flying ? (float) Math.cos((double) (player.ticksExisted + partialTicks) * 0.3F) * 0.25F + 0.25F : 0F)); } } @@ -418,7 +417,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub float f3 = icon.getMaxV(); float sr = 1F / s; - Helper.rotateIfSneaking(event.entityPlayer); + Helper.rotateIfSneaking(player); GlStateManager.translate(0F, h, i); @@ -449,7 +448,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GlStateManager.popMatrix(); } } else if(meta == 1) // Jibril's Halo - renderHalo(event.entityPlayer, event.partialRenderTick); + renderHalo(player, partialTicks); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java index 864c9b99b..33ad02e67 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java @@ -10,12 +10,15 @@ */ package vazkii.botania.common.item.equipment.bauble; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ChatComponentTranslation; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; @@ -59,15 +62,10 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { -/* + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { - float f = itemIcon.getMinU(); - float f1 = itemIcon.getMaxU(); - float f2 = itemIcon.getMinV(); - float f3 = itemIcon.getMaxV(); - boolean armor = event.entityPlayer.getCurrentArmor(3) != null; - Helper.translateToHeadLevel(event.entityPlayer); + boolean armor = player.getCurrentArmor(3) != null; + Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); @@ -77,8 +75,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { GlStateManager.scale(1.1F, 1.1F, 1F); GlStateManager.translate(-0.05F, -0.1F, 0F); } - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 32F); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this), ItemCameraTransforms.TransformType.THIRD_PERSON); } -*/ } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 26cf6074b..2fd863be5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -17,7 +17,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; @@ -126,11 +125,11 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(getRenderTexture()); - Helper.rotateIfSneaking(event.entityPlayer); - boolean armor = event.entityPlayer.getCurrentArmor(2) != null; + Helper.rotateIfSneaking(player); + boolean armor = player.getCurrentArmor(2) != null; GlStateManager.translate(0F, armor ? -0.07F : -0.01F, 0F); float s = 0.1F; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index 2555adfce..1760990bf 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -24,7 +24,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.common.lib.LibItemNames; @@ -102,8 +101,8 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { } @Override - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { - /*if(type == RenderType.BODY) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { + /*if(type == RenderType.BODY) { todo 1.8 Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(2) != null; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 2687981c0..79b870517 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -27,7 +27,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.village.MerchantRecipe; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.common.Botania; @@ -203,8 +202,8 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { -/* + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { +/* todo 1.8 if(type == RenderType.HEAD) { float f = gemIcon.getMinU(); float f1 = gemIcon.getMaxU(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index e31afe3f0..8ab9fb440 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -15,9 +15,9 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.lib.LibResources; @@ -50,10 +50,10 @@ public class ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRend @Override @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(texture); - Helper.rotateIfSneaking(event.entityPlayer); + Helper.rotateIfSneaking(player); GlStateManager.translate(0F, 0.2F, 0F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java index 39930441c..0512d6fa2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java @@ -11,8 +11,8 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.common.lib.LibItemNames; @@ -44,8 +44,8 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { }*/ @Override - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { -/* + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { +/* todo 1.8 if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); Helper.rotateIfSneaking(event.entityPlayer); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index 4c71b1197..c50311882 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -13,6 +13,9 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -20,7 +23,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.item.IBurstViewerBauble; import vazkii.botania.api.item.ICosmeticAttachable; @@ -43,23 +45,17 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm } @Override - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { -/* + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { - float f = itemIcon.getMinU(); - float f1 = itemIcon.getMaxU(); - float f2 = itemIcon.getMinV(); - float f3 = itemIcon.getMaxV(); - boolean armor = event.entityPlayer.getCurrentArmor(3) != null; - Helper.translateToHeadLevel(event.entityPlayer); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + boolean armor = player.getCurrentArmor(3) != null; + Helper.translateToHeadLevel(player); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.35F, -0.1F, armor ? -0.3F : -0.25F); GlStateManager.scale(0.35F, 0.35F, 0.35F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this), ItemCameraTransforms.TransformType.THIRD_PERSON); } -*/ } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index a1367c2a7..af23d46f6 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -12,8 +12,8 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.common.lib.LibItemNames; @@ -55,8 +55,8 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { }*/ @Override - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { -/* + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { +/* todo 1.8 if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); Helper.rotateIfSneaking(event.entityPlayer); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java index 88f4bf1e9..ee0a498b1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -18,11 +18,11 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.item.IBaubleRender; @@ -102,7 +102,7 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { } @Override - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.translate(0.25F, -0.5F, 0F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 8bac12fb0..30898c6e6 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -20,7 +20,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; @@ -152,10 +151,10 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs @Override @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(getRenderTexture()); - Helper.rotateIfSneaking(event.entityPlayer); + Helper.rotateIfSneaking(player); GlStateManager.translate(0F, 0.2F, 0F);