fix orange color

Author: JasperGeurtz

src/main/java/bwapi/Color.java

@@ -8,7 +8,7 @@ public class Color {
     public final static Color Blue = new Color(165);
     public final static Color Teal = new Color(159);
     public final static Color Purple = new Color(164);
-    public final static Color Orange = new Color(179);
+    public final static Color Orange = new Color(156);
     public final static Color Brown = new Color(19);
     public final static Color White = new Color(255);
     public final static Color Yellow = new Color(135);
@@ -19,7 +19,7 @@ public class Color {
 
     private static final RGBQUAD RGBRESERVE = new RGBQUAD(0, 0, 0, 0xFF);
 
-    private static final RGBQUAD defaultPalette[] = {
+    private static final RGBQUAD[] defaultPalette = {
             new RGBQUAD(0, 0, 0), RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESERVE,
             RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESERVE,
             new RGBQUAD(24, 36, 44), new RGBQUAD(72, 36, 20), new RGBQUAD(92, 44, 20), new RGBQUAD(112, 48, 20), new RGBQUAD(104, 60, 36), new RGBQUAD(124, 64, 24), new RGBQUAD(120, 76, 44), new RGBQUAD(168, 8, 8),
@@ -55,7 +55,7 @@ RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESER
     };
 
     private static boolean rgbInitialized;
-    private static byte closestColor[][][] = new byte[64][64][64];
+    private static byte[][][] closestColor = new byte[64][64][64];
     public final int id;
 
     public Color(final int r, final int g, final int b) {

src/main/java/bwapi/Player.java

@@ -4,7 +4,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static bwapi.TextColor.*;
 import static bwapi.UnitType.*;
 import static bwapi.UpgradeType.*;
 import static bwapi.WeaponType.*;
@@ -215,31 +214,31 @@ public Color getColor() {
     public TextColor getTextColor() {
         switch (playerData.getColor()) {
             case 111: // red
-                return BrightRed;
+                return TextColor.BrightRed;
             case 165: // blue
-                return Blue;
+                return TextColor.Blue;
             case 159: // teal
-                return Teal;
+                return TextColor.Teal;
             case 164: // purp
-                return Purple;
-            case 179: // oj
-                return Orange;
+                return TextColor.Purple;
+            case 156: // orange with fix from @n00byEdge
+                return TextColor.Orange;
             case 19:  // brown
-                return Brown;
+                return TextColor.Brown;
             case 84:  // white
-                return PlayerWhite;
+                return TextColor.PlayerWhite;
             case 135: // yellow
-                return PlayerYellow;
+                return TextColor.PlayerYellow;
             case 185: // green p9
-                return DarkGreen;
+                return TextColor.DarkGreen;
             case 136: // p10
-                return LightYellow;
+                return TextColor.LightYellow;
             case 134: // p11
-                return Tan;
+                return TextColor.Tan;
             case 51:  // p12
-                return GreyBlue;
+                return TextColor.GreyBlue;
             default:
-                return Default;
+                return TextColor.Default;
         }
     }