2018-09-01 06:56:57 +08:00
|
|
|
From 70189f3c39051e0bbd3a6fd2071b6aba7f089dfd Mon Sep 17 00:00:00 2001
|
2017-07-27 11:44:09 +08:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Wed, 4 May 2016 23:59:38 -0400
|
|
|
|
Subject: [PATCH] Implement getI18NDisplayName
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
2018-07-31 05:07:36 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
|
2018-09-01 06:56:57 +08:00
|
|
|
index 0648c76a07..bea146630d 100644
|
2018-07-31 05:07:36 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/LocaleLanguage.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
|
2018-09-01 06:56:57 +08:00
|
|
|
@@ -39,10 +39,12 @@ public class LocaleLanguage {
|
2018-07-31 05:07:36 +08:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
+ public static LocaleLanguage getInstance() { return a(); } // Paper - OBFHELPER
|
|
|
|
public static LocaleLanguage a() {
|
2018-09-01 06:56:57 +08:00
|
|
|
return c;
|
2018-07-31 05:07:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
+ public synchronized String translateKey(String key) { return a(key); } // Paper - OBFHELPER
|
|
|
|
public synchronized String a(String s) {
|
|
|
|
return this.c(s);
|
|
|
|
}
|
2017-07-27 11:44:09 +08:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
2018-09-01 06:56:57 +08:00
|
|
|
index be5f922cb6..caaed7cf0b 100644
|
2017-07-27 11:44:09 +08:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
2018-08-27 23:07:22 +08:00
|
|
|
@@ -300,5 +300,18 @@ public final class CraftItemFactory implements ItemFactory {
|
2017-07-27 11:44:09 +08:00
|
|
|
public ItemStack ensureServerConversions(ItemStack item) {
|
|
|
|
return CraftItemStack.asCraftMirror(CraftItemStack.asNMSCopy(item));
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public String getI18NDisplayName(ItemStack item) {
|
|
|
|
+ net.minecraft.server.ItemStack nms = null;
|
|
|
|
+ if (item instanceof CraftItemStack) {
|
|
|
|
+ nms = ((CraftItemStack) item).handle;
|
|
|
|
+ }
|
|
|
|
+ if (nms == null) {
|
|
|
|
+ nms = CraftItemStack.asNMSCopy(item);
|
|
|
|
+ }
|
|
|
|
+
|
2018-07-31 05:07:36 +08:00
|
|
|
+ return nms != null ? net.minecraft.server.LocaleLanguage.getInstance().translateKey(nms.getItem().getName()) : null;
|
2017-07-27 11:44:09 +08:00
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
--
|
2018-08-06 07:46:43 +08:00
|
|
|
2.18.0
|
2017-07-27 11:44:09 +08:00
|
|
|
|