Merge branch '1.21.10' into 1.21.11

Author: rfresh2

build.gradle.kts

@@ -68,10 +68,10 @@ dependencies {
     api("com.github.rfresh2.fastutil.maps:reference-object-maps:$fastutilVersion")
     api("com.github.rfresh2.fastutil.maps:long-double-maps:$fastutilVersion")
     api("com.github.rfresh2.fastutil.queues:int-queues:$fastutilVersion")
-    api("com.viaversion:vialoader:4.0.5")
-    api("com.viaversion:viaversion-common:5.5.1")
-    api("com.viaversion:viabackwards-common:5.5.1")
-    api("com.viaversion:viarewind-common:4.0.11")
+    api("com.viaversion:vialoader:4.0.6")
+    api("com.viaversion:viaversion-common:5.6.0")
+    api("com.viaversion:viabackwards-common:5.6.0")
+    api("com.viaversion:viarewind-common:4.0.12")
     api("org.jline:jline:3.30.6")
     api("ar.com.hjg:pngj:2.1.0")
     api("com.zaxxer:HikariCP:7.0.2")

src/main/java/com/zenith/feature/chatschema/ChatSchemaParser.java

@@ -87,7 +87,7 @@ private static Pattern compilePattern(String schema) {
             if (c == '$' && (i + 1 < schema.length())) {
                 var potentialToken = schema.substring(i, i + 2);
                 String p = switch (potentialToken) {
-                    case senderToken, receiverToken -> "([\\w\\d_]+)";
+                    case senderToken, receiverToken -> "([\\w\\d_.]+)";
                     case messageToken, wildcardStringToken -> "(.+)";
                     default -> null;
                 };

src/main/java/com/zenith/feature/deathmessages/DeathMessageSchemaInstance.java

@@ -14,7 +14,7 @@
 public final class DeathMessageSchemaInstance {
     private final String schemaRaw;
     private final List<String> schema;
-    private static final Pattern userNameValidPattern = Pattern.compile("[A-Za-z0-9_]{1,16}");
+    private static final Pattern userNameValidPattern = Pattern.compile("[A-Za-z0-9_.]{1,16}");
     private final List<String> mobs;
 
     public DeathMessageSchemaInstance(final String schemaRaw, final List<String> mobs) {

src/main/java/com/zenith/via/ZenithViaInitializer.java

@@ -36,7 +36,6 @@ public void init() {
 
     public void clientViaChannelInitializer(Channel channel) {
         if (!CONFIG.client.viaversion.enabled) return;
-        if (true) return;
         if (CONFIG.client.viaversion.autoProtocolVersion) updateClientViaProtocolVersion();
         if (CONFIG.client.viaversion.protocolVersion == MinecraftCodec.CODEC.getProtocolVersion()) {
             CLIENT_LOG.warn("ViaVersion enabled but the protocol is the same as ours, connecting without ViaVersion");
@@ -55,7 +54,6 @@ public void clientViaChannelInitializer(Channel channel) {
 
     public void serverViaChannelInitializer(final Channel channel) {
         if (!CONFIG.server.viaversion.enabled) return;
-        if (true) return;
         init();
         var userConnection = new UserConnectionImpl(channel, false);
         new ProtocolPipelineImpl(userConnection);

src/main/resources/META-INF/native-image/reachability-metadata.json

@@ -373,6 +373,9 @@
     {
       "type": "com.aayushatharva.brotli4j.Brotli4jLoader"
     },
+    {
+      "type": "com.aayushatharva.brotli4j.decoder.BrotliInputStream"
+    },
     {
       "type": "com.collarmc.pounce.MethodAccessor",
       "methods": [
@@ -592,6 +595,9 @@
     {
       "type": "com.github.luben.zstd.Zstd"
     },
+    {
+      "type": "com.github.luben.zstd.ZstdInputStream"
+    },
     {
       "type": "com.google.common.util.concurrent.AbstractFuture",
       "fields": [
@@ -1148,6 +1154,9 @@
     {
       "type": "com.viaversion.viaversion.api.minecraft.data.StructuredData[]"
     },
+    {
+      "type": "com.viaversion.viaversion.api.minecraft.data.predicate.DataComponentPredicate[]"
+    },
     {
       "type": "com.viaversion.viaversion.api.minecraft.item.DataItem",
       "allDeclaredFields": true,
@@ -1176,6 +1185,9 @@
     {
       "type": "com.viaversion.viaversion.api.minecraft.item.data.BlockPredicate[]"
     },
+    {
+      "type": "com.viaversion.viaversion.api.minecraft.item.data.Consumable1_21_2$ConsumeEffect[]"
+    },
     {
       "type": "com.viaversion.viaversion.api.minecraft.item.data.FilterableString[]"
     },
@@ -3482,6 +3494,12 @@
     {
       "type": "int[]"
     },
+    {
+      "type": "io.airlift.compress.v3.zstd.ZstdInputStream"
+    },
+    {
+      "type": "io.airlift.compress.zstd.ZstdInputStream"
+    },
     {
       "type": "io.jsonwebtoken.impl.security.StandardSecureDigestAlgorithms",
       "methods": [
@@ -5525,6 +5543,9 @@
         }
       ]
     },
+    {
+      "type": "org.brotli.dec.BrotliInputStream"
+    },
     {
       "type": "org.cloudburstmc.math.immutable.vector.ImmutableVectorProvider"
     },

src/main/resources/META-INF/native-image/resource-config.json

@@ -16,6 +16,10 @@ public class ChatSchemaParserTest {
         "rfresh2", UUID.fromString("572e683c-888a-4a0d-bc10-5d9cfa76d892")
     );
 
+    PlayerListEntry rfresh2BedrockEntry = new PlayerListEntry(
+        ".rfresh2", UUID.fromString("00000000-0000-0000-0009-01f6c03c69e5")
+    );
+
     PlayerListEntry arrfreshEntry = new PlayerListEntry(
         "aRRfresh", UUID.fromString("7cb31e32-65dc-494e-b812-3391670374c3")
     );
@@ -35,6 +39,7 @@ public class ChatSchemaParserTest {
     public void setUp() {
         CACHE.getTabListCache().add(rfresh2Entry);
         CACHE.getTabListCache().add(arrfreshEntry);
+        CACHE.getTabListCache().add(rfresh2BedrockEntry);
         CACHE.getProfileCache().setProfile(new GameProfile(rfresh2Entry.getProfileId(), rfresh2Entry.getName()));
     }
 
@@ -56,6 +61,18 @@ public void test2b2tPublicChat() {
         assertEquals("what's up?", result.messageContent());
     }
 
+    @Test
+    public void test2b2tBedrockPublicChat() {
+        String input = "<.rfresh2> what's up?";
+        var result = ChatSchemaParser.parse(input, schema2b2t);
+        assertNotNull(result);
+        assertEquals(ChatType.PUBLIC_CHAT, result.type());
+        assertEquals(rfresh2BedrockEntry, result.sender());
+        assertNull(result.receiver());
+        assertEquals("what's up?", result.messageContent());
+    }
+
+
     @Test
     public void test2b2tWhisperOutgoing() {
         String input = "to aRRfresh: what's up?";

src/test/java/com/zenith/feature/chatschema/ChatSchemaParserTest.java

@@ -144,6 +144,12 @@ public void pushedByMobTest() {
                   "LavamanHero", null, null, "Discount code Egg @ Rusherhack.org");
     }
 
+    @Test
+    public void bedrockUserTest() {
+        parseTest(".yakyyakyyou was assassinated by pillagers.",
+            ".yakyyakyyou", "pillagers", KillerType.MOB, null);
+    }
+
     private void parseTest(final String rawInput, final String victim, final String killerName, final KillerType killerType, final String weapon) {
         final var componentBuilder = Component.text();
         componentBuilder.append(Component.text(victim).clickEvent(ClickEvent.suggestCommand("/w " + victim)));