fix a few more covers

Author: ghzdude

src/main/java/gregtech/api/cover/CoverWithUI.java

@@ -94,6 +94,7 @@ default int getHeight() {
                 .coverChildrenHeight();
     }
 
+    // todo remove main panel once mui2 rc2+ is merged
     default @Nullable IWidget createUI(ModularPanel mainPanel, PanelSyncManager manager) {
         return null;
     }

src/main/java/gregtech/common/covers/CoverStorage.java

@@ -32,6 +32,7 @@
 import com.cleanroommc.modularui.widgets.layout.Grid;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -88,24 +89,24 @@ public boolean usesMui2() {
     }
 
     @Override
-    public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager) {
-        guiSyncManager.registerSlotGroup("item_inv", this.storageHandler.getSlots());
+    public int getHeight() {
+        return MAX_HEIGHT;
+    }
+
+    @Override
+    public @Nullable IWidget createUI(ModularPanel mainPanel, PanelSyncManager manager) {
+        manager.registerSlotGroup("item_inv", this.storageHandler.getSlots());
 
         int rowSize = this.storageHandler.getSlots();
-        List<List<IWidget>> widgets = new ArrayList<>();
-        widgets.add(new ArrayList<>());
+        List<IWidget> widgets = new ArrayList<>();
         for (int i = 0; i < rowSize; i++) {
-            widgets.get(0)
-                    .add(new ItemSlot().slot(SyncHandlers.itemSlot(this.storageHandler, i).slotGroup("item_inv")));
+            widgets.add(new ItemSlot().slot(SyncHandlers.itemSlot(this.storageHandler, i).slotGroup("item_inv")));
         }
-        return GTGuis.createPanel(this, MAX_WIDTH, MAX_HEIGHT)
-                .child(IKey.lang("cover.storage.title").asWidget().pos(5, 5))
-                .bindPlayerInventory()
-                .child(new Grid()
-                        .top((MAX_HEIGHT - SLOT_SIZE * 5) / 2).left(7).right(7).height(18)
-                        .minElementMargin(0, 0)
-                        .minColWidth(18).minRowHeight(18)
-                        .matrix(widgets));
+        return new Grid()
+                .top((MAX_HEIGHT - SLOT_SIZE * 5) / 2).left(7).right(7).height(18)
+                .minElementMargin(0, 0)
+                .minColWidth(18).minRowHeight(18)
+                .mapTo(rowSize, widgets, (index, value) -> value);
     }
 
     /**

src/main/java/gregtech/common/covers/ender/CoverAbstractEnderLink.java

@@ -138,19 +138,11 @@ public boolean usesMui2() {
     }
 
     @Override
-    public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager) {
-        var panel = GTGuis.createPanel(this, 176, 192);
-
-        return panel.child(CoverWithUI.createTitleRow(getPickItem()))
-                .child(createWidgets(panel, guiSyncManager))
-                .bindPlayerInventory();
-    }
-
-    protected Column createWidgets(ModularPanel panel, PanelSyncManager syncManager) {
+    public @NotNull IWidget createUI(ModularPanel panel, PanelSyncManager manager) {
         var name = new StringSyncValue(this::getColorStr, this::updateColor);
 
         var entrySelectorSH = createEntrySelector(panel);
-        syncManager.syncValue("entry_selector", entrySelectorSH);
+        manager.syncValue("entry_selector", entrySelectorSH);
 
         return new Column().coverChildrenHeight().top(24)
                 .margin(7, 0).widthRel(1f)