ME hatch refactor and MUI port

src/main/java/gregtech/api/items/metaitem/MetaItem.java

@@ -1011,7 +1011,7 @@ public ItemStack getStackForm(int amount) {
             return new ItemStack(MetaItem.this, amount, metaItemOffset + metaValue);
         }
 
-        public boolean isItemEqual(ItemStack itemStack) {
+        public boolean isItemEqual(@NotNull ItemStack itemStack) {
             return itemStack.getItem() == MetaItem.this && itemStack.getItemDamage() == (metaItemOffset + metaValue);
         }
 

src/main/java/gregtech/api/metatileentity/IAEStatusProvider.java

@@ -0,0 +1,8 @@
+package gregtech.api.metatileentity;
+
+public interface IAEStatusProvider {
+
+    boolean isOnline();
+
+    boolean allowsExtraConnections();
+}

src/main/java/gregtech/api/mui/GTGuiTextures.java

@@ -28,6 +28,7 @@ public static class IDs {
         public static final String PRIMITIVE_BACKGROUND = "gregtech_primitive_bg";
 
         public static final String STANDARD_SLOT = "gregtech_standard_slot";
+        public static final String DARK_SLOT = "gregtech_dark_slot";
         public static final String BRONZE_SLOT = "gregtech_bronze_slot";
         public static final String STEEL_SLOT = "gregtech_steel_slot";
         public static final String PRIMITIVE_SLOT = "gregtech_primitive_slot";
@@ -126,6 +127,14 @@ public static class IDs {
             .canApplyTheme()
             .build();
 
+    public static final UITexture SLOT_DARK = new UITexture.Builder()
+            .location(GTValues.MODID, "textures/gui/base/slot_dark.png")
+            .imageSize(18, 18)
+            .adaptable(1)
+            .name(IDs.DARK_SLOT)
+            .canApplyTheme()
+            .build();
+
     public static final UITexture SLOT_BRONZE = new UITexture.Builder()
             .location(GTValues.MODID, "textures/gui/base/slot_bronze.png")
             .imageSize(18, 18)
@@ -512,6 +521,16 @@ public static class IDs {
 
     // MISC
 
+    // ME hatch/bus
+    public static final UITexture NUMBER_BACKGROUND = fullImage("textures/gui/widget/number_background.png");
+    public static final UITexture CONFIG_ARROW = fullImage("textures/gui/widget/config_arrow.png");
+    public static final UITexture CONFIG_ARROW_DARK = fullImage("textures/gui/widget/config_arrow_dark.png");
+    public static final UITexture SELECT_BOX = fullImage("textures/gui/widget/select_box.png");
+    public static final UITexture BUTTON_AUTO_PULL = fullImage("textures/gui/widget/button_me_auto_pull.png");
+    public static final UITexture ARROW_DOUBLE = fullImage("textures/gui/widget/arrow_double.png");
+    public static final UITexture[] AUTO_PULL = slice("textures/gui/widget/button_me_auto_pull.png",
+            16, 32, 16, 16, true);
+
     public static void init() {/**/}
 
     private static UITexture fullImage(String path) {

src/main/java/gregtech/api/mui/GTGuis.java

@@ -16,10 +16,11 @@
 import com.cleanroommc.modularui.widgets.ButtonWidget;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class GTGuis {
 
-    public static final int DEFAULT_WIDTH = 176, DEFAULT_HIEGHT = 166;
+    public static final int DEFAULT_WIDTH = 176, DEFAULT_HEIGHT = 166;
 
     @ApiStatus.Internal
     public static void registerFactories() {
@@ -53,7 +54,7 @@ public static ModularPanel createPanel(ItemStack stack, int width, int height) {
     }
 
     public static ModularPanel createPanel(String name) {
-        return ModularPanel.defaultPanel(name, DEFAULT_WIDTH, DEFAULT_HIEGHT);
+        return ModularPanel.defaultPanel(name, DEFAULT_WIDTH, DEFAULT_HEIGHT);
     }
 
     public static ModularPanel defaultPanel(MetaTileEntity mte) {
@@ -65,7 +66,7 @@ public static ModularPanel defaultPanel(Cover cover) {
     }
 
     public static ModularPanel defaultPanel(ItemStack stack) {
-        return createPanel(stack, DEFAULT_WIDTH, DEFAULT_HIEGHT);
+        return createPanel(stack, DEFAULT_WIDTH, DEFAULT_HEIGHT);
     }
 
     public static ModularPanel defaultPanel(MetaItem<?>.MetaValueItem valueItem) {
@@ -83,8 +84,17 @@ public static PopupPanel createPopupPanel(String name, int width, int height, bo
     }
 
     public static PopupPanel defaultPopupPanel(String name) {
-        return new PopupPanel(name)
-                .size(DEFAULT_WIDTH, DEFAULT_HIEGHT);
+        return new PopupPanel(name, true)
+                .size(DEFAULT_WIDTH, DEFAULT_HEIGHT);
+    }
+
+    public static PopupPanel blankPopupPanel(String name, int width, int height) {
+        return new PopupPanel(name, false)
+                .size(width, height);
+    }
+
+    public static PopupPanel blankPopupPanel(String name) {
+        return blankPopupPanel(name, DEFAULT_WIDTH, DEFAULT_HEIGHT);
     }
 
     public static PopupPanel defaultPopupPanel(String name, boolean disableBelow,
@@ -100,19 +110,23 @@ public static class PopupPanel extends ModularPanel {
         private boolean disableBelow;
         private boolean closeOnOutsideClick;
         private boolean deleteCachedPanel;
+        @Nullable
+        private Runnable closeListener;
 
-        private PopupPanel(@NotNull String name) {
+        private PopupPanel(@NotNull String name, boolean addCloseButton) {
             super(name);
             align(Alignment.Center);
             background(GTGuiTextures.BACKGROUND_POPUP);
-            child(ButtonWidget.panelCloseButton().top(5).right(5)
-                    .onMousePressed(mouseButton -> {
-                        if (mouseButton == 0 || mouseButton == 1) {
-                            this.closeIfOpen(true);
-                            return true;
-                        }
-                        return false;
-                    }));
+            if (addCloseButton) {
+                child(ButtonWidget.panelCloseButton().top(5).right(5)
+                        .onMousePressed(mouseButton -> {
+                            if (mouseButton == 0 || mouseButton == 1) {
+                                this.closeIfOpen(true);
+                                return true;
+                            }
+                            return false;
+                        }));
+            }
         }
 
         @Override
@@ -121,6 +135,10 @@ public void onClose() {
             if (deleteCachedPanel && isSynced() && getSyncHandler() instanceof IPanelHandler handler) {
                 handler.deleteCachedPanel();
             }
+
+            if (closeListener != null) {
+                closeListener.run();
+            }
         }
 
         public PopupPanel disablePanelsBelow(boolean disableBelow) {
@@ -159,5 +177,10 @@ public boolean disablePanelsBelow() {
         public boolean closeOnOutOfBoundsClick() {
             return closeOnOutsideClick;
         }
+
+        public PopupPanel closeListener(@Nullable Runnable closeListener) {
+            this.closeListener = closeListener;
+            return this;
+        }
     }
 }

src/main/java/gregtech/api/mui/GregTechGuiScreen.java

@@ -1,15 +1,32 @@
 package gregtech.api.mui;
 
 import gregtech.api.GTValues;
+import gregtech.api.util.MUIUtil;
+import gregtech.mixins.mui2.ModularSyncManagerAccessor;
 
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import com.cleanroommc.modularui.integration.jei.JeiRecipeTransferHandler;
 import com.cleanroommc.modularui.screen.ModularPanel;
 import com.cleanroommc.modularui.screen.ModularScreen;
+import com.cleanroommc.modularui.utils.ObjectList;
+import com.cleanroommc.modularui.value.sync.PanelSyncHandler;
+import com.cleanroommc.modularui.value.sync.PanelSyncManager;
+import com.cleanroommc.modularui.value.sync.SyncHandler;
+import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.recipe.transfer.IRecipeTransferError;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static gregtech.api.mui.IJEIRecipeReceiver.DEFAULT_JEI_ERROR;
+
+@SuppressWarnings("UnstableApiUsage")
 @SideOnly(Side.CLIENT)
-public class GregTechGuiScreen extends ModularScreen {
+public class GregTechGuiScreen extends ModularScreen implements JeiRecipeTransferHandler {
 
     public GregTechGuiScreen(ModularPanel mainPanel) {
         this(mainPanel, GTGuiTheme.STANDARD);
@@ -27,4 +44,32 @@ public GregTechGuiScreen(String owner, ModularPanel mainPanel, String themeId) {
         super(owner, mainPanel);
         useTheme(themeId);
     }
+
+    @Override
+    public IRecipeTransferError transferRecipe(IRecipeLayout recipeLayout, boolean maxTransfer, boolean simulate) {
+        Map<String, List<SyncHandler>> panelToSyncMap = new HashMap<>();
+        ObjectList<PanelSyncManager> panels = ObjectList.create();
+        panels.add(((ModularSyncManagerAccessor) getSyncManager()).getMainPanelSyncManager());
+        while (!panels.isEmpty()) {
+            PanelSyncManager psm = panels.removeFirst();
+            panelToSyncMap.put(psm.getPanelName(), new ArrayList<>(MUIUtil.getSyncHandlers(psm)));
+
+            if (MUIUtil.hasSubPanels(psm)) {
+                for (PanelSyncHandler psh : MUIUtil.getSubPanels(psm)) {
+                    if (MUIUtil.hasSyncManager(psh)) {
+                        panels.add(MUIUtil.getPanelSyncManager(psh));
+                    }
+                }
+            }
+        }
+
+        for (SyncHandler syncHandler : panelToSyncMap.get(getPanelManager().getTopMostPanel().getName())) {
+            if (syncHandler instanceof IJEIRecipeReceiver recipeReceiver) {
+                return recipeReceiver.receiveRecipe(recipeLayout, maxTransfer, simulate);
+            }
+        }
+
+        // Hide the + button by default if no recipe receiver was found.
+        return DEFAULT_JEI_ERROR;
+    }
 }

src/main/java/gregtech/api/mui/IJEIRecipeReceiver.java

@@ -0,0 +1,46 @@
+package gregtech.api.mui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.recipe.transfer.IRecipeTransferError;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * For receiving a JEI recipe transfer (the + button in a recipe). <br>
+ * Implement this on a {@link com.cleanroommc.modularui.value.sync.SyncHandler} and ensure it's registered to the
+ * {@link com.cleanroommc.modularui.value.sync.PanelSyncManager}. <br>
+ * If there are multiple sync handlers implementing this, the handler that will be used to receive the recipe is
+ * indeterminate.
+ */
+public interface IJEIRecipeReceiver {
+
+    /**
+     * Return this the recipe is invalid for the receiver to hide the + button.
+     */
+    IRecipeTransferError DEFAULT_JEI_ERROR = new IRecipeTransferError() {
+
+        @Override
+        public @NotNull Type getType() {
+            return Type.INTERNAL;
+        }
+
+        @Override
+        public void showError(@NotNull Minecraft minecraft, int mouseX, int mouseY,
+                              @NotNull IRecipeLayout recipeLayout, int recipeX, int recipeY) {
+            // nothing to show, just hide the + button
+        }
+    };
+
+    /**
+     * @param recipeLayout the recipe layout that contains the recipe category, and the item and fluid stacks
+     * @param maxTransfer  if the receiver should try to move as many ingredients as possible to the crafting slots, ie
+     *                     a crafting table
+     * @param simulate     if this recipe should only be simulated being transferred
+     * @return a {@link IRecipeTransferError} if something isn't right, or null if it's okay to transfer this recipe
+     */
+    @SideOnly(Side.CLIENT)
+    IRecipeTransferError receiveRecipe(@NotNull IRecipeLayout recipeLayout, boolean maxTransfer, boolean simulate);
+}