From dce6bf1e93da8b69eb16bf3746f150e6770847cf Mon Sep 17 00:00:00 2001
From: Nicholas Ignoffo <speedynutty68@gmail.com>
Date: Sat, 21 May 2016 12:47:17 -0700
Subject: [PATCH] Add rune type colors Ritual Diviner tooltip

Fixes casing for direction as well. IE: north -> North
---
 .../bloodmagic/api/ritual/EnumRuneType.java   | 21 ++++++++----
 .../bloodmagic/item/ItemRitualDiviner.java    | 34 ++++++-------------
 .../java/WayofTime/bloodmagic/util/Utils.java |  5 +++
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java
index b619caca..f3e63ebf 100644
--- a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java
+++ b/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java
@@ -3,18 +3,25 @@ package WayofTime.bloodmagic.api.ritual;
 import WayofTime.bloodmagic.api.Constants;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.text.TextFormatting;
 
 import java.util.Locale;
 
 public enum EnumRuneType implements IStringSerializable
 {
-    BLANK,
-    WATER,
-    FIRE,
-    EARTH,
-    AIR,
-    DUSK,
-    DAWN;
+    BLANK(TextFormatting.GRAY),
+    WATER(TextFormatting.AQUA),
+    FIRE(TextFormatting.RED),
+    EARTH(TextFormatting.GREEN),
+    AIR(TextFormatting.WHITE),
+    DUSK(TextFormatting.DARK_GRAY),
+    DAWN(TextFormatting.GOLD);
+
+    public final TextFormatting colorCode;
+
+    EnumRuneType(TextFormatting colorCode) {
+        this.colorCode = colorCode;
+    }
 
     public static EnumRuneType byMetadata(int meta)
     {
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java
index 5f29c4f7..820b1e89 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java
@@ -3,6 +3,7 @@ package WayofTime.bloodmagic.item;
 import java.util.ArrayList;
 import java.util.List;
 
+import WayofTime.bloodmagic.util.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
@@ -202,7 +203,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider
 
             if (sneaking)
             {
-                tooltip.add(TextHelper.localize(tooltipBase + "currentDirection", getDirection(stack)));
+                tooltip.add(TextHelper.localize(tooltipBase + "currentDirection", Utils.toFancyCasing(getDirection(stack).getName())));
                 tooltip.add("");
                 ArrayList<RitualComponent> componentList = ritual.getComponents();
 
@@ -213,11 +214,10 @@ public class ItemRitualDiviner extends Item implements IVariantProvider
                 int earthRunes = 0;
                 int duskRunes = 0;
                 int dawnRunes = 0;
-                int totalRunes = 0;
+                int totalRunes = componentList.size();
 
                 for (RitualComponent component : componentList)
                 {
-                    totalRunes++;
                     switch (component.getRuneType())
                     {
                     case BLANK:
@@ -245,33 +245,19 @@ public class ItemRitualDiviner extends Item implements IVariantProvider
                 }
 
                 if (blankRunes > 0)
-                {
-                    tooltip.add(TextHelper.localize(tooltipBase + "blankRune", blankRunes));
-                }
+                    tooltip.add(EnumRuneType.BLANK.colorCode + TextHelper.localize(tooltipBase + "blankRune", blankRunes));
                 if (waterRunes > 0)
-                {
-                    tooltip.add(TextHelper.localize(tooltipBase + "waterRune", waterRunes));
-                }
+                    tooltip.add(EnumRuneType.WATER.colorCode + TextHelper.localize(tooltipBase + "waterRune", waterRunes));
                 if (airRunes > 0)
-                {
-                    tooltip.add(TextHelper.localize(tooltipBase + "airRune", airRunes));
-                }
+                    tooltip.add(EnumRuneType.AIR.colorCode + TextHelper.localize(tooltipBase + "airRune", airRunes));
                 if (fireRunes > 0)
-                {
-                    tooltip.add(TextHelper.localize(tooltipBase + "fireRune", fireRunes));
-                }
+                    tooltip.add(EnumRuneType.FIRE.colorCode + TextHelper.localize(tooltipBase + "fireRune", fireRunes));
                 if (earthRunes > 0)
-                {
-                    tooltip.add(TextHelper.localize(tooltipBase + "earthRune", earthRunes));
-                }
+                    tooltip.add(EnumRuneType.EARTH.colorCode + TextHelper.localize(tooltipBase + "earthRune", earthRunes));
                 if (duskRunes > 0)
-                {
-                    tooltip.add(TextHelper.localize(tooltipBase + "duskRune", duskRunes));
-                }
+                    tooltip.add(EnumRuneType.DUSK.colorCode + TextHelper.localize(tooltipBase + "duskRune", duskRunes));
                 if (dawnRunes > 0)
-                {
-                    tooltip.add(TextHelper.localize(tooltipBase + "dawnRune", dawnRunes));
-                }
+                    tooltip.add(EnumRuneType.DAWN.colorCode + TextHelper.localize(tooltipBase + "dawnRune", dawnRunes));
 
                 tooltip.add("");
                 tooltip.add(TextHelper.localize(tooltipBase + "totalRune", totalRunes));
diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java
index 9446efc5..1de284d2 100644
--- a/src/main/java/WayofTime/bloodmagic/util/Utils.java
+++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java
@@ -1,6 +1,7 @@
 package WayofTime.bloodmagic.util;
 
 import java.util.ArrayList;
+import java.util.Locale;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPortal;
@@ -86,6 +87,10 @@ public class Utils
         return true;
     }
 
+    public static String toFancyCasing(String input) {
+        return String.valueOf(input.charAt(0)).toUpperCase(Locale.ENGLISH) + input.substring(1);
+    }
+
     /**
      * @param tile
      *        - The {@link TileInventory} to input the item to