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

update

Browse Source
This commit is contained in:
xKylee
2020-01-13 23:42:33 +00:00
parent 6a9a471b72
commit bc486ced56
3 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java
View File

@@ -69,7 +69,6 @@ import net.runelite.client.ui.ClientToolbar;
import net.runelite.client.ui.NavigationButton; import net.runelite.client.ui.NavigationButton;
import net.runelite.client.ui.components.colorpicker.ColorPickerManager; import net.runelite.client.ui.components.colorpicker.ColorPickerManager;
import net.runelite.client.util.ImageUtil; import net.runelite.client.util.ImageUtil;
import javax.inject.Inject; import javax.inject.Inject;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
@@ -149,10 +148,10 @@ public class InventorySetupPlugin extends Plugin
@Override @Override
public void startUp() public void startUp()
{ {
updateConfig(); updateConfig();
this.panel = new InventorySetupPluginPanel(this, itemManager);
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "/inventorysetups_icon.png"); panel = new InventorySetupPluginPanel(this, itemManager);
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "inventorysetups_icon.png");
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.tooltip("Inventory Setups") .tooltip("Inventory Setups")
@@ -166,11 +165,9 @@ public class InventorySetupPlugin extends Plugin
// load all the inventory setups from the config file // load all the inventory setups from the config file
clientThread.invokeLater(() -> clientThread.invokeLater(() ->
{ {
switch (client.getGameState()) if (client.getGameState() != GameState.LOGIN_SCREEN)
{ {
case STARTING: return false;
case UNKNOWN:
return false;
} }
loadConfig(); loadConfig();
@@ -182,7 +179,6 @@ public class InventorySetupPlugin extends Plugin
return true; return true;
}); });
} }
@Override @Override

18
runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPanel.java
View File

