Circuit slot in input hatches

Author: Zorbatron

src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEInputBase.java

@@ -9,6 +9,7 @@
 import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.mui.GTGuis;
 import gregtech.api.mui.sync.appeng.AEFluidSyncHandler;
+import gregtech.api.mui.sync.appeng.AESyncHandler;
 import gregtech.api.mui.widget.GhostCircuitSlotWidget;
 import gregtech.api.util.GTUtility;
 import gregtech.common.ConfigHolder;
@@ -146,11 +147,15 @@ public boolean usesMui2() {
         return true;
     }
 
+    protected abstract @NotNull AESyncHandler<AEStackType> createAESyncHandler();
+
     @Override
     public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager) {
         ModularPanel mainPanel = GTGuis.createPanel(this, 176, 18 + 18 * 4 + 94);
         final boolean isStocking = getAEHandler().isStocking();
 
+        panelSyncManager.syncValue(SYNC_HANDLER_NAME, 0, createAESyncHandler());
+
         return mainPanel.child(IKey.lang(getMetaFullName())
                 .asWidget()
                 .pos(5, 5))
@@ -191,14 +196,19 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManage
                                                         @NotNull PanelSyncManager panelSyncManager) {
         return switch (index) {
             case 1 -> GTGuiTextures.ARROW_DOUBLE.asWidget();
-            case 2 -> new GhostCircuitSlotWidget()
-                    .slot(SyncHandlers.itemSlot(circuitInventory, 0))
-                    .background(GTGuiTextures.SLOT, GTGuiTextures.INT_CIRCUIT_OVERLAY);
+            case 2 -> createGhostCircuitWidget();
             default -> new Widget<>()
                     .size(18);
         };
     }
 
+    protected @NotNull GhostCircuitSlotWidget createGhostCircuitWidget() {
+        // Grrr generics .background only returns ItemSlot
+        return (GhostCircuitSlotWidget) new GhostCircuitSlotWidget()
+                .slot(SyncHandlers.itemSlot(circuitInventory, 0))
+                .background(GTGuiTextures.SLOT, GTGuiTextures.INT_CIRCUIT_OVERLAY);
+    }
+
     protected Widget<?> getSettingWidget(@NotNull PosGuiData guiData, @NotNull PanelSyncManager guiSyncManager) {
         IPanelHandler settingPopup = guiSyncManager.panel("settings_panel", this::buildSettingsPopup, true);
 

src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEInputBus.java

@@ -11,6 +11,8 @@
 import gregtech.api.metatileentity.multiblock.MultiblockAbility;
 import gregtech.api.metatileentity.multiblock.MultiblockControllerBase;
 import gregtech.api.mui.GTGuiTextures;
+import gregtech.api.mui.sync.appeng.AEItemSyncHandler;
+import gregtech.api.mui.sync.appeng.AESyncHandler;
 import gregtech.api.mui.widget.appeng.item.AEItemConfigSlot;
 import gregtech.api.mui.widget.appeng.item.AEItemDisplaySlot;
 import gregtech.api.util.GTUtility;
@@ -115,6 +117,11 @@ public void removeFromMultiBlock(MultiblockControllerBase controllerBase) {
         }
     }
 
+    @Override
+    protected @NotNull AESyncHandler<IAEItemStack> createAESyncHandler() {
+        return new AEItemSyncHandler(getAEHandler(), this::markDirty, circuitInventory::setCircuitValue);
+    }
+
     @Override
     protected @NotNull Widget<?> createMainColumnWidget(@Range(from = 0, to = 3) int index, @NotNull PosGuiData guiData,
                                                         @NotNull PanelSyncManager panelSyncManager) {

src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEInputHatch.java

@@ -8,6 +8,8 @@
 import gregtech.api.metatileentity.multiblock.IMultiblockAbilityPart;
 import gregtech.api.metatileentity.multiblock.MultiblockAbility;
 import gregtech.api.mui.GTGuiTextures;
+import gregtech.api.mui.sync.appeng.AEFluidSyncHandler;
+import gregtech.api.mui.sync.appeng.AESyncHandler;
 import gregtech.api.mui.widget.appeng.fluid.AEFluidConfigSlot;
 import gregtech.api.mui.widget.appeng.fluid.AEFluidDisplaySlot;
 import gregtech.client.renderer.texture.Textures;
@@ -39,6 +41,7 @@
 import com.cleanroommc.modularui.widgets.layout.Grid;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Range;
 
 import java.util.Arrays;
 import java.util.List;
@@ -73,6 +76,22 @@ protected void initializeInventory() {
         return (ExportOnlyAEFluidList) aeHandler;
     }
 
+    @Override
+    protected @NotNull AESyncHandler<IAEFluidStack> createAESyncHandler() {
+        return new AEFluidSyncHandler(getAEHandler(), this::markDirty, circuitInventory::setCircuitValue);
+    }
+
+    @Override
+    protected @NotNull Widget<?> createMainColumnWidget(@Range(from = 0, to = 3) int index, @NotNull PosGuiData guiData,
+                                                        @NotNull PanelSyncManager panelSyncManager) {
+        return switch (index) {
+            case 2 -> new Widget<>()
+                    .size(18);
+            case 3 -> createGhostCircuitWidget();
+            default -> super.createMainColumnWidget(index, guiData, panelSyncManager);
+        };
+    }
+
     @Override
     protected @NotNull Widget<?> createConfigGrid(@NotNull PosGuiData guiData,
                                                   @NotNull PanelSyncManager panelSyncManager) {