make panel handler based on stack translation key

spotless

Author: ghzdude

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

@@ -15,6 +15,7 @@
 import com.cleanroommc.modularui.api.IGuiHolder;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.api.drawable.IKey;
+import com.cleanroommc.modularui.drawable.DynamicDrawable;
 import com.cleanroommc.modularui.drawable.ItemDrawable;
 import com.cleanroommc.modularui.factory.SidedPosGuiData;
 import com.cleanroommc.modularui.screen.ModularPanel;
@@ -28,10 +29,13 @@
 import com.cleanroommc.modularui.value.sync.IntSyncValue;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import com.cleanroommc.modularui.widget.ParentWidget;
+import com.cleanroommc.modularui.widget.Widget;
 import com.cleanroommc.modularui.widgets.ToggleButton;
 import com.cleanroommc.modularui.widgets.layout.Flow;
 import org.jetbrains.annotations.ApiStatus;
 
+import java.util.function.Supplier;
+
 public interface CoverWithUI extends Cover, IUIHolder, IGuiHolder<SidedPosGuiData> {
 
     default void openUI(EntityPlayerMP player) {
@@ -85,11 +89,22 @@ default void markAsDirty() {
      * Create the Title bar widget for a Cover.
      */
     static Flow createTitleRow(ItemStack stack) {
+        return createTitleRow(() -> stack);
+    }
+
+    /**
+     * Create the Title bar widget for a Cover.
+     */
+    static Flow createTitleRow(Supplier<ItemStack> stack) {
+        ItemDrawable itemDrawable = new ItemDrawable();
         return Flow.row()
                 .pos(4, 4)
                 .height(16).coverChildrenWidth()
-                .child(new ItemDrawable(stack).asWidget().size(16).marginRight(4))
-                .child(IKey.str(stack.getDisplayName())
+                .child(new Widget<>()
+                        .overlay(new DynamicDrawable(() -> itemDrawable.setItem(stack.get())))
+                        .size(16)
+                        .marginRight(4))
+                .child(IKey.dynamic(() -> stack.get().getDisplayName())
                         .color(UI_TITLE_COLOR)
                         .asWidget().heightRel(1.0f));
     }

src/main/java/gregtech/common/covers/filter/BaseFilterContainer.java

@@ -206,22 +206,23 @@ public void handleLegacyNBT(NBTTagCompound nbt) {
             getFilter().getFilterReader().handleLegacyNBT(nbt);
     }
 
+    public IPanelHandler getFilterHandler(PanelSyncManager syncManager) {
+        if (hasFilter()) {
+            return getFilter().createPanelHandler(syncManager);
+        }
+        return BaseFilter.ERROR_FILTER.createPanelHandler(syncManager);
+    }
+
     /** Uses Cleanroom MUI */
     public IWidget initUI(GuiData data, PanelSyncManager manager) {
-        IPanelHandler panel = manager.panel("filter_panel", (syncManager, syncHandler) -> {
-            if (hasFilter()) {
-                return getFilter().createPopupPanel(syncManager);
-            }
-            return BaseFilter.ERROR_FILTER.createPopupPanel(syncManager);
-        }, true);
-
         return Flow.row().coverChildrenHeight()
                 .marginBottom(2).widthRel(1f)
                 .child(new ItemSlot()
                         .slot(SyncHandlers.itemSlot(this, 0)
                                 .filter(this::isItemValid)
                                 .singletonSlotGroup(101)
                                 .changeListener((newItem, onlyAmountChanged, client, init) -> {
+                                    IPanelHandler panel = getFilterHandler(manager);
                                     if (!isItemValid(newItem) || (newItem.isEmpty() && panel.isPanelOpen())) {
                                         panel.closePanel();
                                     }
@@ -234,6 +235,7 @@ public IWidget initUI(GuiData data, PanelSyncManager manager) {
                                 GTGuiTextures.FILTER_SETTINGS_OVERLAY.asIcon().size(16))
                         .setEnabledIf(w -> hasFilter())
                         .onMousePressed(i -> {
+                            IPanelHandler panel = getFilterHandler(manager);
                             if (!panel.isPanelOpen()) {
                                 setMaxTransferSize(getMaxTransferSize());
                                 panel.openPanel();

src/main/java/gregtech/common/covers/filter/IFilter.java

@@ -6,6 +6,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
+import com.cleanroommc.modularui.api.IPanelHandler;
 import com.cleanroommc.modularui.screen.ModularPanel;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import com.cleanroommc.modularui.widget.Widget;
@@ -27,6 +28,11 @@ public interface IFilter {
     @NotNull
     Widget<?> createWidgets(PanelSyncManager syncManager);
 
+    default IPanelHandler createPanelHandler(PanelSyncManager syncManager) {
+        return syncManager.panel(getContainerStack().getTranslationKey(), (syncManager1, syncHandler) ->
+                createPopupPanel(syncManager).child(createWidgets(syncManager)), true);
+    }
+
     ItemStack getContainerStack();
 
     void setDirtyNotifiable(@Nullable IDirtyNotifiable dirtyNotifiable);

src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityItemCollector.java

@@ -252,7 +252,7 @@ protected ModularUI createUI(EntityPlayer entityPlayer) {
             }
         }
 
-//        this.itemFilter.initUI(45 + rowSize * 18 + 5, builder::widget);
+        // this.itemFilter.initUI(45 + rowSize * 18 + 5, builder::widget);
         builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 7, 45 + rowSize * 18 + 105);
         return builder.build(getHolder(), entityPlayer);
     }