From a8f1368fb54d1420f7c6ae5636e65653db347f69 Mon Sep 17 00:00:00 2001 From: xKylee <48519776+xKylee@users.noreply.github.com> Date: Sat, 7 Sep 2019 11:56:46 +0100 Subject: [PATCH 1/2] widget: LMS moveable box --- .../main/java/net/runelite/api/widgets/WidgetID.java | 11 +++++++++++ .../java/net/runelite/api/widgets/WidgetInfo.java | 3 +++ .../net/runelite/client/ui/overlay/WidgetOverlay.java | 2 ++ 3 files changed, 16 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 66bab091f7..13822a3544 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -154,6 +154,8 @@ public class WidgetID public static final int TRADING_SCREEN = 335; public static final int SEED_VAULT_GROUP_ID = 631; public static final int EXPLORERS_RING_ALCH_GROUP_ID = 483; + public static final int LMS_GROUP_ID = 333; + public static final int LMS_INGAME_GROUP_ID = 328; static class WorldMap { @@ -1143,4 +1145,13 @@ public class WidgetID { static final int INVENTORY = 7; } + + static class Lms + { + static final int INFO = 2; + } + static class LmsKDA + { + static final int INFO = 4; + } } diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index 545f19a079..808c0eb8ff 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -175,6 +175,9 @@ public enum WidgetInfo MINIMAP_WORLDMAP_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WORLDMAP_ORB), MINIMAP_WORLD_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WORLDMAP_ORB), + LMS_INFO(WidgetID.LMS_GROUP_ID, WidgetID.Lms.INFO), + LMS_KDA(WidgetID.LMS_INGAME_GROUP_ID, WidgetID.LmsKDA.INFO), + LOGIN_CLICK_TO_PLAY_SCREEN(WidgetID.LOGIN_CLICK_TO_PLAY_GROUP_ID, 0), LOGIN_CLICK_TO_PLAY_SCREEN_MESSAGE_OF_THE_DAY(WidgetID.LOGIN_CLICK_TO_PLAY_GROUP_ID, WidgetID.LoginClickToPlayScreen.MESSAGE_OF_THE_DAY), diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java index f6ad586274..269e113b6a 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java @@ -57,6 +57,8 @@ public class WidgetOverlay extends Overlay .put(WidgetInfo.MULTICOMBAT_FIXED, OverlayPosition.BOTTOM_RIGHT) .put(WidgetInfo.MULTICOMBAT_RESIZEABLE, OverlayPosition.CANVAS_TOP_RIGHT) .put(WidgetInfo.PYRAMID_PLUNDER_DATA, OverlayPosition.TOP_CENTER) + .put(WidgetInfo.LMS_INFO, OverlayPosition.TOP_CENTER) + .put(WidgetInfo.LMS_KDA, OverlayPosition.TOP_CENTER) .put(WidgetInfo.THEATRE_OF_BLOOD_HEALTH_ORBS, OverlayPosition.TOP_LEFT) .build(); From 38b2492c25d5ca0712da5f287f3efcdde0c45176 Mon Sep 17 00:00:00 2001 From: xKylee <48519776+xKylee@users.noreply.github.com> Date: Sat, 7 Sep 2019 11:57:44 +0100 Subject: [PATCH 2/2] Revert "util: move weaponType" This reverts commit c1076a159e681995c0096255867c45be799ab11a. --- .../PrayAgainstPlayerOverlay.java | 1 - .../PrayAgainstPlayerOverlayPrayerTab.java | 1 - .../PrayAgainstPlayerPlugin.java | 1 - .../prayagainstplayer}/WeaponType.java | 19 +++++-------------- 4 files changed, 5 insertions(+), 17 deletions(-) rename runelite-client/src/main/java/net/runelite/client/{util => plugins/prayagainstplayer}/WeaponType.java (93%) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java index 431a2c8a55..97d8bfe4c6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java @@ -43,7 +43,6 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.api.util.Text; -import net.runelite.client.util.WeaponType; @Singleton class PrayAgainstPlayerOverlay extends Overlay diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java index 10da63ec35..c4380983f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java @@ -41,7 +41,6 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; -import net.runelite.client.util.WeaponType; @Singleton class PrayAgainstPlayerOverlayPrayerTab extends Overlay 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 fb4518c606..4e3ce27162 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 @@ -56,7 +56,6 @@ 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 net.runelite.client.util.WeaponType; @PluginDescriptor( name = "Pray Against Player", diff --git a/runelite-client/src/main/java/net/runelite/client/util/WeaponType.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java similarity index 93% rename from runelite-client/src/main/java/net/runelite/client/util/WeaponType.java rename to runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java index 3c762f1811..d6078e556e 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/WeaponType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java @@ -22,14 +22,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client.util; +package net.runelite.client.plugins.prayagainstplayer; import net.runelite.api.Client; import net.runelite.api.ItemDefinition; import net.runelite.api.Player; import net.runelite.api.kit.KitType; -public enum WeaponType +enum WeaponType { WEAPON_MELEE, @@ -116,12 +116,7 @@ public enum WeaponType "flail", "granite hammer", "rapier", - "bulwark", - "ham joint", - "blade of saeldor", - "swift blade", - "wolfbane", - "keris" + "bulwark" }; private static final String[] rangedWeaponNames = { @@ -132,18 +127,14 @@ public enum WeaponType "dart", "thrownaxe", "chinchompa", - "ballista", - "javelin" + "ballista" }; private static final String[] magicWeaponNames = { "staff", "trident", "wand", - "dawnbringer", - "ivandis", - "void knight mace", - "sceptre" + "dawnbringer" }; }