Internal changes handling chat components

patches/server/0004-decompile-fixes.patch

@@ -1,4 +1,4 @@
-From 1b3d78effb6b59d0cfee3c0085b6aca862b520c7 Mon Sep 17 00:00:00 2001
+From d6363a354c2352a016afb502db274ee4b903d36d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 13:39:06 -0600
 Subject: [PATCH] decompile-fixes
@@ -78,7 +78,6 @@ 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 +-
@@ -91,7 +90,7 @@ Subject: [PATCH] decompile-fixes
  .../net/minecraft/server/EntityWitch.java     |  4 +--
  .../java/net/minecraft/server/MathHelper.java |  2 +-
  .../server/WorldGenFeatureConfigured.java     |  2 +-
- 87 files changed, 226 insertions(+), 232 deletions(-)
+ 86 files changed, 225 insertions(+), 231 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
@@ -1407,19 +1406,6 @@ 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<IChatBaseComponent> 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

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

@@ -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  | 33 +++++++++++++++++--
- .../net/minecraft/server/LocaleLanguage.java  | 27 +++++++++++++++++--
  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 {
++        try {
--            InputStream inputstream = LocaleLanguage.class.getResourceAsStream("/assets/minecraft/lang/en_us.json");
 +            // 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

patches/server/0042-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From d23a8e40bf8ca2724d057f42f440142fe289cc65 Mon Sep 17 00:00:00 2001
+From 8ffed463c036969e9fd64b8caa10775caca14d40 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API
@@ -37,7 +37,7 @@ index de22cad764..9d26bd1e4c 100644
          super(EntityTypes.PLAYER, world);
          this.bV = ItemStack.a;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 561588ddaa..919921c2d2 100644
+index 561588ddaa..b023a7b198 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1653,8 +1653,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -68,7 +68,7 @@ index 561588ddaa..919921c2d2 100644
 +        }
 +
 +        if (event.getBroadcastMsg() != null && !event.getBroadcastMsg().isEmpty()) {
-+            ((WorldServer) world).getMinecraftServer().server.broadcastMessage(String.format(event.getBroadcastMsg(), getName()));
++            server.getPlayerList().sendAll(new PacketPlayOutChat(new ChatMessage(event.getBroadcastMsg(), getScoreboardDisplayName())));
 +        }
 +
 +        if (world.purpurConfig.idleTimeoutUpdateTabList) {

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

@@ -1,13 +1,13 @@
-From a4f46446e58c09ea0e069089f9deae28d7f0701e Mon Sep 17 00:00:00 2001
+From 758a4766e22050f99c649f753b81b8e7b782ce55 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
 
 ---
  .../minecraft/server/CommandDispatcher.java   |  1 +
- .../net/pl3x/purpur/command/MSPTCommand.java  | 59 +++++++++++++++++++
+ .../net/pl3x/purpur/command/MSPTCommand.java  | 60 +++++++++++++++++++
  src/main/resources/purpur.lang                |  2 +
- 3 files changed, 62 insertions(+)
+ 3 files changed, 63 insertions(+)
  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
@@ -24,16 +24,17 @@ index 37b1a7947c..c9d1f94100 100644
          this.b.findAmbiguities((commandnode, commandnode1, commandnode2, collection) -> {
 diff --git a/src/main/java/net/pl3x/purpur/command/MSPTCommand.java b/src/main/java/net/pl3x/purpur/command/MSPTCommand.java
 new file mode 100644
-index 0000000000..e3b75f9c41
+index 0000000000..c5ca03e48c
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/command/MSPTCommand.java
-@@ -0,0 +1,59 @@
+@@ -0,0 +1,60 @@
 +package net.pl3x.purpur.command;
 +
 +
 +import net.minecraft.server.ChatMessage;
 +import net.minecraft.server.CommandDispatcher;
 +import net.minecraft.server.CommandListenerWrapper;
++import net.minecraft.server.LocaleLanguage;
 +import net.minecraft.server.MinecraftServer;
 +import org.bukkit.ChatColor;
 +
@@ -63,8 +64,8 @@ index 0000000000..e3b75f9c41
 +        times.addAll(eval(server.tickTimes10s.getTimes()));
 +        times.addAll(eval(server.tickTimes60s.getTimes()));
 +
-+        sender.sendMessage(new ChatMessage("commands.purpur.mspt"), false);
++        sender.sendMessage(LocaleLanguage.translate("commands.purpur.mspt"), false);
-+        sender.sendMessage(new ChatMessage("commands.purpur.mspt.times", times.toArray()), false);
++        sender.sendMessage(LocaleLanguage.translate("commands.purpur.mspt.times", times.toArray()), false);
 +        return 0;
 +    }
 +

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

@@ -1,4 +1,4 @@
-From 23e252797baf42ef1d3b165dc6896e4a6595d3bc Mon Sep 17 00:00:00 2001
+From 33362dcb20d112ca6872c2da530d27a7f7ad36ff 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
@@ -77,7 +77,7 @@ index 0b23a0548d..ab0cf8b561 100644
              throw CommandListenerWrapper.a.create();
 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..3aea2a76db
+index 0000000000..f85290888c
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/command/PingCommand.java
 @@ -0,0 +1,34 @@
@@ -86,10 +86,10 @@ index 0000000000..3aea2a76db
 +
 +import com.mojang.brigadier.exceptions.CommandSyntaxException;
 +import net.minecraft.server.ArgumentEntity;
-+import net.minecraft.server.ChatMessage;
 +import net.minecraft.server.CommandDispatcher;
 +import net.minecraft.server.CommandListenerWrapper;
 +import net.minecraft.server.EntityPlayer;
++import net.minecraft.server.LocaleLanguage;
 +
 +import java.util.Collection;
 +import java.util.Collections;
@@ -110,7 +110,7 @@ index 0000000000..3aea2a76db
 +
 +    private static int execute(CommandListenerWrapper sender, Collection<EntityPlayer> targets) throws CommandSyntaxException {
 +        for (EntityPlayer player : targets) {
-+            sender.sendMessage(new ChatMessage("commands.purpur.ping", player.getScoreboardDisplayName(), player.ping), false);
++            sender.sendMessage(LocaleLanguage.translate("commands.purpur.ping", player.getScoreboardDisplayName(), player.ping), false);
 +        }
 +        return targets.size();
 +    }