diff --git a/client/src/main/java/client/gui/element/InventoryButton.java b/client/src/main/java/client/gui/element/InventoryButton.java index bf3456fc..6b59a178 100644 --- a/client/src/main/java/client/gui/element/InventoryButton.java +++ b/client/src/main/java/client/gui/element/InventoryButton.java @@ -3,7 +3,6 @@ package client.gui.element; import client.Client; import client.renderer.Drawing; import common.inventory.Slot; -import common.util.Util; public class InventoryButton extends Element { private final boolean bordered; @@ -30,8 +29,8 @@ public class InventoryButton extends Element { public static void drawButton(Client gm, int x, int y, int w, int h, boolean border) { if(border) - Drawing.drawDoubleRect(x, y, w, h, Util.mixColor(gm.style.fill_top, gm.style.fill_btm), gm.style.brdr_top, gm.style.brdr_btm); + Drawing.drawDoubleRect(x, y, w, h, gm.style.fill_top, gm.style.fill_btm, gm.style.brdr_top, gm.style.brdr_btm); else - Drawing.drawRect(x, y, w, h, Util.mixColor(gm.style.fill_top, gm.style.fill_btm), gm.style.brdr_top, gm.style.brdr_btm); + Drawing.drawGradient(x, y, w, h, gm.style.fill_top, gm.style.fill_btm, gm.style.brdr_top, gm.style.brdr_btm); } } diff --git a/client/src/main/java/client/renderer/Drawing.java b/client/src/main/java/client/renderer/Drawing.java index da4ab7a1..9c4c79bf 100644 --- a/client/src/main/java/client/renderer/Drawing.java +++ b/client/src/main/java/client/renderer/Drawing.java @@ -495,7 +495,7 @@ public abstract class Drawing { drawRect(x + 1, y + 1, w - 2, h - 2, color); } - public static void drawDoubleRect(int x, int y, int w, int h, int color, int topleft, int btmright) { + public static void drawDoubleRect(int x, int y, int w, int h, int top, int bottom, int topleft, int btmright) { int corner = Util.mixColor(topleft, btmright); drawRect(x, y, w - 2, 2, topleft); drawRect(x, y + 2, 2, h - 2, topleft); @@ -503,7 +503,7 @@ public abstract class Drawing { drawRect(x, y + h - 2, 2, 2, corner); drawRect(x + w - 2, y + 2, 2, h - 2, btmright); drawRect(x + 2, y + h - 2, w - 4, 2, btmright); - drawRect(x + 2, y + 2, w - 4, h - 4, color); + drawGradient(x + 2, y + 2, w - 4, h - 4, top, bottom); } public static void drawGradient(int x, int y, int w, int h, int top, int bottom, int topleft, int btmright) {