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

Move afk strings to lang file

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-26 18:39:15 -05:00
parent 405fa5ff10
commit f4ef6baaac
15 changed files with 100 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,13 @@
From 1101e305418f6d797155da54f372008d2c11cfb4 Mon Sep 17 00:00:00 2001
From 4af5ccf83b9d08ecf5b620d546447b473a997bd6 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 | 24 ++++++++++++++++++-
.../net/minecraft/server/LocaleLanguage.java | 27 +++++++++++++++++--
src/main/resources/purpur.lang | 1 +
3 files changed, 26 insertions(+), 2 deletions(-)
3 files changed, 28 insertions(+), 3 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
@@ -32,41 +32,51 @@ index 937361fc2b..37ec73a8cb 100644
@VisibleForTesting
diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
index 6012739331..9cafd1a9cd 100644
index 6012739331..8f36f78c06 100644
--- a/src/main/java/net/minecraft/server/LocaleLanguage.java
+++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
@@ -25,8 +25,30 @@ public class LocaleLanguage {
@@ -25,8 +25,31 @@ public class LocaleLanguage {
private long e;
public LocaleLanguage() {
+ // Purpur start
+ loadFromJar();
+ loadFromFile();
+ loadFromJar("/assets/minecraft/lang/en_us.json");
+ loadFromFile("purpur.lang");
+ }
+
+ private void loadFromFile() {
+ private void loadFromFile(String resource) {
+ try {
+ java.io.File file = new java.io.File("purpur.lang");
+ java.io.File file = new java.io.File(resource);
+ if (!file.exists()) {
+ java.nio.file.Files.copy(getClass().getResourceAsStream("/purpur.lang"), file.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+ java.nio.file.Files.copy(getClass().getResourceAsStream("/" + resource), file.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+ }
+ loadFromStream(new java.io.FileInputStream(file));
+ loadFromJar("/" + resource);
+ loadFromStream(resource, new java.io.FileInputStream(file));
+ } catch (IOException e) {
+ LOGGER.error("Couldn't read string from purpur.lang!", e);
+ LOGGER.error("Couldn't read string from " + resource, e);
+ }
+ }
+
+ private void loadFromJar() {
+ loadFromStream(getClass().getResourceAsStream("/assets/minecraft/lang/en_us.json"));
+ private void loadFromJar(String resource) {
+ loadFromStream(resource, getClass().getResourceAsStream(resource));
+ }
+
+ private void loadFromStream(InputStream inputstream) {
+ // Purpur end
+ private void loadFromStream(String resource, InputStream inputstream) {
try {
- InputStream inputstream = LocaleLanguage.class.getResourceAsStream("/assets/minecraft/lang/en_us.json");
+ // Purpur end
Throwable throwable = null;
try {
@@ -60,7 +83,7 @@ public class LocaleLanguage {
}
} catch (JsonParseException | IOException ioexception) {
- LocaleLanguage.LOGGER.error("Couldn't read strings from /assets/minecraft/lang/en_us.json", ioexception);
+ LocaleLanguage.LOGGER.error("Couldn't read strings from " + resource, ioexception); // Purpur
}
}
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
new file mode 100644
index 0000000000..0967ef424b