Even more hashers for data components, that also need testing

core/src/main/java/org/geysermc/geyser/item/hashing/DataComponentHashers.java

@@ -223,6 +223,31 @@ public class DataComponentHashers {
         register(DataComponentTypes.LOCK, MinecraftHasher.NBT_MAP);
         register(DataComponentTypes.CONTAINER_LOOT, MinecraftHasher.NBT_MAP);
         register(DataComponentTypes.BREAK_SOUND, RegistryHasher.SOUND_EVENT);
+
+        register(DataComponentTypes.VILLAGER_VARIANT, RegistryHasher.VILLAGER_TYPE);
+        register(DataComponentTypes.WOLF_VARIANT, RegistryHasher.WOLF_VARIANT);
+        //register(DataComponentTypes.WOLF_SOUND_VARIANT, ); // TODO same issue as damage type
+        register(DataComponentTypes.WOLF_COLLAR, MinecraftHasher.DYE_COLOR);
+        register(DataComponentTypes.FOX_VARIANT, RegistryHasher.FOX_VARIANT);
+        register(DataComponentTypes.SALMON_SIZE, RegistryHasher.SALMON_VARIANT);
+        register(DataComponentTypes.PARROT_VARIANT, RegistryHasher.PARROT_VARIANT);
+        register(DataComponentTypes.TROPICAL_FISH_PATTERN, RegistryHasher.TROPICAL_FISH_PATTERN);
+        register(DataComponentTypes.TROPICAL_FISH_BASE_COLOR, MinecraftHasher.DYE_COLOR);
+        register(DataComponentTypes.TROPICAL_FISH_PATTERN_COLOR, MinecraftHasher.DYE_COLOR);
+        register(DataComponentTypes.MOOSHROOM_VARIANT, RegistryHasher.MOOSHROOM_VARIANT);
+        register(DataComponentTypes.RABBIT_VARIANT, RegistryHasher.RABBIT_VARIANT);
+        register(DataComponentTypes.PIG_VARIANT, RegistryHasher.PIG_VARIANT);
+        register(DataComponentTypes.COW_VARIANT, RegistryHasher.COW_VARIANT);
+        // register(DataComponentTypes.CHICKEN_VARIANT,); // TODO requires change in MCPL?
+        register(DataComponentTypes.FROG_VARIANT, RegistryHasher.FROG_VARIANT);
+        register(DataComponentTypes.HORSE_VARIANT, RegistryHasher.HORSE_VARIANT);
+        register(DataComponentTypes.PAINTING_VARIANT, RegistryHasher.PAINTING_VARIANT);
+        register(DataComponentTypes.LLAMA_VARIANT, RegistryHasher.LLAMA_VARIANT);
+        register(DataComponentTypes.AXOLOTL_VARIANT, RegistryHasher.AXOLOTL_VARIANT);
+        register(DataComponentTypes.CAT_VARIANT, RegistryHasher.CAT_VARIANT);
+        register(DataComponentTypes.CAT_COLLAR, MinecraftHasher.DYE_COLOR);
+        register(DataComponentTypes.SHEEP_COLOR, MinecraftHasher.DYE_COLOR);
+        register(DataComponentTypes.SHULKER_COLOR, MinecraftHasher.DYE_COLOR);
     }
 
     private static void registerUnit(DataComponentType<Unit> component) {

core/src/main/java/org/geysermc/geyser/item/hashing/RegistryHasher.java

@@ -30,11 +30,22 @@ import org.cloudburstmc.nbt.NbtMap;
 import org.geysermc.geyser.inventory.item.Potion;
 import org.geysermc.geyser.item.hashing.data.ConsumeEffectType;
 import org.geysermc.geyser.item.hashing.data.ItemContainerSlot;
+import org.geysermc.geyser.item.hashing.data.entity.AxolotlVariant;
+import org.geysermc.geyser.item.hashing.data.entity.FoxVariant;
+import org.geysermc.geyser.item.hashing.data.entity.HorseVariant;
+import org.geysermc.geyser.item.hashing.data.entity.LlamaVariant;
+import org.geysermc.geyser.item.hashing.data.entity.MooshroomVariant;
+import org.geysermc.geyser.item.hashing.data.entity.ParrotVariant;
+import org.geysermc.geyser.item.hashing.data.entity.RabbitVariant;
+import org.geysermc.geyser.item.hashing.data.entity.SalmonVariant;
+import org.geysermc.geyser.item.hashing.data.entity.TropicalFishPattern;
+import org.geysermc.geyser.item.hashing.data.entity.VillagerVariant;
 import org.geysermc.geyser.session.cache.registry.JavaRegistries;
 import org.geysermc.geyser.session.cache.registry.JavaRegistryKey;
 import org.geysermc.geyser.util.MinecraftKey;
 import org.geysermc.mcprotocollib.protocol.data.game.Holder;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.Effect;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.PaintingVariant;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.type.EntityType;
 import org.geysermc.mcprotocollib.protocol.data.game.item.ItemStack;
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.ArmorTrim;
@@ -206,12 +217,51 @@ public interface RegistryHasher extends MinecraftHasher<Integer> {
         .accept("ticks_in_hive", INT, BeehiveOccupant::getTicksInHive)
         .accept("min_ticks_in_hive", INT, BeehiveOccupant::getMinTicksInHive));
 
+    RegistryHasher VILLAGER_TYPE = enumIdRegistry(VillagerVariant.values());
+
+    RegistryHasher WOLF_VARIANT = registry(JavaRegistries.WOLF_VARIANT);
+
+    MinecraftHasher<Integer> FOX_VARIANT = MinecraftHasher.fromIdEnum(FoxVariant.values());
+
+    MinecraftHasher<Integer> SALMON_VARIANT = MinecraftHasher.fromIdEnum(SalmonVariant.values());
+
+    MinecraftHasher<Integer> PARROT_VARIANT = MinecraftHasher.fromIdEnum(ParrotVariant.values());
+
+    MinecraftHasher<Integer> TROPICAL_FISH_PATTERN = MinecraftHasher.<TropicalFishPattern>fromEnum().convert(TropicalFishPattern::fromPackedId);
+
+    MinecraftHasher<Integer> MOOSHROOM_VARIANT = MinecraftHasher.fromIdEnum(MooshroomVariant.values());
+
+    MinecraftHasher<Integer> RABBIT_VARIANT = MinecraftHasher.<RabbitVariant>fromEnum().convert(RabbitVariant::fromId);
+
+    RegistryHasher PIG_VARIANT = registry(JavaRegistries.PIG_VARIANT);
+
+    RegistryHasher COW_VARIANT = registry(JavaRegistries.COW_VARIANT);
+
+    RegistryHasher FROG_VARIANT = registry(JavaRegistries.FROG_VARIANT);
+
+    MinecraftHasher<Integer> HORSE_VARIANT = MinecraftHasher.fromIdEnum(HorseVariant.values());
+
+    MinecraftHasher<PaintingVariant> DIRECT_PAINTING_VARIANT = MinecraftHasher.mapBuilder(builder -> builder
+        .accept("width", INT, PaintingVariant::width)
+        .accept("height", INT, PaintingVariant::height)
+        .accept("asset_id", KEY, PaintingVariant::assetId)
+        .optionalNullable("title", ComponentHasher.COMPONENT, PaintingVariant::title)
+        .optionalNullable("author", ComponentHasher.COMPONENT, PaintingVariant::author));
+
+    MinecraftHasher<Holder<PaintingVariant>> PAINTING_VARIANT = holder(JavaRegistries.PAINTING_VARIANT, DIRECT_PAINTING_VARIANT);
+
+    MinecraftHasher<Integer> LLAMA_VARIANT = MinecraftHasher.fromIdEnum(LlamaVariant.values());
+
+    MinecraftHasher<Integer> AXOLOTL_VARIANT = MinecraftHasher.fromIdEnum(AxolotlVariant.values());
+
+    RegistryHasher CAT_VARIANT = registry(JavaRegistries.CAT_VARIANT);
+
     static RegistryHasher registry(JavaRegistryKey<?> registry) {
         MinecraftHasher<Integer> hasher = KEY.sessionConvert(registry::keyFromNetworkId);
         return hasher::hash;
     }
 
-    // We don't need the registry generic type, and this works easier for goat horn instruments and other registries
+    // We don't need the registry generic type, and this works easier for various registries
     static <T> MinecraftHasher<Holder<T>> holder(JavaRegistryKey<?> registry, MinecraftHasher<T> direct) {
         RegistryHasher registryHasher = registry(registry);
         return (value, encoder) -> {

core/src/main/java/org/geysermc/geyser/item/hashing/data/FireworkExplosionShape.java

@@ -25,6 +25,7 @@
 
 package org.geysermc.geyser.item.hashing.data;
 
+// Ordered and named by Java ID
 public enum FireworkExplosionShape {
     SMALL_BALL,
     LARGE_BALL,

core/src/main/java/org/geysermc/geyser/item/hashing/data/entity/AxolotlVariant.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.item.hashing.data.entity;
+
+// Ordered and named by Java ID
+public enum AxolotlVariant {
+    LUCY,
+    WILD,
+    GOLD,
+    CYAN,
+    BLUE
+}

core/src/main/java/org/geysermc/geyser/item/hashing/data/entity/FoxVariant.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2025 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.item.hashing.data.entity;
+
+// Ordered and named by Java ID
+public enum FoxVariant {
+    RED,
+    SNOW
+}

core/src/main/java/org/geysermc/geyser/item/hashing/data/entity/HorseVariant.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2025 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.item.hashing.data.entity;
+
+// Ordered and named by Java ID
+public enum HorseVariant {
+    WHITE,
+    CREAMY,
+    CHESTNUT,
+    BROWN,
+    BLACK,
+    GRAY,
+    DARK_BROWN
+}

core/src/main/java/org/geysermc/geyser/item/hashing/data/entity/LlamaVariant.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2025 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.item.hashing.data.entity;
+
+// Ordered and named by Java ID
+public enum LlamaVariant {
+    CREAMY,
+    WHITE,
+    BROWN,
+    GRAY
+}

core/src/main/java/org/geysermc/geyser/item/hashing/data/entity/MooshroomVariant.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2025 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.item.hashing.data.entity;
+
+// Ordered and named by Java ID
+public enum MooshroomVariant {
+    RED,
+    BROWN
+}

core/src/main/java/org/geysermc/geyser/item/hashing/data/entity/ParrotVariant.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.item.hashing.data.entity;
+
+// Ordered and named by Java ID
+public enum ParrotVariant {
+    RED_BLUE,
+    BLUE,
+    GREEN,
+    YELLOW_BLUE,
+    GRAY
+}

core/src/main/java/org/geysermc/geyser/item/hashing/data/entity/RabbitVariant.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2025 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.item.hashing.data.entity;
+
+// Named by Java ID
+public enum RabbitVariant {
+    BROWN(0),
+    WHITE(1),
+    BLACK(2),
+    WHITE_SPLOTCHED(3),
+    GOLD(4),
+    SALT(5),
+    EVIL(99);
+
+    private final int id;
+
+    RabbitVariant(int id) {
+        this.id = id;
+    }
+
+    public static RabbitVariant fromId(int id) {
+        for (RabbitVariant variant : values()) {
+            if (variant.id == id) {
+                return variant;
+            }
+        }
+        throw new IllegalArgumentException("Unknown rabbit variant ID");
+    }
+}

core/src/main/java/org/geysermc/geyser/item/hashing/data/entity/SalmonVariant.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2025 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.item.hashing.data.entity;
+
+// Ordered and named by Java ID
+public enum SalmonVariant {
+    SMALL,
+    MEDIUM,
+    LARGE
+}

core/src/main/java/org/geysermc/geyser/item/hashing/data/entity/TropicalFishPattern.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2025 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.item.hashing.data.entity;
+
+// Named by Java ID
+public enum TropicalFishPattern {
+    KOB(Base.SMALL, 0),
+    SUNSTREAK(Base.SMALL, 1),
+    SNOOPER(Base.SMALL, 2),
+    DASHER(Base.SMALL, 3),
+    BRINELY(Base.SMALL, 4),
+    SPOTTY(Base.SMALL, 5),
+    FLOPPER(Base.LARGE, 0),
+    STRIPEY(Base.LARGE, 1),
+    GLITTER(Base.LARGE, 2),
+    BLOCKFISH(Base.LARGE, 3),
+    BETTY(Base.LARGE, 4),
+    CLAYFISH(Base.LARGE, 5);
+
+    private final int packedId;
+
+    TropicalFishPattern(Base base, int id) {
+        this.packedId = base.ordinal() | id << 8;
+    }
+
+    // Ordered by Java ID
+    enum Base {
+        SMALL,
+        LARGE
+    }
+
+    public static TropicalFishPattern fromPackedId(int packedId) {
+        for (TropicalFishPattern pattern : values()) {
+            if (pattern.packedId == packedId) {
+                return pattern;
+            }
+        }
+        throw new IllegalArgumentException("Illegal packed tropical fish pattern ID");
+    }
+}

core/src/main/java/org/geysermc/geyser/item/hashing/data/entity/VillagerVariant.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2025 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.item.hashing.data.entity;
+
+// Ordered and named by Java ID
+public enum VillagerVariant {
+    DESERT,
+    JUNGLE,
+    PLAINS,
+    SAVANNA,
+    SNOW,
+    SWAMP,
+    TAIGA
+}

core/src/main/java/org/geysermc/geyser/session/cache/RegistryCache.java

@@ -92,7 +92,7 @@ public final class RegistryCache {
         register(JavaRegistries.ENCHANTMENT, cache -> cache.enchantments, Enchantment::read);
         register(JavaRegistries.INSTRUMENT, cache -> cache.instruments, GeyserInstrument::read);
         register(JavaRegistries.JUKEBOX_SONG, cache -> cache.jukeboxSongs, JukeboxSong::read);
-        register("painting_variant", cache -> cache.paintings, context -> PaintingType.getByName(context.id()));
+        register(JavaRegistries.PAINTING_VARIANT, cache -> cache.paintings, context -> PaintingType.getByName(context.id()));
         register(JavaRegistries.TRIM_MATERIAL, cache -> cache.trimMaterials, TrimRecipe::readTrimMaterial);
         register(JavaRegistries.TRIM_PATTERN, cache -> cache.trimPatterns, TrimRecipe::readTrimPattern);
         register("worldgen/biome", (cache, array) -> cache.biomeTranslations = array, BiomeTranslator::loadServerBiome);

core/src/main/java/org/geysermc/geyser/session/cache/registry/JavaRegistries.java

@@ -38,6 +38,7 @@ import org.geysermc.geyser.inventory.item.GeyserInstrument;
 import org.geysermc.geyser.item.enchantment.Enchantment;
 import org.geysermc.geyser.item.type.Item;
 import org.geysermc.geyser.level.JukeboxSong;
+import org.geysermc.geyser.level.PaintingType;
 import org.geysermc.geyser.level.block.type.Block;
 import org.geysermc.geyser.registry.BlockRegistries;
 import org.geysermc.geyser.registry.ListRegistry;
@@ -61,6 +62,7 @@ public class JavaRegistries {
     public static final JavaRegistryKey<BannerPattern> BANNER_PATTERN = create("banner_pattern", RegistryCache::bannerPatterns);
     public static final JavaRegistryKey<GeyserInstrument> INSTRUMENT = create("instrument", RegistryCache::instruments);
     public static final JavaRegistryKey<JukeboxSong> JUKEBOX_SONG = create("jukebox_song", RegistryCache::jukeboxSongs);
+    public static final JavaRegistryKey<PaintingType> PAINTING_VARIANT = create("painting_variant", RegistryCache::paintings);
     public static final JavaRegistryKey<TrimMaterial> TRIM_MATERIAL = create("trim_material", RegistryCache::trimMaterials);
     public static final JavaRegistryKey<TrimPattern> TRIM_PATTERN = create("trim_pattern", RegistryCache::trimPatterns);