From 59b50a5d8d1be7fcc4a0e90060fc4be2dfb99ba6 Mon Sep 17 00:00:00 2001
From: Jannis Guhl <128991638+guhlutions@users.noreply.github.com>
Date: Fri, 13 Nov 2026 21:42:02 +0100
Subject: [PATCH] Fix cat variant metadata translation

Resolve Bedrock coat variants against the Java cat registry and send them with the dedicated cat variant serializer.
---
 .../rewriter/EntityMetadataRewriter.java      | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/raphimc/viabedrock/protocol/rewriter/EntityMetadataRewriter.java b/src/main/java/net/raphimc/viabedrock/protocol/rewriter/EntityMetadataRewriter.java
index 1f7d7982c..4f166b138 100644
--- a/src/main/java/net/raphimc/viabedrock/protocol/rewriter/EntityMetadataRewriter.java
+++ b/src/main/java/net/raphimc/viabedrock/protocol/rewriter/EntityMetadataRewriter.java
@@ -17,6 +17,7 @@
  */
 package net.raphimc.viabedrock.protocol.rewriter;
 
+import com.google.common.collect.Iterables;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockPosition;
@@ -35,10 +36,12 @@
 import net.raphimc.viabedrock.protocol.data.enums.bedrock.ActorDataIds;
 import net.raphimc.viabedrock.protocol.data.enums.bedrock.ActorFlags;
 import net.raphimc.viabedrock.protocol.data.generated.java.EntityDataFields;
+import net.raphimc.viabedrock.protocol.data.generated.java.RegistryKeys;
 import net.raphimc.viabedrock.protocol.model.EntityAttribute;
 import net.raphimc.viabedrock.protocol.model.EntityProperties;
 import net.raphimc.viabedrock.protocol.storage.EntityPropertyTracker;
 import net.raphimc.viabedrock.protocol.storage.EntityTracker;
+import net.raphimc.viabedrock.protocol.storage.GameSessionStorage;
 import net.raphimc.viabedrock.protocol.types.entitydata.EntityDataTypesBedrock;
 
 import java.util.Iterator;
@@ -337,9 +340,31 @@ public static boolean rewrite(final UserConnection user, final Entity entity, fi
                         final int javaVariant = variant;
                         javaEntityData.add(new EntityData(entity.getJavaEntityDataIndex(EntityDataFields.VARIANT), VersionedTypes.V26_3.entityDataTypes().varIntType, javaVariant));
                     }
-                    case CAT -> { // TODO: Test when I can
-                        final int javaVariant = variant;
-                        javaEntityData.add(new EntityData(entity.getJavaEntityDataIndex(EntityDataFields.VARIANT), VersionedTypes.V26_3.entityDataTypes().varIntType, javaVariant));
+                    case CAT -> {
+                        final String javaVariant = switch (variant) {
+                            case 0 -> "minecraft:white";
+                            case 1 -> "minecraft:black";
+                            case 2 -> "minecraft:red";
+                            case 3 -> "minecraft:siamese";
+                            case 4 -> "minecraft:british_shorthair";
+                            case 5 -> "minecraft:calico";
+                            case 6 -> "minecraft:persian";
+                            case 7 -> "minecraft:ragdoll";
+                            case 8 -> "minecraft:tabby";
+                            case 9 -> "minecraft:all_black";
+                            case 10 -> "minecraft:jellie";
+                            default -> {
+                                ViaBedrock.getPlatform().getLogger().warning("Unknown cat variant " + variant + ", defaulting to BLACK.");
+                                yield "minecraft:black";
+                            }
+                        };
+                        final CompoundTag catVariants = user.get(GameSessionStorage.class).getJavaRegistries().getCompoundTag(RegistryKeys.CAT_VARIANT);
+                        final int javaVariantId = Iterables.indexOf(catVariants.keySet(), javaVariant::equals);
+                        if (javaVariantId == -1) {
+                            ViaBedrock.getPlatform().getLogger().warning("Missing cat variant " + javaVariant + " in the Java registry.");
+                            break;
+                        }
+                        javaEntityData.add(new EntityData(entity.getJavaEntityDataIndex(EntityDataFields.VARIANT), VersionedTypes.V26_3.entityDataTypes().catVariantType, javaVariantId));
                     }
                     default -> {
                         if (variant != 0) { // For some reason bedrock seems to send variant 0 for many entities that don't have variants