Pass guiData to MultiblockUIFactory#createFlexButton

GregTechCEu · Jan 30, 2025 · 901c7b6 · 901c7b6
1 parent 12ad632
commit 901c7b6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/MultiMapMultiblockController.java b/src/main/java/gregtech/api/metatileentity/multiblock/MultiMapMultiblockController.java
@@ -136,7 +136,7 @@ public TraceabilityPredicate autoAbilities(boolean checkEnergyIn, boolean checkM
     protected MultiblockUIFactory createUIFactory() {
         IntSyncValue recipeMapValue = new IntSyncValue(this::getRecipeMapIndex, this::setRecipeMapIndex);
         return super.createUIFactory()
-                .createFlexButton((panel, syncManager) -> {
+                .createFlexButton((panel, syncManager, guiData) -> {
                     if (getAvailableRecipeMaps() == null || getAvailableRecipeMaps().length <= 1)
                         return null;
 

diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java b/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java
@@ -14,6 +14,7 @@
 import gregtech.api.util.JsonUtils;
 import gregtech.api.util.KeyUtil;
 import gregtech.api.util.TextFormattingUtil;
+import gregtech.api.util.function.TriFunction;
 import gregtech.common.ConfigHolder;
 
 import net.minecraft.network.PacketBuffer;
@@ -46,15 +47,15 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 public class MultiblockUIFactory {
 
     private final MultiblockWithDisplayBase mte;
     protected Consumer<Builder> displayText, warningText, errorText;
-    protected BiFunction<ModularPanel, PanelSyncManager, IWidget> flexButton = (panel, syncManager) -> null;
+    protected TriFunction<ModularPanel, PanelSyncManager, PosGuiData, IWidget> flexButton = (panel, syncManager,
+                                                                                             posGuiData) -> null;
     private int width = 198, height = 202;
     private int screenHeight = 109;
     private Supplier<IWidget> customScreen;
@@ -94,7 +95,7 @@ public MultiblockUIFactory(@NotNull MultiblockWithDisplayBase mte) {
                 .margin(4, 0)
                 .child(SlotGroupWidget.playerInventory(0)
                         .alignX(0f))
-                .child(createButtons(panel, panelSyncManager)));
+                .child(createButtons(panel, panelSyncManager, guiData)));
     }
 
     private Widget<?> createIndicator(PanelSyncManager syncManager) {
@@ -196,7 +197,7 @@ public MultiblockUIFactory configureDisplayText(Consumer<Builder> displayText) {
      * <br>
      * Size will be 18x18.
      */
-    public MultiblockUIFactory createFlexButton(BiFunction<ModularPanel, PanelSyncManager, IWidget> flexButton) {
+    public MultiblockUIFactory createFlexButton(TriFunction<ModularPanel, PanelSyncManager, PosGuiData, IWidget> flexButton) {
         this.flexButton = flexButton;
         return this;
     }
@@ -293,8 +294,9 @@ protected Widget<?> createScreen(PanelSyncManager syncManager) {
     }
 
     @NotNull
-    protected Flow createButtons(@NotNull ModularPanel mainPanel, @NotNull PanelSyncManager panelSyncManager) {
-        IWidget flexButton = this.flexButton.apply(mainPanel, panelSyncManager);
+    protected Flow createButtons(@NotNull ModularPanel mainPanel, @NotNull PanelSyncManager panelSyncManager,
+                                 PosGuiData guiData) {
+        IWidget flexButton = this.flexButton.apply(mainPanel, panelSyncManager, guiData);
         if (flexButton == null) {
             flexButton = GTGuiTextures.BUTTON_NO_FLEX.asWidget()
                     .size(18)

diff --git a/src/main/java/gregtech/api/util/function/TriFunction.java b/src/main/java/gregtech/api/util/function/TriFunction.java
@@ -0,0 +1,7 @@
+package gregtech.api.util.function;
+
+@FunctionalInterface
+public interface TriFunction<T, U, Z, R> {
+
+    R apply(T t, U u, Z z);
+}
diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java
@@ -197,7 +197,7 @@ protected void configureWarningText(MultiblockUIFactory.Builder builder) {
     @Override
     protected MultiblockUIFactory createUIFactory() {
         return super.createUIFactory()
-                .createFlexButton((panel, syncManager) -> {
+                .createFlexButton((panel, syncManager, guiData) -> {
                     PanelSyncHandler throttle = (PanelSyncHandler) syncManager.panel("throttle_panel",
                             this::makeThrottlePanel, true);