From faf5e485c456921eed621c8010ca3aec679e14ab Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Mar 2020 14:29:04 -0500 Subject: [PATCH] Start using lang asset for commands --- patches/server/0004-decompile-fixes.patch | 18 +++++++++++-- ...05-Add-default-asset-lang-en_us.json.patch | 26 +++++++++++++++++-- patches/server/0107-Add-ping-command.patch | 26 ++++++++++++++----- .../server/0113-Disable-mojang-profiler.patch | 24 ++++++++--------- 4 files changed, 71 insertions(+), 23 deletions(-) diff --git a/patches/server/0004-decompile-fixes.patch b/patches/server/0004-decompile-fixes.patch index c7c61b330..7088a7058 100644 --- a/patches/server/0004-decompile-fixes.patch +++ b/patches/server/0004-decompile-fixes.patch @@ -1,4 +1,4 @@ -From 1d85f4fa73d52df3f718927ced620dbad1505d9b Mon Sep 17 00:00:00 2001 +From 1b3d78effb6b59d0cfee3c0085b6aca862b520c7 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 27 Feb 2020 13:39:06 -0600 Subject: [PATCH] decompile-fixes @@ -78,6 +78,7 @@ Subject: [PATCH] decompile-fixes .../java/net/minecraft/server/BiomeVoid.java | 2 +- .../minecraft/server/BiomeWarmDeepOcean.java | 8 +++--- .../net/minecraft/server/BiomeWarmOcean.java | 10 +++---- + .../net/minecraft/server/ChatMessage.java | 2 +- .../net/minecraft/server/CommandDebug.java | 2 +- .../net/minecraft/server/EntityBlaze.java | 2 +- .../java/net/minecraft/server/EntityCat.java | 2 +- @@ -90,7 +91,7 @@ Subject: [PATCH] decompile-fixes .../net/minecraft/server/EntityWitch.java | 4 +-- .../java/net/minecraft/server/MathHelper.java | 2 +- .../server/WorldGenFeatureConfigured.java | 2 +- - 86 files changed, 225 insertions(+), 231 deletions(-) + 87 files changed, 226 insertions(+), 232 deletions(-) diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungle.java b/src/main/java/net/minecraft/server/BiomeBambooJungle.java index de831ed87e..9c38f8907a 100644 @@ -1406,6 +1407,19 @@ index dd7916c090..e4dc7d198c 100644 BiomeDecoratorGroups.ap(this); this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SQUID, 10, 4, 4)); this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.PUFFERFISH, 15, 1, 3)); +diff --git a/src/main/java/net/minecraft/server/ChatMessage.java b/src/main/java/net/minecraft/server/ChatMessage.java +index afd299441f..937361fc2b 100644 +--- a/src/main/java/net/minecraft/server/ChatMessage.java ++++ b/src/main/java/net/minecraft/server/ChatMessage.java +@@ -171,7 +171,7 @@ public class ChatMessage extends ChatBaseComponent implements ChatComponentConte + @Override + public Stream c() { + this.i(); +- return Streams.concat(new Stream[]{this.b.stream(), this.siblings.stream()}).flatMap(IChatBaseComponent::c); ++ return Streams.concat(this.b.stream(), this.siblings.stream()).flatMap(IChatBaseComponent::c); // Purpur decompile error + } + + @Override diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java index d384e9578a..f0d72ea39d 100644 --- a/src/main/java/net/minecraft/server/CommandDebug.java diff --git a/patches/server/0005-Add-default-asset-lang-en_us.json.patch b/patches/server/0005-Add-default-asset-lang-en_us.json.patch index e10b192f7..fa4ad228e 100644 --- a/patches/server/0005-Add-default-asset-lang-en_us.json.patch +++ b/patches/server/0005-Add-default-asset-lang-en_us.json.patch @@ -1,13 +1,35 @@ -From bbe8819ffe8e08b54d9adac64267a14ff41afd43 Mon Sep 17 00:00:00 2001 +From dafd4b38613ad6e3d537266735394762d3087088 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Mar 2020 13:17:09 -0500 Subject: [PATCH] Add default asset lang en_us.json --- + .../net/minecraft/server/ChatMessage.java | 3 +- .../assets/minecraft/lang/en_us.json | 4389 +++++++++++++++++ - 1 file changed, 4389 insertions(+) + 2 files changed, 4391 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/minecraft/lang/en_us.json +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/resources/assets/minecraft/lang/en_us.json b/src/main/resources/assets/minecraft/lang/en_us.json new file mode 100644 index 0000000000..ae0b45fe41 diff --git a/patches/server/0107-Add-ping-command.patch b/patches/server/0107-Add-ping-command.patch index b978b50bb..b9089a1a9 100644 --- a/patches/server/0107-Add-ping-command.patch +++ b/patches/server/0107-Add-ping-command.patch @@ -1,4 +1,4 @@ -From 8468a0984bd94e3262646912f5b09e8c1216de60 Mon Sep 17 00:00:00 2001 +From 0fa2b2131a54e8622238ab538933a0454a27b4d4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 13 Mar 2020 22:29:10 -0500 Subject: [PATCH] Add /ping command @@ -8,8 +8,9 @@ Subject: [PATCH] Add /ping command .../minecraft/server/CommandDispatcher.java | 5 ++- .../server/CommandListenerWrapper.java | 1 + .../java/net/pl3x/purpur/PurpurConfig.java | 1 + - .../net/pl3x/purpur/command/PingCommand.java | 35 +++++++++++++++++++ - 5 files changed, 43 insertions(+), 1 deletion(-) + .../net/pl3x/purpur/command/PingCommand.java | 34 +++++++++++++++++++ + .../assets/minecraft/lang/en_us.json | 1 + + 6 files changed, 43 insertions(+), 1 deletion(-) 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 @@ -89,10 +90,10 @@ index 63a91e7b7a..f9f83e5b9a 100644 import org.bukkit.configuration.InvalidConfigurationException; diff --git a/src/main/java/net/pl3x/purpur/command/PingCommand.java b/src/main/java/net/pl3x/purpur/command/PingCommand.java new file mode 100644 -index 0000000000..883b68a5cf +index 0000000000..3aea2a76db --- /dev/null +++ b/src/main/java/net/pl3x/purpur/command/PingCommand.java -@@ -0,0 +1,35 @@ +@@ -0,0 +1,34 @@ +package net.pl3x.purpur.command; + + @@ -102,7 +103,6 @@ index 0000000000..883b68a5cf +import net.minecraft.server.CommandDispatcher; +import net.minecraft.server.CommandListenerWrapper; +import net.minecraft.server.EntityPlayer; -+import org.bukkit.ChatColor; + +import java.util.Collection; +import java.util.Collections; @@ -123,11 +123,23 @@ index 0000000000..883b68a5cf + + private static int execute(CommandListenerWrapper sender, Collection targets) throws CommandSyntaxException { + for (EntityPlayer player : targets) { -+ sender.sendMessage(new ChatMessage(ChatColor.GREEN + "%s's ping is %sms", player.getScoreboardDisplayName(), player.ping), false); ++ sender.sendMessage(new ChatMessage("commands.purpur.ping", player.getScoreboardDisplayName(), player.ping), false); + } + 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 +index ae0b45fe41..2d7d38d2fb 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", ++ "commands.purpur.ping": "§a%s's ping is %sms", + "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 diff --git a/patches/server/0113-Disable-mojang-profiler.patch b/patches/server/0113-Disable-mojang-profiler.patch index b068a5aba..a098fae1c 100644 --- a/patches/server/0113-Disable-mojang-profiler.patch +++ b/patches/server/0113-Disable-mojang-profiler.patch @@ -1,4 +1,4 @@ -From 0284d0fe32a0599358e6401836955b780eacad7c Mon Sep 17 00:00:00 2001 +From beb5ae19e6d8056090d8fec450566a2df1392c77 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Mar 2020 12:48:02 -0500 Subject: [PATCH] Disable mojang profiler @@ -13,14 +13,14 @@ Subject: [PATCH] Disable mojang profiler create mode 100644 src/main/java/net/pl3x/purpur/GameProfilerNoop.java diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java -index f0d72ea39d..415f6cb323 100644 +index f0d72ea39d..e38a684060 100644 --- a/src/main/java/net/minecraft/server/CommandDebug.java +++ b/src/main/java/net/minecraft/server/CommandDebug.java @@ -22,6 +22,7 @@ public class CommandDebug { private static final Logger LOGGER = LogManager.getLogger(); private static final SimpleCommandExceptionType b = new SimpleCommandExceptionType(new ChatMessage("commands.debug.notRunning", new Object[0])); private static final SimpleCommandExceptionType c = new SimpleCommandExceptionType(new ChatMessage("commands.debug.alreadyRunning", new Object[0])); -+ private static final SimpleCommandExceptionType disabled = new SimpleCommandExceptionType(new ChatMessage("commands.debug.disabled")); // Purpur ++ private static final SimpleCommandExceptionType disabled = new SimpleCommandExceptionType(new ChatMessage("commands.purpur.debug.disabled")); // Purpur @Nullable private static final FileSystemProvider d = (FileSystemProvider) FileSystemProvider.installedProviders().stream().filter((filesystemprovider) -> { return filesystemprovider.getScheme().equalsIgnoreCase("jar"); @@ -160,17 +160,17 @@ index d1af8e9a92..9da9f54d18 100644 // 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 ae0b45fe41..c4dcaaf2d4 100644 +index 2d7d38d2fb..c5d6a73d01 100644 --- a/src/main/resources/assets/minecraft/lang/en_us.json +++ b/src/main/resources/assets/minecraft/lang/en_us.json -@@ -4127,6 +4127,7 @@ - "commands.clone.failed": "No blocks were cloned", - "commands.debug.notRunning": "The debug profiler hasn't started", - "commands.debug.alreadyRunning": "The debug profiler is already started", -+ "commands.debug.disabled": "The debug profiler is disabled", - "commands.deop.failed": "Nothing changed. The player is not an operator", - "commands.effect.give.failed": "Unable to apply this effect (target is either immune to effects, or has something stronger)", - "commands.effect.clear.everything.failed": "Target has no effects to remove", +@@ -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", ++ "commands.purpur.debug.disabled": "The debug profiler is disabled", + "commands.purpur.ping": "§a%s's ping is %sms", + "argument.range.empty": "Expected value or range of values", + "argument.range.ints": "Only whole numbers allowed, not decimals", -- 2.24.0