@@ -101,7 +101,7 @@ public class InventorySetupPanel extends JPanel
static static
{ {
final BufferedImage bankFilterImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "/filter_icon.png"); final BufferedImage bankFilterImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "filter_icon.png");
final BufferedImage bankFilterHover = ImageUtil.luminanceOffset(bankFilterImg, -150); final BufferedImage bankFilterHover = ImageUtil.luminanceOffset(bankFilterImg, -150);
BANK_FILTER_ICON = new ImageIcon(bankFilterImg); BANK_FILTER_ICON = new ImageIcon(bankFilterImg);
BANK_FILTER_HOVER_ICON = new ImageIcon(bankFilterHover); BANK_FILTER_HOVER_ICON = new ImageIcon(bankFilterHover);
@@ -109,7 +109,7 @@ public class InventorySetupPanel extends JPanel
NO_BANK_FILTER_ICON = new ImageIcon(bankFilterHover); NO_BANK_FILTER_ICON = new ImageIcon(bankFilterHover);
NO_BANK_FILTER_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(bankFilterHover, -100)); NO_BANK_FILTER_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(bankFilterHover, -100));
final BufferedImage stackImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "/stack_icon.png"); final BufferedImage stackImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "stack_icon.png");
final BufferedImage stackHover = ImageUtil.luminanceOffset(stackImg, -150); final BufferedImage stackHover = ImageUtil.luminanceOffset(stackImg, -150);
STACK_DIFFERENCE_ICON = new ImageIcon(stackImg); STACK_DIFFERENCE_ICON = new ImageIcon(stackImg);
STACK_DIFFERENCE_HOVER_ICON = new ImageIcon(stackHover); STACK_DIFFERENCE_HOVER_ICON = new ImageIcon(stackHover);
@@ -117,7 +117,7 @@ public class InventorySetupPanel extends JPanel
NO_STACK_DIFFERENCE_ICON = new ImageIcon(stackHover); NO_STACK_DIFFERENCE_ICON = new ImageIcon(stackHover);
NO_STACK_DIFFERENCE_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(stackHover, -100)); NO_STACK_DIFFERENCE_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(stackHover, -100));
final BufferedImage variationImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "/variation_icon.png"); final BufferedImage variationImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "variation_icon.png");
final BufferedImage variationHover = ImageUtil.luminanceOffset(variationImg, -150); final BufferedImage variationHover = ImageUtil.luminanceOffset(variationImg, -150);
VARIATION_DIFFERENCE_ICON = new ImageIcon(variationImg); VARIATION_DIFFERENCE_ICON = new ImageIcon(variationImg);
VARIATION_DIFFERENCE_HOVER_ICON = new ImageIcon(variationHover); VARIATION_DIFFERENCE_HOVER_ICON = new ImageIcon(variationHover);
@@ -125,7 +125,7 @@ public class InventorySetupPanel extends JPanel
NO_VARIATION_DIFFERENCE_ICON = new ImageIcon(variationHover); NO_VARIATION_DIFFERENCE_ICON = new ImageIcon(variationHover);
NO_VARIATION_DIFFERENCE_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(variationHover, -100)); NO_VARIATION_DIFFERENCE_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(variationHover, -100));
final BufferedImage unorderedHighlightImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "/unordered_highlight_icon.png"); final BufferedImage unorderedHighlightImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "unordered_highlight_icon.png");
final BufferedImage unorderedHighlightHover = ImageUtil.luminanceOffset(unorderedHighlightImg, -150); final BufferedImage unorderedHighlightHover = ImageUtil.luminanceOffset(unorderedHighlightImg, -150);
UNORDERED_HIGHLIGHT_ICON = new ImageIcon(unorderedHighlightImg); UNORDERED_HIGHLIGHT_ICON = new ImageIcon(unorderedHighlightImg);
UNORDERED_HIGHLIGHT_HOVER_ICON = new ImageIcon(unorderedHighlightHover); UNORDERED_HIGHLIGHT_HOVER_ICON = new ImageIcon(unorderedHighlightHover);
@@ -133,7 +133,7 @@ public class InventorySetupPanel extends JPanel
NO_UNORDERED_HIGHLIGHT_ICON = new ImageIcon(unorderedHighlightHover); NO_UNORDERED_HIGHLIGHT_ICON = new ImageIcon(unorderedHighlightHover);
NO_UNORDERED_HIGHLIGHT_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(unorderedHighlightHover, -100)); NO_UNORDERED_HIGHLIGHT_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(unorderedHighlightHover, -100));
final BufferedImage highlightToggleImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "/highlight_icon.png"); final BufferedImage highlightToggleImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "highlight_icon.png");
final BufferedImage highlightToggleHover = ImageUtil.luminanceOffset(highlightToggleImg, -150); final BufferedImage highlightToggleHover = ImageUtil.luminanceOffset(highlightToggleImg, -150);
TOGGLE_HIGHLIGHT_ICON = new ImageIcon(highlightToggleImg); TOGGLE_HIGHLIGHT_ICON = new ImageIcon(highlightToggleImg);
TOGGLE_HIGHLIGHT_HOVER_ICON = new ImageIcon(highlightToggleHover); TOGGLE_HIGHLIGHT_HOVER_ICON = new ImageIcon(highlightToggleHover);
@@ -141,7 +141,7 @@ public class InventorySetupPanel extends JPanel
NO_TOGGLE_HIGHLIGHT_ICON = new ImageIcon(highlightToggleHover); NO_TOGGLE_HIGHLIGHT_ICON = new ImageIcon(highlightToggleHover);
NO_TOGGLE_HIGHLIGHT_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(highlightToggleHover, -100)); NO_TOGGLE_HIGHLIGHT_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(highlightToggleHover, -100));
final BufferedImage highlightImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "/highlight_color_icon.png"); final BufferedImage highlightImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "highlight_color_icon.png");
final BufferedImage highlightHover = ImageUtil.luminanceOffset(highlightImg, -150); final BufferedImage highlightHover = ImageUtil.luminanceOffset(highlightImg, -150);
HIGHLIGHT_COLOR_ICON = new ImageIcon(highlightImg); HIGHLIGHT_COLOR_ICON = new ImageIcon(highlightImg);
HIGHLIGHT_COLOR_HOVER_ICON = new ImageIcon(highlightHover); HIGHLIGHT_COLOR_HOVER_ICON = new ImageIcon(highlightHover);
@@ -149,17 +149,17 @@ public class InventorySetupPanel extends JPanel
NO_HIGHLIGHT_COLOR_ICON = new ImageIcon(highlightHover); NO_HIGHLIGHT_COLOR_ICON = new ImageIcon(highlightHover);
NO_HIGHLIGHT_COLOR_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(highlightHover, -100)); NO_HIGHLIGHT_COLOR_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(highlightHover, -100));
final BufferedImage viewImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "/visible_icon.png"); final BufferedImage viewImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "visible_icon.png");
final BufferedImage viewImgHover = ImageUtil.luminanceOffset(viewImg, -150); final BufferedImage viewImgHover = ImageUtil.luminanceOffset(viewImg, -150);
VIEW_SETUP_ICON = new ImageIcon(viewImg); VIEW_SETUP_ICON = new ImageIcon(viewImg);
VIEW_SETUP_HOVER_ICON = new ImageIcon(viewImgHover); VIEW_SETUP_HOVER_ICON = new ImageIcon(viewImgHover);
final BufferedImage exportImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "/export_icon.png"); final BufferedImage exportImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "export_icon.png");
final BufferedImage exportImgHover = ImageUtil.luminanceOffset(exportImg, -150); final BufferedImage exportImgHover = ImageUtil.luminanceOffset(exportImg, -150);
EXPORT_ICON = new ImageIcon(exportImg); EXPORT_ICON = new ImageIcon(exportImg);
EXPORT_HOVER_ICON = new ImageIcon(exportImgHover); EXPORT_HOVER_ICON = new ImageIcon(exportImgHover);
final BufferedImage deleteImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "/delete_icon.png"); final BufferedImage deleteImg = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "delete_icon.png");
DELETE_ICON = new ImageIcon(deleteImg); DELETE_ICON = new ImageIcon(deleteImg);
DELETE_HOVER_ICON = new ImageIcon(ImageUtil.luminanceOffset(deleteImg, -100)); DELETE_HOVER_ICON = new ImageIcon(ImageUtil.luminanceOffset(deleteImg, -100));
} }

