From 9e16c4490bd2555fb958669594bb9d782aa74483 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 8 Jan 2016 19:10:28 -0600 Subject: [PATCH] Rename RenderEventHandler, restore flugel tiara extra renders, and fix sparkles renderirng too low. Closes #21 --- .../handler/ContributorFancinessHandler.java | 13 +++---------- ...ntHandler.java => MiscellaneousIcons.java} | 14 ++++++++++---- .../client/core/proxy/ClientProxy.java | 6 ++---- .../elventrade/ElvenTradeRecipeCategory.java | 4 ++-- .../render/entity/RenderBabylonWeapon.java | 7 ++----- .../render/entity/RenderCorporeaSpark.java | 18 +++--------------- .../client/render/entity/RenderSpark.java | 5 ++--- .../client/render/entity/RenderSparkBase.java | 5 ++--- .../render/tile/RenderTileAlfPortal.java | 8 +++----- .../render/tile/RenderTileEnchanter.java | 8 ++------ .../render/tile/RenderTileLightRelay.java | 8 ++------ .../client/render/tile/RenderTilePool.java | 8 ++------ .../render/tile/RenderTileTerraPlate.java | 6 ++---- .../render/tile/RenderTileTinyPotato.java | 17 ++++------------- .../block/mana/BlockAlchemyCatalyst.java | 8 ++------ .../common/block/mana/BlockManaVoid.java | 10 ++-------- .../buildcraft/TriggerManaDetector.java | 8 ++------ .../buildcraft/TriggerManaLevel.java | 8 ++------ .../buildcraft/TriggerRuneAltarCanCraft.java | 8 ++------ .../equipment/bauble/ItemFlightTiara.java | 19 ++++++++----------- .../common/lexicon/page/PageElvenRecipe.java | 6 ++---- 21 files changed, 61 insertions(+), 133 deletions(-) rename src/main/java/vazkii/botania/client/core/handler/{RenderEventHandler.java => MiscellaneousIcons.java} (91%) diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index ebc977426..a77e46ce9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -18,19 +18,14 @@ import java.util.Properties; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.settings.GameSettings.Options; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.item.ItemStack; -import net.minecraftforge.client.event.RenderPlayerEvent; - -import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBaubleRender.Helper; @@ -39,9 +34,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.version.VersionChecker; -import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.item.material.ItemManaResource; import net.minecraftforge.fml.common.FMLLog; public final class ContributorFancinessHandler implements LayerRenderer { @@ -101,7 +94,7 @@ public final class ContributorFancinessHandler implements LayerRenderer manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class); + public TextureAtlasSprite[] tiaraWingIcons; // begin dank_memes public TextureAtlasSprite tailIcon = null; @@ -111,7 +112,12 @@ public class RenderEventHandler { for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) { manaLevelTriggerIcons.put(s, IconHelper.forName(evt.map, "triggers/mana" + WordUtils.capitalizeFully(s.name()), "items")); } + + tiaraWingIcons = new TextureAtlasSprite[ItemFlightTiara.WING_TYPES]; + for (int i = 0; i < tiaraWingIcons.length; i++) { + tiaraWingIcons[i] = IconHelper.forName(evt.map, "flightTiara" + i, "items"); + } } - private RenderEventHandler() {} + private MiscellaneousIcons() {} } 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 d95109c94..16ac0a542 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -55,7 +55,7 @@ import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.handler.SubTileRadiusRenderHandler; import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.client.core.helper.ShaderHelper; @@ -95,7 +95,6 @@ import vazkii.botania.client.render.tile.RenderTileRedString; import vazkii.botania.client.render.tile.RenderTileRuneAltar; import vazkii.botania.client.render.tile.RenderTileSkullOverride; import vazkii.botania.client.render.tile.RenderTileSparkChanger; -import vazkii.botania.client.render.tile.RenderTileSpawnerClaw; import vazkii.botania.client.render.tile.RenderTileSpreader; import vazkii.botania.client.render.tile.RenderTileStarfield; import vazkii.botania.client.render.tile.RenderTileTerraPlate; @@ -117,7 +116,6 @@ import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.block.tile.TileSparkChanger; -import vazkii.botania.common.block.tile.TileSpawnerClaw; import vazkii.botania.common.block.tile.TileStarfield; import vazkii.botania.common.block.tile.TileTerraPlate; import vazkii.botania.common.block.tile.TileTeruTeruBozu; @@ -179,7 +177,7 @@ public class ClientProxy extends CommonProxy { super.preInit(event); - MinecraftForge.EVENT_BUS.register(RenderEventHandler.INSTANCE); + MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE); ModelHandler.registerModels(); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index fe85ab7a2..121b6bc3a 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -24,7 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import javax.annotation.Nonnull; import java.util.Collection; @@ -71,7 +71,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { @Override public void drawAnimations(Minecraft minecraft) { minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - TextureAtlasSprite sprite = RenderEventHandler.INSTANCE.alfPortalTex; + TextureAtlasSprite sprite = MiscellaneousIcons.INSTANCE.alfPortalTex; Tessellator tess = Tessellator.getInstance(); WorldRenderer wr = tess.getWorldRenderer(); wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java index d8cbeb00a..2466d3c50 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -14,7 +14,6 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; @@ -22,17 +21,15 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.entity.EntityBabylonWeapon; -import vazkii.botania.common.item.relic.ItemKingKey; public class RenderBabylonWeapon extends Render { @@ -62,7 +59,7 @@ public class RenderBabylonWeapon extends Render { GlStateManager.scale(s, s, s); GlStateManager.rotate(-90F, 0F, 1F, 0F); GlStateManager.rotate(45F, 0F, 0F, 1F); - TextureAtlasSprite icon = RenderEventHandler.INSTANCE.kingKeyWeaponIcons[weapon.getVariety()]; + TextureAtlasSprite icon = MiscellaneousIcons.INSTANCE.kingKeyWeaponIcons[weapon.getVariety()]; GlStateManager.color(1F, 1F, 1F, chargeMul); float f = icon.getMinU(); float f1 = icon.getMaxU(); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index 521b7a1fa..af957786c 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -10,26 +10,14 @@ */ package vazkii.botania.client.render.entity; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.entity.EntityCorporeaSpark; -import vazkii.botania.common.item.ItemCorporeaSpark; public class RenderCorporeaSpark extends RenderSparkBase { @@ -39,7 +27,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getBaseIcon(EntityCorporeaSpark entity) { - return entity.isMaster() ? RenderEventHandler.INSTANCE.corporeaWorldIconMaster : RenderEventHandler.INSTANCE.corporeaWorldIcon; + return entity.isMaster() ? MiscellaneousIcons.INSTANCE.corporeaWorldIconMaster : MiscellaneousIcons.INSTANCE.corporeaWorldIcon; } @Override @@ -54,7 +42,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntityCorporeaSpark entity) { - return RenderEventHandler.INSTANCE.corporeaIconStar; + return MiscellaneousIcons.INSTANCE.corporeaIconStar; } @Override diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index 3992b8628..cbda1c6a2 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -12,9 +12,8 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.entity.EntitySpark; -import vazkii.botania.common.item.ItemSparkUpgrade; public class RenderSpark extends RenderSparkBase { @@ -25,7 +24,7 @@ public class RenderSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntitySpark entity) { int upgrade = entity.getUpgrade() - 1; - return upgrade >= 0 && upgrade < RenderEventHandler.INSTANCE.sparkUpgradeIcons.length ? RenderEventHandler.INSTANCE.sparkUpgradeIcons[upgrade] : null; + return upgrade >= 0 && upgrade < MiscellaneousIcons.INSTANCE.sparkUpgradeIcons.length ? MiscellaneousIcons.INSTANCE.sparkUpgradeIcons[upgrade] : null; } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index ef26a2607..e97be636b 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -25,9 +25,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.entity.EntitySpark; -import vazkii.botania.common.item.ItemSpark; public class RenderSparkBase extends RenderEntity { @@ -82,7 +81,7 @@ public class RenderSparkBase extends RenderEntity { } public TextureAtlasSprite getBaseIcon(T entity) { - return RenderEventHandler.INSTANCE.sparkWorldIcon; + return MiscellaneousIcons.INSTANCE.sparkWorldIcon; } public void colorSpinningIcon(T entity, float a) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index a5ac940ca..552268409 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -17,15 +17,13 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.handler.RenderEventHandler; -import vazkii.botania.common.block.BlockAlfPortal; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; @@ -64,11 +62,11 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { @@ -34,7 +30,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer 0 ? RenderEventHandler.INSTANCE.lightRelayWorldIconRed : RenderEventHandler.INSTANCE.lightRelayWorldIcon; + TextureAtlasSprite iicon = tile.getBlockMetadata() > 0 ? MiscellaneousIcons.INSTANCE.lightRelayWorldIconRed : MiscellaneousIcons.INSTANCE.lightRelayWorldIcon; GlStateManager.pushMatrix(); GlStateManager.translate(x + 0.5, y + 0.3, z + 0.5); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 1f9082418..beeb87960 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -11,12 +11,10 @@ package vazkii.botania.client.render.tile; import java.awt.Color; -import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -24,7 +22,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; @@ -35,11 +32,10 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPool; -import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.tile.mana.TilePool; public class RenderTilePool extends TileEntitySpecialRenderer { @@ -150,7 +146,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { GlStateManager.scale(s, s, s); ShaderHelper.useShader(ShaderHelper.manaPool); - renderIcon(0, 0, RenderEventHandler.INSTANCE.manaWater, 16, 16, 240); + renderIcon(0, 0, MiscellaneousIcons.INSTANCE.manaWater, 16, 16, 240); ShaderHelper.releaseShader(); GlStateManager.enableAlpha(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java index 8739931dc..3f2e5bab3 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -18,14 +18,12 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; -import vazkii.botania.common.block.mana.BlockTerraPlate; import vazkii.botania.common.block.tile.TileTerraPlate; public class RenderTileTerraPlate extends TileEntitySpecialRenderer { @@ -58,7 +56,7 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer { @@ -148,14 +139,14 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer 0.1 || Math.abs(player.motionZ) > 0.1) { double x = event.entityLiving.posX - 0.5; - double y = event.entityLiving.posY - 1.7; + double y = event.entityLiving.posY - 0.5; double z = event.entityLiving.posZ - 0.5; player.getGameProfile().getName(); @@ -332,12 +331,11 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { -/* int meta = stack.getItemDamage(); if(type == RenderType.BODY) { - if(meta > 0 && meta <= ItemFlightTiara.wingIcons.length) { - IIcon icon = ItemFlightTiara.wingIcons[meta - 1]; - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + 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; @@ -428,7 +426,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GlStateManager.rotate(rx, 1F, 0F, 0F); GlStateManager.rotate(ry, 0F, 1F, 0F); GlStateManager.scale(s, s, s); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); GlStateManager.scale(sr, sr, sr); GlStateManager.rotate(-ry, 0F, 1F, 0F); GlStateManager.rotate(-rx, 1F, 0F, 0F); @@ -440,7 +438,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GlStateManager.rotate(rx, 1F, 0F, 0F); GlStateManager.rotate(ry, 0F, 1F, 0F); GlStateManager.scale(s, s, s); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); GlStateManager.scale(sr, sr, sr); GlStateManager.rotate(-ry, 1F, 0F, 0F); GlStateManager.rotate(-rx, 1F, 0F, 0F); @@ -452,7 +450,6 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } } else if(meta == 1) // Jibril's Halo renderHalo(event.entityPlayer, event.partialRenderTick); -*/ } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index dd22cc9d3..60bddbfaf 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -7,7 +7,6 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; @@ -21,9 +20,8 @@ import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.recipe.RecipeElvenTrade; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.block.BlockAlfPortal; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -75,7 +73,7 @@ public class PageElvenRecipe extends PageRecipe { i++; } - TextureAtlasSprite portalIcon = RenderEventHandler.INSTANCE.alfPortalTex; + TextureAtlasSprite portalIcon = MiscellaneousIcons.INSTANCE.alfPortalTex; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft() + 22, gui.getTop() + 36, portalIcon, 48, 48); }