From d3497e4b5423a44a0cb75b462ff2bd01a05dde6f Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Wed, 24 Apr 2019 19:19:47 -0600 Subject: [PATCH 1/8] Updated Type --- .../plugins/barbarianassault/BarbarianAssaultPlugin.java | 4 ++-- 1 file changed, 2 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 68de83caa8..53b67bf1a3 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,9 +65,9 @@ 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"}, - type = PluginType.PVM + tags = {"minigame", "overlay", "timer"} ) + public class BarbarianAssaultPlugin extends Plugin { private static final int BA_WAVE_NUM_INDEX = 2; private static final String START_WAVE = "1"; From a7a1a250650d6c79d39eb4975888246981036826 Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Wed, 24 Apr 2019 19:20:16 -0600 Subject: [PATCH 2/8] Updated Name --- .../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 4177b78fcd..38e9818d59 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 @@ -21,7 +21,7 @@ import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.util.ImageUtil; @PluginDescriptor( - name = "Vorkath", + name = "Vorkath Helper", description = "Count vorkath attacks, and which phase is coming next", tags = {"combat", "overlay", "pve", "pvm"}, type = PluginType.PVM @@ -192,4 +192,4 @@ public class VorkathPlugin extends Plugin vorkath.setLastTickAnimation(animationId); } } -} \ No newline at end of file +} From ebc2436c56af460a04875c9994a3f8892b185f21 Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Wed, 24 Apr 2019 19:23:12 -0600 Subject: [PATCH 3/8] Update TarnsLairPlugin.java --- .../runelite/client/plugins/tarnslair/TarnsLairPlugin.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java index c262ad813d..0abf012eb2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java @@ -49,8 +49,10 @@ import net.runelite.client.ui.overlay.OverlayManager; @PluginDescriptor( name = "Tarn's Lair", description = "Mark tiles and clickboxes to help traverse the maze", - tags = {"agility", "maze", "minigame", "overlay"} + tags = {"agility", "maze", "minigame", "overlay"}, + type = PluginType.UTILITY ) + @Slf4j public class TarnsLairPlugin extends Plugin { From b087791e276858b141b07c9e72d8147494d1d3df Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Wed, 24 Apr 2019 19:23:36 -0600 Subject: [PATCH 4/8] Updated Type --- .../net/runelite/client/plugins/smelting/SmeltingPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java index 9534129ad1..20c992c4ff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java @@ -44,7 +44,8 @@ import net.runelite.client.ui.overlay.OverlayManager; @PluginDescriptor( name = "Smelting", description = "Show Smelting stats", - tags = {"overlay", "skilling"} + tags = {"overlay", "skilling"}, + type = PluginType.UTILITY ) @PluginDependency(XpTrackerPlugin.class) public class SmeltingPlugin extends Plugin @@ -127,4 +128,3 @@ public class SmeltingPlugin extends Plugin } } } - From 19156dc6f80917cb56416e454a59dc5a152b476a Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Wed, 24 Apr 2019 19:23:59 -0600 Subject: [PATCH 5/8] Update MusicCustomizerPlugin.java --- .../client/plugins/musicmodifier/MusicCustomizerPlugin.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/musicmodifier/MusicCustomizerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/musicmodifier/MusicCustomizerPlugin.java index a1202750bb..91d604a33c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/musicmodifier/MusicCustomizerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/musicmodifier/MusicCustomizerPlugin.java @@ -42,6 +42,7 @@ import java.io.File; name = "Music Track Customizer", description = "Customize what track plays and how it sounds, with local files", tags = {"music", "sound"}, + type = PluginType.UTILITY, enabledByDefault = false ) From b5b17576889fbcba5f4c43d6c8fcac4841f5b3dc Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Wed, 24 Apr 2019 19:24:17 -0600 Subject: [PATCH 6/8] Update MenuEntrySwapperPlugin.java --- .../MenuEntrySwapperPlugin.java | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index 48cf92d0b4..2e52f9ebb8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -450,30 +450,32 @@ public class MenuEntrySwapperPlugin extends Plugin swap("quick-travel", option, target, true); } } + else if (config.swapTravel() && option.equals("pass") && target.equals("energy barrier")) { swap("pay-toll(2-ecto)", option, target, true); } + else if (config.swapTravel() && option.equals("open") && target.equals("gate")) { swap("pay-toll(10gp)", option, target, true); } + else if (config.swapTravel() && option.equals("inspect") && target.equals("trapdoor")) { swap("travel", option, target, true); } - else if (config.swapTravel() && option.equals("board") && target.equals("travel cart")) - { - swap("pay-fare", option, target, true); - } + else if (config.swapHarpoon() && option.equals("cage")) { swap("harpoon", option, target, true); } + else if (config.swapHarpoon() && (option.equals("big net") || option.equals("net"))) { swap("harpoon", option, target, true); } + else if (config.swapHomePortal() != HouseMode.ENTER && option.equals("enter")) { switch (config.swapHomePortal()) @@ -501,57 +503,76 @@ public class MenuEntrySwapperPlugin extends Plugin swap("configure", option, target, false); } } + else if (config.swapFairyRing() == FairyRingMode.ZANARIS && option.equals("tree")) { swap("zanaris", option, target, false); } + else if (config.swapBoxTrap() && (option.equals("check") || option.equals("dismantle"))) { swap("reset", option, target, true); } + else if (config.swapBoxTrap() && option.equals("take")) { swap("lay", option, target, true); } + else if (config.swapChase() && option.equals("pick-up")) { swap("chase", option, target, true); } + else if (config.swapBirdhouseEmpty() && option.equals("interact") && target.contains("birdhouse")) { swap("empty", option, target, true); } + else if (config.swapQuick() && option.equals("ring")) { swap("quick-start", option, target, true); } + else if (config.swapQuick() && option.equals("pass")) { swap("quick-pass", option, target, true); swap("quick pass", option, target, true); } + else if (config.swapQuick() && option.equals("open")) { swap("quick-open", option, target, true); } + else if (config.swapAdmire() && option.equals("admire")) { swap("teleport", option, target, true); swap("spellbook", option, target, true); swap("perks", option, target, true); } + else if (config.swapPrivate() && option.equals("shared")) { swap("private", option, target, true); } + else if (config.swapPick() && option.equals("pick")) { swap("pick-lots", option, target, true); } + else if (config.swapRogueschests() && target.contains("chest")) { swap("search for traps", option, target, true); } + + else if (config.rockCake() && option.equals("eat")) + { + swap("guzzle", option, target, true); + } + + else if (config.shiftClickCustomization() && shiftModifier && !option.equals("use")) { Integer customOption = getSwapConfig(eventId); @@ -561,6 +582,7 @@ public class MenuEntrySwapperPlugin extends Plugin swap("use", option, target, true); } } + // Put all item-related swapping after shift-click else if (config.swapTeleportItem() && option.equals("wear")) { From 4ba20f55bfbebe8086ea6322c4e2ae929d7ebeb6 Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Wed, 24 Apr 2019 19:27:13 -0600 Subject: [PATCH 7/8] Update MenuEntrySwapperConfig.java --- .../MenuEntrySwapperConfig.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java index cb68438e51..a7bc841eb9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java @@ -282,14 +282,24 @@ public interface MenuEntrySwapperConfig extends Config { return true; } + + @ConfigItem( + keyName = "rockCake", + name = "Rock Cake Guzzle", + description = "Enables Left Click Guzzle to Rock Cake" + ) + default boolean rockCake() + { + return false; + } @ConfigItem( - keyName = "swapRogueschests", - name = "Rogueschests", - description = "Swap Rogueschests from open to Search for traps" + keyName = "swapRogueschests", + name = "Rogueschests", + description = "Swap Rogueschests from open to Search for traps" ) default boolean swapRogueschests() { return true; } -} \ No newline at end of file +} From 3c3bf45198e1da2b935e766ce9f49cdb4ea079c7 Mon Sep 17 00:00:00 2001 From: Ganom Date: Wed, 24 Apr 2019 21:43:48 -0400 Subject: [PATCH 8/8] Adding types for rai --- .../client/plugins/musicmodifier/MusicCustomizerPlugin.java | 1 + .../net/runelite/client/plugins/smelting/SmeltingPlugin.java | 1 + .../net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java | 1 + 3 files changed, 3 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/musicmodifier/MusicCustomizerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/musicmodifier/MusicCustomizerPlugin.java index 91d604a33c..009fd81bf8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/musicmodifier/MusicCustomizerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/musicmodifier/MusicCustomizerPlugin.java @@ -37,6 +37,7 @@ import net.runelite.client.plugins.PluginDescriptor; import javax.inject.Inject; import java.io.File; +import net.runelite.client.plugins.PluginType; @PluginDescriptor( name = "Music Track Customizer", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java index 20c992c4ff..cf9ee4a144 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java @@ -38,6 +38,7 @@ import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDependency; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.xptracker.XpTrackerPlugin; import net.runelite.client.ui.overlay.OverlayManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java index 0abf012eb2..d277b77931 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java @@ -44,6 +44,7 @@ import net.runelite.api.events.GroundObjectSpawned; 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(