color supplier for text

Author: brachy84

src/main/java/com/cleanroommc/modularui/api/drawable/IKey.java

@@ -2,7 +2,15 @@
 
 import com.cleanroommc.modularui.api.IJsonSerializable;
 import com.cleanroommc.modularui.drawable.Icon;
-import com.cleanroommc.modularui.drawable.text.*;
+import com.cleanroommc.modularui.drawable.text.AnimatedText;
+import com.cleanroommc.modularui.drawable.text.CompoundKey;
+import com.cleanroommc.modularui.drawable.text.DynamicKey;
+import com.cleanroommc.modularui.drawable.text.FormattingState;
+import com.cleanroommc.modularui.drawable.text.KeyIcon;
+import com.cleanroommc.modularui.drawable.text.LangKey;
+import com.cleanroommc.modularui.drawable.text.StringKey;
+import com.cleanroommc.modularui.drawable.text.StyledText;
+import com.cleanroommc.modularui.drawable.text.TextRenderer;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
 import com.cleanroommc.modularui.theme.WidgetTheme;
 import com.cleanroommc.modularui.utils.Alignment;
@@ -17,6 +25,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.IntSupplier;
 import java.util.function.Supplier;
 
 /**
@@ -234,7 +243,11 @@ default StyledText alignment(Alignment alignment) {
         return withStyle().alignment(alignment);
     }
 
-    default StyledText color(@Nullable Integer color) {
+    default StyledText color(int color) {
+        return withStyle().color(() -> color);
+    }
+
+    default StyledText color(@Nullable IntSupplier color) {
         return withStyle().color(color);
     }
 

src/main/java/com/cleanroommc/modularui/drawable/text/AnimatedText.java

@@ -12,6 +12,8 @@
 
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.IntSupplier;
+
 public class AnimatedText extends StyledText {
 
     private String fullString;
@@ -113,7 +115,12 @@ public AnimatedText alignment(Alignment alignment) {
     }
 
     @Override
-    public AnimatedText color(@Nullable Integer color) {
+    public AnimatedText color(int color) {
+        return color(() -> color);
+    }
+
+    @Override
+    public AnimatedText color(@Nullable IntSupplier color) {
         return (AnimatedText) super.color(color);
     }
 

src/main/java/com/cleanroommc/modularui/drawable/text/StyledText.java

@@ -12,11 +12,13 @@
 
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.IntSupplier;
+
 public class StyledText extends BaseKey {
 
     private final IKey key;
     private Alignment alignment = Alignment.Center;
-    private Integer color = null;
+    private IntSupplier color = null;
     private Boolean shadow = null;
     private float scale = 1f;
 
@@ -38,7 +40,7 @@ public String getFormatted() {
     @Override
     public void draw(GuiContext context, int x, int y, int width, int height, WidgetTheme widgetTheme) {
         renderer.setAlignment(this.alignment, width, height);
-        renderer.setColor(this.color != null ? this.color : widgetTheme.getColor());
+        renderer.setColor(this.color != null ? this.color.getAsInt() : widgetTheme.getColor());
         renderer.setScale(this.scale);
         renderer.setPos(x, y);
         renderer.setShadow(this.shadow != null ? this.shadow : widgetTheme.getTextShadow());
@@ -49,7 +51,7 @@ public Alignment getAlignment() {
         return this.alignment;
     }
 
-    public @Nullable Integer getColor() {
+    public @Nullable IntSupplier getColor() {
         return this.color;
     }
 
@@ -74,7 +76,12 @@ public StyledText alignment(Alignment alignment) {
     }
 
     @Override
-    public StyledText color(@Nullable Integer color) {
+    public StyledText color(int color) {
+        return color(() -> color);
+    }
+
+    @Override
+    public StyledText color(@Nullable IntSupplier color) {
         this.color = color;
         return this;
     }

src/main/java/com/cleanroommc/modularui/widgets/ScrollingTextWidget.java

@@ -8,6 +8,8 @@
 
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.IntSupplier;
+
 public class ScrollingTextWidget extends TextWidget {
 
     private static final int pauseTime = 60;
@@ -59,7 +61,7 @@ public void onUpdate() {
     public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
         checkString();
         TextRenderer renderer = TextRenderer.SHARED;
-        renderer.setColor(getColor() != null ? getColor() : widgetTheme.getTextColor());
+        renderer.setColor(getColor() != null ? getColor().getAsInt() : widgetTheme.getTextColor());
         renderer.setAlignment(getAlignment(), getArea().w() + 1, getArea().h());
         renderer.setShadow(isShadow() != null ? isShadow() : widgetTheme.getTextShadow());
         renderer.setPos(getArea().getPadding().left, getArea().getPadding().top);
@@ -88,7 +90,12 @@ public ScrollingTextWidget alignment(Alignment alignment) {
     }
 
     @Override
-    public ScrollingTextWidget color(@Nullable Integer color) {
+    public ScrollingTextWidget color(int color) {
+        return color(() -> color);
+    }
+
+    @Override
+    public ScrollingTextWidget color(@Nullable IntSupplier color) {
         return (ScrollingTextWidget) super.color(color);
     }
 

src/main/java/com/cleanroommc/modularui/widgets/TextWidget.java

@@ -13,11 +13,13 @@
 
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.IntSupplier;
+
 public class TextWidget extends Widget<TextWidget> {
 
     private final IKey key;
     private Alignment alignment = Alignment.CenterLeft;
-    private Integer color = null;
+    private IntSupplier color = null;
     private Boolean shadow = null;
     private float scale = 1f;
 
@@ -37,7 +39,7 @@ public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
             WidgetTree.resizeInternal(this, false);
         }
         this.lastText = text;
-        renderer.setColor(this.color != null ? this.color : widgetTheme.getTextColor());
+        renderer.setColor(this.color != null ? this.color.getAsInt() : widgetTheme.getTextColor());
         renderer.setAlignment(this.alignment, getArea().w() + this.scale, getArea().h());
         renderer.setShadow(this.shadow != null ? this.shadow : widgetTheme.getTextShadow());
         renderer.setPos(getArea().getPadding().left, getArea().getPadding().top);
@@ -121,7 +123,7 @@ public float getScale() {
         return this.scale;
     }
 
-    public @Nullable Integer getColor() {
+    public @Nullable IntSupplier getColor() {
         return this.color;
     }
 
@@ -134,7 +136,11 @@ public TextWidget alignment(Alignment alignment) {
         return this;
     }
 
-    public TextWidget color(@Nullable Integer color) {
+    public TextWidget color(int color) {
+        return color(() -> color);
+    }
+
+    public TextWidget color(@Nullable IntSupplier color) {
         this.color = color;
         return this;
     }