Fix i18n String API
In 1.13 the method previously used now returns translatable keys. `block.minecraft.cobblestone` instead of `Cobblestone` We just need to make sure we're translating those keys.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 570da01a74b273d367daa8ffbd4e4c38ed323aee Mon Sep 17 00:00:00 2001
|
||||
From fb596b3a8df6a1332aff27d428bb4de583b6bef8 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 4 May 2016 23:59:38 -0400
|
||||
Subject: [PATCH] Implement getI18NDisplayName
|
||||
@@ -7,8 +7,25 @@ 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/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
|
||||
index 4361b2cee..f81887c66 100644
|
||||
--- a/src/main/java/net/minecraft/server/LocaleLanguage.java
|
||||
+++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
|
||||
@@ -44,10 +44,12 @@ public class LocaleLanguage {
|
||||
|
||||
}
|
||||
|
||||
+ public static LocaleLanguage getInstance() { return a(); } // Paper - OBFHELPER
|
||||
public static LocaleLanguage a() {
|
||||
return LocaleLanguage.c;
|
||||
}
|
||||
|
||||
+ public synchronized String translateKey(String key) { return a(key); } // Paper - OBFHELPER
|
||||
public synchronized String a(String s) {
|
||||
return this.c(s);
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
index e98e1ed72..1df2b463a 100644
|
||||
index e98e1ed72..35eb3181d 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
@@ -292,5 +292,18 @@ public final class CraftItemFactory implements ItemFactory {
|
||||
@@ -26,10 +43,10 @@ index e98e1ed72..1df2b463a 100644
|
||||
+ nms = CraftItemStack.asNMSCopy(item);
|
||||
+ }
|
||||
+
|
||||
+ return nms != null ? nms.getItem().getName() : null;
|
||||
+ return nms != null ? net.minecraft.server.LocaleLanguage.getInstance().translateKey(nms.getItem().getName()) : null;
|
||||
+ }
|
||||
// Paper end
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
2.17.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user