2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2017-07-27 03:44:09 +00: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-30 21:07:36 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
|
2020-08-25 02:22:08 +00:00
|
|
|
index cc5b6512fa115f73800b6894a2d58107b6495e07..29d55483510d3644a1edd3a01d7314232c358ac6 100644
|
2018-07-30 21:07:36 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/LocaleLanguage.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
|
2020-06-25 13:11:48 +00:00
|
|
|
@@ -29,7 +29,7 @@ public abstract class LocaleLanguage {
|
|
|
|
|
|
|
|
private static LocaleLanguage c() {
|
|
|
|
Builder<String, String> builder = ImmutableMap.builder();
|
|
|
|
- BiConsumer biconsumer = builder::put;
|
|
|
|
+ BiConsumer<String, String> biconsumer = builder::put; // Paper - decompile fix
|
|
|
|
|
|
|
|
try {
|
|
|
|
InputStream inputstream = LocaleLanguage.class.getResourceAsStream("/assets/minecraft/lang/en_us.json");
|
2020-08-25 02:22:08 +00:00
|
|
|
@@ -86,10 +86,12 @@ public abstract class LocaleLanguage {
|
2018-07-30 21:07:36 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
+ public static LocaleLanguage getInstance() { return a(); } // Paper - OBFHELPER
|
|
|
|
public static LocaleLanguage a() {
|
2020-06-25 13:11:48 +00:00
|
|
|
return LocaleLanguage.d;
|
2018-07-30 21:07:36 +00:00
|
|
|
}
|
|
|
|
|
2020-06-25 13:11:48 +00:00
|
|
|
+ public String translateKey(String key) { return a(key); } // Paper - OBFHELPER
|
|
|
|
public abstract String a(String s);
|
|
|
|
|
|
|
|
public abstract boolean b(String s);
|
2017-07-27 03:44:09 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
2020-07-03 06:08:00 +00:00
|
|
|
index bee1de72de76738d5eed2e0ca5ae8c0a65be7595..1c3e6e0c9abe681bf9e7305a74a68c1506ad8d0c 100644
|
2017-07-27 03:44:09 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
2020-07-03 06:08:00 +00:00
|
|
|
@@ -339,5 +339,18 @@ public final class CraftItemFactory implements ItemFactory {
|
2017-07-27 03:44:09 +00: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-30 21:07:36 +00:00
|
|
|
+ return nms != null ? net.minecraft.server.LocaleLanguage.getInstance().translateKey(nms.getItem().getName()) : null;
|
2017-07-27 03:44:09 +00:00
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
}
|