Make the lang stuff cleaner

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

@@ -0,0 +1,79 @@
+From 1101e305418f6d797155da54f372008d2c11cfb4 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 ++++++++++++++++++-
+ src/main/resources/purpur.lang                |  1 +
+ 3 files changed, 26 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..9cafd1a9cd 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 {
+     private long e;
+ 
+     public LocaleLanguage() {
++        // Purpur start
++        loadFromJar();
++        loadFromFile();
++    }
++
++    private void loadFromFile() {
++        try {
++            java.io.File file = new java.io.File("purpur.lang");
++            if (!file.exists()) {
++                java.nio.file.Files.copy(getClass().getResourceAsStream("/purpur.lang"), file.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
++            }
++            loadFromStream(new java.io.FileInputStream(file));
++        } catch (IOException e) {
++            LOGGER.error("Couldn't read string from purpur.lang!", e);
++        }
++    }
++
++    private void loadFromJar() {
++        loadFromStream(getClass().getResourceAsStream("/assets/minecraft/lang/en_us.json"));
++    }
++
++    private void loadFromStream(InputStream inputstream) {
++        // Purpur end
+         try {
+-            InputStream inputstream = LocaleLanguage.class.getResourceAsStream("/assets/minecraft/lang/en_us.json");
+             Throwable throwable = null;
+ 
+             try {
+diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
+new file mode 100644
+index 0000000000..0967ef424b
+--- /dev/null
++++ b/src/main/resources/purpur.lang
+@@ -0,0 +1 @@
++{}
+-- 
+2.24.0
+

patches/server/0106-Add-mspt-command.patch

@@ -1,4 +1,4 @@
-From 0d62cef2d76283db36e227544c3820f89a04cf3f Mon Sep 17 00:00:00 2001
+From 9397614a1e6f58c962d2801df4508c716a18d236 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 13 Mar 2020 22:23:44 -0500
 Subject: [PATCH] Add /mspt command
@@ -6,8 +6,8 @@ Subject: [PATCH] Add /mspt command
 ---
  .../minecraft/server/CommandDispatcher.java   |  1 +
  .../net/pl3x/purpur/command/MSPTCommand.java  | 59 +++++++++++++++++++
- .../assets/minecraft/lang/en_us.json          |  2 +
+ src/main/resources/purpur.lang                |  5 +-
- 3 files changed, 62 insertions(+)
+ 3 files changed, 64 insertions(+), 1 deletion(-)
  create mode 100644 src/main/java/net/pl3x/purpur/command/MSPTCommand.java
 
 diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -87,19 +87,16 @@ index 0000000000..e3b75f9c41
 +        return ChatColor.COLOR_CHAR + (avg >= 50 ? "c" : avg >= 40 ? "e" : "a") + DF.format(avg);
 +    }
 +}
-diff --git a/src/main/resources/assets/minecraft/lang/en_us.json b/src/main/resources/assets/minecraft/lang/en_us.json
+diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
-index ae0b45fe41..09816cedfc 100644
+index 0967ef424b..5394225094 100644
---- a/src/main/resources/assets/minecraft/lang/en_us.json
+--- a/src/main/resources/purpur.lang
-+++ b/src/main/resources/assets/minecraft/lang/en_us.json
++++ b/src/main/resources/purpur.lang
-@@ -4071,6 +4071,8 @@
+@@ -1 +1,4 @@
-   "commands.spectate.success.started": "Now spectating %s",
+-{}
-   "commands.spectate.not_spectator": "%s is not in spectator mode",
++{
-   "commands.spectate.self": "Cannot spectate yourself",
 +  "commands.purpur.mspt": "§6Server tick times §e(§7avg§e/§7min§e/§7max§e)§6 from last 5s§7,§6 10s§7,§6 1m§e:",
-+  "commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s",
++  "commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s"
-   "argument.range.empty": "Expected value or range of values",
++}
-   "argument.range.ints": "Only whole numbers allowed, not decimals",
-   "argument.range.swapped": "Min cannot be bigger than max",
 -- 
 2.24.0
 

patches/server/0107-Add-ping-command.patch

@@ -1,4 +1,4 @@
-From ca4d608c6e987a44f467fae90f5bf036763ad3a4 Mon Sep 17 00:00:00 2001
+From 656d855ec7cca2b392f3514b75fb0006643e7b25 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 13 Mar 2020 22:29:10 -0500
 Subject: [PATCH] Add /ping command
@@ -8,8 +8,8 @@ Subject: [PATCH] Add /ping command
  .../minecraft/server/CommandDispatcher.java   |  5 ++-
  .../server/CommandListenerWrapper.java        |  1 +
  .../net/pl3x/purpur/command/PingCommand.java  | 34 +++++++++++++++++++
- .../assets/minecraft/lang/en_us.json          |  1 +
+ src/main/resources/purpur.lang                |  3 +-
- 5 files changed, 42 insertions(+), 1 deletion(-)
+ 5 files changed, 43 insertions(+), 2 deletions(-)
  create mode 100644 src/main/java/net/pl3x/purpur/command/PingCommand.java
 
 diff --git a/src/main/java/net/minecraft/server/ArgumentEntity.java b/src/main/java/net/minecraft/server/ArgumentEntity.java
@@ -115,18 +115,17 @@ index 0000000000..3aea2a76db
 +        return targets.size();
 +    }
 +}
-diff --git a/src/main/resources/assets/minecraft/lang/en_us.json b/src/main/resources/assets/minecraft/lang/en_us.json
+diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
-index 09816cedfc..e6b0c86b03 100644
+index 5394225094..489dcbf350 100644
---- a/src/main/resources/assets/minecraft/lang/en_us.json
+--- a/src/main/resources/purpur.lang
-+++ b/src/main/resources/assets/minecraft/lang/en_us.json
++++ b/src/main/resources/purpur.lang
-@@ -4073,6 +4073,7 @@
+@@ -1,4 +1,5 @@
-   "commands.spectate.self": "Cannot spectate yourself",
+ {
    "commands.purpur.mspt": "§6Server tick times §e(§7avg§e/§7min§e/§7max§e)§6 from last 5s§7,§6 10s§7,§6 1m§e:",
-   "commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s",
+-  "commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s"
-+  "commands.purpur.ping": "§a%s's ping is %sms",
++  "commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s",
-   "argument.range.empty": "Expected value or range of values",
++  "commands.purpur.ping": "§a%s's ping is %sms"
-   "argument.range.ints": "Only whole numbers allowed, not decimals",
+ }
-   "argument.range.swapped": "Min cannot be bigger than max",
 -- 
 2.24.0
 

patches/server/0113-Disable-mojang-profiler.patch

@@ -1,4 +1,4 @@
-From ebec2174c178ca46126aeb055da04d7f4e64f383 Mon Sep 17 00:00:00 2001
+From ecc23306bffb62ac83a14bdec6a0c37e50258fd6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 12:48:02 -0500
 Subject: [PATCH] Disable mojang profiler
@@ -8,7 +8,7 @@ Subject: [PATCH] Disable mojang profiler
  .../net/minecraft/server/MinecraftServer.java |  5 +-
  .../net/pl3x/purpur/GameProfilerNoop.java     | 68 +++++++++++++++++++
  .../java/org/bukkit/craftbukkit/Main.java     |  2 +
- .../assets/minecraft/lang/en_us.json          |  1 +
+ src/main/resources/purpur.lang                |  1 +
  5 files changed, 80 insertions(+), 1 deletion(-)
  create mode 100644 src/main/java/net/pl3x/purpur/GameProfilerNoop.java
 
@@ -159,18 +159,16 @@ index d1af8e9a92..9da9f54d18 100644
                  // Purpur end
  
                  // Paper start
-diff --git a/src/main/resources/assets/minecraft/lang/en_us.json b/src/main/resources/assets/minecraft/lang/en_us.json
+diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
-index e6b0c86b03..4311098415 100644
+index 489dcbf350..84df5c7633 100644
---- a/src/main/resources/assets/minecraft/lang/en_us.json
+--- a/src/main/resources/purpur.lang
-+++ b/src/main/resources/assets/minecraft/lang/en_us.json
++++ b/src/main/resources/purpur.lang
-@@ -4071,6 +4071,7 @@
+@@ -1,4 +1,5 @@
-   "commands.spectate.success.started": "Now spectating %s",
+ {
-   "commands.spectate.not_spectator": "%s is not in spectator mode",
-   "commands.spectate.self": "Cannot spectate yourself",
 +  "commands.purpur.debug.disabled": "The debug profiler is disabled",
    "commands.purpur.mspt": "§6Server tick times §e(§7avg§e/§7min§e/§7max§e)§6 from last 5s§7,§6 10s§7,§6 1m§e:",
    "commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s",
-   "commands.purpur.ping": "§a%s's ping is %sms",
+   "commands.purpur.ping": "§a%s's ping is %sms"
 -- 
 2.24.0