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:
@@ -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
|
||||
@@ -0,0 +0,0 @@ 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
|
||||
@@ -0,0 +0,0 @@ public final class CraftItemFactory implements ItemFactory {
|
||||
@@ -26,7 +43,7 @@ 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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user