From f02ac6f13ffdae7ec499688e395ce4b127763c8c Mon Sep 17 00:00:00 2001 From: Scott Burns Date: Mon, 22 Apr 2019 18:32:03 +0200 Subject: [PATCH 01/22] Check Matcher#find Fixes #44 --- .../client/plugins/freezetimers/FreezeTimersPlugin.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java index 5e0c7a7824..cb97861189 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java @@ -129,9 +129,9 @@ public class FreezeTimersPlugin extends Plugin final Pattern ppattern = Pattern.compile("> (.+?) Date: Mon, 22 Apr 2019 11:31:42 -0700 Subject: [PATCH 02/22] ammo: fix weapon check --- .../main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java index 8aa9c80601..c22ce8215b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java @@ -97,7 +97,7 @@ public class AmmoPlugin extends Plugin { // Check for weapon slot items. This overrides the ammo slot, // as the player will use the thrown weapon (eg. chinchompas, knives, darts) - if (items.length >= EquipmentInventorySlot.WEAPON.getSlotIdx() - 1) + if (items.length > EquipmentInventorySlot.WEAPON.getSlotIdx()) { final Item weapon = items[EquipmentInventorySlot.WEAPON.getSlotIdx()]; final ItemComposition weaponComp = itemManager.getItemComposition(weapon.getId()); From 56edd6169f98e0b78ce702afc3247b8a5b8212a5 Mon Sep 17 00:00:00 2001 From: Ganom Date: Mon, 22 Apr 2019 15:44:44 -0400 Subject: [PATCH 03/22] Adding overload varbit --- runelite-api/src/main/java/net/runelite/api/Varbits.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-api/src/main/java/net/runelite/api/Varbits.java b/runelite-api/src/main/java/net/runelite/api/Varbits.java index 66dfcef672..987115bd28 100644 --- a/runelite-api/src/main/java/net/runelite/api/Varbits.java +++ b/runelite-api/src/main/java/net/runelite/api/Varbits.java @@ -292,6 +292,7 @@ public enum Varbits { */ NMZ_ABSORPTION(3956), NMZ_POINTS(3949), + NMZ_OVERLOAD(3955), /** * Blast Furnace From 1cbd7a9e5c1fee5c2cfe3cacefde19f66dafb88a Mon Sep 17 00:00:00 2001 From: Giovanni Ruddy Gazivoda Date: Mon, 22 Apr 2019 16:10:35 -0400 Subject: [PATCH 04/22] PluginType --- .../client/plugins/PluginDescriptor.java | 2 +- .../runelite/client/plugins/PluginType.java | 15 ++++++++++ .../plugins/antidrag/AntiDragPlugin.java | 3 +- .../plugins/aoewarnings/AoeWarningPlugin.java | 3 +- .../client/plugins/batools/BAToolsPlugin.java | 3 +- .../clanmanmode/ClanManModePlugin.java | 3 +- .../EquipmentInspectorPlugin.java | 3 +- .../FightCaveJadHelperPlugin.java | 3 +- .../FightCaveWaveHelperPlugin.java | 3 +- .../client/plugins/flexo/FlexoPlugin.java | 3 +- .../freezetimers/FreezeTimersPlugin.java | 3 +- .../GrotesqueGuardiansPlugin.java | 3 +- .../hideprayers/HidePrayersPlugin.java | 3 +- .../client/plugins/hydra/HydraPlugin.java | 3 +- .../LizardmenShamanPlugin.java | 4 ++- .../LootingBagViewerPlugin.java | 3 +- .../client/plugins/maxhit/MaxHitPlugin.java | 3 +- .../menumodifier/MenuModifierPlugin.java | 3 +- .../MultiIndicatorsPlugin.java | 3 +- .../PlayerIndicatorsPlugin.java | 3 +- .../pluginsorter/PluginSorterPlugin.java | 30 ++++++++++++------- .../PrayAgainstPlayerPlugin.java | 3 +- .../plugins/pvptools/PvpToolsPlugin.java | 3 +- .../raidsthieving/RaidsThievingPlugin.java | 3 +- .../rememberclan/RememberClanPlugin.java | 3 +- .../ShayzienInfirmaryPlugin.java | 3 +- .../shiftwalker/ShiftWalkerPlugin.java | 3 +- .../SuppliesTrackerPlugin.java | 3 +- .../tickcounter/TickCounterPlugin.java | 3 +- .../tobdamagecount/DamageCounterPlugin.java | 3 +- .../plugins/vanguards/VanguardPlugin.java | 3 +- .../client/plugins/vetion/VetionPlugin.java | 3 +- .../client/plugins/vorkath/VorkathPlugin.java | 3 +- .../warindicators/WarIndicatorPlugin.java | 4 ++- .../whalewatchers/WhaleWatchersPlugin.java | 3 +- .../WildernessLocationsPlugin.java | 4 ++- .../worldmaphider/WorldMapHiderPlugin.java | 3 +- .../client/plugins/ztob/TheatrePlugin.java | 3 +- .../client/plugins/zulrah/ZulrahPlugin.java | 3 +- 39 files changed, 110 insertions(+), 48 deletions(-) create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginDescriptor.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginDescriptor.java index 78cb1d38d5..fafcaebcbd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginDescriptor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginDescriptor.java @@ -59,5 +59,5 @@ public @interface PluginDescriptor boolean loadWhenOutdated() default false; - String type() default ""; + PluginType type() default PluginType.GENERAL_USE; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java new file mode 100644 index 0000000000..1ba59834cb --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java @@ -0,0 +1,15 @@ +package net.runelite.client.plugins; + +public enum PluginType { + + PVM, + PVP, + + UTILITY, + GENERAL_USE, + + EXTERNAL, + + PLUGIN_ORGANIZER + +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java index 4dafc29b8c..70f7400d7b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java @@ -35,10 +35,11 @@ import net.runelite.client.input.KeyListener; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; @PluginDescriptor( name = "Anti Drag", - type = "utility", + type = PluginType.UTILITY, enabledByDefault = false) public class AntiDragPlugin extends Plugin implements KeyListener { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java index 2fa20d725f..5314f65fd0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java @@ -52,6 +52,7 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; import javax.inject.Inject; @@ -64,7 +65,7 @@ import java.util.logging.Logger; name = "AoE Warnings", description = "Shows the final destination for AoE Attack projectiles", tags = {"bosses", "combat", "pve", "overlay"}, - type = "PVM" + type = PluginType.PVM ) @Slf4j diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java index 961e8760cb..d7af4f3228 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java @@ -70,6 +70,7 @@ import net.runelite.client.input.KeyListener; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.client.util.Text; @@ -79,7 +80,7 @@ import net.runelite.client.util.Text; name = "BA Tools", description = "Custom tools for Barbarian Assault", tags = {"minigame", "overlay", "timer"}, - type = "utility" + type = PluginType.UTILITY ) public class BAToolsPlugin extends Plugin implements KeyListener { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java index 7821fd8946..624bad7078 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java @@ -17,6 +17,7 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.game.ClanManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.util.Text; import org.apache.commons.lang3.ArrayUtils; @@ -25,7 +26,7 @@ import org.apache.commons.lang3.ArrayUtils; name = "Clan Man Mode", description = "Assists in clan PVP scenarios", tags = {"highlight", "minimap", "overlay", "players"}, - type = "PVP" + type = PluginType.PVP ) public class ClanManModePlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java index 29904c2fb8..35711a9a63 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java @@ -19,6 +19,7 @@ import net.runelite.client.game.ItemManager; import net.runelite.client.menus.MenuManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.ClientToolbar; import net.runelite.client.ui.NavigationButton; import net.runelite.client.util.ImageUtil; @@ -36,7 +37,7 @@ import java.util.concurrent.ScheduledExecutorService; @PluginDescriptor( name = "Equipment Inspector", enabledByDefault = false, - type = "utility" + type = PluginType.UTILITY ) @Slf4j diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcavejadhelper/FightCaveJadHelperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcavejadhelper/FightCaveJadHelperPlugin.java index 8488545015..6fd2ab22ca 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcavejadhelper/FightCaveJadHelperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcavejadhelper/FightCaveJadHelperPlugin.java @@ -12,13 +12,14 @@ import net.runelite.api.events.NpcSpawned; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; @PluginDescriptor( name = "Fight Cave - Jad", description = "Show what to pray against Jad", tags = {"bosses", "combat", "minigame", "overlay", "prayer", "pve", "pvm"}, - type = "PVM", + type = PluginType.PVM, enabledByDefault = false ) public class FightCaveJadHelperPlugin extends Plugin diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcavewavehelper/FightCaveWaveHelperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcavewavehelper/FightCaveWaveHelperPlugin.java index b3321a3b33..c7a3a29b6c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcavewavehelper/FightCaveWaveHelperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcavewavehelper/FightCaveWaveHelperPlugin.java @@ -41,6 +41,7 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; import org.apache.commons.lang3.ArrayUtils; @@ -48,7 +49,7 @@ import org.apache.commons.lang3.ArrayUtils; name = "Fight Cave - Waves", description = "Displays current and upcoming wave monsters in the Fight Caves", tags = {"bosses", "combat", "minigame", "overlay", "pve", "pvm", "jad", "fire", "cape", "wave"}, - type = "PVM", + type = PluginType.PVM, enabledByDefault = false ) public class FightCaveWaveHelperPlugin extends Plugin diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java index 7cd7b961bc..3921f49e12 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java @@ -18,6 +18,7 @@ import net.runelite.client.flexo.Flexo; import net.runelite.client.flexo.FlexoUtils; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.stretchedmode.StretchedModeConfig; import net.runelite.client.ui.overlay.OverlayManager; @@ -29,7 +30,7 @@ import java.util.List; name = "Flexo Config", description = "Customizes Flexo, the MouseInput Assistant ;)", tags = {"flexo", "null"}, - type = "utility" + type = PluginType.UTILITY ) @Slf4j public class FlexoPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java index cb97861189..59f4ff6ccb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java @@ -26,6 +26,7 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.util.ImageUtil; import org.slf4j.Logger; @@ -33,7 +34,7 @@ import org.slf4j.Logger; @PluginDescriptor( name = "Freeze Timers", description = "PVP Freeze Timers", - type = "PVP", + type = PluginType.PVP, tags = {"PvP", "Freeze", "Timers", "pklite"} ) public class FreezeTimersPlugin extends Plugin diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java index a7f59a7bed..e41c1a4b47 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java @@ -27,13 +27,14 @@ package net.runelite.client.plugins.grotesqueguardians; import javax.inject.Inject; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; @PluginDescriptor( name = "Grotesque Guardians", description = "Display tile indicators for the Grotesque Guardian special attacks", tags = {"grotesque", "guardians", "gargoyle", "garg"}, - type = "PVM" + type = PluginType.PVM ) public class GrotesqueGuardiansPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java index 61f9b91b44..fa88699a97 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java @@ -13,6 +13,7 @@ import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import javax.inject.Inject; import java.util.List; @@ -22,7 +23,7 @@ import java.util.stream.Collectors; @PluginDescriptor( name = "Hide Prayers", description = "Hides specific Prayers in the Prayer tab.", - type = "utility" + type = PluginType.UTILITY ) public class HidePrayersPlugin extends Plugin { private static final int PRAYER_COUNT = Prayer.values().length; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/HydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/HydraPlugin.java index f976a9cd2b..92089b31d2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/HydraPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/HydraPlugin.java @@ -9,6 +9,7 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; import java.util.HashMap; @@ -18,7 +19,7 @@ import java.util.Map; name = "Hydra", description = "Hydra Helper", tags = {"Hydra", "Helper"}, - type = "PVM" + type = PluginType.PVM ) public class HydraPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java index 6b93885523..49422add2e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java @@ -16,6 +16,8 @@ import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import java.util.HashMap; import java.util.Map; + +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; @PluginDescriptor( @@ -23,7 +25,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Configures timer for lizardmen shaman spawns.", enabledByDefault = false, tags = {"shaman", "lizard", "lizardmen"}, - type = "PVM" + type = PluginType.PVM ) @Slf4j public class LizardmenShamanPlugin extends Plugin diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java index 5d28a4bbea..df73647d3a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.lootingbagviewer; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; import javax.inject.Inject; @@ -35,7 +36,7 @@ import javax.inject.Inject; name = "PvP Looting Bag Viewer", description = "Add an overlay showing the contents of your looting bag", tags = {"alternate", "items", "overlay", "second"}, - type = "utility", + type = PluginType.UTILITY, enabledByDefault = false ) public class LootingBagViewerPlugin extends Plugin diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java index 874f038774..8afa99a904 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java @@ -36,6 +36,7 @@ import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.maxhit.calculators.MagicMaxHitCalculator; import net.runelite.client.plugins.maxhit.calculators.MeleeMaxHitCalculator; import net.runelite.client.plugins.maxhit.calculators.RangeMaxHitCalculator; @@ -45,7 +46,7 @@ import javax.inject.Inject; @PluginDescriptor( name = "Max Hit", description = "Max Hit Calculator", - type = "PVM", + type = PluginType.PVM, enabledByDefault = false ) public class MaxHitPlugin extends Plugin diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menumodifier/MenuModifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menumodifier/MenuModifierPlugin.java index fedf163a55..13dde647e5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menumodifier/MenuModifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menumodifier/MenuModifierPlugin.java @@ -15,6 +15,7 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.util.MiscUtils; import net.runelite.client.util.Text; @@ -29,7 +30,7 @@ import java.util.List; description = "Changes right click menu for players", tags = { "menu", "modifier", "right", "click", "pk", "bogla" }, enabledByDefault = false, - type = "utility" + type = PluginType.UTILITY ) public class MenuModifierPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java index 8410d96d40..5c24ec6f95 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java @@ -49,6 +49,7 @@ import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; @PluginDescriptor( @@ -56,7 +57,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Show borders of multicombat and PvP safezones", tags = {"multicombat", "lines", "pvp", "deadman", "safezones", "bogla"}, enabledByDefault = false, - type = "PVP" + type = PluginType.PVP ) public class MultiIndicatorsPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java index fd56c88fea..00c603b481 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java @@ -42,6 +42,7 @@ import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.ClanManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.util.ColorUtil; import com.google.common.base.Splitter; @@ -58,7 +59,7 @@ import net.runelite.client.util.WildcardMatcher; name = "Player Indicators", description = "Highlight players on-screen and/or on the minimap", tags = {"highlight", "minimap", "overlay", "players"}, - type = "utility" + type = PluginType.UTILITY ) public class PlayerIndicatorsPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java index ba31160a32..34285f6ea8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java @@ -9,6 +9,7 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.config.ConfigPanel; import net.runelite.client.plugins.config.PluginListItem; @@ -22,7 +23,7 @@ import java.util.List; name = "Plugin Organizer", description = "Hides and colors 3rd party plugins for better control", tags = {"Fuck RL","Abex is shit :p"}, - type = "pluginOrganizer" + type = PluginType.PLUGIN_ORGANIZER ) public class PluginSorterPlugin extends Plugin { @@ -76,16 +77,23 @@ public class PluginSorterPlugin extends Plugin { for (PluginListItem pli : ConfigPanel.pluginList) { if (pli.getPlugin()!=null) { if (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type()!=null) - if (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("external")) - pli.nameLabel.setForeground(config.externalColor()); - else if (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("PVM")) - pli.nameLabel.setForeground(config.pvmColor()); - else if (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("PVP")) - pli.nameLabel.setForeground(config.pvpColor()); - else if (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("utility")) - pli.nameLabel.setForeground(config.utilityColor()); - else - pli.nameLabel.setForeground(Color.WHITE); + switch (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type()) { + case EXTERNAL: + pli.nameLabel.setForeground(config.externalColor()); + break; + case PVM: + pli.nameLabel.setForeground(config.pvmColor()); + break; + case PVP: + pli.nameLabel.setForeground(config.pvpColor()); + break; + case UTILITY: + pli.nameLabel.setForeground(config.utilityColor()); + break; + default: + pli.nameLabel.setForeground(Color.WHITE); + break; + } } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java index c0dc2644a1..0f9d144bcb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java @@ -32,6 +32,7 @@ import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.util.ImageUtil; @@ -45,7 +46,7 @@ import java.util.Arrays; name = "Pray Against Player", description = "Use plugin in PvP situations for best results!!", tags = {"highlight", "pvp", "overlay", "players"}, - type = "PVP" + type = PluginType.PVP ) /** diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java index 47aee1f8b6..42f8e4395f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java @@ -54,6 +54,7 @@ import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginManager; +import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.clanchat.ClanChatPlugin; import static net.runelite.client.plugins.pvptools.PvpToolsPanel.htmlLabel; import net.runelite.client.ui.ClientToolbar; @@ -70,7 +71,7 @@ import org.apache.commons.lang3.ArrayUtils; name = "PvP Tools", description = "Enable the PvP Tools panel", tags = {"panel", "pvp", "pk", "pklite"}, - type = "PVP" + type = PluginType.PVP ) public class PvpToolsPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java index 10873e02d8..8f0baf9639 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java @@ -41,6 +41,7 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.raidsthieving.BatSolver.BatSolver; import net.runelite.client.plugins.raidsthieving.BatSolver.ChestIdentifier; import net.runelite.client.plugins.raidsthieving.BatSolver.ThievingRoomType; @@ -56,7 +57,7 @@ import java.util.Map; name = "Raids Bat Finder", description = "Tracks which chests need to be searched for bats and which poison", tags = {"overlay", "skilling", "raid"}, - type = "PVM" + type = PluginType.PVM ) public class RaidsThievingPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/rememberclan/RememberClanPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/rememberclan/RememberClanPlugin.java index 2b5dd54b35..bdac2a3289 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/rememberclan/RememberClanPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/rememberclan/RememberClanPlugin.java @@ -41,11 +41,12 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; @PluginDescriptor( name = "Remember Clan", description = "Remember a specific clan!", - type = "utility", + type = PluginType.UTILITY, enabledByDefault = false ) public class RememberClanPlugin extends Plugin diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java index 954eb72b56..70f47daf4c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java @@ -36,6 +36,7 @@ import net.runelite.api.events.GameTick; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; @Slf4j @@ -43,7 +44,7 @@ import net.runelite.client.ui.overlay.OverlayManager; name = "Shayzien Infirmary", description = "Shows the status of wounded soldiers", tags = {"shayzien", "infirmary", "soldiers"}, - type = "utility" + type = PluginType.UTILITY ) public class ShayzienInfirmaryPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java index cedc212d04..5593ef59b9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java @@ -33,6 +33,7 @@ import net.runelite.client.eventbus.Subscribe; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.util.Text; import javax.inject.Inject; @@ -45,7 +46,7 @@ import javax.inject.Inject; description = "Use Shift to toggle the Walk Here menu option. While pressed you will Walk rather than interact with objects.", tags = {"npcs", "items", "objects"}, enabledByDefault = false, - type = "utility" + type = PluginType.UTILITY ) public class ShiftWalkerPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java index 9212432d7e..c39e284e89 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java @@ -40,6 +40,7 @@ import net.runelite.client.game.ItemManager; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.ClientToolbar; import net.runelite.client.ui.NavigationButton; import net.runelite.client.util.ImageUtil; @@ -63,7 +64,7 @@ import java.awt.image.BufferedImage; name = "Supplies Used Tracker", description = "Tracks supplies used during the session", tags = {"cost"}, - type = "PVM", + type = PluginType.PVM, enabledByDefault = false ) @Slf4j diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tickcounter/TickCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tickcounter/TickCounterPlugin.java index 4e40b23ff3..cc17572eba 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tickcounter/TickCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tickcounter/TickCounterPlugin.java @@ -19,12 +19,13 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; @PluginDescriptor(name = "Tick Counter", description = "Counts combat activity for nearby players", enabledByDefault = false, - type = "utility" + type = PluginType.UTILITY ) public class TickCounterPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java index 7b49a30ece..2225ebde17 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java @@ -49,6 +49,7 @@ import net.runelite.client.chat.QueuedMessage; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.plugins.PluginType; @PluginDescriptor( @@ -56,7 +57,7 @@ import net.runelite.client.eventbus.Subscribe; description = "Gives you an estimation damage on a boss and taken after the fight is done" + "the damage will be posted in the chat", tags = {"combat", "npcs", "tob", "damage"}, - type = "PVM", + type = PluginType.PVM, enabledByDefault = false ) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vanguards/VanguardPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vanguards/VanguardPlugin.java index 88cb075867..e872cada91 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vanguards/VanguardPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vanguards/VanguardPlugin.java @@ -4,6 +4,7 @@ package net.runelite.client.plugins.vanguards; import javax.inject.Inject; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; @PluginDescriptor( @@ -11,7 +12,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description= "tracks HP of all three vanguards", tags= {"overlay", "vangs", "cox"}, enabledByDefault = false, - type = "PVM" + type = PluginType.PVM ) public class VanguardPlugin extends Plugin { private static final int MAGE_VANGUARD_ID = 7526; //i think diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java index 847c1f3678..7c637b65c1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java @@ -32,6 +32,7 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; import javax.inject.Inject; @@ -43,7 +44,7 @@ import java.util.Map; name = "Vetion", description = "Tracks Vet'ion's special attacks", tags = {"bosses", "combat", "pve", "overlay"}, - type = "PVM" + type = PluginType.PVM ) public class VetionPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java index 060a9d2246..ab058dc5b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java @@ -10,6 +10,7 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; import org.apache.commons.lang3.ArrayUtils; @@ -17,7 +18,7 @@ import org.apache.commons.lang3.ArrayUtils; name = "Vorkath", description = "Vorkath Helper", tags = {"Vorkath", "Helper"}, - type = "PVM" + type = PluginType.PVM ) public class VorkathPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java index 9dc378547c..b43aca57f1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java @@ -30,6 +30,8 @@ import com.google.inject.Provides; import java.awt.Color; import java.util.Collection; import javax.inject.Inject; + +import net.runelite.client.plugins.PluginType; import org.apache.commons.lang3.ArrayUtils; import net.runelite.api.Client; import static net.runelite.api.MenuAction.FOLLOW; @@ -57,7 +59,7 @@ import net.runelite.client.ui.overlay.OverlayManager; name = "War calling indicators", description = "War War War.", tags = {"skill", "total", "max", "PVP"}, - type = "PVP", + type = PluginType.PVP, enabledByDefault = false ) public class WarIndicatorPlugin extends Plugin diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java index b08d7e4ca4..356b846bdc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java @@ -36,6 +36,7 @@ import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.util.WorldUtil; import org.apache.commons.lang3.ObjectUtils; @@ -48,7 +49,7 @@ import org.jetbrains.annotations.NotNull; enabledByDefault = true, hidden = false, developerPlugin = false, - type = "PVP", + type = PluginType.PVP, loadWhenOutdated = false ) public class WhaleWatchersPlugin extends Plugin diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java index c698e5894a..30cc474a2b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java @@ -18,6 +18,7 @@ import net.runelite.api.events.GameTick; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.wildernesslocations.WildernessLocationsOverlay; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayManager; @@ -26,7 +27,8 @@ import net.runelite.client.util.WildernessLocation; @PluginDescriptor(name="PvP Wild Locations", description="Indicates the players current location in the wild", tags={"Wildy,", "Wilderness Location", "location", "loc", "pvp", "pklite"}, - type = "PVP") + type = PluginType.PVP +) public class WildernessLocationsPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmaphider/WorldMapHiderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmaphider/WorldMapHiderPlugin.java index d1f2971cd6..34b79a803e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmaphider/WorldMapHiderPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmaphider/WorldMapHiderPlugin.java @@ -24,11 +24,12 @@ import net.runelite.client.menus.MenuManager; import net.runelite.client.menus.WidgetMenuOption; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; @PluginDescriptor( name = "Hide Worldmap Button", description = "Hides the world map button", - type = "PVM", + type = PluginType.PVM, tags = {"world", "world map", "hide", "button", "map", "hide world map", "pklite"} ) public class WorldMapHiderPlugin extends Plugin diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ztob/TheatrePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/ztob/TheatrePlugin.java index fe91da0930..1f3d4ae0a9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ztob/TheatrePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ztob/TheatrePlugin.java @@ -20,6 +20,7 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.util.Text; @@ -31,7 +32,7 @@ import java.util.*; description = "All-in-one plugin for Theatre of Blood", tags = {"ToB"}, enabledByDefault = false, - type = "PVM" + type = PluginType.PVM ) public class TheatrePlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java index 4fdbe3fa25..534f836349 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java @@ -17,6 +17,7 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.util.ImageUtil; @@ -24,7 +25,7 @@ import net.runelite.client.util.ImageUtil; name = "Zulrah", description = "Zulrah Helper", tags = {"Zulrah", "Helper"}, - type = "PVM" + type = PluginType.PVM ) public class ZulrahPlugin extends Plugin { From 545251819d6f57a079b3ac550fe12201f1563f58 Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:23:45 -0600 Subject: [PATCH 05/22] Type Change --- .../plugins/barbarianassault/BarbarianAssaultPlugin.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java index 30e6a56b90..695a8cc779 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java @@ -64,7 +64,8 @@ import net.runelite.client.util.ImageUtil; @PluginDescriptor( name = "Barbarian Assault", description = "Show a timer to the next call change and game/wave duration in chat.", - tags = {"minigame", "overlay", "timer"} + tags = {"minigame", "overlay", "timer"}, + type = "utility" ) public class BarbarianAssaultPlugin extends Plugin { private static final int BA_WAVE_NUM_INDEX = 2; @@ -398,4 +399,4 @@ public class BarbarianAssaultPlugin extends Plugin { { return clockImage; } -} \ No newline at end of file +} From 19167e7a031e99dae96b70338dc598475954e3d9 Mon Sep 17 00:00:00 2001 From: James Munson Date: Mon, 22 Apr 2019 13:25:39 -0700 Subject: [PATCH 06/22] Added PKer Notifier --- .../idlenotifier/IdleNotifierConfig.java | 14 +++++++++ .../idlenotifier/IdleNotifierPlugin.java | 29 ++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierConfig.java index 7d846b9db9..ff1337b73f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierConfig.java @@ -118,4 +118,18 @@ public interface IdleNotifierConfig extends Config { return 0; } + + @ConfigItem( + keyName = "pkers", + name = "PKer Notifier", + position = 9, + description = "Notifies if an attackable player based on your level range appears on screen.", + group = "pvp", + warning = "This will not notify you if the player is in your cc or is online on your friends list." + ) + default boolean notifyPkers() + { + return true; + } + } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java index 9aa51bad78..d806888047 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java @@ -26,6 +26,8 @@ package net.runelite.client.plugins.idlenotifier; import com.google.inject.Provides; + +import java.awt.*; import java.time.Duration; import java.time.Instant; import java.util.Arrays; @@ -50,16 +52,18 @@ import net.runelite.api.events.GameTick; import net.runelite.api.events.GraphicChanged; import net.runelite.api.events.HitsplatApplied; import net.runelite.api.events.InteractingChanged; +import net.runelite.api.events.PlayerSpawned; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.util.PvPUtil; @PluginDescriptor( name = "Idle Notifier", description = "Send a notification when going idle, or when HP/Prayer reaches a threshold", - tags = {"health", "hitpoints", "notifications", "prayer"} + tags = {"health", "hitpoints", "notifications", "prayer", "pvp", "pker"} ) public class IdleNotifierPlugin extends Plugin { @@ -238,6 +242,29 @@ public class IdleNotifierPlugin extends Plugin } } + @Subscribe + private void onPlayerSpawned(PlayerSpawned event) + { + final Player p = event.getPlayer(); + if (config.notifyPkers()) + { + if (p != null) + { + if (p != client.getLocalPlayer()) + { + if (PvPUtil.isAttackable(client, p) && !client.isFriended(p.getName(), false) + && !client.isClanMember(p.getName())) + { + String playerName = p.getName(); + int combat = p.getCombatLevel(); + notifier.notify("PK'er warning! A level " + combat + " player named " + playerName + + " appeared!", TrayIcon.MessageType.WARNING); + } + } + } + } + } + @Subscribe public void onInteractingChanged(InteractingChanged event) { From 1f1e80cce61a37e40224bdf35da0a1c8670d5748 Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:25:50 -0600 Subject: [PATCH 07/22] Update BarbarianAssaultPlugin.java --- .../client/plugins/barbarianassault/BarbarianAssaultPlugin.java | 1 - 1 file changed, 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java index 695a8cc779..79146bcf21 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java @@ -65,7 +65,6 @@ import net.runelite.client.util.ImageUtil; name = "Barbarian Assault", description = "Show a timer to the next call change and game/wave duration in chat.", tags = {"minigame", "overlay", "timer"}, - type = "utility" ) public class BarbarianAssaultPlugin extends Plugin { private static final int BA_WAVE_NUM_INDEX = 2; From e9595f99118dad41f919edb7c3bbdbb855b10528 Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:26:35 -0600 Subject: [PATCH 08/22] Type Update --- .../net/runelite/client/plugins/batools/BAToolsPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java index 961e8760cb..7c5e60b201 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java @@ -79,7 +79,7 @@ import net.runelite.client.util.Text; name = "BA Tools", description = "Custom tools for Barbarian Assault", tags = {"minigame", "overlay", "timer"}, - type = "utility" + type = "PVM" ) public class BAToolsPlugin extends Plugin implements KeyListener { @@ -641,4 +641,4 @@ public class BAToolsPlugin extends Plugin implements KeyListener shiftDown = false; } } -} \ No newline at end of file +} From 9d03fc4401b344a4bfb339f015815b668923eee7 Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:27:45 -0600 Subject: [PATCH 09/22] Update LootingBagViewerPlugin.java --- .../client/plugins/lootingbagviewer/LootingBagViewerPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java index 5d28a4bbea..6f8e366e73 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java @@ -35,7 +35,7 @@ import javax.inject.Inject; name = "PvP Looting Bag Viewer", description = "Add an overlay showing the contents of your looting bag", tags = {"alternate", "items", "overlay", "second"}, - type = "utility", + type = "PVP", enabledByDefault = false ) public class LootingBagViewerPlugin extends Plugin From eb1ebe180da50c3b7e475fc8239ceb7af6db31a0 Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:28:20 -0600 Subject: [PATCH 10/22] Update PlayerIndicatorsPlugin.java --- .../client/plugins/playerindicators/PlayerIndicatorsPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java index fd56c88fea..5ddf521c15 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java @@ -58,7 +58,7 @@ import net.runelite.client.util.WildcardMatcher; name = "Player Indicators", description = "Highlight players on-screen and/or on the minimap", tags = {"highlight", "minimap", "overlay", "players"}, - type = "utility" + type = "PVP" ) public class PlayerIndicatorsPlugin extends Plugin { From 39e612ceb350eca8427626b582882fb328d89f9f Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:29:23 -0600 Subject: [PATCH 11/22] Update HydraPlugin.java --- .../java/net/runelite/client/plugins/hydra/HydraPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/HydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/HydraPlugin.java index f976a9cd2b..9468cb707e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/HydraPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/HydraPlugin.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.Map; @PluginDescriptor( - name = "Hydra", + name = "Hydra Helper", description = "Hydra Helper", tags = {"Hydra", "Helper"}, type = "PVM" @@ -143,4 +143,4 @@ public class HydraPlugin extends Plugin } } } -} \ No newline at end of file +} From 4c91e97ead38734374b40fe0e682e67c2d1df4f9 Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:30:22 -0600 Subject: [PATCH 12/22] Update SuppliesTrackerPlugin.java --- .../client/plugins/suppliestracker/SuppliesTrackerPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java index 9212432d7e..6041a02eb2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java @@ -63,7 +63,7 @@ import java.awt.image.BufferedImage; name = "Supplies Used Tracker", description = "Tracks supplies used during the session", tags = {"cost"}, - type = "PVM", + type = "utility", enabledByDefault = false ) @Slf4j From 59c82c4b781486bef5f5d28d50c856baf1eae5a2 Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:30:44 -0600 Subject: [PATCH 13/22] Update VetionPlugin.java --- .../java/net/runelite/client/plugins/vetion/VetionPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java index 847c1f3678..60516a9dc4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java @@ -40,7 +40,7 @@ import java.util.HashMap; import java.util.Map; @PluginDescriptor( - name = "Vetion", + name = "Vetion Helper", description = "Tracks Vet'ion's special attacks", tags = {"bosses", "combat", "pve", "overlay"}, type = "PVM" From 0d92e4a27e3f2d7310c82def37fc536b3552f03b Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:31:15 -0600 Subject: [PATCH 14/22] Update VorkathPlugin.java --- .../net/runelite/client/plugins/vorkath/VorkathPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java index 060a9d2246..7040584b3e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java @@ -14,10 +14,10 @@ import net.runelite.client.ui.overlay.OverlayManager; import org.apache.commons.lang3.ArrayUtils; @PluginDescriptor( - name = "Vorkath", + name = "Vorkath Helper", description = "Vorkath Helper", tags = {"Vorkath", "Helper"}, - type = "PVM" + type = "PVM" ) public class VorkathPlugin extends Plugin { From 09e608ee04b95ebe96f9e4d36ff9bbcc766708ac Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:31:40 -0600 Subject: [PATCH 15/22] Update ZulrahPlugin.java --- .../java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java index 4fdbe3fa25..b7cd6311b6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java @@ -21,10 +21,10 @@ import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.util.ImageUtil; @PluginDescriptor( - name = "Zulrah", + name = "Zulrah Helper", description = "Zulrah Helper", tags = {"Zulrah", "Helper"}, - type = "PVM" + type = "PVM" ) public class ZulrahPlugin extends Plugin { From 31a792d7b9a5dda88bf465c6d74db9c12bb097b1 Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:32:35 -0600 Subject: [PATCH 16/22] Update EquipmentInspectorPlugin.java --- .../plugins/equipmentinspector/EquipmentInspectorPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java index 29904c2fb8..d707731c76 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java @@ -36,7 +36,7 @@ import java.util.concurrent.ScheduledExecutorService; @PluginDescriptor( name = "Equipment Inspector", enabledByDefault = false, - type = "utility" + type = "PVP" ) @Slf4j @@ -225,4 +225,4 @@ public class EquipmentInspectorPlugin extends Plugin { }); } } -} \ No newline at end of file +} From 582966c6a62bed3aace14f6f3e4532dac84c3212 Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:33:57 -0600 Subject: [PATCH 17/22] Update ProfilesPlugin.java --- .../runelite/client/plugins/profiles/ProfilesPlugin.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java index 4128adba44..d1aca754fd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java @@ -25,7 +25,14 @@ import net.runelite.client.ui.ClientToolbar; import net.runelite.client.ui.NavigationButton; import net.runelite.client.util.ImageUtil; -@PluginDescriptor(name="Account Switcher", description="Allow for a allows you to easily switch between multiple OSRS Accounts", tags={"profile", "account", "login", "log in"}) +@PluginDescriptor( + + name="Account Switcher", + description="Allow for a allows you to easily switch between multiple OSRS Accounts", + tags={"profile", "account", "login", "log in"}, + type = "utility" +) + public class ProfilesPlugin extends Plugin { @Inject From 0ed019ed1d0af49e6411b6965e01adc3ab72b9fc Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:34:33 -0600 Subject: [PATCH 18/22] Update RaidsPlugin.java --- .../java/net/runelite/client/plugins/raids/RaidsPlugin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index 4e1689eaee..39b7fa320e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -87,7 +87,8 @@ import net.runelite.client.util.HotkeyListener; @PluginDescriptor( name = "Chambers Of Xeric", description = "Show helpful information for the Chambers of Xeric raid", - tags = {"combat", "raid", "overlay", "pve", "pvm", "bosses", "cox", "olm"} + tags = {"combat", "raid", "overlay", "pve", "pvm", "bosses", "cox", "olm"}, + type = "PVM" ) @Slf4j public class RaidsPlugin extends Plugin From d63d125df2e4dcdcba2fb62f3d0038df2db79a66 Mon Sep 17 00:00:00 2001 From: Scott Burns Date: Mon, 22 Apr 2019 22:35:37 +0200 Subject: [PATCH 19/22] Use the PluginType enum in ConfigPanel --- .../client/plugins/config/ConfigPanel.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index ea8908b824..4037f639d1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -82,6 +82,7 @@ import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginInstantiationException; import net.runelite.client.plugins.PluginManager; +import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.pluginsorter.PluginSorterPlugin; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.DynamicGridLayout; @@ -219,7 +220,7 @@ public class ConfigPanel extends PluginPanel List pvmPlugins = new ArrayList<>(); // populate pluginList with all PVM Plugins pluginManager.getPlugins().stream() - .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("PVM")) + .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PVM)) .forEach(plugin -> { final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); @@ -239,7 +240,7 @@ public class ConfigPanel extends PluginPanel List pvpPlugins = new ArrayList<>(); // populate pluginList with all PVP Plugins pluginManager.getPlugins().stream() - .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("PVP")) + .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PVP)) .forEach(plugin -> { final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); @@ -259,7 +260,7 @@ public class ConfigPanel extends PluginPanel List utilPlugins = new ArrayList<>(); // populate pluginList with all utility Plugins pluginManager.getPlugins().stream() - .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("utility")) + .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.UTILITY)) .forEach(plugin -> { final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); @@ -287,10 +288,10 @@ public class ConfigPanel extends PluginPanel List vanillaPlugins = new ArrayList<>(); pluginManager.getPlugins().stream() .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).hidden()) - .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("PVM")) - .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("PVP")) - .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("utility")) - .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("pluginOrganizer")) + .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PVM)) + .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PVP)) + .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.UTILITY)) + .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PLUGIN_ORGANIZER)) .forEach(plugin -> { final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); @@ -322,7 +323,7 @@ public class ConfigPanel extends PluginPanel // Add plugin sorter to bottom pluginManager.getPlugins().stream() - .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("pluginOrganizer")) + .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PLUGIN_ORGANIZER)) .forEach(plugin -> { final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); From 88743b562da61fe9a1d65fcc7d268fb381525d23 Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:35:42 -0600 Subject: [PATCH 20/22] Update PyramidPlunderPlugin.java --- .../client/plugins/pyramidplunder/PyramidPlunderPlugin.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java index 64a009f2cb..4109b4c7e7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java @@ -58,6 +58,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager; name = "PyramidPlunder", description = "Highlights doors and spear traps in pyramid plunder and adds a numerical timer", tags = {"pyramidplunder", "pyramid", "plunder", "overlay", "skilling", "thieving"}, + type = "utility", enabledByDefault = false ) From da764fc7dfb10a1ed221610ab07fad0801a1a105 Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:45:47 -0600 Subject: [PATCH 21/22] Update BarbarianAssaultPlugin.java --- .../client/plugins/barbarianassault/BarbarianAssaultPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java index 79146bcf21..7124cd71d2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java @@ -64,7 +64,7 @@ import net.runelite.client.util.ImageUtil; @PluginDescriptor( name = "Barbarian Assault", description = "Show a timer to the next call change and game/wave duration in chat.", - tags = {"minigame", "overlay", "timer"}, + tags = {"minigame", "overlay", "timer"} ) public class BarbarianAssaultPlugin extends Plugin { private static final int BA_WAVE_NUM_INDEX = 2; From b05432e2c527e7813e9c278cc09803380afc599b Mon Sep 17 00:00:00 2001 From: Scott Burns Date: Mon, 22 Apr 2019 22:47:37 +0200 Subject: [PATCH 22/22] Small refactor to Plugin sorter --- .../pluginsorter/PluginSorterPlugin.java | 76 ++++++++----------- 1 file changed, 32 insertions(+), 44 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java index 34285f6ea8..c5d48b0d82 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java @@ -76,24 +76,23 @@ public class PluginSorterPlugin extends Plugin { public void updateColors() { for (PluginListItem pli : ConfigPanel.pluginList) { if (pli.getPlugin()!=null) { - if (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type()!=null) - switch (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type()) { - case EXTERNAL: - pli.nameLabel.setForeground(config.externalColor()); - break; - case PVM: - pli.nameLabel.setForeground(config.pvmColor()); - break; - case PVP: - pli.nameLabel.setForeground(config.pvpColor()); - break; - case UTILITY: - pli.nameLabel.setForeground(config.utilityColor()); - break; - default: - pli.nameLabel.setForeground(Color.WHITE); - break; - } + switch (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type()) { + case EXTERNAL: + pli.nameLabel.setForeground(config.externalColor()); + break; + case PVM: + pli.nameLabel.setForeground(config.pvmColor()); + break; + case PVP: + pli.nameLabel.setForeground(config.pvpColor()); + break; + case UTILITY: + pli.nameLabel.setForeground(config.utilityColor()); + break; + default: + pli.nameLabel.setForeground(Color.WHITE); + break; + } } } } @@ -103,38 +102,27 @@ public class PluginSorterPlugin extends Plugin { while (iter.hasNext()) { PluginListItem pli = iter.next(); if (pli.getPlugin() != null) { - if (!pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("")) - if (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("external")) { - iter.remove(); - removedPlugins.add(pli); - } - if (!pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("")) - if (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("PVM")) { - iter.remove(); - removedPlugins.add(pli); - } - if (!pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("")) - if (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("PVP")) { - iter.remove(); - removedPlugins.add(pli); - } - if (!pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("")) - if (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("utility")) { - iter.remove(); - removedPlugins.add(pli); - } + switch (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type()) + { + case PVM: + case PVP: + case UTILITY: + case EXTERNAL: + iter.remove(); + removedPlugins.add(pli); + break; + case GENERAL_USE: + default: + break; + } } } } public void showPlugins() { List tempList = new ArrayList<>(); - for (PluginListItem pli : removedPlugins) { - tempList.add(pli); - } - for (PluginListItem pli : ConfigPanel.pluginList) { - tempList.add(pli); - } + tempList.addAll(removedPlugins); + tempList.addAll(ConfigPanel.pluginList); ConfigPanel.pluginList = tempList; } }