From 19d1cdae7005720b734070bc7ec95f63a2b1e109 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Tue, 26 Apr 2016 09:09:55 +0200 Subject: [PATCH] Change section list to be half as small (due to scale changes) and draw section name as tooltip --- .../client/book/data/AppearanceData.java | 1 + .../gui/book/element/ElementSection.java | 42 +++++++++++-------- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/main/java/slimeknights/mantle/client/book/data/AppearanceData.java b/src/main/java/slimeknights/mantle/client/book/data/AppearanceData.java index 3138528..4c05d53 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/AppearanceData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/AppearanceData.java @@ -14,6 +14,7 @@ public class AppearanceData implements IDataItem { public String title = ""; public String subtitle = ""; public boolean drawPageNumbers = true; + public boolean drawSectionListText = false; @Override public void load() { diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementSection.java b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementSection.java index 18819b0..8350846 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementSection.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementSection.java @@ -14,10 +14,10 @@ import slimeknights.mantle.client.book.data.SectionData; public class ElementSection extends SizedBookElement { - public static final int IMG_SIZE = 64; + public static final int IMG_SIZE = 32; - public static final int WIDTH = 85; - public static final int HEIGHT = 85; + public static final int WIDTH = 42; + public static final int HEIGHT = 42; private SectionData section; @@ -51,7 +51,7 @@ public class ElementSection extends SizedBookElement { } else { GlStateManager.pushMatrix(); GlStateManager.translate(x + WIDTH / 2 - IMG_SIZE / 2, y + HEIGHT / 2 - IMG_SIZE / 2, 0); - GlStateManager.scale(4F, 4F, 1F); + GlStateManager.scale(2F, 2F, 1F); RenderHelper.enableGUIStandardItemLighting(); mc.getRenderItem().renderItemAndEffectIntoGUI(section.icon.item.getItems()[0], 0, 0); RenderHelper.disableStandardItemLighting(); @@ -59,27 +59,33 @@ public class ElementSection extends SizedBookElement { } } - fontRenderer.drawString(section.getTitle(), x + WIDTH / 2 - fontRenderer.getStringWidth(section - .getTitle()) / 2, y + HEIGHT - fontRenderer.FONT_HEIGHT, hover ? 0xFF000000 : 0x7F000000); + if(section.parent.appearance.drawSectionListText) { + fontRenderer.drawString(section.getTitle(), + x + WIDTH / 2 - fontRenderer.getStringWidth(section.getTitle()) / 2, + y + HEIGHT - fontRenderer.FONT_HEIGHT/2, + hover ? 0xFF000000 : 0x7F000000); + } } @Override public void drawOverlay(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) { - if(section != null && !section.isUnlocked(parent.statFile) && isHovered(mouseX, mouseY)) { - List l = new ArrayList<>(); - l.add(TextFormatting.RED + "Locked"); - l.add("Requirements:"); + if(section != null && isHovered(mouseX, mouseY)) { + List text = new ArrayList<>(); + text.add(section.getTitle()); + if(!section.isUnlocked(parent.statFile)) { + text.add(TextFormatting.RED + "Locked"); + text.add("Requirements:"); - for(String requirement : section.requirements) { - Achievement achievement = SectionData.findAchievement(requirement); - if(achievement != null) { - l.add((SectionData - .requirementSatisfied(requirement, parent.statFile) ? TextFormatting.GREEN : TextFormatting.RED) + TextFormatting - .getTextWithoutFormattingCodes(achievement.getStatName().getFormattedText())); + for(String requirement : section.requirements) { + Achievement achievement = SectionData.findAchievement(requirement); + if(achievement != null) { + text.add((SectionData + .requirementSatisfied(requirement, parent.statFile) ? TextFormatting.GREEN : TextFormatting.RED) + TextFormatting + .getTextWithoutFormattingCodes(achievement.getStatName().getFormattedText())); + } } } - - drawHoveringText(l, mouseX, mouseY, Minecraft.getMinecraft().fontRendererObj); + drawHoveringText(text, mouseX, mouseY, Minecraft.getMinecraft().fontRendererObj); } }