From a6ff477b8a2d19b4092b61fca7e0e6da803f73c6 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sat, 5 Oct 2024 16:08:52 +0200
Subject: [PATCH] Implement clientbound ghost recipe, fix null recipe groups

---
 .../BlockItemPacketRewriter1_21_2.java        |  9 +++---
 .../rewriter/RecipeRewriter1_21_2.java        | 31 ++++++++++++-------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/BlockItemPacketRewriter1_21_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/BlockItemPacketRewriter1_21_2.java
index df0d9301d..fe3c4fbcb 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/BlockItemPacketRewriter1_21_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/BlockItemPacketRewriter1_21_2.java
@@ -125,14 +125,15 @@ public final class BlockItemPacketRewriter1_21_2 extends StructuredItemRewriter<
         protocol.registerClientbound(ClientboundPackets1_21.PLACE_GHOST_RECIPE, wrapper -> {
             this.updateContainerId(wrapper);
 
-            // TODO
-            if (true) {
+            final String recipeKey = wrapper.read(Types.STRING);
+            final RecipeRewriter1_21_2.Recipe recipe = wrapper.user().get(RecipeRewriter1_21_2.class).recipe(recipeKey);
+            if (recipe == null) {
                 wrapper.cancel();
                 return;
             }
 
-            final String recipe = wrapper.read(Types.STRING);
-            wrapper.write(Types.VAR_INT, recipeDisplay(recipe));
+            wrapper.write(Types.VAR_INT, recipe.recipeDisplayId());
+            recipe.writeRecipeDisplay(wrapper);
         });
         protocol.registerServerbound(ServerboundPackets1_21_2.PLACE_RECIPE, wrapper -> {
             this.updateContainerIdServerbound(wrapper);
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/RecipeRewriter1_21_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/RecipeRewriter1_21_2.java
index 24cf5376b..f9561f0a2 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/RecipeRewriter1_21_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/RecipeRewriter1_21_2.java
@@ -71,7 +71,7 @@ final class RecipeRewriter1_21_2 extends RecipeRewriter1_20_3<ClientboundPacket1
 
     @Override
     public void handleStonecutting(final PacketWrapper wrapper) {
-        final int group = recipeGroupId(wrapper.read(Types.STRING));
+        final int group = readRecipeGroup(wrapper);
         final Item[] ingredient = readIngredient(wrapper);
         final Item result = rewrite(wrapper.user(), wrapper.read(itemType()));
 
@@ -85,12 +85,6 @@ final class RecipeRewriter1_21_2 extends RecipeRewriter1_20_3<ClientboundPacket1
         recipesByKey.put(currentRecipeIdentifier, recipe);
     }
 
-    private int recipeGroupId(final String recipeGroup) {
-        final int size = recipeGroups.size();
-        final int value = recipeGroups.putIfAbsent(Key.stripMinecraftNamespace(recipeGroup), size);
-        return value != -1 ? value : size;
-    }
-
     @Override
     public void handleSmithingTransform(final PacketWrapper wrapper) {
         final IntList template = new IntArrayList();
@@ -124,7 +118,7 @@ final class RecipeRewriter1_21_2 extends RecipeRewriter1_20_3<ClientboundPacket1
 
     @Override
     public void handleCraftingShaped(final PacketWrapper wrapper) {
-        final int group = recipeGroupId(wrapper.read(Types.STRING));
+        final int group = readRecipeGroup(wrapper);
         final int category = wrapper.read(Types.VAR_INT);
         final int width = wrapper.read(Types.VAR_INT);
         final int height = wrapper.read(Types.VAR_INT);
@@ -143,7 +137,7 @@ final class RecipeRewriter1_21_2 extends RecipeRewriter1_20_3<ClientboundPacket1
 
     @Override
     public void handleCraftingShapeless(final PacketWrapper wrapper) {
-        final int group = recipeGroupId(wrapper.read(Types.STRING));
+        final int group = readRecipeGroup(wrapper);
         final int category = wrapper.read(Types.VAR_INT);
         final int ingredientsSize = wrapper.read(Types.VAR_INT);
         final Item[][] ingredients = new Item[ingredientsSize][];
@@ -158,7 +152,7 @@ final class RecipeRewriter1_21_2 extends RecipeRewriter1_20_3<ClientboundPacket1
 
     @Override
     public void handleSmelting(final PacketWrapper wrapper) {
-        final int group = recipeGroupId(wrapper.read(Types.STRING));
+        final int group = readRecipeGroup(wrapper);
         final int category = wrapper.read(Types.VAR_INT);
         final Item[] ingredient = readIngredient(wrapper);
         final Item result = rewrite(wrapper.user(), wrapper.read(itemType()));
@@ -170,6 +164,21 @@ final class RecipeRewriter1_21_2 extends RecipeRewriter1_20_3<ClientboundPacket1
         wrapper.read(Types.VAR_INT); // Cooking time
     }
 
+    private int readRecipeGroup(final PacketWrapper wrapper) {
+        final String recipeGroup = Key.stripMinecraftNamespace(wrapper.read(Types.STRING));
+        if (recipeGroup.isEmpty()) {
+            return -1;
+        }
+
+        if (recipeGroups.containsKey(recipeGroup)) {
+            return recipeGroups.getInt(recipeGroup);
+        }
+
+        final int size = recipeGroups.size();
+        recipeGroups.put(recipeGroup, size);
+        return size;
+    }
+
     private Item[] readIngredient(final PacketWrapper wrapper) {
         final Item[] items = wrapper.read(itemArrayType());
         for (int i = 0; i < items.length; i++) {
@@ -313,7 +322,6 @@ final class RecipeRewriter1_21_2 extends RecipeRewriter1_20_3<ClientboundPacket1
     }
 
     private static void writeIngredientsDisplay(final PacketWrapper wrapper, final Item[][] ingredients) {
-        // TODO Check what the 24w40a server sends for shapeless/shaped ingredient slot displays
         wrapper.write(Types.VAR_INT, ingredients.length);
         for (final Item[] ingredient : ingredients) {
             writeIngredientDisplay(wrapper, ingredient);
@@ -326,7 +334,6 @@ final class RecipeRewriter1_21_2 extends RecipeRewriter1_20_3<ClientboundPacket1
             return;
         }
 
-        // TODO Check what's sent by the server
         wrapper.write(Types.VAR_INT, Recipe.SLOT_DISPLAY_COMPOSITE);
         wrapper.write(Types.VAR_INT, ingredient.length);
         for (final Item item : ingredient) {