ability to override color on UITexture without theme

Author: brachy84

src/main/java/com/cleanroommc/modularui/ClientProxy.java

@@ -94,9 +94,8 @@ void preInit(FMLPreInitializationEvent event) {
         } catch (IOException | LWJGLException e) {
             throw new RuntimeException(e);
         } catch (Throwable e) {
-            ModularUI.LOGGER.info("Custom Cursors failed to load. This is likely because an incompatible LWJGL version was used like with CleanroomLoader.");
-            // TODO: proper lwjgl 3 support
-            // currently it seems this is not even triggered and the cursors are created correctly, but when the cursors are set nothing happens
+            ModularUI.LOGGER.info("Custom Cursors failed to load.");
+            // lwjgl3: currently it seems this is not even triggered and the cursors are created correctly, but when the cursors are set nothing happens
         }
     }
 

src/main/java/com/cleanroommc/modularui/drawable/AdaptableUITexture.java

@@ -179,4 +179,14 @@ public boolean saveToJson(JsonObject json) {
         json.addProperty("tiled", this.tiled);
         return true;
     }
+
+    @Override
+    protected AdaptableUITexture copy() {
+        return new AdaptableUITexture(location, u0, v0, u1, v1, colorType, nonOpaque, imageWidth, imageHeight, bl, bt, br, bb, tiled);
+    }
+
+    @Override
+    public AdaptableUITexture withColorOverride(int color) {
+        return (AdaptableUITexture) super.withColorOverride(color);
+    }
 }

src/main/java/com/cleanroommc/modularui/drawable/DelegateDrawable.java

@@ -0,0 +1,64 @@
+package com.cleanroommc.modularui.drawable;
+
+import com.cleanroommc.modularui.api.drawable.IDrawable;
+import com.cleanroommc.modularui.screen.viewport.GuiContext;
+import com.cleanroommc.modularui.theme.WidgetTheme;
+import com.cleanroommc.modularui.widget.Widget;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class DelegateDrawable implements IDrawable {
+
+    @NotNull
+    private IDrawable drawable;
+
+    public DelegateDrawable(@Nullable IDrawable drawable) {
+        setDrawable(drawable);
+    }
+
+    // protected, so subclasses can define mutability
+    protected void setDrawable(@Nullable IDrawable drawable) {
+        this.drawable = drawable != null ? drawable : IDrawable.EMPTY;
+    }
+
+    @NotNull
+    public IDrawable getWrappedDrawable() {
+        return drawable;
+    }
+
+    @Override
+    public void draw(GuiContext context, int x, int y, int width, int height, WidgetTheme widgetTheme) {
+        this.drawable.draw(context, x, y, width, height, widgetTheme);
+    }
+
+    @Override
+    public boolean canApplyTheme() {
+        return this.drawable.canApplyTheme();
+    }
+
+    @Override
+    public void applyColor(int themeColor) {
+        this.drawable.applyColor(themeColor);
+    }
+
+    @Override
+    public int getDefaultWidth() {
+        return this.drawable.getDefaultWidth();
+    }
+
+    @Override
+    public int getDefaultHeight() {
+        return this.drawable.getDefaultHeight();
+    }
+
+    @Override
+    public Widget<?> asWidget() {
+        return this.drawable.asWidget();
+    }
+
+    @Override
+    public Icon asIcon() {
+        return this.drawable.asIcon();
+    }
+}

src/main/java/com/cleanroommc/modularui/drawable/DelegateIcon.java

@@ -1,6 +1,5 @@
 package com.cleanroommc.modularui.drawable;
 
-import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.api.drawable.IIcon;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
 import com.cleanroommc.modularui.theme.WidgetTheme;

src/main/java/com/cleanroommc/modularui/drawable/TiledUITexture.java

@@ -1,9 +1,9 @@
 package com.cleanroommc.modularui.drawable;
 
-import com.google.gson.JsonObject;
-
 import net.minecraft.util.ResourceLocation;
 
+import com.google.gson.JsonObject;
+
 public class TiledUITexture extends UITexture {
 
     private final int imageWidth, imageHeight;
@@ -35,4 +35,14 @@ public boolean saveToJson(JsonObject json) {
         }
         return true;
     }
+
+    @Override
+    protected TiledUITexture copy() {
+        return new TiledUITexture(location, u0, v0, u1, v1, imageWidth, imageHeight, colorType, nonOpaque);
+    }
+
+    @Override
+    public TiledUITexture withColorOverride(int color) {
+        return (TiledUITexture) super.withColorOverride(color);
+    }
 }

src/main/java/com/cleanroommc/modularui/drawable/UITexture.java

@@ -48,6 +48,8 @@ static UITexture icon(String name, int x, int y) {
     @Nullable public final ColorType colorType;
     public final boolean nonOpaque;
 
+    private int colorOverride = 0;
+
     /**
      * Creates a drawable texture
      *
@@ -164,11 +166,7 @@ public void drawSubArea(float x, float y, float width, float height, float uStar
     }
 
     public void drawSubArea(float x, float y, float width, float height, float uStart, float vStart, float uEnd, float vEnd, WidgetTheme widgetTheme) {
-        if (canApplyTheme()) {
-            Color.setGlColor(widgetTheme.getColor());
-        } else {
-            Color.setGlColorOpaque(Color.WHITE.main);
-        }
+        applyColor(this.colorType != null ? this.colorType.getColor(widgetTheme) : ColorType.DEFAULT.getColor(widgetTheme));
         GuiDraw.drawTexture(this.location, x, y, x + width, y + height, lerpU(uStart), lerpV(vStart), lerpU(uEnd), lerpV(vEnd), this.nonOpaque);
     }
 
@@ -177,6 +175,15 @@ public boolean canApplyTheme() {
         return colorType != null;
     }
 
+    @Override
+    public void applyColor(int themeColor) {
+        if (this.colorOverride != 0) {
+            Color.setGlColor(this.colorOverride);
+        } else {
+            IDrawable.super.applyColor(themeColor);
+        }
+    }
+
     public static UITexture parseFromJson(JsonObject json) {
         String name = JsonHelper.getString(json, null, "name", "id");
         if (name != null) {
@@ -218,6 +225,8 @@ public static UITexture parseFromJson(JsonObject json) {
         } else if (JsonHelper.getBoolean(json, false, "canApplyTheme")) {
             builder.canApplyTheme();
         }
+        UITexture uiTexture = builder.build();
+        uiTexture.colorOverride = JsonHelper.getColor(json, 0, "colorOverride");
         return builder.build();
     }
 
@@ -234,9 +243,20 @@ public boolean saveToJson(JsonObject json) {
         json.addProperty("u1", this.u1);
         json.addProperty("v1", this.v1);
         if (this.colorType != null) json.addProperty("colorType", this.colorType.getName());
+        json.addProperty("colorOverride", this.colorOverride);
         return true;
     }
 
+    protected UITexture copy() {
+        return new UITexture(this.location, this.u0, this.v0, this.u1, this.v1, this.colorType);
+    }
+
+    public UITexture withColorOverride(int color) {
+        UITexture t = copy();
+        t.colorOverride = color;
+        return t;
+    }
+
     private static int defaultImageWidth = 16, defaultImageHeight = 16;
 
     public static void setDefaultImageSize(int w, int h) {