From dce4c387f82e535c1d9df74e3dad48c092546c5c Mon Sep 17 00:00:00 2001 From: Zeruth Date: Sun, 7 Jul 2019 19:36:41 -0400 Subject: [PATCH] finish upstream merge --- .../MenuEntrySwapperConfig.java | 1 - .../MenuEntrySwapperPlugin.java | 5 --- .../client/plugins/timers/TimersPlugin.java | 37 +------------------ 3 files changed, 2 insertions(+), 41 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 8808985dc9..121b1f395c 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 @@ -1,4 +1,3 @@ -<<<<<<< HEAD /* * Copyright (c) 2018, Adam * Copyright (c) 2018, Kyle 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 65b87f2138..a4414ca6dc 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 @@ -1162,7 +1162,6 @@ public class MenuEntrySwapperPlugin extends Plugin swap(client, "quick-travel", option, target, true); } -<<<<<<< HEAD if (this.swapEnchant) { swap(client, "enchant", option, target, true); @@ -1178,10 +1177,6 @@ public class MenuEntrySwapperPlugin extends Plugin else if (this.swapMetamorphosis && target.contains("baby chinchompa")) { swap(client, "metamorphosis", option, target, true); - if (config.swapEnchant()) - { - swap("enchant", option, target, true); - } } else if (this.swapStun && target.contains("hoop snake")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index d6b95dee24..43701cbb34 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -78,41 +78,8 @@ import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import static net.runelite.client.plugins.timers.GameIndicator.VENGEANCE_ACTIVE; -import static net.runelite.client.plugins.timers.GameTimer.ABYSSAL_SIRE_STUN; -import static net.runelite.client.plugins.timers.GameTimer.ANTIFIRE; -import static net.runelite.client.plugins.timers.GameTimer.ANTIPOISON; -import static net.runelite.client.plugins.timers.GameTimer.ANTIVENOM; -import static net.runelite.client.plugins.timers.GameTimer.BIND; -import static net.runelite.client.plugins.timers.GameTimer.CANNON; -import static net.runelite.client.plugins.timers.GameTimer.CHARGE; -import static net.runelite.client.plugins.timers.GameTimer.DMM_FULLTB; -import static net.runelite.client.plugins.timers.GameTimer.DMM_HALFTB; -import static net.runelite.client.plugins.timers.GameTimer.ENTANGLE; -import static net.runelite.client.plugins.timers.GameTimer.EXANTIFIRE; -import static net.runelite.client.plugins.timers.GameTimer.EXSUPERANTIFIRE; -import static net.runelite.client.plugins.timers.GameTimer.FULLTB; -import static net.runelite.client.plugins.timers.GameTimer.GOD_WARS_ALTAR; -import static net.runelite.client.plugins.timers.GameTimer.HALFBIND; -import static net.runelite.client.plugins.timers.GameTimer.HALFENTANGLE; -import static net.runelite.client.plugins.timers.GameTimer.HALFSNARE; -import static net.runelite.client.plugins.timers.GameTimer.HALFTB; -import static net.runelite.client.plugins.timers.GameTimer.HOME_TELEPORT; -import static net.runelite.client.plugins.timers.GameTimer.ICEBARRAGE; -import static net.runelite.client.plugins.timers.GameTimer.ICEBLITZ; -import static net.runelite.client.plugins.timers.GameTimer.ICEBURST; -import static net.runelite.client.plugins.timers.GameTimer.ICERUSH; -import static net.runelite.client.plugins.timers.GameTimer.IMBUEDHEART; -import static net.runelite.client.plugins.timers.GameTimer.MAGICIMBUE; -import static net.runelite.client.plugins.timers.GameTimer.MINIGAME_TELEPORT; -import static net.runelite.client.plugins.timers.GameTimer.OVERLOAD; -import static net.runelite.client.plugins.timers.GameTimer.OVERLOAD_RAID; -import static net.runelite.client.plugins.timers.GameTimer.PRAYER_ENHANCE; -import static net.runelite.client.plugins.timers.GameTimer.SKULL; -import static net.runelite.client.plugins.timers.GameTimer.SNARE; -import static net.runelite.client.plugins.timers.GameTimer.STAFF_OF_THE_DEAD; -import static net.runelite.client.plugins.timers.GameTimer.STAMINA; -import static net.runelite.client.plugins.timers.GameTimer.SUPERANTIFIRE; -import static net.runelite.client.plugins.timers.GameTimer.VENGEANCE; +import static net.runelite.client.plugins.timers.GameTimer.*; + import net.runelite.client.ui.overlay.infobox.InfoBoxManager; @PluginDescriptor(