Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 11:00:06 +01:00
2fa8efce9b
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 82af5dc6 SPIGOT-7396: Add PlayerSignOpenEvent 3f0281ca SPIGOT-7063, PR-763: Add DragonBattle#initiateRespawn with custom EnderCrystals f83c8df4 PR-873: Add PlayerRecipeBookClickEvent 14560d39 SPIGOT-7435: Add TeleportCause#EXIT_BED 2cc6db92 SPIGOT-7422, PR-887: Add API to set sherds on decorated pots 36022f02 PR-883: Add ItemFactory#getSpawnEgg 12eb5c46 PR-881: Update Scoreboard Javadocs, remove explicit exception throwing f6d8d44a PR-882: Add modern time API methods to ban API 21a7b710 Upgrade some Maven plugins to reduce warnings 11fd1225 PR-886: Deprecate the SmithingRecipe constructor as it now does nothing dbd1761d SPIGOT-7406: Improve documentation for getDragonBattle CraftBukkit Changes: d548daac2 SPIGOT-7446: BlockState#update not updating a spawner's type to null 70e0bc050 SPIGOT-7447: Fix --forceUpgrade 6752f1d63 SPIGOT-7396: Add PlayerSignOpenEvent 847b4cad5 SPIGOT-7063, PR-1071: Add DragonBattle#initiateRespawn with custom EnderCrystals c335a555f PR-1212: Add PlayerRecipeBookClickEvent 4be756ecb SPIGOT-7445: Fix opening smithing inventory db70bd6ed SPIGOT-7441: Fix issue placing certain items in creative/op f7fa6d993 SPIGOT-7435: Add TeleportCause#EXIT_BED b435e8e8d SPIGOT-7349: Player#setDisplayName not working when message/format unmodified a2fafdd1d PR-1232: Re-add fix for player rotation 7cf863de1 PR-1233: Remove some old MC bug fixes now fixed in vanilla 08ec344ad Fix ChunkGenerator#generateCaves never being called 5daeb502a SPIGOT-7422, PR-1228: Add API to set sherds on decorated pots 52faa6b32 PR-1224: Add ItemFactory#getSpawnEgg 01cae71b7 SPIGOT-7429: Fix LEFT_CLICK_AIR not working for passable entities and spectators a94277a18 PR-1223: Remove non-existent scoreboard display name/prefix/suffix limits 36b107660 PR-1225: Add modern time API methods to ban API 59ead25bc Upgrade some Maven plugins to reduce warnings 202fc5c4e Increase outdated build delay ce545de57 SPIGOT-7398: TextDisplay#setInterpolationDuration incorrectly updates the line width Spigot Changes: b41c46db Rebuild patches 3374045a SPIGOT-7431: Fix EntityMountEvent returning opposite entities 0ca4eb66 Rebuild patches
112 Zeilen
5.0 KiB
Diff
112 Zeilen
5.0 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 NBT 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..92f6285d87cabde3c1f1690ee4747217c4d098b2 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 copyNbt; // 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 copyNbt whether to copy the nbt 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 copyNbt) {
|
|
+ this.copyNbt = copyNbt;
|
|
+ // Paper end
|
|
this.key = key;
|
|
this.result = result;
|
|
this.base = base;
|
|
@@ -65,4 +83,15 @@ public class SmithingRecipe implements Recipe, Keyed {
|
|
public NamespacedKey getKey() {
|
|
return this.key;
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Whether or not to copy the NBT of the input base item to the output.
|
|
+ *
|
|
+ * @return true to copy the NBT (default for vanilla smithing recipes)
|
|
+ */
|
|
+ public boolean willCopyNbt() {
|
|
+ return copyNbt;
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java b/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java
|
|
index 08fd3eca8383cdc2d06c3ce973e8c402d279077e..ad2fc850819c9784d477b59adcc5f5ab32ed4fac 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 copyNbt whether to copy the nbt 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 copyNbt) {
|
|
+ super(key, result, base, addition, copyNbt);
|
|
+ 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..9e84114528507848a4c1947d677ba02d06f9dc14 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 copyNbt whether to copy the nbt from the input base item to the output
|
|
+ */
|
|
+ public SmithingTrimRecipe(@NotNull NamespacedKey key, @NotNull RecipeChoice template, @NotNull RecipeChoice base, @NotNull RecipeChoice addition, boolean copyNbt) {
|
|
+ super(key, new ItemStack(Material.AIR), base, addition, copyNbt);
|
|
+ this.template = template;
|
|
+ }
|
|
+ // Paper end
|
|
|
|
/**
|
|
* Get the template recipe item.
|