Fix cache image task from last commit and make it work with reloading

candrawardana · Jan 31, 2022 · 7853e8c · 7853e8c
1 parent 36afd3f
commit 7853e8c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java
@@ -154,7 +154,6 @@ private GeyserImpl(PlatformType platformType, GeyserBootstrap bootstrap) {
         ItemTranslator.init();
         MessageTranslator.init();
         MinecraftLocale.init();
-        SkinProvider.init();
 
         start();
 
@@ -197,6 +196,8 @@ private void start() {
 
         ScoreboardUpdater.init();
 
+        SkinProvider.registerCacheImageTask(this);
+
         ResourcePack.loadPacks();
 
         if (platformType != PlatformType.STANDALONE && config.getRemote().getAddress().equals("auto")) {

diff --git a/core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java b/core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java
@@ -115,10 +115,12 @@ public class SkinProvider {
         WEARING_CUSTOM_SKULL = new SkinGeometry("{\"geometry\" :{\"default\" :\"geometry.humanoid.wearingCustomSkull\"}}", wearingCustomSkull, false);
         String wearingCustomSkullSlim = new String(FileUtils.readAllBytes("bedrock/skin/geometry.humanoid.wearingCustomSkullSlim.json"), StandardCharsets.UTF_8);
         WEARING_CUSTOM_SKULL_SLIM = new SkinGeometry("{\"geometry\" :{\"default\" :\"geometry.humanoid.wearingCustomSkullSlim\"}}", wearingCustomSkullSlim, false);
+    }
 
+    public static void registerCacheImageTask(GeyserImpl geyser) {
         // Schedule Daily Image Expiry if we are caching them
-        if (GeyserImpl.getInstance().getConfig().getCacheImages() > 0) {
-            GeyserImpl.getInstance().getScheduledThread().scheduleAtFixedRate(() -> {
+        if (geyser.getConfig().getCacheImages() > 0) {
+            geyser.getScheduledThread().scheduleAtFixedRate(() -> {
                 File cacheFolder = GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("cache").resolve("images").toFile();
                 if (!cacheFolder.exists()) {
                     return;
@@ -819,8 +821,4 @@ public static String toRequestedType(CapeUrlType type, UUID uuid, String usernam
             };
         }
     }
-
-    public static void init() {
-        // no-op
-    }
 }