Change section list to be half as small (due to scale changes) and dr…

…aw section name as tooltip
SlimeKnights · Apr 26, 2016 · 19d1cda · 19d1cda
1 parent 25d357e
commit 19d1cda
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 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
@@ -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
@@ -14,10 +14,10 @@
 
 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,35 +51,41 @@ public void draw(int mouseX, int mouseY, float partialTicks, FontRenderer fontRe
       } 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();
         GlStateManager.popMatrix();
       }
     }
 
-    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<String> l = new ArrayList<>();
-      l.add(TextFormatting.RED + "Locked");
-      l.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()));
+    if(section != null && isHovered(mouseX, mouseY)) {
+      List<String> 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) {
+            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);
     }
   }