Update SmithingTripRecipe

Author: electronicboy

paper-api/src/main/java/org/bukkit/inventory/SmithingTrimRecipe.java

@@ -2,6 +2,7 @@
 
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
+import org.bukkit.inventory.meta.trim.TrimPattern;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -11,6 +12,7 @@
 public class SmithingTrimRecipe extends SmithingRecipe implements ComplexRecipe {
 
     private final RecipeChoice template;
+    private final TrimPattern pattern;
 
     /**
      * Create a smithing recipe to produce the specified result ItemStack.
@@ -20,9 +22,10 @@ public class SmithingTrimRecipe extends SmithingRecipe implements ComplexRecipe
      * @param base The base ingredient ({@link RecipeChoice#empty()} can be used)
      * @param addition The addition ingredient ({@link RecipeChoice#empty()} can be used)
      */
-    public SmithingTrimRecipe(@NotNull NamespacedKey key, @NotNull RecipeChoice template, @NotNull RecipeChoice base, @NotNull RecipeChoice addition) { // Paper - fix issues with recipe api - prevent null choices
+    public SmithingTrimRecipe(@NotNull NamespacedKey key, @NotNull RecipeChoice template, @NotNull RecipeChoice base, @NotNull RecipeChoice addition, @NotNull TrimPattern pattern) { // Paper - fix issues with recipe api - prevent null choices
         super(key, new ItemStack(Material.AIR), base, addition);
         this.template = template == null ? RecipeChoice.empty() : template.validate(true).clone(); // Paper
+        this.pattern = pattern;
     }
     // Paper start
     /**
@@ -34,9 +37,10 @@ public SmithingTrimRecipe(@NotNull NamespacedKey key, @NotNull RecipeChoice temp
      * @param addition The addition ingredient ({@link RecipeChoice#empty()} can be used)
      * @param copyDataComponents whether to copy the data components from the input base item to the output
      */
-    public SmithingTrimRecipe(@NotNull NamespacedKey key, @NotNull RecipeChoice template, @NotNull RecipeChoice base, @NotNull RecipeChoice addition, boolean copyDataComponents) { // Paper - fix issues with recipe api - prevent null choices
+    public SmithingTrimRecipe(@NotNull NamespacedKey key, @NotNull RecipeChoice template, @NotNull RecipeChoice base, @NotNull RecipeChoice addition, @NotNull TrimPattern pattern, boolean copyDataComponents) { // Paper - fix issues with recipe api - prevent null choices
         super(key, new ItemStack(Material.AIR), base, addition, copyDataComponents);
         this.template = template == null ? RecipeChoice.empty() : template.validate(true).clone(); // Paper
+        this.pattern = pattern;
     }
     // Paper end
 
@@ -49,4 +53,14 @@ public SmithingTrimRecipe(@NotNull NamespacedKey key, @NotNull RecipeChoice temp
     public RecipeChoice getTemplate() {
         return (template != null) ? template.clone() : null;
     }
+
+    /**
+     * Get the trim pattern.
+     *
+     * @return trim pattern
+     */
+    @NotNull
+    public TrimPattern getTrimPattern() {
+        return pattern;
+    }
 }

paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftSmithingTrimRecipe.java

@@ -3,34 +3,37 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import org.bukkit.NamespacedKey;
+import org.bukkit.craftbukkit.inventory.trim.CraftTrimPattern;
 import org.bukkit.inventory.RecipeChoice;
 import org.bukkit.inventory.SmithingTrimRecipe;
+import org.bukkit.inventory.meta.trim.TrimPattern;
 
 public class CraftSmithingTrimRecipe extends SmithingTrimRecipe implements CraftRecipe {
 
-    public CraftSmithingTrimRecipe(NamespacedKey key, RecipeChoice template, RecipeChoice base, RecipeChoice addition) {
-        super(key, template, base, addition);
+    public CraftSmithingTrimRecipe(NamespacedKey key, RecipeChoice template, RecipeChoice base, RecipeChoice addition, TrimPattern pattern) {
+        super(key, template, base, addition, pattern);
     }
     // Paper start - Option to prevent data components copy
-    public CraftSmithingTrimRecipe(NamespacedKey key, RecipeChoice template, RecipeChoice base, RecipeChoice addition, boolean copyDataComponents) {
-        super(key, template, base, addition, copyDataComponents);
+    public CraftSmithingTrimRecipe(NamespacedKey key, RecipeChoice template, RecipeChoice base, RecipeChoice addition, TrimPattern pattern, boolean copyDataComponents) {
+        super(key, template, base, addition, pattern, copyDataComponents);
     }
     // Paper end - Option to prevent data components copy
 
     public static CraftSmithingTrimRecipe fromBukkitRecipe(SmithingTrimRecipe recipe) {
         if (recipe instanceof CraftSmithingTrimRecipe) {
             return (CraftSmithingTrimRecipe) recipe;
         }
-        CraftSmithingTrimRecipe ret = new CraftSmithingTrimRecipe(recipe.getKey(), recipe.getTemplate(), recipe.getBase(), recipe.getAddition(), recipe.willCopyDataComponents()); // Paper - Option to prevent data components copy
+        CraftSmithingTrimRecipe ret = new CraftSmithingTrimRecipe(recipe.getKey(), recipe.getTemplate(), recipe.getBase(), recipe.getAddition(), recipe.getTrimPattern(), recipe.willCopyDataComponents()); // Paper - Option to prevent data components copy
         return ret;
     }
 
     @Override
     public void addToCraftingManager() {
-        final SmithingTrimRecipe recipe = new SmithingTrimRecipe(
-            this.toNMSOptional(this.getTemplate(), false),
-            this.toNMSOptional(this.getBase(), false),
-            this.toNMSOptional(this.getAddition(), false),
+        final net.minecraft.world.item.crafting.SmithingTrimRecipe recipe = new net.minecraft.world.item.crafting.SmithingTrimRecipe(
+            this.toNMS(this.getTemplate(), false),
+            this.toNMS(this.getBase(), false),
+            this.toNMS(this.getAddition(), false),
+            CraftTrimPattern.bukkitToMinecraftHolder(this.getTrimPattern()),
             this.willCopyDataComponents()
         );
         MinecraftServer.getServer().getRecipeManager().addRecipe(new RecipeHolder<>(CraftRecipe.toMinecraft(this.getKey()), recipe));