Port the ME buses and hatches to MUI2

src/main/java/gregtech/api/capability/impl/GhostCircuitItemStackHandler.java

@@ -12,6 +12,7 @@
 import net.minecraftforge.items.IItemHandlerModifiable;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,8 +30,15 @@ public class GhostCircuitItemStackHandler extends GTItemStackHandler
     private int circuitValue = NO_CONFIG;
     private ItemStack circuitStack = ItemStack.EMPTY;
 
-    public GhostCircuitItemStackHandler(MetaTileEntity metaTileEntity) {
+    public GhostCircuitItemStackHandler(@NotNull MetaTileEntity metaTileEntity) {
+        this(metaTileEntity, metaTileEntity);
+    }
+
+    public GhostCircuitItemStackHandler(@NotNull MetaTileEntity metaTileEntity, @Nullable MetaTileEntity mteToNotify) {
         super(metaTileEntity);
+        if (mteToNotify != null) {
+            notifiableEntities.add(mteToNotify);
+        }
     }
 
     /**

src/main/java/gregtech/api/capability/impl/ItemHandlerList.java

@@ -20,9 +20,11 @@ public class ItemHandlerList implements IItemHandlerModifiable {
     private final Int2ObjectMap<IItemHandler> handlerBySlotIndex = new Int2ObjectOpenHashMap<>();
     private final Object2IntMap<IItemHandler> baseIndexOffset = new Object2IntArrayMap<>();
 
-    public ItemHandlerList(List<? extends IItemHandler> itemHandlerList) {
+    public ItemHandlerList(@NotNull List<? extends @NotNull IItemHandler> itemHandlerList) {
         int currentSlotIndex = 0;
         for (IItemHandler itemHandler : itemHandlerList) {
+            Objects.requireNonNull(itemHandler, "Handler passed to ItemHandlerList was null.");
+
             if (baseIndexOffset.containsKey(itemHandler)) {
                 throw new IllegalArgumentException("Attempted to add item handler " + itemHandler + " twice");
             }

src/main/java/gregtech/api/gui/widgets/TankWidget.java

@@ -511,7 +511,7 @@ public static void addIngotMolFluidTooltip(FluidStack fluidStack, List<String> t
             if (extra != 0) {
                 fluidAmount += String.format(" + %d L", extra);
             }
-            tooltip.add(TextFormatting.GRAY + LocalizationUtils.format("gregtech.gui.amount_raw") + fluidAmount);
+            tooltip.add(TextFormatting.GRAY + LocalizationUtils.format("gregtech.gui.amount_raw", fluidAmount));
         }
     }
 }

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

@@ -1007,7 +1007,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/metatileentity/SimpleMachineMetaTileEntity.java

@@ -127,7 +127,6 @@ protected void initializeInventory() {
         this.outputFluidInventory = new FluidHandlerProxy(new FluidTankList(false), exportFluids);
         if (this.hasGhostCircuitInventory()) {
             this.circuitInventory = new GhostCircuitItemStackHandler(this);
-            this.circuitInventory.addNotifiableMetaTileEntity(this);
         }
 
         this.actualImportItems = null;

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

@@ -3,10 +3,14 @@
 import gregtech.api.recipes.chance.output.impl.ChancedFluidOutput;
 import gregtech.api.recipes.chance.output.impl.ChancedItemOutput;
 import gregtech.api.util.NetworkUtil;
+import gregtech.common.metatileentities.multi.multiblockpart.appeng.stack.WrappedFluidStack;
+import gregtech.common.metatileentities.multi.multiblockpart.appeng.stack.WrappedItemStack;
 
 import net.minecraft.network.PacketBuffer;
 import net.minecraftforge.fluids.Fluid;
 
+import appeng.api.storage.data.IAEFluidStack;
+import appeng.api.storage.data.IAEItemStack;
 import com.cleanroommc.modularui.utils.serialization.*;
 import org.jetbrains.annotations.NotNull;
 
@@ -23,6 +27,12 @@ public class GTByteBufAdapters {
 
     public static final IByteBufAdapter<Fluid> FLUID = makeAdapter(NetworkUtil::readFluid, NetworkUtil::writeFluid);
 
+    public static final IByteBufAdapter<IAEItemStack> WRAPPED_ITEM_STACK = makeAdapter(WrappedItemStack::fromPacket,
+            (buffer, value) -> value.writeToPacket(buffer));
+
+    public static final IByteBufAdapter<IAEFluidStack> WRAPPED_FLUID_STACK = makeAdapter(
+            WrappedFluidStack::fromPacket, (buffer, value) -> value.writeToPacket(buffer));
+
     public static <T> IByteBufAdapter<T> makeAdapter(@NotNull IByteBufDeserializer<T> deserializer,
                                                      @NotNull IByteBufSerializer<T> serializer) {
         return makeAdapter(deserializer, serializer, IEquals.defaultTester());

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

@@ -32,6 +32,7 @@ public static class IDs {
         public static final String PRIMITIVE_BACKGROUND = id("primitive_bg");
 
         public static final String STANDARD_SLOT = id("standard_slot");
+        public static final String DARK_SLOT = id("dark_slot");
         public static final String BRONZE_SLOT = id("bronze_slot");
         public static final String STEEL_SLOT = id("steel_slot");
         public static final String PRIMITIVE_SLOT = id("primitive_slot");
@@ -159,6 +160,14 @@ private static String id(String path) {
             .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)
@@ -709,6 +718,17 @@ private static String id(String path) {
 
     // 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 ARROW_OPPOSITE = fullImage("textures/gui/widget/opposite_arrows.png");
+    public static final UITexture[] AUTO_PULL = slice("textures/gui/widget/button_me_auto_pull.png",
+            16, 32, 16, 16, ColorType.DEFAULT);
+
     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,17 +110,21 @@ 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)
+            childIf(addCloseButton, () -> ButtonWidget.panelCloseButton()
+                    .top(5).right(5)
                     .onMousePressed(mouseButton -> {
                         if (mouseButton == 0 || mouseButton == 1) {
-                            this.closeIfOpen();
+                            closeIfOpen();
                             return true;
                         }
+
                         return false;
                     }));
         }
@@ -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,24 @@
 package gregtech.api.mui;
 
 import gregtech.api.GTValues;
+import gregtech.integration.jei.JustEnoughItemsModule;
 
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import com.cleanroommc.modularui.integration.recipeviewer.RecipeViewerRecipeTransferHandler;
 import com.cleanroommc.modularui.screen.ModularPanel;
 import com.cleanroommc.modularui.screen.ModularScreen;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.recipe.transfer.IRecipeTransferError;
 
+@SuppressWarnings("UnstableApiUsage")
 @SideOnly(Side.CLIENT)
-public class GregTechGuiScreen extends ModularScreen {
+public class GregTechGuiScreen extends ModularScreen implements RecipeViewerRecipeTransferHandler {
+
+    private static final Object2ObjectMap<String, IJEIRecipeReceiver> knownRecipeReceivers = new Object2ObjectOpenHashMap<>();
 
     public GregTechGuiScreen(ModularPanel mainPanel) {
         this(mainPanel, GTGuiTheme.STANDARD);
@@ -27,4 +36,21 @@ public GregTechGuiScreen(String owner, ModularPanel mainPanel, String themeId) {
         super(owner, mainPanel);
         useTheme(themeId);
     }
+
+    @Override
+    public IRecipeTransferError transferRecipe(IRecipeLayout recipeLayout, boolean maxTransfer, boolean simulate) {
+        for (IJEIRecipeReceiver handler : knownRecipeReceivers.values()) {
+            IRecipeTransferError error = handler.receiveRecipe(recipeLayout, maxTransfer, simulate);
+            if (error == null) return null;
+        }
+        return JustEnoughItemsModule.transferHelper.createInternalError();
+    }
+
+    public static void registerRecipeReceiver(String key, IJEIRecipeReceiver receiver) {
+        knownRecipeReceivers.put(key, receiver);
+    }
+
+    public static void removeRecipeReceiver(String key) {
+        knownRecipeReceivers.remove(key);
+    }
 }

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

@@ -0,0 +1,33 @@
+package gregtech.api.mui;
+
+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 {
+
+    /**
+     * Returning an {@link IRecipeTransferError} with a type of {@link IRecipeTransferError.Type#INTERNAL} will hide the
+     * + button. <br>
+     * JEI has a static instance available at {@link mezz.jei.transfer.RecipeTransferErrorInternal#INSTANCE} for this
+     * purpose.
+     * 
+     * @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);
+}