From 27659d0f2b16624e00e55bbe87452ea795928ef5 Mon Sep 17 00:00:00 2001
From: onebeastchris <github@onechris.mozmail.com>
Date: Mon, 24 Jun 2024 18:30:34 +0200
Subject: [PATCH] Add device type to debug to be able to isolate platform
 specific requirements

---
 .../org/geysermc/geyser/network/UpstreamPacketHandler.java | 2 +-
 .../geyser/registry/loader/ResourcePackLoader.java         | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
index db55a543a..b83b512d8 100644
--- a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
@@ -305,7 +305,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
 
         // If a remote pack ends up here, that usually implies that a client was not able to download the pack
         if (codec instanceof UrlPackCodec urlPackCodec) {
-            ResourcePackLoader.testUrlPack(urlPackCodec);
+            ResourcePackLoader.testUrlPack(session, urlPackCodec);
         }
 
         data.setChunkIndex(packet.getChunkIndex());
diff --git a/core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java
index 71f139973..a0805edde 100644
--- a/core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java
@@ -42,6 +42,7 @@ import org.geysermc.geyser.pack.SkullResourcePackManager;
 import org.geysermc.geyser.pack.path.GeyserPathPackCodec;
 import org.geysermc.geyser.pack.url.GeyserUrlPackCodec;
 import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.text.GeyserLocale;
 import org.geysermc.geyser.util.FileUtils;
 import org.geysermc.geyser.util.WebUtils;
@@ -252,10 +253,12 @@ public class ResourcePackLoader implements RegistryLoader<Path, Map<String, Reso
      *
      * @param codec the codec of the resource pack that wasn't successfully downloaded by a Bedrock client.
      */
-    public static void testUrlPack(UrlPackCodec codec) {
+    public static void testUrlPack(GeyserSession session, UrlPackCodec codec) {
         if (CACHED_FAILED_PACKS.getIfPresent(codec.url()) == null) {
             CACHED_FAILED_PACKS.put(codec.url(), codec);
-            GeyserImpl.getInstance().getLogger().warning("A client was not able to download the resource pack at %s. Is it still available? Running check now:");
+            GeyserImpl.getInstance().getLogger().warning("""
+                A Bedrock client (%s, playing on %s / %s) was not able to download the resource pack at %s. Is it still available? Running check now.
+           """.formatted(session.bedrockUsername(), session.getClientData().getDeviceOs().name(), session.getClientData().getDeviceId(), codec.url()));
             downloadPack(codec.url(), true);
         }
     }