Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Internal changes handling chat components

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-27 18:17:21 -05:00
parent 3bc14897d5
commit 1970428fdd
5 changed files with 35 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
patches/server/0005-Add-language-asset-purpur.lang.patch
View File

@@ -1,38 +1,16 @@
From 4af5ccf83b9d08ecf5b620d546447b473a997bd6 Mon Sep 17 00:00:00 2001
From 8abcf16cd90b077caa223a2e4ea59ed53e939ed1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 13:17:09 -0500
Subject: [PATCH] Add language asset purpur.lang
---
.../net/minecraft/server/ChatMessage.java | 3 ++-
.../net/minecraft/server/LocaleLanguage.java | 27 +++++++++++++++++--
.../net/minecraft/server/LocaleLanguage.java | 33 +++++++++++++++++--
src/main/resources/purpur.lang | 1 +
3 files changed, 28 insertions(+), 3 deletions(-)
2 files changed, 32 insertions(+), 2 deletions(-)
create mode 100644 src/main/resources/purpur.lang
diff --git a/src/main/java/net/minecraft/server/ChatMessage.java b/src/main/java/net/minecraft/server/ChatMessage.java
index 937361fc2b..37ec73a8cb 100644
--- a/src/main/java/net/minecraft/server/ChatMessage.java
+++ b/src/main/java/net/minecraft/server/ChatMessage.java
@@ -17,7 +17,7 @@ public class ChatMessage extends ChatBaseComponent implements ChatComponentConte
private static final LocaleLanguage d = new LocaleLanguage();
private static final LocaleLanguage e = LocaleLanguage.a();
- private final String key;
+ private String key; // Purpur - remove final
private final Object[] args;
private final Object h = new Object();
private long i = -1L;
@@ -41,6 +41,7 @@ public class ChatMessage extends ChatBaseComponent implements ChatComponentConte
}
}
+ if (key != null && key.contains(".purpur.")) key = getText(); // Purpur
}
@VisibleForTesting
diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
index 6012739331..8f36f78c06 100644
index 6012739331..01f1ffa2d4 100644
--- a/src/main/java/net/minecraft/server/LocaleLanguage.java
+++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
@@ -25,8 +25,31 @@ public class LocaleLanguage {
@@ -45,7 +23,8 @@ index 6012739331..8f36f78c06 100644
+ }
+
+ private void loadFromFile(String resource) {
+ try {
try {
- InputStream inputstream = LocaleLanguage.class.getResourceAsStream("/assets/minecraft/lang/en_us.json");
+ java.io.File file = new java.io.File(resource);
+ if (!file.exists()) {
+ java.nio.file.Files.copy(getClass().getResourceAsStream("/" + resource), file.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
@@ -62,8 +41,7 @@ index 6012739331..8f36f78c06 100644
+ }
+
+ private void loadFromStream(String resource, InputStream inputstream) {
try {
- InputStream inputstream = LocaleLanguage.class.getResourceAsStream("/assets/minecraft/lang/en_us.json");
+ try {
+ // Purpur end
Throwable throwable = null;
@@ -77,6 +55,17 @@ index 6012739331..8f36f78c06 100644
}
}
@@ -88,4 +111,10 @@ public class LocaleLanguage {
public long b() {
return this.e;
}
+
+ // Purpur start
+ public static ChatMessage translate(String key, Object... args) {
+ return new ChatMessage(org.bukkit.ChatColor.translateAlternateColorCodes('&', getInstance().translateKey(key)), args);
+ }
+ // Purpur end
}
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
new file mode 100644
index 0000000000..0967ef424b