8
runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java
View File

@@ -69,19 +69,19 @@ public class InventorySetupPluginPanel extends PluginPanel
static static
{ {
final BufferedImage addIcon = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "/add_icon.png"); final BufferedImage addIcon = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "add_icon.png");
ADD_ICON = new ImageIcon(addIcon); ADD_ICON = new ImageIcon(addIcon);
ADD_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(addIcon, 0.53f)); ADD_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(addIcon, 0.53f));
final BufferedImage importIcon = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "/import_icon.png"); final BufferedImage importIcon = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "import_icon.png");
IMPORT_ICON = new ImageIcon(importIcon); IMPORT_ICON = new ImageIcon(importIcon);
IMPORT_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(importIcon, 0.53f)); IMPORT_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(importIcon, 0.53f));
final BufferedImage updateIcon = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "/update_icon.png"); final BufferedImage updateIcon = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "update_icon.png");
UPDATE_ICON = new ImageIcon(updateIcon); UPDATE_ICON = new ImageIcon(updateIcon);
UPDATE_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(updateIcon, 0.53f)); UPDATE_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(updateIcon, 0.53f));
final BufferedImage backIcon = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "/back_arrow_icon.png"); final BufferedImage backIcon = ImageUtil.getResourceStreamFromClass(InventorySetupPlugin.class, "back_arrow_icon.png");
BACK_ICON = new ImageIcon(ImageUtil.flipImage(backIcon, true, false)); BACK_ICON = new ImageIcon(ImageUtil.flipImage(backIcon, true, false));
BACK_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(ImageUtil.flipImage(backIcon, true, false), 0.53f)); BACK_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(ImageUtil.flipImage(backIcon, true, false), 0.53f));