Fix Battery Buffer accepting more than 1 items per slot (#1590)

1 files changed, 50 insertions, 4 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java
index 50ef4788e2..a279f92783 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java
@@ -4,6 +4,8 @@ import static gregtech.api.enums.GT_Values.V;
 
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
+import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot;
+import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.modularui.GT_UIInfos;
 import gregtech.api.interfaces.ITexture;
@@ -376,16 +378,60 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         switch (mInventory.length) {
             case 4:
-                getBaseMetaTileEntity().add2by2Slots(builder);
+                builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 2)
+                        .startFromSlot(0)
+                        .endAtSlot(3)
+                        .slotCreator(index -> new BaseSlot(inventoryHandler, index) {
+                            @Override
+                            public int getSlotStackLimit() {
+                                return 1;
+                            }
+                        })
+                        .background(getGUITextureSet().getItemSlot())
+                        .build()
+                        .setPos(70, 25));
                 break;
             case 9:
-                getBaseMetaTileEntity().add3by3Slots(builder);
+                builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 3)
+                        .startFromSlot(0)
+                        .endAtSlot(8)
+                        .slotCreator(index -> new BaseSlot(inventoryHandler, index) {
+                            @Override
+                            public int getSlotStackLimit() {
+                                return 1;
+                            }
+                        })
+                        .background(getGUITextureSet().getItemSlot())
+                        .build()
+                        .setPos(61, 16));
                 break;
             case 16:
-                getBaseMetaTileEntity().add4by4Slots(builder);
+                builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 4)
+                        .startFromSlot(0)
+                        .endAtSlot(15)
+                        .slotCreator(index -> new BaseSlot(inventoryHandler, index) {
+                            @Override
+                            public int getSlotStackLimit() {
+                                return 1;
+                            }
+                        })
+                        .background(getGUITextureSet().getItemSlot())
+                        .build()
+                        .setPos(52, 7));
                 break;
             default:
-                getBaseMetaTileEntity().add1by1Slot(builder);
+                builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 1)
+                        .startFromSlot(0)
+                        .endAtSlot(0)
+                        .slotCreator(index -> new BaseSlot(inventoryHandler, index) {
+                            @Override
+                            public int getSlotStackLimit() {
+                                return 1;
+                            }
+                        })
+                        .background(getGUITextureSet().getItemSlot())
+                        .build()
+                        .setPos(79, 34));
                 break;
         }
     }