Added opacity to UITexture copy() method (#112)

(cherry picked from commit 7631a27)

Author: TheYoingLad

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

@@ -22,9 +22,9 @@ public class AdaptableUITexture extends UITexture {
     /**
      * Use {@link UITexture#builder()} with {@link Builder#adaptable(int, int)}
      */
-    AdaptableUITexture(ResourceLocation location, float u0, float v0, float u1, float v1, ColorType colorType, boolean nonOpaque,
+    AdaptableUITexture(ResourceLocation location, float u0, float v0, float u1, float v1, ColorType colorType, boolean nonOpaque, int colorOverride,
                        int imageWidth, int imageHeight, int bl, int bt, int br, int bb, boolean tiled) {
-        super(location, u0, v0, u1, v1, colorType, nonOpaque);
+        super(location, u0, v0, u1, v1, colorType, nonOpaque, colorOverride);
         this.imageWidth = imageWidth;
         this.imageHeight = imageHeight;
         this.bl = bl;
@@ -42,7 +42,7 @@ public AdaptableUITexture register(String name) {
     @Override
     public AdaptableUITexture getSubArea(float uStart, float vStart, float uEnd, float vEnd) {
         return new AdaptableUITexture(this.location, lerpU(uStart), lerpV(vStart), lerpU(uEnd), lerpV(vEnd), this.colorType, this.nonOpaque,
-                this.imageWidth, this.imageHeight, this.bl, this.bt, this.br, this.bb, this.tiled);
+                this.colorOverride, this.imageWidth, this.imageHeight, this.bl, this.bt, this.br, this.bb, this.tiled);
     }
 
     @Override
@@ -187,7 +187,7 @@ protected void saveTextureToJson(JsonObject json) {
 
     @Override
     protected AdaptableUITexture copy() {
-        return new AdaptableUITexture(location, u0, v0, u1, v1, colorType, nonOpaque, imageWidth, imageHeight, bl, bt, br, bb, tiled);
+        return new AdaptableUITexture(location, u0, v0, u1, v1, colorType, nonOpaque, colorOverride, imageWidth, imageHeight, bl, bt, br, bb, tiled);
     }
 
     @Override

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

@@ -13,9 +13,9 @@ public class TiledUITexture extends UITexture {
     /**
      * Use {@link UITexture#builder()} with {@link Builder#tiled()}
      */
-    TiledUITexture(ResourceLocation location, float u0, float v0, float u1, float v1, int imageWidth, int imageHeight, ColorType colorType,
-                   boolean nonOpaque) {
-        super(location, u0, v0, u1, v1, colorType, nonOpaque);
+    TiledUITexture(ResourceLocation location, float u0, float v0, float u1, float v1, ColorType colorType, boolean nonOpaque,
+                   int colorOverride, int imageWidth, int imageHeight) {
+        super(location, u0, v0, u1, v1, colorType, nonOpaque, colorOverride);
         this.imageWidth = imageWidth;
         this.imageHeight = imageHeight;
     }
@@ -44,7 +44,7 @@ protected void saveTextureToJson(JsonObject json) {
 
     @Override
     protected TiledUITexture copy() {
-        return new TiledUITexture(location, u0, v0, u1, v1, imageWidth, imageHeight, colorType, nonOpaque);
+        return new TiledUITexture(location, u0, v0, u1, v1, colorType, nonOpaque, colorOverride, imageWidth, imageHeight);
     }
 
     @Override

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

@@ -50,7 +50,7 @@ static UITexture icon(String name, int x, int y) {
     @Nullable public final ColorType colorType;
     public final boolean nonOpaque;
 
-    private int colorOverride = 0;
+    protected int colorOverride;
 
     /**
      * Creates a drawable texture
@@ -63,7 +63,7 @@ static UITexture icon(String name, int x, int y) {
      * @param colorType a function to get which color from a widget theme should be used to color this texture. Can be null.
      */
     public UITexture(ResourceLocation location, float u0, float v0, float u1, float v1, @Nullable ColorType colorType) {
-        this(location, u0, v0, u1, v1, colorType, false);
+        this(location, u0, v0, u1, v1, colorType, false, 0);
     }
 
     /**
@@ -78,6 +78,22 @@ public UITexture(ResourceLocation location, float u0, float v0, float u1, float
      * @param nonOpaque whether the texture should draw with blend (if true) or not (if false).
      */
     public UITexture(ResourceLocation location, float u0, float v0, float u1, float v1, @Nullable ColorType colorType, boolean nonOpaque) {
+        this(location, u0, v0, u1, v1, colorType, nonOpaque, 0);
+    }
+
+    /**
+     * Creates a drawable texture
+     *
+     * @param location      location of the texture
+     * @param u0            x offset of the image (0-1)
+     * @param v0            y offset of the image (0-1)
+     * @param u1            x end offset of the image (0-1)
+     * @param v1            y end offset of the image (0-1)
+     * @param colorType     a function to get which color from a widget theme should be used to color this texture. Can be null.
+     * @param nonOpaque     whether the texture should draw with blend (if true) or not (if false).
+     * @param colorOverride color override for the texture in ARGB format. 0 means no override
+     */
+    public UITexture(ResourceLocation location, float u0, float v0, float u1, float v1, @Nullable ColorType colorType, boolean nonOpaque, int colorOverride) {
         this.colorType = colorType;
         boolean png = !location.getPath().endsWith(".png");
         boolean textures = !location.getPath().startsWith("textures/");
@@ -92,6 +108,7 @@ public UITexture(ResourceLocation location, float u0, float v0, float u1, float
         this.u1 = u1;
         this.v1 = v1;
         this.nonOpaque = nonOpaque;
+        this.colorOverride = colorOverride;
     }
 
     public static Builder builder() {
@@ -281,7 +298,7 @@ public int hashCode() {
     }
 
     protected UITexture copy() {
-        return new UITexture(this.location, this.u0, this.v0, this.u1, this.v1, this.colorType);
+        return new UITexture(this.location, this.u0, this.v0, this.u1, this.v1, this.colorType, this.nonOpaque, this.colorOverride);
     }
 
     public UITexture withColorOverride(int color) {
@@ -312,6 +329,7 @@ public static class Builder {
         private boolean tiled = false;
         private ColorType colorType = null;
         private boolean nonOpaque = false;
+        private int colorOverride = 0;
 
         /**
          * @param loc location of the image to draw
@@ -603,13 +621,13 @@ private UITexture create() {
                     throw new IllegalArgumentException("UV values must be 0 - 1");
                 if (this.bl > 0 || this.bt > 0 || this.br > 0 || this.bb > 0) {
                     return new AdaptableUITexture(this.location, this.u0, this.v0, this.u1, this.v1, this.colorType, this.nonOpaque,
-                            this.iw, this.ih, this.bl, this.bt, this.br, this.bb, this.tiled);
+                            this.colorOverride, this.iw, this.ih, this.bl, this.bt, this.br, this.bb, this.tiled);
                 }
                 if (this.tiled) {
-                    return new TiledUITexture(this.location, this.u0, this.v0, this.u1, this.v1, this.iw, this.ih, this.colorType,
-                            this.nonOpaque);
+                    return new TiledUITexture(this.location, this.u0, this.v0, this.u1, this.v1, this.colorType, this.nonOpaque,
+                            this.colorOverride, this.iw, this.ih);
                 }
-                return new UITexture(this.location, this.u0, this.v0, this.u1, this.v1, this.colorType, this.nonOpaque);
+                return new UITexture(this.location, this.u0, this.v0, this.u1, this.v1, this.colorType, this.nonOpaque, this.colorOverride);
             }
             throw new IllegalStateException();
         }