2021-09-30 20:27:25 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Sun, 26 Sep 2021 12:57:35 -0700
|
2024-04-25 17:13:36 +02:00
|
|
|
Subject: [PATCH] Option to prevent data components copy in smithing recipes
|
2021-09-30 20:27:25 +02:00
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/SmithingRecipe.java b/src/main/java/org/bukkit/inventory/SmithingRecipe.java
|
2024-10-21 00:06:54 +02:00
|
|
|
index 717878019aa78bc3ab1acadd2908567b70614320..ee462ca9fd3e0ddcdb0fffd5dba91d82fa6ad08f 100644
|
2021-09-30 20:27:25 +02:00
|
|
|
--- a/src/main/java/org/bukkit/inventory/SmithingRecipe.java
|
|
|
|
+++ b/src/main/java/org/bukkit/inventory/SmithingRecipe.java
|
2024-10-21 00:06:54 +02:00
|
|
|
@@ -14,6 +14,7 @@ public class SmithingRecipe implements Recipe, Keyed {
|
2021-09-30 20:27:25 +02:00
|
|
|
private final ItemStack result;
|
|
|
|
private final RecipeChoice base;
|
|
|
|
private final RecipeChoice addition;
|
2024-04-25 17:13:36 +02:00
|
|
|
+ private final boolean copyDataComponents; // Paper
|
2021-09-30 20:27:25 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Create a smithing recipe to produce the specified result ItemStack.
|
2024-10-21 00:06:54 +02:00
|
|
|
@@ -29,6 +30,23 @@ public class SmithingRecipe implements Recipe, Keyed {
|
2021-09-30 20:27:25 +02:00
|
|
|
*/
|
2023-08-06 02:21:59 +02:00
|
|
|
@Deprecated
|
2024-10-21 00:06:54 +02:00
|
|
|
public SmithingRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result, @Nullable RecipeChoice base, @Nullable RecipeChoice addition) {
|
2021-09-30 20:27:25 +02:00
|
|
|
+ // Paper start
|
|
|
|
+ this(key, result, base, addition, true);
|
|
|
|
+ }
|
|
|
|
+ /**
|
|
|
|
+ * Create a smithing recipe to produce the specified result ItemStack.
|
|
|
|
+ *
|
|
|
|
+ * @param key The unique recipe key
|
|
|
|
+ * @param result The item you want the recipe to create.
|
|
|
|
+ * @param base The base ingredient
|
|
|
|
+ * @param addition The addition ingredient
|
2024-04-25 17:13:36 +02:00
|
|
|
+ * @param copyDataComponents whether to copy the data components from the input base item to the output
|
2023-06-09 07:45:45 +02:00
|
|
|
+ * @deprecated use {@link SmithingTrimRecipe} or {@link SmithingTransformRecipe}
|
2021-09-30 20:27:25 +02:00
|
|
|
+ */
|
2023-08-06 02:21:59 +02:00
|
|
|
+ @Deprecated
|
2024-10-21 00:06:54 +02:00
|
|
|
+ public SmithingRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result, @Nullable RecipeChoice base, @Nullable RecipeChoice addition, boolean copyDataComponents) {
|
2024-04-25 17:13:36 +02:00
|
|
|
+ this.copyDataComponents = copyDataComponents;
|
2021-09-30 20:27:25 +02:00
|
|
|
+ // Paper end
|
|
|
|
this.key = key;
|
|
|
|
this.result = result;
|
|
|
|
this.base = base;
|
2024-10-21 00:06:54 +02:00
|
|
|
@@ -66,4 +84,26 @@ public class SmithingRecipe implements Recipe, Keyed {
|
2021-09-30 20:27:25 +02:00
|
|
|
public NamespacedKey getKey() {
|
|
|
|
return this.key;
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
2024-04-25 17:13:36 +02:00
|
|
|
+ * Whether to copy the NBT of the input base item to the output.
|
2021-09-30 20:27:25 +02:00
|
|
|
+ *
|
|
|
|
+ * @return true to copy the NBT (default for vanilla smithing recipes)
|
2024-04-25 17:13:36 +02:00
|
|
|
+ * @apiNote use {@link #willCopyDataComponents()}
|
2021-09-30 20:27:25 +02:00
|
|
|
+ */
|
2024-04-25 17:13:36 +02:00
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Obsolete(since = "1.20.5")
|
2021-09-30 20:27:25 +02:00
|
|
|
+ public boolean willCopyNbt() {
|
2024-04-25 17:13:36 +02:00
|
|
|
+ return this.willCopyDataComponents();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Whether to copy the data components of the input base item to the output.
|
|
|
|
+ *
|
|
|
|
+ * @return true to copy the data components (default for vanilla smithing recipes)
|
|
|
|
+ */
|
|
|
|
+ public boolean willCopyDataComponents() {
|
|
|
|
+ return this.copyDataComponents;
|
2021-09-30 20:27:25 +02:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
2023-06-08 04:04:01 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java b/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java
|
2024-10-21 00:06:54 +02:00
|
|
|
index 7a9d77a0cd1c287a3f940f94d4398f84720488aa..e5726da0507ee70cb9dd76c57da6a8442e771307 100644
|
2023-06-08 04:04:01 +02:00
|
|
|
--- a/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java
|
|
|
|
+++ b/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java
|
2024-10-21 00:06:54 +02:00
|
|
|
@@ -24,6 +24,22 @@ public class SmithingTransformRecipe extends SmithingRecipe {
|
2023-06-08 04:04:01 +02:00
|
|
|
super(key, result, base, addition);
|
|
|
|
this.template = template;
|
|
|
|
}
|
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
|
|
|
+ * Create a smithing recipe to produce the specified result ItemStack.
|
|
|
|
+ *
|
|
|
|
+ * @param key The unique recipe key
|
|
|
|
+ * @param result The item you want the recipe to create.
|
|
|
|
+ * @param template The template item.
|
|
|
|
+ * @param base The base ingredient
|
|
|
|
+ * @param addition The addition ingredient
|
2024-04-25 17:13:36 +02:00
|
|
|
+ * @param copyDataComponents whether to copy the data components from the input base item to the output
|
2023-06-08 04:04:01 +02:00
|
|
|
+ */
|
2024-10-21 00:06:54 +02:00
|
|
|
+ public SmithingTransformRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result, @Nullable RecipeChoice template, @Nullable RecipeChoice base, @Nullable RecipeChoice addition, boolean copyDataComponents) {
|
2024-04-25 17:13:36 +02:00
|
|
|
+ super(key, result, base, addition, copyDataComponents);
|
2023-06-08 04:04:01 +02:00
|
|
|
+ this.template = template;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Get the template recipe item.
|
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/SmithingTrimRecipe.java b/src/main/java/org/bukkit/inventory/SmithingTrimRecipe.java
|
2024-10-21 00:06:54 +02:00
|
|
|
index 4271c54cfbb0fabd241794d8aea31374d7efe45a..232aa8aeef9e34146e413e56b3681919c8850687 100644
|
2023-06-08 04:04:01 +02:00
|
|
|
--- a/src/main/java/org/bukkit/inventory/SmithingTrimRecipe.java
|
|
|
|
+++ b/src/main/java/org/bukkit/inventory/SmithingTrimRecipe.java
|
2024-10-21 00:06:54 +02:00
|
|
|
@@ -24,6 +24,21 @@ public class SmithingTrimRecipe extends SmithingRecipe implements ComplexRecipe
|
2023-06-08 04:04:01 +02:00
|
|
|
super(key, new ItemStack(Material.AIR), base, addition);
|
|
|
|
this.template = template;
|
|
|
|
}
|
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
|
|
|
+ * Create a smithing recipe to produce the specified result ItemStack.
|
|
|
|
+ *
|
|
|
|
+ * @param key The unique recipe key
|
|
|
|
+ * @param template The template item.
|
|
|
|
+ * @param base The base ingredient
|
|
|
|
+ * @param addition The addition ingredient
|
2024-04-25 17:13:36 +02:00
|
|
|
+ * @param copyDataComponents whether to copy the data components from the input base item to the output
|
2023-06-08 04:04:01 +02:00
|
|
|
+ */
|
2024-04-25 17:13:36 +02:00
|
|
|
+ public SmithingTrimRecipe(@NotNull NamespacedKey key, @NotNull RecipeChoice template, @NotNull RecipeChoice base, @NotNull RecipeChoice addition, boolean copyDataComponents) {
|
|
|
|
+ super(key, new ItemStack(Material.AIR), base, addition, copyDataComponents);
|
2023-06-08 04:04:01 +02:00
|
|
|
+ this.template = template;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Get the template recipe item.
|