Port/Rework Crafting Station to MUI2

dependencies.gradle

@@ -42,6 +42,7 @@ dependencies {
     api("codechicken:codechickenlib:3.2.3.358")
     api("com.cleanroommc:modularui:2.5.0-rc2") { 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/impl/ItemHandlerList.java

@@ -40,36 +40,43 @@ public int getSlots() {
 
     @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);
+        if (itemHandler instanceof IItemHandlerModifiable modifiable) {
+            modifiable.setStackInSlot(slot - baseIndexOffset.get(itemHandler), stack);
+        } else {
+            itemHandler.extractItem(slot, Integer.MAX_VALUE, false);
+            itemHandler.insertItem(slot, 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 +85,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/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,66 @@
+package gregtech.api.mui;
+
+import gregtech.common.metatileentities.storage.CraftingRecipeLogic;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.PacketBuffer;
+
+import com.cleanroommc.modularui.network.NetworkUtils;
+import com.cleanroommc.modularui.screen.ModularContainer;
+import com.cleanroommc.modularui.value.sync.PanelSyncManager;
+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;
+    private InventoryCrafting craftingMatrix;
+
+    public GregTechGuiTransferHandler(IRecipeTransferHandlerHelper handlerHelper) {
+        this.handlerHelper = handlerHelper;
+    }
+
+    @Override
+    public @NotNull Class<ModularContainer> getContainerClass() {
+        return ModularContainer.class;
+    }
+
+    @Override
+    public @Nullable IRecipeTransferError transferRecipe(ModularContainer container, IRecipeLayout recipeLayout,
+                                                         EntityPlayer player, boolean maxTransfer, boolean doTransfer) {
+        String key = PanelSyncManager.makeSyncKey("recipe_logic", 0);
+        CraftingRecipeLogic recipeLogic = (CraftingRecipeLogic) container.getSyncManager()
+                .getSyncHandler("workbench", key);
+
+        if (!doTransfer) {
+            // todo highlighting in JEI?
+            return null;
+        }
+
+        var ingredients = recipeLayout.getItemStacks().getGuiIngredients();
+        this.craftingMatrix = recipeLogic.getCraftingMatrix();
+
+        for (int i = 0; i < craftingMatrix.getSizeInventory(); i++) {
+            var ing = ingredients.get(i + 1).getDisplayedIngredient();
+            this.craftingMatrix.setInventorySlotContents(i, ing == null ? ItemStack.EMPTY : ing);
+        }
+
+        recipeLogic.syncToServer(CraftingRecipeLogic.UPDATE_MATRIX, this::writeCraftingMatrix);
+        recipeLogic.updateCurrentRecipe();
+        return null;
+    }
+
+    private void writeCraftingMatrix(PacketBuffer buffer) {
+        buffer.writeVarInt(this.craftingMatrix.getSizeInventory());
+        for (int i = 0; i < this.craftingMatrix.getSizeInventory(); i++) {
+            var stack = this.craftingMatrix.getStackInSlot(i);
+            NetworkUtils.writeItemStack(buffer, stack);
+        }
+    }
+}

src/main/java/gregtech/api/util/ItemStackHashStrategy.java

@@ -58,7 +58,7 @@ static ItemStackHashStrategy comparingItemDamageCount() {
      */
     class ItemStackHashStrategyBuilder {
 
-        private boolean item, count, damage, tag;
+        private boolean item, count, damage, tag, meta;
 
         /**
          * Defines whether the Item type should be considered for equality.
@@ -93,6 +93,17 @@ public ItemStackHashStrategyBuilder compareDamage(boolean choice) {
             return this;
         }
 
+        /**
+         * Defines whether metadata values should be considered for equality.
+         *
+         * @param choice {@code true} to consider this property, {@code false} to ignore it.
+         * @return {@code this}
+         */
+        public ItemStackHashStrategyBuilder compareMetadata(boolean choice) {
+            meta = choice;
+            return this;
+        }
+
         /**
          * Defines whether NBT Tags should be considered for equality.
          *
@@ -116,7 +127,8 @@ public int hashCode(@Nullable ItemStack o) {
                             item ? o.getItem() : null,
                             count ? o.getCount() : null,
                             damage ? o.getItemDamage() : null,
-                            tag ? o.getTagCompound() : null);
+                            tag ? o.getTagCompound() : null,
+                            meta ? o.getMetadata() : null);
                 }
 
                 @Override
@@ -127,6 +139,7 @@ public boolean equals(@Nullable ItemStack a, @Nullable ItemStack b) {
                     return (!item || a.getItem() == b.getItem()) &&
                             (!count || a.getCount() == b.getCount()) &&
                             (!damage || a.getItemDamage() == b.getItemDamage()) &&
+                            (!meta || a.getMetadata() == b.getMetadata()) &&
                             (!tag || Objects.equals(a.getTagCompound(), b.getTagCompound()));
                 }
             };

src/main/java/gregtech/client/utils/RenderUtil.java

@@ -26,6 +26,7 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import codechicken.lib.vec.Matrix4;
+import com.cleanroommc.modularui.api.MCHelper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.opengl.GL11;
@@ -384,6 +385,25 @@ public static void renderItemOverLay(float x, float y, float z, float scale, Ite
         net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
     }
 
+    // adapted from com.cleanroommc.modularui.drawable.GuiDraw.java
+    public static void renderItem(ItemStack item, int x, int y, float width, float height) {
+        if (item.isEmpty()) return;
+        GlStateManager.pushMatrix();
+        RenderHelper.enableGUIStandardItemLighting();
+        GlStateManager.enableDepth();
+        GlStateManager.translate(x, y, 0);
+        GlStateManager.scale(width / 16f, height / 16f, 1);
+        RenderItem renderItem = MCHelper.getMc().getRenderItem();
+        renderItem.zLevel = 200;
+        renderItem.renderItemAndEffectIntoGUI(MCHelper.getPlayer(), item, 0, 0);
+        renderItem.renderItemOverlayIntoGUI(MCHelper.getFontRenderer(), item, x, y, null);
+        renderItem.zLevel = 0;
+        GlStateManager.disableDepth();
+        RenderHelper.enableStandardItemLighting();
+        GlStateManager.disableLighting();
+        GlStateManager.popMatrix();
+    }
+
     public static void renderFluidOverLay(float x, float y, float width, float height, float z, FluidStack fluidStack,
                                           float alpha) {
         if (fluidStack != null) {