Merge pull request #767 from pylonmc/human/fix-crafting

Fix Crafting in 26.1.2

Author: Seggan

nms/src/main/kotlin/io/github/pylonmc/rebar/i18n/packet/PlayerPacketHandler.kt

@@ -8,6 +8,7 @@ import io.github.pylonmc.rebar.resourcepack.armor.ArmorTextureEngine
 import io.netty.channel.ChannelDuplexHandler
 import io.netty.channel.ChannelHandlerContext
 import io.netty.channel.ChannelPromise
+import net.minecraft.commands.arguments.SlotsArgument.slots
 import net.minecraft.network.HashedPatchMap
 import net.minecraft.network.HashedStack
 import net.minecraft.network.protocol.Packet
@@ -18,8 +19,10 @@ import net.minecraft.server.level.ServerPlayer
 import net.minecraft.util.HashOps
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.ItemStackTemplate
+import net.minecraft.world.item.crafting.Ingredient
 import net.minecraft.world.item.crafting.display.*
 import org.bukkit.craftbukkit.inventory.CraftItemStack
+import java.util.Optional
 import java.util.logging.Level
 import kotlin.jvm.optionals.getOrNull
 
@@ -85,8 +88,12 @@ class PlayerPacketHandler(private val player: ServerPlayer, val handler: PlayerT
                             handleRecipeDisplay(it.contents.display),
                             it.contents.group,
                             it.contents.category,
-                            it.contents.craftingRequirements.apply {
-                                getOrNull()?.forEach { ingredient -> ingredient.itemStacks()?.forEach { item -> translate(item) } }
+                            it.contents.craftingRequirements.map { ingredients ->
+                                ingredients.map { ingredient ->
+                                    ingredient.itemStacks()?.let { stacks ->
+                                        Ingredient.ofStacks(stacks.map { item -> translate(item.copy()) })
+                                    } ?: ingredient
+                                }
                             }
                         ),
                         it.flags
@@ -243,8 +250,8 @@ class PlayerPacketHandler(private val player: ServerPlayer, val handler: PlayerT
         }
     }
 
-    private fun translate(item: ItemStack) {
-        if (item.isEmpty) return
+    private fun translate(item: ItemStack): ItemStack {
+        if (item.isEmpty) return item
         try {
             handler.handleItem(CraftItemStack.asCraftMirror(item))
         } catch (e: Throwable) {
@@ -256,6 +263,7 @@ class PlayerPacketHandler(private val player: ServerPlayer, val handler: PlayerT
                 e
             )
         }
+        return item
     }
 
     companion object {