renamed DrawableArray to DrawableStack

Author: brachy84

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

@@ -1,6 +1,6 @@
 package com.cleanroommc.modularui.api.drawable;
 
-import com.cleanroommc.modularui.drawable.DrawableArray;
+import com.cleanroommc.modularui.drawable.DrawableStack;
 import com.cleanroommc.modularui.drawable.Icon;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
 import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
@@ -11,7 +11,6 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import com.google.gson.JsonObject;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -26,7 +25,7 @@ static IDrawable of(IDrawable... drawables) {
         } else if (drawables.length == 1) {
             return drawables[0];
         } else {
-            return new DrawableArray(drawables);
+            return new DrawableStack(drawables);
         }
     }
 
@@ -149,7 +148,7 @@ default Icon asIcon() {
 
     static boolean isVisible(@Nullable IDrawable drawable) {
         if (drawable == null || drawable == EMPTY || drawable == NONE) return false;
-        if (drawable instanceof DrawableArray array) {
+        if (drawable instanceof DrawableStack array) {
             return array.getDrawables().length > 0;
         }
         return true;

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

@@ -94,7 +94,7 @@ public IDrawable deserialize(JsonElement element, Type typeOfT, JsonDeserializat
             if (list.size() == 1) {
                 return list.get(0);
             }
-            return new DrawableArray(list.toArray(new IDrawable[0]));
+            return new DrawableStack(list.toArray(new IDrawable[0]));
         }
         if (!element.isJsonObject()) {
             ModularUI.LOGGER.throwing(new JsonParseException("Drawable json should be an object or an array."));
@@ -123,9 +123,9 @@ public IDrawable deserialize(JsonElement element, Type typeOfT, JsonDeserializat
     public JsonElement serialize(IDrawable src, Type typeOfSrc, JsonSerializationContext context) {
         if (src == IDrawable.EMPTY) return JsonNull.INSTANCE;
         if (src == IDrawable.NONE) return new JsonPrimitive("none");
-        if (src instanceof DrawableArray drawableArray) {
+        if (src instanceof DrawableStack drawableStack) {
             JsonArray jsonArray = new JsonArray();
-            for (IDrawable drawable : drawableArray.getDrawables()) {
+            for (IDrawable drawable : drawableStack.getDrawables()) {
                 jsonArray.add(JsonHelper.serialize(drawable));
             }
             return jsonArray;

src/main/java/com/cleanroommc/modularui/drawable/DrawableArray.java renamed to src/main/java/com/cleanroommc/modularui/drawable/DrawableStack.java

@@ -10,13 +10,16 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-public class DrawableArray implements IDrawable, IJsonSerializable {
+/**
+ * A stack of {@link IDrawable} backed by an array which are drawn on top of each other.
+ */
+public class DrawableStack implements IDrawable, IJsonSerializable {
 
     public static final IDrawable[] EMPTY_BACKGROUND = {};
 
     private final IDrawable[] drawables;
 
-    public DrawableArray(IDrawable... drawables) {
+    public DrawableStack(IDrawable... drawables) {
         this.drawables = drawables == null || drawables.length == 0 ? EMPTY_BACKGROUND : drawables;
     }
 

src/main/java/com/cleanroommc/modularui/test/TestGuis.java

@@ -23,7 +23,6 @@
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
-
 import net.minecraft.util.text.TextFormatting;
 
 import org.jetbrains.annotations.NotNull;
@@ -48,7 +47,10 @@ public class TestGuis extends CustomModularScreen {
                         .size(20)
                         .center()
                         .tooltipBuilder(tooltip -> {
-                            tooltip.addLine("Line 1");
+                            tooltip.addLine("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.  " +
+                                    "Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.  " +
+                                    "Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.  " +
+                                    "Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem");
                             tooltip.addLine("Longer Line 2");
                             tooltip.addLine("Line 3");
                             tooltip.alignment(Alignment.Center);

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

@@ -3,7 +3,7 @@
 import com.cleanroommc.modularui.api.ITheme;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.api.widget.Interactable;
-import com.cleanroommc.modularui.drawable.DrawableArray;
+import com.cleanroommc.modularui.drawable.DrawableStack;
 import com.cleanroommc.modularui.drawable.TabTexture;
 import com.cleanroommc.modularui.theme.WidgetTheme;
 import com.cleanroommc.modularui.theme.WidgetThemeSelectable;
@@ -58,7 +58,7 @@ public PageButton background(boolean active, IDrawable... background) {
         } else if (background.length == 1) {
             this.inactiveTexture = background[0];
         } else {
-            this.inactiveTexture = new DrawableArray(background);
+            this.inactiveTexture = new DrawableStack(background);
         }
         return this;
     }