From 5808b7f5406a7d317116b180c0cefc8b061e22a1 Mon Sep 17 00:00:00 2001
From: mezz <tehgeek@gmail.com>
Date: Wed, 21 Sep 2016 13:49:11 -0700
Subject: [PATCH] Fix #444 Crash from color search tooltip

---
 src/main/java/mezz/jei/util/ItemStackElement.java  | 10 +---------
 src/main/java/mezz/jei/util/color/ColorGetter.java | 10 ++++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/mezz/jei/util/ItemStackElement.java b/src/main/java/mezz/jei/util/ItemStackElement.java
index 8e3c6c18c..19ddaf1b9 100644
--- a/src/main/java/mezz/jei/util/ItemStackElement.java
+++ b/src/main/java/mezz/jei/util/ItemStackElement.java
@@ -140,15 +140,7 @@ private static String getColorString(ItemStack itemStack) {
 			return "";
 		}
 
-		final Collection<String> colorNames;
-		try {
-			colorNames = colorNamer.getColorNames(itemStack);
-		} catch (RuntimeException ignored) {
-			return "";
-		} catch (LinkageError ignored) {
-			return "";
-		}
-
+		Collection<String> colorNames = colorNamer.getColorNames(itemStack);
 		return Joiner.on(' ').join(colorNames).toLowerCase();
 	}
 
diff --git a/src/main/java/mezz/jei/util/color/ColorGetter.java b/src/main/java/mezz/jei/util/color/ColorGetter.java
index 7c82b5bad..8addf4411 100644
--- a/src/main/java/mezz/jei/util/color/ColorGetter.java
+++ b/src/main/java/mezz/jei/util/color/ColorGetter.java
@@ -72,6 +72,16 @@ public static String[] getColorDefaults() {
 	}
 
 	public static List<Color> getColors(ItemStack itemStack, int colorCount) {
+		try {
+			return _getColors(itemStack, colorCount);
+		} catch (RuntimeException ignored) {
+			return Collections.emptyList();
+		} catch (LinkageError ignored) {
+			return Collections.emptyList();
+		}
+	}
+
+	private static List<Color> _getColors(ItemStack itemStack, int colorCount) {
 		final Item item = itemStack.getItem();
 		if (item == null) {
 			return Collections.emptyList();