From ff20350c2dca5cbbb7201f5d2233bf23d9fa1967 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 18 Jul 2014 14:57:11 +0100 Subject: [PATCH] Changed the Lexicon HUD icon to be a lot less intrusive. --- .../botania/client/core/handler/HUDHandler.java | 15 +++++---------- .../botania/client/core/helper/RenderHelper.java | 6 ++++-- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java b/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java index f072ec0db..2168cda76 100644 --- a/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java +++ b/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java @@ -44,7 +44,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; public final class HUDHandler { private static final ResourceLocation manaBar = new ResourceLocation(LibResources.GUI_MANA_HUD); - private static final RenderItem itemRender = new RenderItem(); @SubscribeEvent public void onDrawScreen(RenderGameOverlayEvent.Post event) { @@ -140,16 +139,12 @@ public final class HUDHandler { GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); Minecraft mc = Minecraft.getMinecraft(); - int x = res.getScaledWidth() / 2 + 8; - int y = res.getScaledHeight() / 2 - 4; - - int color = 0x6600FF00; - - mc.fontRenderer.drawStringWithShadow(StatCollector.translateToLocal(entry.getUnlocalizedName()), x + 18, y, color); - mc.fontRenderer.drawStringWithShadow(StatCollector.translateToLocal("botaniamisc.shiftToRead"), x + 18, y + 11, color); - itemRender.renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, new ItemStack(ModItems.lexicon), x, y); + int x = res.getScaledWidth() / 2 - 17; + int y = res.getScaledHeight() / 2 + 2; + + RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, new ItemStack(ModItems.lexicon), x, y); GL11.glDisable(GL11.GL_LIGHTING); - mc.fontRenderer.drawStringWithShadow("?", x + 10, y + 8, 0xFFFFFF); + mc.fontRenderer.drawStringWithShadow("?", x + 10, y + 8, 0xFFFFFFFF); GL11.glDisable(GL11.GL_BLEND); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java b/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java index 4d021ebd0..a2c2481cd 100644 --- a/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java +++ b/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java @@ -122,8 +122,10 @@ public final class RenderHelper { } public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6) { - float f = 0.00390625F; - float f1 = 0.00390625F; + drawTexturedModalRect(par1, par2, z, par3, par4, par5, par6, 0.00390625F, 0.00390625F); + } + + public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6, float f, float f1) { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.addVertexWithUV(par1 + 0, par2 + par6, z, (par3 + 0) * f, (par4 + par6) * f1);