From fd96ca5d42be1c02974ce1df31efacf2177d3d84 Mon Sep 17 00:00:00 2001 From: kawaiizenbo <48113593+kawaiizenbo@users.noreply.github.com> Date: Mon, 9 Sep 2024 19:13:25 -0700 Subject: [PATCH] make indexsetting visually distinct from stringsetting --- .../moonlight/module/settings/IndexSetting.java | 2 ++ .../me/kawaiizenbo/moonlight/util/DrawUtils.java | 8 ++++++++ .../moonlight/textures/gui/sprites/updown.png | Bin 0 -> 355 bytes .../textures/gui/sprites/updown_light.png | Bin 0 -> 350 bytes 4 files changed, 10 insertions(+) create mode 100644 src/main/resources/assets/moonlight/textures/gui/sprites/updown.png create mode 100644 src/main/resources/assets/moonlight/textures/gui/sprites/updown_light.png diff --git a/src/main/java/me/kawaiizenbo/moonlight/module/settings/IndexSetting.java b/src/main/java/me/kawaiizenbo/moonlight/module/settings/IndexSetting.java index b743754..9681b6a 100644 --- a/src/main/java/me/kawaiizenbo/moonlight/module/settings/IndexSetting.java +++ b/src/main/java/me/kawaiizenbo/moonlight/module/settings/IndexSetting.java @@ -1,6 +1,7 @@ package me.kawaiizenbo.moonlight.module.settings; import me.kawaiizenbo.moonlight.Moonlight; +import me.kawaiizenbo.moonlight.util.DrawUtils; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; @@ -25,6 +26,7 @@ public class IndexSetting extends Setting drawContext.fill(x+96, y+5, x+190, y+19, Moonlight.THEME.border.getRGB()); drawContext.fill(x+97, y+6, x+189, y+18, hovered(mouseX, mouseY) ? Moonlight.THEME.hover.getRGB() : Moonlight.THEME.background.getRGB()); drawContext.drawText(textRenderer, elements[index], x+98, y+8, Moonlight.THEME.text.getRGB(), false); + drawContext.drawGuiTexture(DrawUtils.getThemedGUIIcon("updown", Moonlight.THEME.background), x+177, y+6, 12, 12); } @Override diff --git a/src/main/java/me/kawaiizenbo/moonlight/util/DrawUtils.java b/src/main/java/me/kawaiizenbo/moonlight/util/DrawUtils.java index be83b3e..03443bc 100644 --- a/src/main/java/me/kawaiizenbo/moonlight/util/DrawUtils.java +++ b/src/main/java/me/kawaiizenbo/moonlight/util/DrawUtils.java @@ -1,10 +1,18 @@ package me.kawaiizenbo.moonlight.util; import me.kawaiizenbo.moonlight.Moonlight; +import me.kawaiizenbo.moonlight.theme.ThemeColor; import net.minecraft.util.Identifier; public class DrawUtils { + public static Identifier getThemedGUIIcon(String textureName, ThemeColor invert) + { + boolean mode = ((invert.r + invert.g + invert.b) / 3) > 77; + String addition = mode ? "_light" : ""; + return Identifier.of("moonlight", textureName+addition); + } + public static Identifier getThemedGUIIcon(String textureName) { String addition = Moonlight.THEME.useDarkIcons ? "_light" : ""; diff --git a/src/main/resources/assets/moonlight/textures/gui/sprites/updown.png b/src/main/resources/assets/moonlight/textures/gui/sprites/updown.png new file mode 100644 index 0000000000000000000000000000000000000000..ca631108967420bde167fa776131c829662e6069 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;Fi<~&ooa@Ed~xChm}E!k(GfF$npYWX($_H zlLjL*SeyySHe_UC-~-Z8K%Cjm0v68zvOypLh(Y>cbU|WfUWr~_YKelWo*@G>1H%M% z1{R>afswHR;{u48AoZ*ZAm&U0vO$0eXbKZpWss!>kOkFcXkY-6J);rv(3khA4v=Z# z>Ealo5uBW`!0gBW|NrY#?39hzWfip3Qh?yVa>lzUY%0FavJbwn==ndsa-cyuf|Du7 bY$6N8zc=E4#r&4mgUs`E^>bP0l+XkK9f(5c literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/moonlight/textures/gui/sprites/updown_light.png b/src/main/resources/assets/moonlight/textures/gui/sprites/updown_light.png new file mode 100644 index 0000000000000000000000000000000000000000..684cdbdb0a75e7ee47aa76f09027cee430763206 GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;Fi<~&ooa@Ed~xChm}E!k(GfF$npYWX($_H zlLjL*SeyySHe_UC-~-Z8K%Cjm0v68zvOypLh(Y>cbU|WfUWr~_YKelWo*@G>1H%M% z1{R>afswHR;{u48AoZ*ZAm&U0vO$0eXbKZpWss!>kOkFcXkY-6J);rv(3khA4v=Z= z>Ealo5uBW`fbmEFnM9Xo35+MYBpgTe~DWM4fkv~5p literal 0 HcmV?d00001