Port/Rework Crafting Station to MUI2 + Misc Fixes

dependencies.gradle

@@ -42,6 +42,7 @@ dependencies {
     api("codechicken:codechickenlib:3.2.3.358")
     api("com.cleanroommc:modularui:2.5.0-rc3") { transitive = false }
     api("com.cleanroommc:groovyscript:1.2.0-hotfix1") { transitive = false }
+    api("curse.maven:inventory-bogosorter-632327:4951607-deobf-4951608-sources-4951609")
     api("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.700")
     api("appeng:ae2-uel:v0.56.4") { transitive = false }
     api rfg.deobf("curse.maven:ctm-267602:2915363") // CTM 1.0.2.31

src/main/java/gregtech/api/capability/GregtechDataCodes.java

@@ -46,6 +46,9 @@ public static int assignId() {
     // Misc TEs (Transformer, World Accelerator)
     public static final int SYNC_TILE_MODE = assignId();
 
+    // Crafting Station
+    public static final int UPDATE_CLIENT_HANDLER = assignId();
+
     // Clipboard
     public static final int CREATE_FAKE_UI = assignId();
     public static final int MOUSE_POSITION = assignId();

src/main/java/gregtech/api/capability/IQuantumController.java

@@ -30,5 +30,5 @@ public interface IQuantumController extends ICapabilityProvider {
 
     long getTypeEnergy(IQuantumStorage<?> storage);
 
-    void updateHandler();
+    void onHandlerUpdate();
 }

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

@@ -6,6 +6,8 @@
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2IntArrayMap;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
@@ -16,7 +18,7 @@
 public class ItemHandlerList implements IItemHandlerModifiable {
 
     private final Int2ObjectMap<IItemHandler> handlerBySlotIndex = new Int2ObjectOpenHashMap<>();
-    private final Map<IItemHandler, Integer> baseIndexOffset = new IdentityHashMap<>();
+    private final Object2IntMap<IItemHandler> baseIndexOffset = new Object2IntArrayMap<>();
 
     public ItemHandlerList(List<? extends IItemHandler> itemHandlerList) {
         int currentSlotIndex = 0;
@@ -33,43 +35,55 @@ public ItemHandlerList(List<? extends IItemHandler> itemHandlerList) {
         }
     }
 
+    public int getIndexOffset(IItemHandler handler) {
+        return baseIndexOffset.getOrDefault(handler, -1);
+    }
+
     @Override
     public int getSlots() {
         return handlerBySlotIndex.size();
     }
 
     @Override
     public void setStackInSlot(int slot, @NotNull ItemStack stack) {
+        if (invalidSlot(slot)) return;
         IItemHandler itemHandler = handlerBySlotIndex.get(slot);
-        if (!(itemHandler instanceof IItemHandlerModifiable))
-            throw new UnsupportedOperationException("Handler " + itemHandler + " does not support this method");
-        ((IItemHandlerModifiable) itemHandler).setStackInSlot(slot - baseIndexOffset.get(itemHandler), stack);
+        int actualSlot = slot - baseIndexOffset.get(itemHandler);
+        if (itemHandler instanceof IItemHandlerModifiable modifiable) {
+            modifiable.setStackInSlot(actualSlot, stack);
+        } else {
+            itemHandler.extractItem(actualSlot, Integer.MAX_VALUE, false);
+            itemHandler.insertItem(actualSlot, stack, false);
+        }
     }
 
     @NotNull
     @Override
     public ItemStack getStackInSlot(int slot) {
+        if (invalidSlot(slot)) return ItemStack.EMPTY;
         IItemHandler itemHandler = handlerBySlotIndex.get(slot);
-        int realSlot = slot - baseIndexOffset.get(itemHandler);
         return itemHandler.getStackInSlot(slot - baseIndexOffset.get(itemHandler));
     }
 
     @Override
     public int getSlotLimit(int slot) {
+        if (invalidSlot(slot)) return 0;
         IItemHandler itemHandler = handlerBySlotIndex.get(slot);
         return itemHandler.getSlotLimit(slot - baseIndexOffset.get(itemHandler));
     }
 
     @NotNull
     @Override
     public ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate) {
+        if (invalidSlot(slot)) return stack;
         IItemHandler itemHandler = handlerBySlotIndex.get(slot);
         return itemHandler.insertItem(slot - baseIndexOffset.get(itemHandler), stack, simulate);
     }
 
     @NotNull
     @Override
     public ItemStack extractItem(int slot, int amount, boolean simulate) {
+        if (invalidSlot(slot)) return ItemStack.EMPTY;
         IItemHandler itemHandler = handlerBySlotIndex.get(slot);
         return itemHandler.extractItem(slot - baseIndexOffset.get(itemHandler), amount, simulate);
     }
@@ -78,4 +92,8 @@ public ItemStack extractItem(int slot, int amount, boolean simulate) {
     public Collection<IItemHandler> getBackingHandlers() {
         return Collections.unmodifiableCollection(handlerBySlotIndex.values());
     }
+
+    private boolean invalidSlot(int slot) {
+        return slot < 0 && slot >= this.getSlots();
+    }
 }

src/main/java/gregtech/api/items/itemhandlers/GTItemStackHandler.java

@@ -25,9 +25,16 @@ public GTItemStackHandler(MetaTileEntity metaTileEntity, NonNullList<ItemStack>
         this.metaTileEntity = metaTileEntity;
     }
 
+    @Override
+    public void setStackInSlot(int slot, ItemStack stack) {
+        if (ItemStack.areItemStacksEqual(stack, getStackInSlot(slot)))
+            return;
+
+        super.setStackInSlot(slot, stack);
+    }
+
     @Override
     public void onContentsChanged(int slot) {
-        super.onContentsChanged(slot);
         metaTileEntity.markDirty();
     }
 }

src/main/java/gregtech/api/items/toolitem/ItemGTToolbelt.java

@@ -115,7 +115,7 @@ public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager
 
         int heightBonus = (handler.getSlots() / 9) * 18;
 
-        SlotGroup group = new SlotGroup("toolbelt_inventory", 9);
+        SlotGroup group = new SlotGroup("toolbelt_inventory", Math.min(handler.getSlots(), 9));
         guiSyncManager.registerSlotGroup(group);
 
         List<ItemSlot> slots = new ArrayList<>();
@@ -669,7 +669,6 @@ public boolean isItemValid(int slot, @NotNull ItemStack stack) {
 
         @Override
         protected void onContentsChanged(int slot) {
-            if (this.selectedSlot == slot) this.selectedSlot = -1;
             this.updateSlot(slot);
             this.update();
 

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

@@ -214,6 +214,8 @@ public static class IDs {
 
     public static final UITexture MENU_OVERLAY = fullImage("textures/gui/overlay/menu_overlay.png");
 
+    public static final UITexture RECIPE_LOCK = fullImage("textures/gui/widget/lock.png");
+
     // todo bronze/steel/primitive fluid slots?
 
     // SLOT OVERLAYS
@@ -355,6 +357,7 @@ public static class IDs {
     public static final UITexture BUTTON_AUTO_COLLAPSE = fullImage(
             "textures/gui/widget/button_auto_collapse_overlay.png");
     public static final UITexture BUTTON_X = fullImage("textures/gui/widget/button_x_overlay.png", true);
+    public static final UITexture BUTTON_CLEAR_GRID = fullImage("textures/gui/widget/button_clear_grid.png", false);
 
     public static final UITexture BUTTON_CROSS = fullImage("textures/gui/widget/button_cross.png");
     public static final UITexture BUTTON_REDSTONE_ON = fullImage("textures/gui/widget/button_redstone_on.png");

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

@@ -0,0 +1,69 @@
+package gregtech.api.mui;
+
+import gregtech.api.mui.sync.PagedWidgetSyncHandler;
+import gregtech.common.metatileentities.storage.CraftingRecipeLogic;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+import com.cleanroommc.modularui.screen.ModularContainer;
+import com.cleanroommc.modularui.value.sync.PanelSyncManager;
+import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import mezz.jei.api.gui.IGuiItemStackGroup;
+import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.recipe.transfer.IRecipeTransferError;
+import mezz.jei.api.recipe.transfer.IRecipeTransferHandler;
+import mezz.jei.api.recipe.transfer.IRecipeTransferHandlerHelper;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class GregTechGuiTransferHandler implements IRecipeTransferHandler<ModularContainer> {
+
+    private final IRecipeTransferHandlerHelper handlerHelper;
+
+    public GregTechGuiTransferHandler(IRecipeTransferHandlerHelper handlerHelper) {
+        this.handlerHelper = handlerHelper;
+    }
+
+    @Override
+    public @NotNull Class<ModularContainer> getContainerClass() {
+        return ModularContainer.class;
+    }
+
+    @Override
+    public @Nullable IRecipeTransferError transferRecipe(ModularContainer container,
+                                                         @NotNull IRecipeLayout recipeLayout,
+                                                         @NotNull EntityPlayer player, boolean maxTransfer,
+                                                         boolean doTransfer) {
+        if (!container.getSyncManager().isOpen("workbench")) {
+            return null;
+        }
+        PanelSyncManager syncManager = container.getSyncManager().getPanelSyncManager("workbench");
+        var recipeLogic = (CraftingRecipeLogic) syncManager.getSyncHandler("recipe_logic:0");
+        var pageController = (PagedWidgetSyncHandler) syncManager.getSyncHandler("page_controller:0");
+
+        if (!doTransfer) {
+            // todo highlighting in JEI?
+            return null;
+        }
+
+        var matrix = extractMatrix(recipeLayout.getItemStacks());
+        recipeLogic.fillCraftingGrid(matrix);
+        pageController.setPage(0);
+        return null;
+    }
+
+    private Int2ObjectMap<ItemStack> extractMatrix(IGuiItemStackGroup stackGroup) {
+        var ingredients = stackGroup.getGuiIngredients();
+        Int2ObjectMap<ItemStack> matrix = new Int2ObjectArrayMap<>(9);
+        for (var slot : ingredients.keySet()) {
+            if (slot != 0) {
+                var ing = ingredients.get(slot).getDisplayedIngredient();
+                if (ing == null) continue;
+                matrix.put(slot - 1, ingredients.get(slot).getDisplayedIngredient());
+            }
+        }
+        return matrix;
+    }
+}

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

@@ -0,0 +1,23 @@
+package gregtech.api.mui;
+
+import com.cleanroommc.modularui.api.widget.Interactable;
+import com.cleanroommc.modularui.screen.viewport.LocatedWidget;
+
+// todo remove on next mui2 update
+// this can't be a true accessor because of illegal classloading
+public interface InputAccessor {
+
+    boolean held();
+
+    void held(boolean held);
+
+    void timeHeld(long a);
+
+    LocatedWidget lastPressed();
+
+    void lastPressed(LocatedWidget last);
+
+    void lastButton(int b);
+
+    void addInteractable(Interactable i);
+}

src/main/java/gregtech/api/mui/sync/PagedWidgetSyncHandler.java

@@ -0,0 +1,45 @@
+package gregtech.api.mui.sync;
+
+import net.minecraft.network.PacketBuffer;
+
+import com.cleanroommc.modularui.value.sync.SyncHandler;
+import com.cleanroommc.modularui.widgets.PagedWidget;
+
+public class PagedWidgetSyncHandler extends SyncHandler {
+
+    private final PagedWidget.Controller controller;
+    public static final int SET_PAGE = 0;
+
+    public PagedWidgetSyncHandler(PagedWidget.Controller controller) {
+        this.controller = controller;
+    }
+
+    @Override
+    public void readOnClient(int id, PacketBuffer buf) {
+        if (id == SET_PAGE) {
+            setPage(buf.readVarInt(), false);
+        }
+    }
+
+    @Override
+    public void readOnServer(int id, PacketBuffer buf) {
+        if (id == SET_PAGE) {
+            setPage(buf.readVarInt(), false);
+        }
+    }
+
+    public void setPage(int page) {
+        setPage(page, true);
+    }
+
+    public void setPage(int page, boolean sync) {
+        if (controller.isInitialised() && page != getPage()) {
+            controller.setPage(page);
+            if (sync) sync(SET_PAGE, buffer -> buffer.writeVarInt(page));
+        }
+    }
+
+    public int getPage() {
+        return controller.getActivePageIndex();
+    }
+}