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

inventorytags: add 4 additional tags (#2307)

Browse Source 
* inventory tags: add 4 additional tags

bring inline with tile markers having 12 options.

* inventory tags: add 4 additional tags

* Update InventoryTagsConfig.java

* Update InventoryTagsPlugin.java
This commit is contained in:
Kyle
2020-02-02 15:23:10 +00:00
committed by GitHub
parent 6ece2b5f2f
commit 9073e00159
2 changed files with 91 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsConfig.java
View File

@@ -45,7 +45,11 @@ public interface InventoryTagsConfig extends Config
FIVE("5"),
SIX("6"),
SEVEN("7"),
EIGHT("8");
EIGHT("8"),
NINE("9"),
TEN("10"),
ELEVEN("11"),
TWELVE("12");
private final String name;
@@ -79,7 +83,7 @@ public interface InventoryTagsConfig extends Config
description = "Color of the Tag",
hidden = true,
unhide = "amount",
unhideValue = "1 || 2 || 3 || 4 || 5 || 6 || 7 || 8"
unhideValue = "1 || 2 || 3 || 4 || 5 || 6 || 7 || 8 || 9 || 10 || 11 || 12"
)
default Color getGroup1Color()
{
@@ -93,7 +97,7 @@ public interface InventoryTagsConfig extends Config
description = "Color of the Tag",
hidden = true,
unhide = "amount",
unhideValue = "2 || 3 || 4 || 5 || 6 || 7 || 8"
unhideValue = "2 || 3 || 4 || 5 || 6 || 7 || 8 || 9 || 10 || 11 || 12"
)
default Color getGroup2Color()
{
@@ -107,7 +111,7 @@ public interface InventoryTagsConfig extends Config
description = "Color of the Tag",
hidden = true,
unhide = "amount",
unhideValue = "3 || 4 || 5 || 6 || 7 || 8"
unhideValue = "3 || 4 || 5 || 6 || 7 || 8 || 9 || 10 || 11 || 12"
)
default Color getGroup3Color()
{
@@ -121,7 +125,7 @@ public interface InventoryTagsConfig extends Config
description = "Color of the Tag",
hidden = true,
unhide = "amount",
unhideValue = "4 || 5 || 6 || 7 || 8"
unhideValue = "4 || 5 || 6 || 7 || 8 || 9 || 10 || 11 || 12"
)
default Color getGroup4Color()
{
@@ -135,7 +139,7 @@ public interface InventoryTagsConfig extends Config
description = "Color of the Tag",
hidden = true,
unhide = "amount",
unhideValue = "5 || 6 || 7 || 8"
unhideValue = "5 || 6 || 7 || 8 || 9 || 10 || 11 || 12"
)
default Color getGroup5Color()
{
@@ -149,7 +153,7 @@ public interface InventoryTagsConfig extends Config
description = "Color of the Tag",
hidden = true,
unhide = "amount",
unhideValue = "6 || 7 || 8"
unhideValue = "6 || 7 || 8 || 9 || 10 || 11 || 12"
)
default Color getGroup6Color()
{
@@ -163,7 +167,7 @@ public interface InventoryTagsConfig extends Config
description = "Color of the Tag",
hidden = true,
unhide = "amount",
unhideValue = "7 || 8"
unhideValue = "7 || 8 || 9 || 10 || 11 || 12"
)
default Color getGroup7Color()
{
@@ -177,10 +181,66 @@ public interface InventoryTagsConfig extends Config
description = "Color of the Tag",
hidden = true,
unhide = "amount",
unhideValue = "8"
unhideValue = "8 || 9 || 10 || 11 || 12"
)
default Color getGroup8Color()
{
return new Color(104, 105, 255);
}
@ConfigItem(
position = 9,
keyName = "groupColor9",
name = "Group 9 Color",
description = "Color of the Tag",
hidden = true,
unhide = "amount",
unhideValue = "9 || 10 || 11 || 12"
)
default Color getGroup9Color()
{
return new Color(255, 81, 0);
}
@ConfigItem(
position = 10,
keyName = "groupColor10",
name = "Group 10 Color",
description = "Color of the Tag",
hidden = true,
unhide = "amount",
unhideValue = "10 || 11 || 12"
)
default Color getGroup10Color()
{
return new Color(255, 107, 229);
}
@ConfigItem(
position = 11,
keyName = "groupColor11",
name = "Group 11 Color",
description = "Color of the Tag",
hidden = true,
unhide = "amount",
unhideValue = "11 || 12"
)
default Color getGroup11Color()
{
return new Color(121, 255, 157);
}
@ConfigItem(
position = 12,
keyName = "groupColor12",
name = "Group 12 Color",
description = "Color of the Tag",
hidden = true,
unhide = "amount",
unhideValue = "12"
)
default Color getGroup12Color()
{
return new Color(65, 61, 64);
}
}

