Added color-blind textures for solid item colors

externalannotations/com/google/common/base/Optional.eea

@@ -0,0 +1,4 @@
+class com/google/common/base/Optional
+fromNullable
+ <T:Ljava/lang/Object;>(TT;)Lcom/google/common/base/Optional<TT;>;
+ <T:Ljava/lang/Object;>(TT;)L1com/google/common/base/Optional<TT;>;

externalannotations/com/google/common/collect/ImmutableSet.eea

@@ -0,0 +1,4 @@
+class com/google/common/collect/ImmutableSet
+copyOf
+ <E:Ljava/lang/Object;>(Ljava/util/Collection<+TE;>;)Lcom/google/common/collect/ImmutableSet<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Collection<+TE;>;)L1com/google/common/collect/ImmutableSet<TE;>;

src/main/java/com/enderio/core/client/render/EnderWidget.java

@@ -68,6 +68,24 @@ public enum EnderWidget implements IWidgetIcon {
   STOP_BUT_HOVER(200, 80, 8, 8),
   RETURN_BUT_HOVER(200, 88, 8, 8),
 
+  // Item colors
+  COLOR_BLACK(0, 240), // 0: #1e1b1b #242020 black
+  COLOR_RED(16, 240), // 1: #b3312c #d63a34 red
+  COLOR_GREEN(32, 240), // 2: #3b511a #46611f green
+  COLOR_BROWN(48, 240), // 3: #51301a #61391f brown
+  COLOR_BLUE(64, 240), // 4: #253192 #2c3aaf blue
+  COLOR_PURPLE(80, 240), // 5: #7b2fbe #9338e4 purple
+  COLOR_CYAN(96, 240), // 6: #287697 #308db5 cyan
+  COLOR_SILVER(112, 240), // 7: #ababab #888888 silver
+  COLOR_GRAY(128, 240), // 8: #434343 #505050 gray
+  COLOR_PINK(144, 240), // 9: #d88198 #ac6779 pink
+  COLOR_LIME(160, 240), // 10: #41cd34 #4ef63e lime
+  COLOR_YELLOW(176, 240), // 11: #decf2a #b1a521 yellow
+  COLOR_LIGHTBLUE(192, 240), // 12: #6689d3 #516da8 lightBlue
+  COLOR_MAGENTA(208, 240), // 13: #c354cd #9c43a4 magenta
+  COLOR_ORANGE(224, 240), // 14: #eb8844 #bc6c36 orange
+  COLOR_WHITE(240, 240),// 15: #f0f0f0 #c0c0c0 white
+
   ;
 
   public static final @Nonnull ResourceLocation TEXTURE = new ResourceLocation(EnderCore.MODID, "textures/gui/widgets.png");

src/main/java/com/enderio/core/common/util/DyeColor.java

@@ -1,17 +1,22 @@
 package com.enderio.core.common.util;
 
+import java.util.List;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import com.enderio.core.EnderCore;
+import com.enderio.core.api.client.render.IWidgetIcon;
+import com.enderio.core.client.gui.button.CycleButton.ICycleEnum;
+import com.enderio.core.client.render.EnderWidget;
 
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.item.ItemDye;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.MathHelper;
 import net.minecraftforge.oredict.OreDictionary;
 
-public enum DyeColor {
+public enum DyeColor implements ICycleEnum {
 
   BLACK,
   RED,
@@ -42,6 +47,14 @@ public enum DyeColor {
 
   };
 
+  public static final IWidgetIcon[] DYE_ICONS = {
+
+      EnderWidget.COLOR_BLACK, EnderWidget.COLOR_RED, EnderWidget.COLOR_GREEN, EnderWidget.COLOR_BROWN, EnderWidget.COLOR_BLUE, EnderWidget.COLOR_PURPLE,
+      EnderWidget.COLOR_CYAN, EnderWidget.COLOR_SILVER, EnderWidget.COLOR_GRAY, EnderWidget.COLOR_PINK, EnderWidget.COLOR_LIME, EnderWidget.COLOR_YELLOW,
+      EnderWidget.COLOR_LIGHTBLUE, EnderWidget.COLOR_MAGENTA, EnderWidget.COLOR_ORANGE, EnderWidget.COLOR_WHITE
+
+  };
+
   public static @Nonnull DyeColor getNext(@Nonnull DyeColor col) {
     int ord = col.ordinal() + 1;
     if (ord >= DyeColor.values().length) {
@@ -89,4 +102,16 @@ public int getColor() {
   public String toString() {
     return getName();
   }
+
+  @Override
+  @Nonnull
+  public IWidgetIcon getIcon() {
+    return NullHelper.first(DYE_ICONS[ordinal()], EnderWidget.COLOR_BLACK);
+  }
+
+  @Override
+  @Nonnull
+  public List<String> getTooltipLines() {
+    return new NNList<>(getLocalisedName());
+  }
 }