From 19bc14d3e91ff61bf9ab6b0b9bd74cf24aa47287 Mon Sep 17 00:00:00 2001
From: Yusarnn <yusarnn@gmail.com>
Date: Wed, 12 Feb 2025 13:46:01 +0100
Subject: Fix shift click issue (#1821)

---
 .../java/me/shedaniel/rei/impl/common/transfer/InputSlotCrafter.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/InputSlotCrafter.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/InputSlotCrafter.java
index 19557779c..27451c75d 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/InputSlotCrafter.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/InputSlotCrafter.java
@@ -139,6 +139,10 @@ public abstract class InputSlotCrafter<T extends AbstractContainerMenu, C extend
             int finalCraftsAmount = amountToFill;
             
             for (int itemId : recipeItemIds) {
+                // Fix issue with empty item id (grid slot) [shift-click issue]
+                if (itemId == 0) {
+                    continue;
+                }
                 finalCraftsAmount = Math.min(finalCraftsAmount, RecipeFinder.getStackFromId(itemId).getMaxStackSize());
             }
             
-- 
cgit 


From afd98b073b4e86425a424e4d93b2ac1a0fa1d80b Mon Sep 17 00:00:00 2001
From: ellellie <me@ell.gay>
Date: Mon, 17 Feb 2025 00:50:31 +1300
Subject: fix: register S2C packet type for TagNodes (#1827)

Closes #1744, #1772, #1800
---
 .../me/shedaniel/rei/plugin/common/displays/tag/TagNodes.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/tag/TagNodes.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/tag/TagNodes.java
index b0aa10fef..3e99277cd 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/tag/TagNodes.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/tag/TagNodes.java
@@ -25,8 +25,10 @@ package me.shedaniel.rei.plugin.common.displays.tag;
 
 import com.mojang.serialization.DataResult;
 import dev.architectury.event.events.client.ClientLifecycleEvent;
+import dev.architectury.impl.NetworkAggregator;
 import dev.architectury.networking.NetworkManager;
 import dev.architectury.networking.transformers.SplitPacketTransformer;
+import dev.architectury.platform.Platform;
 import dev.architectury.utils.Env;
 import dev.architectury.utils.EnvExecutor;
 import io.netty.buffer.Unpooled;
@@ -122,6 +124,12 @@ public class TagNodes {
     
     public static void init() {
         EnvExecutor.runInEnv(Env.CLIENT, () -> Client::init);
+
+        // Fix for TagNodes not being loaded on the server
+        // A bit hacky as it uses Architectury's internal API, but this class needs rewriting to use codecs due to the deprecation of the old serialization system anyway.
+        if(Platform.getEnvironment() != Env.CLIENT) {
+            NetworkAggregator.registerS2CType(REQUEST_TAGS_PACKET_S2C, Collections.singletonList(new SplitPacketTransformer()));
+        }
         
         NetworkManager.registerReceiver(NetworkManager.c2s(), REQUEST_TAGS_PACKET_C2S, Collections.singletonList(new SplitPacketTransformer()), (buf, context) -> {
             UUID uuid = buf.readUUID();
-- 
cgit