From c0227d3da1a427203dfbee98de045733df59ab1a Mon Sep 17 00:00:00 2001
From: onebeastchris <github@onechris.mozmail.com>
Date: Wed, 11 Oct 2023 21:09:14 +0200
Subject: [PATCH] Move loading cdn entries to separate function

---
 .../registry/loader/ResourcePackLoader.java   | 62 ++++++++++---------
 1 file changed, 34 insertions(+), 28 deletions(-)

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 32900d9c7..8a2f5abdf 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
@@ -100,34 +100,8 @@ public class ResourcePackLoader implements RegistryLoader<Path, Map<String, Reso
             resourcePacks.add(skullResourcePack);
         }
 
-        final Path cachedCdnPacksDirectory = GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("cache").resolve("cdn-packs");
-
-        // Download CDN packs to get the pack uuid's
-        if (!Files.exists(cachedCdnPacksDirectory)) {
-            try {
-                Files.createDirectories(cachedCdnPacksDirectory);
-            } catch (IOException e) {
-                GeyserImpl.getInstance().getLogger().error("Could not create cached packs directory", e);
-            }
-        }
-
-        List<String> cdnPacks = GeyserImpl.getInstance().getConfig().getResourcePackUrls();
-        for (String url: cdnPacks) {
-            int packHash = url.hashCode();
-            Path cachedPath = cachedCdnPacksDirectory.resolve(packHash + ".zip");
-            WebUtils.downloadFile(url, cachedPath.toString());
-
-            ResourcePack cdnpack = readPack(cachedPath);
-            UUID uuid = cdnpack.manifest().header().uuid();
-
-            RESOURCE_PACK_CDN_ENTRIES.add(new ResourcePackCDNEntry(url, uuid));
-
-            try {
-                Files.delete(cachedPath);
-            } catch (IOException e) {
-                GeyserImpl.getInstance().getLogger().error("Could not delete cached pack", e);
-            }
-        }
+        // Load CDN entries
+        loadCdnEntries();
 
         GeyserLoadResourcePacksEvent event = new GeyserLoadResourcePacksEvent(resourcePacks);
         GeyserImpl.getInstance().eventBus().fire(event);
@@ -200,4 +174,36 @@ public class ResourcePackLoader implements RegistryLoader<Path, Map<String, Reso
             throw new IllegalArgumentException(GeyserLocale.getLocaleStringLog("geyser.resource_pack.broken", path.getFileName()), e);
         }
     }
+
+    public void loadCdnEntries() {
+        final Path cachedCdnPacksDirectory = GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("cache").resolve("cdn-packs");
+
+        // Download CDN packs to get the pack uuid's
+        if (!Files.exists(cachedCdnPacksDirectory)) {
+            try {
+                Files.createDirectories(cachedCdnPacksDirectory);
+            } catch (IOException e) {
+                GeyserImpl.getInstance().getLogger().error("Could not create cached packs directory", e);
+                return;
+            }
+        }
+
+        List<String> cdnPacks = GeyserImpl.getInstance().getConfig().getResourcePackUrls();
+        for (String url: cdnPacks) {
+            int packHash = url.hashCode();
+            Path cachedPath = cachedCdnPacksDirectory.resolve(packHash + ".zip");
+            WebUtils.downloadFile(url, cachedPath.toString());
+
+            ResourcePack cdnpack = readPack(cachedPath);
+            UUID uuid = cdnpack.manifest().header().uuid();
+
+            RESOURCE_PACK_CDN_ENTRIES.add(new ResourcePackCDNEntry(url, uuid));
+
+            try {
+                Files.delete(cachedPath);
+            } catch (IOException e) {
+                GeyserImpl.getInstance().getLogger().error("Could not delete cached pack", e);
+            }
+        }
+    }
 }