From c4d5314a1a80bc3f23a676f46ffbb94ff01ee791 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 19 Mar 2020 20:15:41 -0400
Subject: [PATCH] Color script fixes

---
 tools/build.gradle                   | 4 ++--
 tools/src/mindustry/tools/Image.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/build.gradle b/tools/build.gradle
index e527ef1e10..544fd9606e 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -27,8 +27,8 @@ def transformColors = { List<List<String>> list ->
         }
 
         newColors.each{ color ->
-            colorMap.put(Color.argb8888(color), newColors)
-            colorIndexMap.put(Color.argb8888(color), newColors.indexOf(color))
+            colorMap.put(color.argb8888(), newColors)
+            colorIndexMap.put(color.argb8888(), newColors.indexOf(color))
         }
     }
 }
diff --git a/tools/src/mindustry/tools/Image.java b/tools/src/mindustry/tools/Image.java
index 0407783614..7a811d5f6b 100644
--- a/tools/src/mindustry/tools/Image.java
+++ b/tools/src/mindustry/tools/Image.java
@@ -50,7 +50,7 @@ class Image{
     Color getColor(int x, int y){
         if(!Structs.inBounds(x, y, width, height)) return color.set(0, 0, 0, 0);
         int i = image.getRGB(x, y);
-        Color.argb8888ToColor(color, i);
+        color.argb8888(i);
         return color;
     }