mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-22 22:45:31 +01:00
f17519338b
* Expose server build information * squash patches * final tweaks --------- Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: masmc05 <masmc05@gmail.com>
122 lines
5.5 KiB
Diff
122 lines
5.5 KiB
Diff
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
|
|
Subject: [PATCH] Option to prevent data components copy in smithing recipes
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/SmithingRecipe.java b/src/main/java/org/bukkit/inventory/SmithingRecipe.java
|
|
index 0235f4aa50eb69f87068005c669bd486899025d6..1ef9a715a2736e88a16083c6873803a8bd6bcf29 100644
|
|
--- a/src/main/java/org/bukkit/inventory/SmithingRecipe.java
|
|
+++ b/src/main/java/org/bukkit/inventory/SmithingRecipe.java
|
|
@@ -13,6 +13,7 @@ public class SmithingRecipe implements Recipe, Keyed {
|
|
private final ItemStack result;
|
|
private final RecipeChoice base;
|
|
private final RecipeChoice addition;
|
|
+ private final boolean copyDataComponents; // Paper
|
|
|
|
/**
|
|
* Create a smithing recipe to produce the specified result ItemStack.
|
|
@@ -28,6 +29,23 @@ public class SmithingRecipe implements Recipe, Keyed {
|
|
*/
|
|
@Deprecated
|
|
public SmithingRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result, @NotNull RecipeChoice base, @NotNull RecipeChoice addition) {
|
|
+ // 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
|
|
+ * @param copyDataComponents whether to copy the data components from the input base item to the output
|
|
+ * @deprecated use {@link SmithingTrimRecipe} or {@link SmithingTransformRecipe}
|
|
+ */
|
|
+ @Deprecated
|
|
+ public SmithingRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result, @NotNull RecipeChoice base, @NotNull RecipeChoice addition, boolean copyDataComponents) {
|
|
+ this.copyDataComponents = copyDataComponents;
|
|
+ // Paper end
|
|
this.key = key;
|
|
this.result = result;
|
|
this.base = base;
|
|
@@ -65,4 +83,26 @@ public class SmithingRecipe implements Recipe, Keyed {
|
|
public NamespacedKey getKey() {
|
|
return this.key;
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Whether to copy the NBT of the input base item to the output.
|
|
+ *
|
|
+ * @return true to copy the NBT (default for vanilla smithing recipes)
|
|
+ * @apiNote use {@link #willCopyDataComponents()}
|
|
+ */
|
|
+ @org.jetbrains.annotations.ApiStatus.Obsolete(since = "1.20.5")
|
|
+ public boolean willCopyNbt() {
|
|
+ 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;
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java b/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java
|
|
index 08fd3eca8383cdc2d06c3ce973e8c402d279077e..68e7132d77151b7b8312638d8bb79ea59e2fa5a6 100644
|
|
--- a/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java
|
|
+++ b/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java
|
|
@@ -23,6 +23,22 @@ public class SmithingTransformRecipe extends SmithingRecipe {
|
|
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
|
|
+ * @param copyDataComponents whether to copy the data components from the input base item to the output
|
|
+ */
|
|
+ public SmithingTransformRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result, @NotNull RecipeChoice template, @NotNull RecipeChoice base, @NotNull RecipeChoice addition, boolean copyDataComponents) {
|
|
+ super(key, result, base, addition, copyDataComponents);
|
|
+ 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
|
|
index 32cbdc342615e76ff7a896e67cb0736b0bdf1978..ce36bb5b030f17e11f74e987235be143c1925aa7 100644
|
|
--- a/src/main/java/org/bukkit/inventory/SmithingTrimRecipe.java
|
|
+++ b/src/main/java/org/bukkit/inventory/SmithingTrimRecipe.java
|
|
@@ -23,6 +23,21 @@ public class SmithingTrimRecipe extends SmithingRecipe implements ComplexRecipe
|
|
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
|
|
+ * @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) {
|
|
+ super(key, new ItemStack(Material.AIR), base, addition, copyDataComponents);
|
|
+ this.template = template;
|
|
+ }
|
|
+ // Paper end
|
|
|
|
/**
|
|
* Get the template recipe item.
|