From d4dc309cf5b90faa4d7083df5dbc4bc1b8d15b57 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 30 May 2021 23:46:55 -0400 Subject: [PATCH] sprite manager: use constructor injection Also make cache private --- .../runelite/client/game/SpriteManager.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java index 7c0bd4f2fc..5920682dd7 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java @@ -26,12 +26,12 @@ package net.runelite.client.game; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import com.google.inject.Inject; import java.awt.image.BufferedImage; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import javax.annotation.Nullable; +import javax.inject.Inject; import javax.inject.Singleton; import javax.swing.ImageIcon; import javax.swing.JButton; @@ -48,20 +48,23 @@ import net.runelite.client.util.ImageUtil; @Singleton public class SpriteManager { - @Inject - private Client client; + private final Client client; + private final ClientThread clientThread; + private final InfoBoxManager infoBoxManager; - @Inject - private ClientThread clientThread; - - @Inject - private InfoBoxManager infoBoxManager; - - public Cache cache = CacheBuilder.newBuilder() + private final Cache cache = CacheBuilder.newBuilder() .maximumSize(128L) .expireAfterAccess(1, TimeUnit.HOURS) .build(); + @Inject + private SpriteManager(Client client, ClientThread clientThread, InfoBoxManager infoBoxManager) + { + this.client = client; + this.clientThread = clientThread; + this.infoBoxManager = infoBoxManager; + } + @Nullable public BufferedImage getSprite(int archive, int file) {