Make the lang stuff cleaner

This commit is contained in:
William Blake Galbreath
2020-03-26 16:54:34 -05:00
parent 562f8132b7
commit 405fa5ff10
5 changed files with 113 additions and 4470 deletions

View File

@@ -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
index e6b0c86b03..4311098415 100644
--- a/src/main/resources/assets/minecraft/lang/en_us.json
+++ b/src/main/resources/assets/minecraft/lang/en_us.json
@@ -4071,6 +4071,7 @@
"commands.spectate.success.started": "Now spectating %s",
"commands.spectate.not_spectator": "%s is not in spectator mode",
"commands.spectate.self": "Cannot spectate yourself",
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
index 489dcbf350..84df5c7633 100644
--- a/src/main/resources/purpur.lang
+++ b/src/main/resources/purpur.lang
@@ -1,4 +1,5 @@
{
+ "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