24
runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java
View File

@@ -69,6 +69,10 @@ public class InventoryTagsPlugin extends Plugin
private static final String SETNAME_GROUP_6 = "Group 6";
private static final String SETNAME_GROUP_7 = "Group 7";
private static final String SETNAME_GROUP_8 = "Group 8";
private static final String SETNAME_GROUP_9 = "Group 9";
private static final String SETNAME_GROUP_10 = "Group 10";
private static final String SETNAME_GROUP_11 = "Group 11";
private static final String SETNAME_GROUP_12 = "Group 12";
private static final String CONFIGURE = "Configure";
@@ -90,8 +94,8 @@ public class InventoryTagsPlugin extends Plugin
private static final WidgetMenuOption RESIZABLE_BOTTOM_LINE_INVENTORY_TAB_SAVE = new WidgetMenuOption(SAVE,
MENU_TARGET, WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_INVENTORY_TAB);
private static final List<String> GROUPS = ImmutableList.of(SETNAME_GROUP_8, SETNAME_GROUP_7, SETNAME_GROUP_6,
SETNAME_GROUP_5, SETNAME_GROUP_4, SETNAME_GROUP_3, SETNAME_GROUP_2, SETNAME_GROUP_1);
private static final List<String> GROUPS = ImmutableList.of(SETNAME_GROUP_12, SETNAME_GROUP_11, SETNAME_GROUP_10, SETNAME_GROUP_9,
SETNAME_GROUP_8, SETNAME_GROUP_7, SETNAME_GROUP_6, SETNAME_GROUP_5, SETNAME_GROUP_4, SETNAME_GROUP_3, SETNAME_GROUP_2, SETNAME_GROUP_1);
@Inject
private ConfigManager configManager;
@@ -119,6 +123,10 @@ public class InventoryTagsPlugin extends Plugin
private Color group6Color;
private Color group7Color;
private Color group8Color;
private Color group9Color;
private Color group10Color;
private Color group11Color;
private Color group12Color;
@Provides
InventoryTagsConfig provideConfig(ConfigManager configManager)
@@ -265,6 +273,14 @@ public class InventoryTagsPlugin extends Plugin
return this.group7Color;
case SETNAME_GROUP_8:
return this.group8Color;
case SETNAME_GROUP_9:
return this.group9Color;
case SETNAME_GROUP_10:
return this.group10Color;
case SETNAME_GROUP_11:
return this.group11Color;
case SETNAME_GROUP_12:
return this.group12Color;
}
return null;
}
@@ -316,5 +332,9 @@ public class InventoryTagsPlugin extends Plugin
this.group6Color = config.getGroup6Color();
this.group7Color = config.getGroup7Color();
this.group8Color = config.getGroup8Color();
this.group9Color = config.getGroup9Color();
this.group10Color = config.getGroup10Color();
this.group11Color = config.getGroup11Color();
this.group12Color = config.getGroup12Color();
}
}