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

Merge pull request #1605 from xKylee/lms

Browse Source 
WidgetID: move LMS Widget
This commit is contained in:
ST0NEWALL
2019-09-13 09:19:07 -04:00
committed by GitHub
parent f7ca6b00c8 38b2492c25
commit 36259e0792
7 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
View File

@@ -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;
}
}

3
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
View File

@@ -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),

1
runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java
View File

@@ -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

1
runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java
View File

@@ -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

1
runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java
View File

@@ -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",

19
runelite-client/src/main/java/net/runelite/client/util/WeaponType.java → runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java
View File

@@ -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"
};
}

2
runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java
View File

@@ -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();