add method to configure panel

remove width/height methods

Author: ghzdude

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

@@ -69,24 +69,20 @@ default GTGuiTheme getUITheme() {
 
     @Override
     default ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager) {
-        var panel = GTGuis.createPanel(getPickItem(), getWidth(), getHeight());
+        var panel = confgurePanel(GTGuis.createPanel(getPickItem(), 100, 100), false);
         var w = createUI(panel, guiSyncManager);
         return panel.childIf(w != null, w)
                 .child(createTitleRow(getPickItem()).pos(5, 5))
                 .bindPlayerInventory();
     }
 
-    default int getWidth() {
-        return 176;
-    }
-
-    default int getHeight() {
-        return 192;
+    default ModularPanel confgurePanel(ModularPanel panel, boolean isSmallGui) {
+        return panel;
     }
 
     default @NotNull ModularPanel getSmallGUI(@NotNull SidedPosGuiData guiData,
                                               @NotNull PanelSyncManager guiSyncManager) {
-        var panel = GTGuis.createPopupPanel(getPickItem().getTranslationKey(), getWidth(), 100);
+        var panel = confgurePanel(GTGuis.createPopupPanel(getPickItem().getTranslationKey(), 100, 100), true);
         var w = createUI(panel, guiSyncManager);
         return panel.childIf(w != null, w)
                 .child(createTitleRow(getPickItem()).pos(5, 5))

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

@@ -62,6 +62,7 @@
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenCustomHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;
 import java.util.Map;
@@ -502,11 +503,11 @@ public boolean usesMui2() {
     }
 
     @Override
-    public int getHeight() {
-        return 192 + 18;
+    public ModularPanel confgurePanel(ModularPanel panel, boolean isSmallGui) {
+        return panel.height(210);
     }
 
-    public @NotNull ParentWidget<Column> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
+    public @Nullable ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
         getItemFilterContainer().setMaxTransferSize(getMaxStackSize());
 
         var column = new Column().top(24).margin(7, 0)

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

@@ -30,6 +30,7 @@
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import org.apache.logging.log4j.message.FormattedMessage;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -241,12 +242,12 @@ private boolean shouldDisplayAmountSlider() {
     }
 
     @Override
-    public int getHeight() {
-        return super.getHeight() + 36;
+    public ModularPanel confgurePanel(ModularPanel panel, boolean isSmallGui) {
+        return panel.height(228);
     }
 
     @Override
-    public @NotNull ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
+    public @Nullable ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
         var transferMode = new EnumSyncValue<>(TransferMode.class, this::getTransferMode, this::setTransferMode);
         transferMode.updateCacheFromSource(true);
         syncManager.syncValue("transfer_mode", transferMode);

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

@@ -33,6 +33,7 @@
 import com.cleanroommc.modularui.widgets.ToggleButton;
 import com.cleanroommc.modularui.widgets.layout.Row;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class CoverFluidVoiding extends CoverPump {
 
@@ -70,12 +71,12 @@ public void renderCover(@NotNull CCRenderState renderState, @NotNull Matrix4 tra
     }
 
     @Override
-    public int getHeight() {
-        return super.getHeight() - 22;
+    public ModularPanel confgurePanel(ModularPanel panel, boolean isSmallGui) {
+        return panel.height(170);
     }
 
     @Override
-    public @NotNull ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
+    public @Nullable ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
         var isWorking = new BooleanSyncValue(this::isWorkingEnabled, this::setWorkingEnabled);
 
         return super.createUI(mainPanel, syncManager)

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

@@ -28,6 +28,7 @@
 import com.cleanroommc.modularui.widget.ParentWidget;
 import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Predicate;
 
@@ -99,12 +100,13 @@ public VoidingMode getVoidingMode() {
     }
 
     @Override
-    public int getHeight() {
-        return super.getHeight() + 42;
+    public ModularPanel confgurePanel(ModularPanel panel, boolean isSmallGui) {
+        return super.confgurePanel(panel, isSmallGui)
+                .height(212);
     }
 
     @Override
-    public @NotNull ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
+    public @Nullable ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
         var voidingMode = new EnumSyncValue<>(VoidingMode.class, this::getVoidingMode, this::setVoidingMode);
         syncManager.syncValue("voiding_mode", voidingMode);
 

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

@@ -28,9 +28,9 @@
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import com.cleanroommc.modularui.widget.ParentWidget;
 import com.cleanroommc.modularui.widgets.ToggleButton;
-import com.cleanroommc.modularui.widgets.layout.Column;
 import com.cleanroommc.modularui.widgets.layout.Row;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class CoverItemVoiding extends CoverConveyor {
 
@@ -72,12 +72,13 @@ void voidAny(IItemHandler myItemHandler) {
     }
 
     @Override
-    public int getHeight() {
-        return 192 - 22;
+    public ModularPanel confgurePanel(ModularPanel panel, boolean isSmallGui) {
+        return super.confgurePanel(panel, isSmallGui)
+                .height(170);
     }
 
     @Override
-    public @NotNull ParentWidget<Column> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
+    public @Nullable ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
         var isWorking = new BooleanSyncValue(this::isWorkingEnabled, this::setWorkingEnabled);
 
         return super.createUI(mainPanel, guiSyncManager)

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

@@ -23,10 +23,10 @@
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import com.cleanroommc.modularui.value.sync.StringSyncValue;
 import com.cleanroommc.modularui.widget.ParentWidget;
-import com.cleanroommc.modularui.widgets.layout.Column;
 import com.cleanroommc.modularui.widgets.layout.Row;
 import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
 
@@ -88,12 +88,13 @@ protected void voidOverflow(IItemHandler myItemHandler) {
     }
 
     @Override
-    public int getHeight() {
-        return 192 + 18;
+    public ModularPanel confgurePanel(ModularPanel panel, boolean isSmallGui) {
+        return super.confgurePanel(panel, isSmallGui)
+                .height(210);
     }
 
     @Override
-    public @NotNull ParentWidget<Column> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
+    public @Nullable ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
         var voidingMode = new EnumSyncValue<>(VoidingMode.class, this::getVoidingMode, this::setVoidingMode);
         guiSyncManager.syncValue("voiding_mode", voidingMode);
 

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

@@ -187,7 +187,7 @@ public boolean usesMui2() {
         return true;
     }
 
-    public @NotNull ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
+    public @Nullable ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
         getFluidFilterContainer().setMaxTransferSize(getMaxTransferRate());
         var manualIOmode = new EnumSyncValue<>(ManualImportExportMode.class,
                 this::getManualImportExportMode, this::setManualImportExportMode);

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

@@ -25,10 +25,10 @@
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import com.cleanroommc.modularui.value.sync.StringSyncValue;
 import com.cleanroommc.modularui.widget.ParentWidget;
-import com.cleanroommc.modularui.widgets.layout.Column;
 import com.cleanroommc.modularui.widgets.layout.Row;
 import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -191,12 +191,13 @@ private boolean shouldDisplayAmountSlider() {
     }
 
     @Override
-    public int getHeight() {
-        return 192 + 36 + 18 + 2;
+    public ModularPanel confgurePanel(ModularPanel panel, boolean isSmallGui) {
+        return super.confgurePanel(panel, isSmallGui)
+                .height(248);
     }
 
     @Override
-    public @NotNull ParentWidget<Column> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
+    public @Nullable ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
         EnumSyncValue<TransferMode> transferMode = new EnumSyncValue<>(TransferMode.class, this::getTransferMode,
                 this::setTransferMode);
         guiSyncManager.syncValue("transfer_mode", transferMode);

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

@@ -4,7 +4,6 @@
 import gregtech.api.cover.CoverDefinition;
 import gregtech.api.cover.CoverWithUI;
 import gregtech.api.cover.CoverableView;
-import gregtech.api.mui.GTGuis;
 import gregtech.client.renderer.texture.Textures;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -22,12 +21,11 @@
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Cuboid6;
 import codechicken.lib.vec.Matrix4;
-import com.cleanroommc.modularui.api.drawable.IKey;
 import com.cleanroommc.modularui.api.widget.IWidget;
-import com.cleanroommc.modularui.factory.SidedPosGuiData;
 import com.cleanroommc.modularui.screen.ModularPanel;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import com.cleanroommc.modularui.value.sync.SyncHandlers;
+import com.cleanroommc.modularui.widget.ParentWidget;
 import com.cleanroommc.modularui.widgets.ItemSlot;
 import com.cleanroommc.modularui.widgets.layout.Grid;
 import org.jetbrains.annotations.ApiStatus;
@@ -89,12 +87,12 @@ public boolean usesMui2() {
     }
 
     @Override
-    public int getHeight() {
-        return MAX_HEIGHT;
+    public ModularPanel confgurePanel(ModularPanel panel, boolean isSmallGui) {
+        return panel.height(MAX_HEIGHT);
     }
 
     @Override
-    public @Nullable IWidget createUI(ModularPanel mainPanel, PanelSyncManager manager) {
+    public @Nullable ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager manager) {
         manager.registerSlotGroup("item_inv", this.storageHandler.getSlots());
 
         int rowSize = this.storageHandler.getSlots();