From d91ff744f2d2ce875ae16c7cd7379f3781e3ab88 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 19 Mar 2020 20:14:37 -0400 Subject: [PATCH] Fixed color methods --- 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 631802e28c..2719592d54 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -27,8 +27,8 @@ def transformColors = { List> 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; }