add getWrappedDrawable() to IIcon

Author: brachy84

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

@@ -4,11 +4,18 @@
 import com.cleanroommc.modularui.drawable.InteractableIcon;
 import com.cleanroommc.modularui.widget.sizer.Box;
 
+import org.jetbrains.annotations.Nullable;
+
 /**
  * A {@link IDrawable} with a fixed size.
  */
 public interface IIcon extends IDrawable {
 
+    /**
+     * @return the drawable this icon wraps or null if it doesn't wrap anything
+     */
+    @Nullable IDrawable getWrappedDrawable();
+
     /**
      * @return width of this icon or 0 if the width should be dynamic
      */
@@ -24,6 +31,15 @@ public interface IIcon extends IDrawable {
      */
     Box getMargin();
 
+    default IDrawable getRootDrawable() {
+        IDrawable drawable = this;
+        while (drawable instanceof IIcon icon) {
+            drawable = icon.getWrappedDrawable();
+            if (drawable == null) return icon;
+        }
+        return drawable;
+    }
+
     default HoverableIcon asHoverable() {
         return new HoverableIcon(this);
     }

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

@@ -1,5 +1,6 @@
 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;
@@ -13,6 +14,11 @@ public DelegateIcon(IIcon icon) {
         this.icon = icon;
     }
 
+    @Override
+    public IIcon getWrappedDrawable() {
+        return icon;
+    }
+
     @Override
     public int getWidth() {
         return this.icon.getWidth();

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

@@ -29,6 +29,11 @@ public Icon(IDrawable drawable) {
         this.drawable = drawable;
     }
 
+    @Override
+    public IDrawable getWrappedDrawable() {
+        return drawable;
+    }
+
     @Override
     public int getWidth() {
         return this.width;
@@ -44,6 +49,10 @@ public Box getMargin() {
         return this.margin;
     }
 
+    public int getColor() {
+        return color;
+    }
+
     @SideOnly(Side.CLIENT)
     @Override
     public void draw(GuiContext context, int x, int y, int width, int height, WidgetTheme widgetTheme) {

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

@@ -1,6 +1,7 @@
 package com.cleanroommc.modularui.drawable.text;
 
 import com.cleanroommc.modularui.api.MCHelper;
+import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.api.drawable.IIcon;
 import com.cleanroommc.modularui.api.drawable.IKey;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
@@ -27,6 +28,11 @@ public FontRenderer getFontRenderer() {
         return this.overrideFontRenderer != null ? this.overrideFontRenderer : MCHelper.getFontRenderer();
     }
 
+    @Override
+    public IKey getWrappedDrawable() {
+        return key;
+    }
+
     @Override
     public int getWidth() {
         return getFontRenderer().getStringWidth(key.get()) + this.margin.horizontal();
@@ -42,6 +48,10 @@ public Box getMargin() {
         return null;
     }
 
+    public IKey getKey() {
+        return key;
+    }
+
     @Override
     public void draw(GuiContext context, int x, int y, int width, int height, WidgetTheme widgetTheme) {
         int w = getWidth(), h = getHeight();

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

@@ -1,5 +1,6 @@
 package com.cleanroommc.modularui.drawable.text;
 
+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;
@@ -9,6 +10,8 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import org.jetbrains.annotations.Nullable;
+
 public class TextIcon implements IIcon {
 
     private final String text;
@@ -34,6 +37,11 @@ public void draw(GuiContext context, int x, int y, int width, int height, Widget
         TextRenderer.SHARED.drawSimple(this.text);
     }
 
+    @Override
+    public @Nullable IDrawable getWrappedDrawable() {
+        return null;
+    }
+
     @Override
     public int getWidth() {
         return this.width;