mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
e82ef9ec05
ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
50 lines
No EOL
2 KiB
Diff
50 lines
No EOL
2 KiB
Diff
From 0000000000000000000000000000000000000000 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
|
|
|
|
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 0648c76a07..bea146630d 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 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 be5f922cb6..caaed7cf0b 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 {
|
|
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);
|
|
+ }
|
|
+
|
|
+ return nms != null ? net.minecraft.server.LocaleLanguage.getInstance().translateKey(nms.getItem().getName()) : null;
|
|
+ }
|
|
// Paper end
|
|
}
|
|
--
|