1cfd363d32
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: fc460d1b PR-735: Add Villager#zombify c8c8331e PR-690: Add method to read ItemStack input 62845f2f SPIGOT-6829: Add per-player world border API CraftBukkit Changes: a459f4d4 PR-1033: Add Villager#zombify d65d1430 PR-975: Add method to read ItemStack input b5559f8c SPIGOT-6990: Fix setRepairCost(0) in Anvil 6c308e1b SPIGOT-6829: Add per-player world border API Spigot Changes: 42b61526 SPIGOT-7000: Generation and /locate issues when using custom structure seeds
59 Zeilen
2.7 KiB
Diff
59 Zeilen
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 4 May 2016 23:55:48 -0400
|
|
Subject: [PATCH] Add getI18NDisplayName API
|
|
|
|
Gets the Display name as seen in the Client.
|
|
Currently the server only supports the English language. To override this,
|
|
You must replace the language file embedded in the server jar.
|
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
|
index af4a7ce37eb10bab06eadb6583c7894b3ec55ae6..159e5a908b35b84b7fabc36581e093d9aa4c4b67 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
|
@@ -178,5 +178,19 @@ public interface ItemFactory {
|
|
*/
|
|
@NotNull
|
|
net.kyori.adventure.text.Component displayName(@NotNull ItemStack itemStack);
|
|
+
|
|
+ /**
|
|
+ * Gets the Display name as seen in the Client.
|
|
+ * Currently the server only supports the English language. To override this,
|
|
+ * You must replace the language file embedded in the server jar.
|
|
+ *
|
|
+ * @param item Item to return Display name of
|
|
+ * @return Display name of Item
|
|
+ * @deprecated {@link ItemStack} implements {@link net.kyori.adventure.translation.Translatable}; use that and
|
|
+ * {@link net.kyori.adventure.text.Component#translatable(net.kyori.adventure.translation.Translatable)} instead.
|
|
+ */
|
|
+ @Nullable
|
|
+ @Deprecated
|
|
+ String getI18NDisplayName(@Nullable ItemStack item);
|
|
// Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
index a15abec467bac70116a6fc21a300d4930b909f15..dfd16531926e639231e93cb295de3d802d17413d 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
@@ -611,5 +611,20 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
|
|
public @NotNull net.kyori.adventure.text.Component displayName() {
|
|
return Bukkit.getServer().getItemFactory().displayName(this);
|
|
}
|
|
+
|
|
+ /**
|
|
+ * Gets the Display name as seen in the Client.
|
|
+ * Currently the server only supports the English language. To override this,
|
|
+ * You must replace the language file embedded in the server jar.
|
|
+ *
|
|
+ * @return Display name of Item
|
|
+ * @deprecated {@link ItemStack} implements {@link net.kyori.adventure.translation.Translatable}; use that and
|
|
+ * {@link net.kyori.adventure.text.Component#translatable(net.kyori.adventure.translation.Translatable)} instead.
|
|
+ */
|
|
+ @Nullable
|
|
+ @Deprecated
|
|
+ public String getI18NDisplayName() {
|
|
+ return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
|
|
+ }
|
|
// Paper end
|
|
}
|