ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Use ItemManager in KourendLibraryPlugin

Browse Source
This commit is contained in:
Max Weber
2018-04-11 03:42:11 -06:00
parent b3fa9a5e49
commit 30413c0257
29 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java
View File

@@ -24,14 +24,13 @@
*/
package net.runelite.client.plugins.kourendlibrary;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import javax.imageio.ImageIO;
import lombok.Getter;
import net.runelite.api.ItemID;
import net.runelite.client.game.AsyncBufferedImage;
import net.runelite.client.game.ItemManager;
public enum Book
{
@@ -77,7 +76,7 @@ public enum Book
return Collections.unmodifiableMap(byId);
}
private static final Map<String, Book> buildByName()
private static Map<String, Book> buildByName()
{
HashMap<String, Book> byName = new HashMap<>();
for (Book b : Book.values())
@@ -110,7 +109,7 @@ public enum Book
private final String shortName;
@Getter
private final BufferedImage icon;
private AsyncBufferedImage icon;
@Getter
private final boolean isDarkManuscript;
@@ -121,7 +120,6 @@ public enum Book
this.isDarkManuscript = false;
this.shortName = shortName;
this.name = name;
this.icon = getImage(Integer.toString(id));
}
Book(int id)
@@ -130,21 +128,13 @@ public enum Book
this.isDarkManuscript = true;
this.name = "Dark Manuscript";
this.shortName = "Dark Manuscript";
this.icon = getImage(Integer.toString(id));
}
private static BufferedImage getImage(String name)
static void fillImages(ItemManager itemManager)
{
try
for (Book b : values())
{
synchronized (ImageIO.class)
{
return ImageIO.read(Book.class.getResourceAsStream("items/" + name + ".png"));
}
}
catch (IOException | IllegalArgumentException e)
{
throw new RuntimeException("Cannot load book " + name, e);
b.icon = itemManager.getImage(b.item);
}
}
}
}

4
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java
View File

@@ -26,7 +26,6 @@ package net.runelite.client.plugins.kourendlibrary;
import java.awt.Color;
import javax.swing.GroupLayout;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JPanel;
import net.runelite.client.ui.FontManager;
@@ -40,7 +39,8 @@ class BookPanel extends JPanel
GroupLayout layout = new GroupLayout(this);
this.setLayout(layout);
JLabel image = new JLabel(new ImageIcon(b.getIcon()));
JLabel image = new JLabel();
b.getIcon().addTo(image);
JLabel name = new JLabel(b.getShortName());
location.setFont(FontManager.getRunescapeSmallFont());

6
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
View File

@@ -42,6 +42,7 @@ import net.runelite.api.events.GameTick;
import net.runelite.api.events.MenuOptionClicked;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.game.ItemManager;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.ui.NavigationButton;
@@ -68,6 +69,9 @@ public class KourendLibraryPlugin extends Plugin
@Inject
private KourendLibraryOverlay overlay;
@Inject
private ItemManager itemManager;
private KourendLibraryPanel panel;
private NavigationButton navButton;
@@ -77,6 +81,8 @@ public class KourendLibraryPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
Book.fillImages(itemManager);
panel = injector.getInstance(KourendLibraryPanel.class);
panel.init();