From ce3083b9b83b65ffc041326e45f14aa040c9dd7b Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Thu, 13 Jun 2024 11:24:16 -0400
Subject: [PATCH] Fix key regression with pre-built registries

---
 .../geysermc/geyser/session/cache/RegistryCache.java   | 10 +++++-----
 .../java/JavaClientboundRecipesTranslator.java         |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/RegistryCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/RegistryCache.java
index 02c43939d..3121af369 100644
--- a/core/src/main/java/org/geysermc/geyser/session/cache/RegistryCache.java
+++ b/core/src/main/java/org/geysermc/geyser/session/cache/RegistryCache.java
@@ -72,7 +72,7 @@ import java.util.function.ToIntFunction;
 @Accessors(fluent = true)
 @Getter
 public final class RegistryCache {
-    private static final Map<Key, Map<String, NbtMap>> DEFAULTS;
+    private static final Map<Key, Map<Key, NbtMap>> DEFAULTS;
     private static final Map<Key, BiConsumer<RegistryCache, List<RegistryEntry>>> REGISTRIES = new HashMap<>();
 
     static {
@@ -89,14 +89,14 @@ public final class RegistryCache {
 
         // Load from MCProtocolLib's classloader
         NbtMap tag = MinecraftProtocol.loadNetworkCodec();
-        Map<Key, Map<String, NbtMap>> defaults = new HashMap<>();
+        Map<Key, Map<Key, NbtMap>> defaults = new HashMap<>();
         // Don't create a keySet - no need to create the cached object in HashMap if we don't use it again
         REGISTRIES.forEach((key, $) -> {
             List<NbtMap> rawValues = tag.getCompound(key.asString())
                     .getList("value", NbtType.COMPOUND);
-            Map<String, NbtMap> values = new HashMap<>();
+            Map<Key, NbtMap> values = new HashMap<>();
             for (NbtMap value : rawValues) {
-                String name = value.getString("name");
+                Key name = MinecraftKey.key(value.getString("name"));
                 values.put(name, value.getCompound("element"));
             }
             // Can make these maps immutable and as efficient as possible after initialization
@@ -152,7 +152,7 @@ public final class RegistryCache {
     private static <T> void register(String registry, Function<RegistryCache, JavaRegistry<T>> localCacheFunction, BiFunction<GeyserSession, RegistryEntry, T> reader) {
         Key key = MinecraftKey.key(registry);
         REGISTRIES.put(key, (registryCache, entries) -> {
-            Map<String, NbtMap> localRegistry = null;
+            Map<Key, NbtMap> localRegistry = null;
             JavaRegistry<T> localCache = localCacheFunction.apply(registryCache);
             // Clear each local cache every time a new registry entry is given to us
             // (e.g. proxy server switches)
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaClientboundRecipesTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaClientboundRecipesTranslator.java
index 06abbbac0..9eb69183d 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaClientboundRecipesTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaClientboundRecipesTranslator.java
@@ -39,7 +39,6 @@ public class JavaClientboundRecipesTranslator extends PacketTranslator<Clientbou
 
     @Override
     public void translate(GeyserSession session, ClientboundRecipePacket packet) {
-        System.out.println(packet);
         UnlockedRecipesPacket recipesPacket = new UnlockedRecipesPacket();
         switch (packet.getAction()) {
             case INIT -> {