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 b3878756bc..b1bfae34b2 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 @@ -814,7 +814,7 @@ public class WidgetID static final int FLAMES_OF_ZAMORAK = 47; static final int TROLLHEIM_TELEPORT = 48; static final int WIND_WAVE = 49; - static final int HARGE_FIRE_ORB = 50; + static final int CHARGE_FIRE_ORB = 50; static final int TELEPORT_TO_APE_ATOLL = 51; static final int WATER_WAVE = 52; static final int CHARGE_AIR_ORB = 53; @@ -913,7 +913,7 @@ public class WidgetID static final int OURANIA_TELEPORT = 142; // ARCEUUS SPELLS - static final int ARCEUUS_HOME_TELEPORT = 143; + static final int ARCEUUS_HOME_TELEPORT = 143; } static class Pvp 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 eecfeb5404..09bdff4e02 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 @@ -486,28 +486,81 @@ public enum WidgetInfo PVP_BOUNTY_HUNTER_INFO(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.BOUNTY_HUNTER_INFO), PVP_KILLDEATH_COUNTER(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.KILLDEATH_RATIO), - SPELLBOOK_FILTERED_BOUNDS(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FILTERED_SPELLS_BOUNDS), + SPELLBOOK_FILTERED_BOUNDS(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FILTERED_SPELLS_BOUNDS), + /* STANDARD SPELL BOOK WIDGETS*/ SPELL_LUMBRIDGE_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LUMBRIDGE_HOME_TELEPORT), + SPELL_WIND_STRIKE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WIND_STRIKE), + SPELL_CONFUSE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CONFUSE), + SPELL_ENCHANT_CROSSBOW_BOLT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ENCHANT_CROSSBOW_BOLT), + SPELL_WATER_STRIKE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATER_STRIKE), + SPELL_LVL_1_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_1_ENCHANT), + SPELL_EARTH_STRIKE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.EARTH_STRIKE), + SPELL_WEAKEN(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WEAKEN), + SPELL_FIRE_STRIKE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FIRE_STRIKE), + SPELL_BONES_TO_BANANAS(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.BONES_TO_BANANAS), + SPELL_WIND_BOLT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WIND_BOLT), + SPELL_CURSE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CURSE), SPELL_BIND(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.BIND), + SPELL_LOW_LEVEL_ALCHEMY(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LOW_LEVEL_ALCHEMY), + SPELL_WATER_BOLT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATER_BOLT), + SPELL_VARROCK_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.VARROCK_TELEPORT), + SPELL_LVL_2_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_2_ENCHANT), + SPELL_EARTH_BOLT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.EARTH_BOLT), + SPELL_LUMBRIDGE_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LUMBRIDGE_TELEPORT), + SPELL_TELEKINETIC_GRAB(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELEKINETIC_GRAB), + SPELL_FIRE_BOLT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FIRE_BOLT), + SPELL_FALADOR_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FALADOR_TELEPORT), + SPELL_CRUMBLE_UNDEAD(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CRUMBLE_UNDEAD), + SPELL_TELEPORT_TO_HOUSE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELEPORT_TO_HOUSE), + SPELL_WIND_BLAST(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WIND_BLAST), + SPELL_SUPERHEAT_ITEM(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.SUPERHEAT_ITEM), + SPELL_CAMELOT_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CAMELOT_TELEPORT), + SPELL_WATER_BLAST(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATER_BLAST), + SPELL_LVL_3_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_3_ENCHANT), + SPELL_IBAN_BLAST(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.IBAN_BLAST), SPELL_SNARE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.SNARE), + SPELL_MAGIC_DART(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.MAGIC_DART), + SPELL_ARDOUGNE_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ARDOUGNE_TELEPORT), + SPELL_EARTH_BLAST(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.EARTH_BLAST), + SPELL_HIGH_LEVEL_ALCHEMY(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.HIGH_LEVEL_ALCHEMY), + SPELL_CHARGE_WATER_ORB(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CHARGE_WATER_ORB), + SPELL_LVL_4_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_4_ENCHANT), + SPELL_WATCHTOWER_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATCHTOWER_TELEPORT), + SPELL_FIRE_BLAST(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FIRE_BLAST), + SPELL_CHARGE_EARTH_ORB(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CHARGE_EARTH_ORB), + SPELL_BONES_TO_PEACHES(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.BONES_TO_PEACHES), + SPELL_SARADOMIN_STRIKE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.SARADOMIN_STRIKE), + SPELL_CLAWS_OF_GUTHIX(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CLAWS_OF_GUTHIX), + SPELL_FLAMES_OF_ZAMORAK(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FLAMES_OF_ZAMORAK), + SPELL_TROLLHEIM_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TROLLHEIM_TELEPORT), + SPELL_WIND_WAVE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WIND_WAVE), + SPELL_CHARGE_FIRE_ORB(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CHARGE_FIRE_ORB), + SPELL_TELEPORT_TO_APE_ATOLL(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELEPORT_TO_APE_ATOLL), + SPELL_WATER_WAVE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATER_WAVE), + SPELL_CHARGE_AIR_ORB(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CHARGE_AIR_ORB), + SPELL_VULNERABILITY(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.VULNERABILITY), + SPELL_LVL_5_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_5_ENCHANT), + SPELL_TELEPORT_TO_KOUREND(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELEPORT_TO_KOUREND), + SPELL_EARTH_WAVE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.EARTH_WAVE), + SPELL_ENFEEBLE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ENFEEBLE), + SPELL_FIRE_WAVE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FIRE_WAVE), SPELL_ENTANGLE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ENTANGLE), + SPELL_TELEOTHER_LUMBRIDGE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELEOTHER_LUMBRIDGE), + SPELL_STUN(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.STUN), + SPELL_CHARGE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CHARGE), + SPELL_WIND_SURGE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WIND_SURGE), + SPELL_TELEOTHER_FALADOR(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELEOTHER_FALADOR), + SPELL_WATER_SURGE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATER_SURGE), SPELL_TELE_BLOCK(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELE_BLOCK), + SPELL_LVL_6_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_6_ENCHANT), + SPELL_TELEOTHER_CAMELOT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELEOTHER_CAMELOT), + SPELL_EARTH_SURGE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.EARTH_SURGE), + SPELL_LVL_7_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_7_ENCHANT), SPELL_FIRE_SURGE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FIRE_SURGE), SPELL_BOUNTY_TARGET_TELEPORT2(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.BOUNTY_TARGET_TELEPORT), - /* END OF STANDARD SPELL BOOK WIDGETS*/ - - /* LUNAR SPELL BOOK WIDGETS*/ - SPELL_LUNAR_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LUNAR_HOME_TELEPORT), - SPELL_VENGEANCE_OTHER(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.VENGEANCE_OTHER), - SPELL_VENGEANCE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.VENGEANCE), - SPELL_BOUNTY_TARGET_TELEPORT3(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.BOUNTY_TARGET_TELEPORT), - /* LUNA SPELL BOOK WIDGETS*/ - - /* ARCEUUS SPELL BOOK WIDGETS*/ - SPELL_ARCEUUS_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ARCEUUS_HOME_TELEPORT), - /* END OF ARCEUUS SPELL BOOK WIDGETS*/ - +/* END OF STANDARD SPELL BOOK WIDGETS*/ + /* ANCIENT SPELL BOOK WIDGETS*/ SPELL_ICE_RUSH(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ICE_RUSH), SPELL_ICE_BLITZ(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ICE_BLITZ), @@ -535,8 +588,59 @@ public enum WidgetInfo SPELL_GHORROCK_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.GHORROCK_TELEPORT), SPELL_EDGEVILLE_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.EDGEVILLE_HOME_TELEPORT), SPELL_BOUNTY_TARGET_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.BOUNTY_TARGET_TELEPORT), +/* END OF ANCIENT SPELL BOOK WIDGETS*/ - /* END OF ANCIENT SPELL BOOK WIDGETS*/ +/* LUNAR SPELL BOOK WIDGETS*/ + SPELL_LUNAR_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LUNAR_HOME_TELEPORT), + SPELL_VENGEANCE_OTHER(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.VENGEANCE_OTHER), + SPELL_VENGEANCE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.VENGEANCE), + SPELL_BOUNTY_TARGET_TELEPORT3(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.BOUNTY_TARGET_TELEPORT), + SPELL_BAKE_PIE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.BAKE_PIE), + SPELL_CURE_PLANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CURE_PLANT), + SPELL_MONSTER_EXAMINE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.MONSTER_EXAMINE), + SPELL_NPC_CONTACT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.NPC_CONTACT), + SPELL_CURE_OTHER(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CURE_OTHER), + SPELL_HUMIDIFY(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.HUMIDIFY), + SPELL_MOONCLAN_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.MOONCLAN_TELEPORT), + SPELL_TELE_GROUP_MOONCLAN(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELE_GROUP_MOONCLAN), + SPELL_CURE_ME(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CURE_ME), + SPELL_HUNTER_KIT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.HUNTER_KIT), + SPELL_WATERBIRTH_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATERBIRTH_TELEPORT), + SPELL_TELE_GROUP_WATERBIRTH(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELE_GROUP_WATERBIRTH), + SPELL_CURE_GROUP(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CURE_GROUP), + SPELL_STAT_SPY(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.STAT_SPY), + SPELL_BARBARIAN_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.BARBARIAN_TELEPORT), + SPELL_TELE_GROUP_BARBARIAN(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELE_GROUP_BARBARIAN), + SPELL_SUPERGLASS_MAKE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.SUPERGLASS_MAKE), + SPELL_TAN_LEATHER(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TAN_LEATHER), + SPELL_KHAZARD_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.KHAZARD_TELEPORT), + SPELL_TELE_GROUP_KHAZARD(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELE_GROUP_KHAZARD), + SPELL_DREAM(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.DREAM), + SPELL_STRING_JEWELLERY(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.STRING_JEWELLERY), + SPELL_STAT_RESTORE_POT_SHARE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.STAT_RESTORE_POT_SHARE), + SPELL_MAGIC_IMBUE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.MAGIC_IMBUE), + SPELL_FERTILE_SOIL(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FERTILE_SOIL), + SPELL_BOOST_POTION_SHARE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.BOOST_POTION_SHARE), + SPELL_FISHING_GUILD_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FISHING_GUILD_TELEPORT), + SPELL_TELE_GROUP_FISHING_GUILD(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELE_GROUP_FISHING_GUILD), + SPELL_PLANK_MAKE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.PLANK_MAKE), + SPELL_CATHERBY_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CATHERBY_TELEPORT), + SPELL_TELE_GROUP_CATHERBY(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELE_GROUP_CATHERBY), + SPELL_RECHARGE_DRAGONSTONE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.RECHARGE_DRAGONSTONE), + SPELL_ICE_PLATEAU_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ICE_PLATEAU_TELEPORT), + SPELL_TELE_GROUP_ICE_PLATEAU(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELE_GROUP_ICE_PLATEAU), + SPELL_ENERGY_TRANSFER(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ENERGY_TRANSFER), + SPELL_HEAL_OTHER(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.HEAL_OTHER), + SPELL_HEAL_GROUP(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.HEAL_GROUP), + SPELL_SPELLBOOK_SWAP(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.SPELLBOOK_SWAP), + SPELL_GEOMANCY(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.GEOMANCY), + SPELL_SPIN_FLAX(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.SPIN_FLAX), + SPELL_OURANIA_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.OURANIA_TELEPORT), +/* END OF LUNAR SPELL BOOK WIDGETS*/ + +/* ARCEUUS SPELL BOOK WIDGETS*/ + SPELL_ARCEUUS_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ARCEUUS_HOME_TELEPORT), +/* END OF ARCEUUS SPELL BOOK WIDGETS*/ KOUREND_FAVOUR_OVERLAY(WidgetID.KOUREND_FAVOUR_GROUP_ID, WidgetID.KourendFavour.KOUREND_FAVOUR_OVERLAY), ZEAH_MESS_HALL_COOKING_DISPLAY(WidgetID.ZEAH_MESS_HALL_GROUP_ID, WidgetID.Zeah.MESS_HALL_COOKING_DISPLAY), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java index 48b702994b..04d9e5955a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java @@ -148,8 +148,6 @@ public class FreezeTimersOverlay extends Overlay int xOffset = (int) rect.getWidth(); OverlayUtil.renderActorTextAndImage(g, actor, text, Color.WHITE, image, yOffset, xOffset); - g.setColor(RED); - g.draw(actor.getConvexHull().getBounds()); } private String processTickCounter(long finishedAt) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbookiconresize/spellbookiconresizeConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbookiconresize/spellbookiconresizeConfig.java index c087f39068..37a4c69964 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbookiconresize/spellbookiconresizeConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbookiconresize/spellbookiconresizeConfig.java @@ -38,7 +38,7 @@ public interface spellbookiconresizeConfig extends Config return true; } - //ice blitz + //Blood Barrage @ConfigItem(position = 1, keyName = "shouldModifyBloodBarrage", name = "Blood Barrage", description = "Toggle on to Blood Barrage modifications.") default boolean shouldModifyBloodBarrage() { return true; } @ConfigItem(position = 2, keyName = "getBloodPositionX", name = "Blood Barrage Pos X", description = "Modifies the X-axis position of Blood Barrage.") @@ -58,7 +58,7 @@ public interface spellbookiconresizeConfig extends Config { return false; } - //ice barrage + //Ice Barrage @ConfigItem(position = 7, keyName = "shouldModifyIceBarrage", name = "Ice Barrage", description = "Toggle on to enable Ice Barrage modifications.") default boolean shouldModifyIceBarrage() { return true; } @ConfigItem(position = 8, keyName = "getBarragePositionX", name = "Ice Barrage Pos X", description = "Modifies the X-axis position of Ice Barrage.") @@ -81,7 +81,7 @@ public interface spellbookiconresizeConfig extends Config { return false; } - + //Ice Blitz @ConfigItem(position = 13, keyName = "shouldModifyIceBlitz", name = "Ice Blitz", description = "Toggle on to enable Ice Blitz modifications.") default boolean shouldModifyIceBlitz() { return true; } @ConfigItem(position = 14, keyName = "getBlitzPositionX", name = "Ice Blitz Pos X", description = "Modifies the X-axis position of Ice Blitz.") @@ -101,8 +101,8 @@ public interface spellbookiconresizeConfig extends Config { return false; } - - @ConfigItem(position = 18, keyName = "shouldModifyBloodBlitz", name = "Blood Blitz", description = "Toggle on to enable Ice Blitz modifications.") + //Blood blitz + @ConfigItem(position = 18, keyName = "shouldModifyBloodBlitz", name = "Blood Blitz", description = "Toggle on to enable Blood Blitz modifications.") default boolean shouldModifyBloodBlitz() { return true; } @ConfigItem(position = 19, keyName = "getBloodBlitzPositionX", name = "Blood Blitz Pos X", description = "Modifies the X-axis position of Blood Blitz.") default int getBloodBlitzPositionX() { return 0; } @@ -121,6 +121,86 @@ public interface spellbookiconresizeConfig extends Config { return false; } - - +/* + //Vengeance + @ConfigItem(position = 23, keyName = "shouldModifyVengeance", name = "Vengeance", description = "Toggle on to enable Vengeance modifications.") + default boolean shouldModifyVengeance() { return true; } + @ConfigItem(position = 24, keyName = "getVengeancePositionX", name = "Vengeance Pos X", description = "Modifies the X-axis position of Vengeance.") + default int getVengeancePositionX() { return 0; } + @ConfigItem(position = 25, keyName = "getVengeancePositionY", name = "Vengeance Pos y", description = "Modifies the X-axis position of Vengeance.") + default int getVengeancePositionY() + { + return 0; + } + @ConfigItem(position = 26, keyName = "getVengeanceSize", name = "Vengeance Size", description = "Modifies the width position of Vengeance.") + default int getVengeanceSize() + { + return 100; + } + @ConfigItem(position = 27, keyName = "shouldHideVengeance", name = "Hide Vengeance", description = "Enable this to hide Vengeance") + default boolean shouldVengeance() + { + return false; + } + //TeleBlock + @ConfigItem(position = 28, keyName = "shouldModifyTeleBlock", name = "TeleBlock", description = "Toggle on to enable TeleBlock modifications.") + default boolean shouldModifyTeleBlock() { return true; } + @ConfigItem(position = 29, keyName = "getTeleBlockPositionX", name = "TeleBlock Pos X", description = "Modifies the X-axis position of TeleBlock.") + default int getTeleBlockPositionX() { return 0; } + @ConfigItem(position = 30, keyName = "getTeleBlockPositionY", name = "TeleBlock Pos y", description = "Modifies the X-axis position of TeleBlock.") + default int getTeleBlockPositionY() + { + return 0; + } + @ConfigItem(position = 31, keyName = "getTeleBlockSize", name = "TeleBlock Size", description = "Modifies the width position of TeleBlock.") + default int getTeleBlockSize() + { + return 100; + } + @ConfigItem(position = 32, keyName = "shouldHideTeleBlock", name = "Hide TeleBlock", description = "Enable this to hide TeleBlock") + default boolean shouldTeleBlock() + { + return false; + } + //Entangle + @ConfigItem(position = 33, keyName = "shouldModifyEntangle", name = "Entangle", description = "Toggle on to enable Entangle modifications.") + default boolean shouldModifyEntangle() { return true; } + @ConfigItem(position = 34, keyName = "getEntanglePositionX", name = "Entangle Pos X", description = "Modifies the X-axis position of Entangle.") + default int getEntanglePositionX() { return 0; } + @ConfigItem(position = 35, keyName = "getEntanglePositionY", name = "Entangle Pos y", description = "Modifies the X-axis position of Entangle.") + default int getEntanglePositionY() + { + return 0; + } + @ConfigItem(position = 36, keyName = "getEntangleSize", name = "Entangle Size", description = "Modifies the width position of Entangle.") + default int getEntangleSize() + { + return 100; + } + @ConfigItem(position = 37, keyName = "shouldHideEntangle", name = "Hide Entangle", description = "Enable this to hide Entangle") + default boolean shouldEntangle() + { + return false; + } + //FireSurge + @ConfigItem(position = 38, keyName = "shouldModifyFireSurge", name = "FireSurge", description = "Toggle on to enable FireSurge modifications.") + default boolean shouldModifyFireSurge() { return true; } + @ConfigItem(position = 39, keyName = "getFireSurgePositionX", name = "FireSurge Pos X", description = "Modifies the X-axis position of FireSurge.") + default int getFireSurgePositionX() { return 0; } + @ConfigItem(position = 40, keyName = "getFireSurgePositionY", name = "FireSurge Pos y", description = "Modifies the X-axis position of FireSurge.") + default int getFireSurgePositionY() + { + return 0; + } + @ConfigItem(position = 41, keyName = "getFireSurgeSize", name = "FireSurge Size", description = "Modifies the width position of FireSurge.") + default int getFireSurgeSize() + { + return 100; + } + @ConfigItem(position = 42, keyName = "shouldHideFireSurge", name = "Hide FireSurge", description = "Enable this to hide FireSurge") + default boolean shouldFireSurge() + { + return false; + } +*/ } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbookiconresize/spellbookiconresizePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbookiconresize/spellbookiconresizePlugin.java index 5f64e4f61c..e05641ae66 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbookiconresize/spellbookiconresizePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbookiconresize/spellbookiconresizePlugin.java @@ -205,20 +205,169 @@ public class spellbookiconresizePlugin extends Plugin { } - // if (spellbookID == 2) { - // if (config.shouldModifyVengeance()) - /// modifySpell(WidgetInfo.SPELL_VENGEANCE, config.getVengeancePositionX(), config.getVengeancePositionY(), config.getVengeanceSize()); - // } - // if (spellbookID == 0) { - - // if (config.shouldModifyTeleBlock()) - // modifySpell(WidgetInfo.SPELL_TELE_BLOCK, config.getTeleBlockPositionX(), config.getTeleBlockPositionY(), config.getTeleBlockSize()); -// - // if (config.shouldModifyEntangle()) - // modifySpell(WidgetInfo.SPELL_ENTANGLE, config.getEntanglePositionX(), config.getEntanglePositionY(), config.getEntangleSize()); - // } + +/* + if (spellbookID == 2) { + if (config.shouldModifyVengeance()) { + modifySpell(WidgetInfo.SPELL_VENGEANCE, config.getVengeancePositionX(), config.getVengeancePositionY(), config.getVengeanceSize()); + } else { + if (client.getVar(Varbits.SPELLBOOK_HIDDEN) == 1) { + modifySpell(WidgetInfo.SPELL_VENGEANCE, 0, 0, 0); + } else if (client.getVar(Varbits.SPELLBOOK_HIDDEN) == 0) { + modifySpell(WidgetInfo.SPELL_VENGEANCE, 0, 0, 0); + } + } + + setSpellHidden(WidgetInfo.SPELL_LUNAR_HOME_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_VENGEANCE_OTHER, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_VENGEANCE, config.shouldHideVengeance()); + setSpellHidden(WidgetInfo.SPELL_BOUNTY_TARGET_TELEPORT3, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_BAKE_PIE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_CURE_PLANT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_MONSTER_EXAMINE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_NPC_CONTACT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_CURE_OTHER, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_HUMIDIFY, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_MOONCLAN_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TELE_GROUP_MOONCLAN, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_CURE_ME, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_HUNTER_KIT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_WATERBIRTH_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TELE_GROUP_WATERBIRTH, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_CURE_GROUP, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_STAT_SPY, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_BARBARIAN_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TELE_GROUP_BARBARIAN, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_SUPERGLASS_MAKE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TAN_LEATHER, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_KHAZARD_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TELE_GROUP_KHAZARD, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_DREAM, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_STRING_JEWELLERY, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_STAT_RESTORE_POT_SHARE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_MAGIC_IMBUE(, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_FERTILE_SOIL, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_BOOST_POTION_SHARE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_FISHING_GUILD_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TELE_GROUP_FISHING_GUILD, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_PLANK_MAKE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_CATHERBY_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TELE_GROUP_CATHERBY, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_RECHARGE_DRAGONSTONE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_ICE_PLATEAU_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TELE_GROUP_ICE_PLATEAU, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_ENERGY_TRANSFER, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_HEAL_OTHER, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_HEAL_GROUP, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_SPELLBOOK_SWAP, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_GEOMANCY, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_SPIN_FLAX, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_OURANIA_TELEPORT, config.shouldHideOthers()); + } + if (spellbookID == 0) { + if (config.shouldModifyTeleBlock()) { + modifySpell(WidgetInfo.SPELL_TELE_BLOCK, config.getTeleBlockPositionX() -20, config.getTeleBlockPositionY(), config.getTeleBlockSize()); + } else { + if (client.getVar(Varbits.SPELLBOOK_HIDDEN) == 1) { + modifySpell(WidgetInfo.SPELL_TELE_BLOCK, 0, 0, 0); + } else if (client.getVar(Varbits.SPELLBOOK_HIDDEN) == 0) { + modifySpell(WidgetInfo.SPELL_TELE_BLOCK, 0, 0, 0); + } + } + if (config.shouldModifyFireSurge()) { + modifySpell(WidgetInfo.SPELL_FIRE_SURGE, config.getFireSurgePositionX() -20, config.getFireSurgePositionY(), config.getFireSurgeSize()); + } else { + if (client.getVar(Varbits.SPELLBOOK_HIDDEN) == 1) { + modifySpell(WidgetInfo.SPELL_FIRE_SURGE, 0, 0, 0); + } else if (client.getVar(Varbits.SPELLBOOK_HIDDEN) == 0) { + modifySpell(WidgetInfo.SPELL_FIRE_SURGE, 0, 0, 0); + } + } + if (config.shouldModifyEntangle()) { + modifySpell(WidgetInfo.SPELL_ENTANGLE, config.getEntanglePositionX() -20, config.getEntanglePositionY(), config.getEntangleSize()); + } else { + if (client.getVar(Varbits.SPELLBOOK_HIDDEN) == 1) { + modifySpell(WidgetInfo.SPELL_ENTANGLE, 0, 0, 0); + } else if (client.getVar(Varbits.SPELLBOOK_HIDDEN) == 0) { + modifySpell(WidgetInfo.SPELL_ENTANGLE, 0, 0, 0); + } + } + + setSpellHidden(WidgetInfo.SPELL_LUMBRIDGE_HOME_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_WIND_STRIKE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_CONFUSE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_ENCHANT_CROSSBOW_BOLT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_WATER_STRIKE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_LVL_1_ENCHANT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_EARTH_STRIKE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_WEAKEN, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_FIRE_STRIKE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_BONES_TO_BANANAS, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_WIND_BOLT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_CURSE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_BIND, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_LOW_LEVEL_ALCHEMY, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_WATER_BOLT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_VARROCK_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_LVL_2_ENCHANT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_EARTH_BOLT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_LUMBRIDGE_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TELEKINETIC_GRAB, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_FIRE_BOLT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_FALADOR_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_CRUMBLE_UNDEAD, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TELEPORT_TO_HOUSE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_WIND_BLAST, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_SUPERHEAT_ITEM, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_CAMELOT_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_WATER_BLAST, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_LVL_3_ENCHANT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_IBAN_BLAST, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_SNARE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_MAGIC_DART, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_ARDOUGNE_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_EARTH_BLAST, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_HIGH_LEVEL_ALCHEMY, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_CHARGE_WATER_ORB, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_LVL_4_ENCHANT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_WATCHTOWER_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_FIRE_BLAST, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_CHARGE_EARTH_ORB, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_BONES_TO_PEACHES, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_SARADOMIN_STRIKE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_CLAWS_OF_GUTHIX, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_FLAMES_OF_ZAMORAK, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TROLLHEIM_TELEPORT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_WIND_WAVE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_CHARGE_FIRE_ORB, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TELEPORT_TO_APE_ATOLL, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_WATER_WAVE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_CHARGE_AIR_ORB, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_VULNERABILITY, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_LVL_5_ENCHANT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TELEPORT_TO_KOUREND, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_EARTH_WAVE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_ENFEEBLE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_FIRE_WAVE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_ENTANGLE, config.shouldHideEntangle()); + setSpellHidden(WidgetInfo.SPELL_TELEOTHER_LUMBRIDGE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_STUN, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_CHARGE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_WIND_SURGE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TELEOTHER_FALADOR, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_WATER_SURGE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TELE_BLOCK, config.shouldHideTeleBlock()); + setSpellHidden(WidgetInfo.SPELL_LVL_6_ENCHANT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_TELEOTHER_CAMELOT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_EARTH_SURGE, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_LVL_7_ENCHANT, config.shouldHideOthers()); + setSpellHidden(WidgetInfo.SPELL_FIRE_SURGE, config.shouldHideFireSurge()); + setSpellHidden(WidgetInfo.SPELL_BOUNTY_TARGET_TELEPORT2, config.shouldHideOthers()); + } +*/ + } catch (Exception e) { //swallow } @@ -296,6 +445,164 @@ public class spellbookiconresizePlugin extends Plugin { setSpellHidden(WidgetInfo.SPELL_GHORROCK_TELEPORT, false); setSpellHidden(WidgetInfo.SPELL_EDGEVILLE_HOME_TELEPORT, false); } +/* + if (spellbookID == 0) { + + if (client.getVar(Varbits.SPELLBOOK_HIDDEN) == 1) { + modifySpell(WidgetInfo.SPELL_ENTANGLE, 0, 0, 0); + } else { + modifySpell(WidgetInfo.SPELL_ENTANGLE, 0, 0, 0); + } + + if (client.getVar(Varbits.SPELLBOOK_HIDDEN) == 1) { + modifySpell(WidgetInfo.SPELL_TELE_BLOCK, 0, 0, 0); + } else { + modifySpell(WidgetInfo.SPELL_TELE_BLOCK, 0, 0, 0); + } + + if (client.getVar(Varbits.SPELLBOOK_HIDDEN) == 1) { + modifySpell(WidgetInfo.SPELL_FIRE_SURGE, 0, 0, 0); + } else { + modifySpell(WidgetInfo.SPELL_FIRE_SURGE, 0, 0, 0); + } + + if (config.shouldHideTeleBlock()) { + setSpellHidden(WidgetInfo.SPELL_TELE_BLOCK, false); + } + if (config.shouldHideEntangle()) { + setSpellHidden(WidgetInfo.SPELL_ENTANGLE, false); + } + if (config.shouldHideFireSurge()) { + setSpellHidden(WidgetInfo.SPELL_FIRE_SURGE, false); + } + + setSpellHidden(WidgetInfo.SPELL_LUMBRIDGE_HOME_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_WIND_STRIKE, false); + setSpellHidden(WidgetInfo.SPELL_CONFUSE, false); + setSpellHidden(WidgetInfo.SPELL_ENCHANT_CROSSBOW_BOLT, false); + setSpellHidden(WidgetInfo.SPELL_WATER_STRIKE, false); + setSpellHidden(WidgetInfo.SPELL_LVL_1_ENCHANT, false); + setSpellHidden(WidgetInfo.SPELL_EARTH_STRIKE, false); + setSpellHidden(WidgetInfo.SPELL_WEAKEN, false); + setSpellHidden(WidgetInfo.SPELL_FIRE_STRIKE, false); + setSpellHidden(WidgetInfo.SPELL_BONES_TO_BANANAS, false); + setSpellHidden(WidgetInfo.SPELL_WIND_BOLT, false); + setSpellHidden(WidgetInfo.SPELL_CURSE, false); + setSpellHidden(WidgetInfo.SPELL_BIND, false); + setSpellHidden(WidgetInfo.SPELL_LOW_LEVEL_ALCHEMY, false); + setSpellHidden(WidgetInfo.SPELL_WATER_BOLT, false); + setSpellHidden(WidgetInfo.SPELL_VARROCK_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_LVL_2_ENCHANT, false); + setSpellHidden(WidgetInfo.SPELL_EARTH_BOLT, false); + setSpellHidden(WidgetInfo.SPELL_LUMBRIDGE_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_TELEKINETIC_GRAB, false); + setSpellHidden(WidgetInfo.SPELL_FIRE_BOLT, false); + setSpellHidden(WidgetInfo.SPELL_FALADOR_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_CRUMBLE_UNDEAD, false); + setSpellHidden(WidgetInfo.SPELL_TELEPORT_TO_HOUSE, false); + setSpellHidden(WidgetInfo.SPELL_WIND_BLAST, false); + setSpellHidden(WidgetInfo.SPELL_SUPERHEAT_ITEM, false); + setSpellHidden(WidgetInfo.SPELL_CAMELOT_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_WATER_BLAST, false); + setSpellHidden(WidgetInfo.SPELL_LVL_3_ENCHANT, false); + setSpellHidden(WidgetInfo.SPELL_IBAN_BLAST, false); + setSpellHidden(WidgetInfo.SPELL_SNARE, false); + setSpellHidden(WidgetInfo.SPELL_MAGIC_DART, false); + setSpellHidden(WidgetInfo.SPELL_ARDOUGNE_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_EARTH_BLAST, false); + setSpellHidden(WidgetInfo.SPELL_HIGH_LEVEL_ALCHEMY, false); + setSpellHidden(WidgetInfo.SPELL_CHARGE_WATER_ORB, false); + setSpellHidden(WidgetInfo.SPELL_LVL_4_ENCHANT, false); + setSpellHidden(WidgetInfo.SPELL_WATCHTOWER_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_FIRE_BLAST, false); + setSpellHidden(WidgetInfo.SPELL_CHARGE_EARTH_ORB, false); + setSpellHidden(WidgetInfo.SPELL_BONES_TO_PEACHES, false); + setSpellHidden(WidgetInfo.SPELL_SARADOMIN_STRIKE, false); + setSpellHidden(WidgetInfo.SPELL_CLAWS_OF_GUTHIX, false); + setSpellHidden(WidgetInfo.SPELL_FLAMES_OF_ZAMORAK, false); + setSpellHidden(WidgetInfo.SPELL_TROLLHEIM_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_WIND_WAVE, false); + setSpellHidden(WidgetInfo.SPELL_CHARGE_FIRE_ORB, false); + setSpellHidden(WidgetInfo.SPELL_TELEPORT_TO_APE_ATOLL, false); + setSpellHidden(WidgetInfo.SPELL_WATER_WAVE, false); + setSpellHidden(WidgetInfo.SPELL_CHARGE_AIR_ORB, false); + setSpellHidden(WidgetInfo.SPELL_VULNERABILITY, false); + setSpellHidden(WidgetInfo.SPELL_LVL_5_ENCHANT, false); + setSpellHidden(WidgetInfo.SPELL_TELEPORT_TO_KOUREND, false); + setSpellHidden(WidgetInfo.SPELL_EARTH_WAVE, false); + setSpellHidden(WidgetInfo.SPELL_ENFEEBLE, false); + setSpellHidden(WidgetInfo.SPELL_FIRE_WAVE, false); + setSpellHidden(WidgetInfo.SPELL_TELEOTHER_LUMBRIDGE, false); + setSpellHidden(WidgetInfo.SPELL_STUN, false); + setSpellHidden(WidgetInfo.SPELL_CHARGE, false); + setSpellHidden(WidgetInfo.SPELL_WIND_SURGE, false); + setSpellHidden(WidgetInfo.SPELL_TELEOTHER_FALADOR, false); + setSpellHidden(WidgetInfo.SPELL_WATER_SURGE, false); + setSpellHidden(WidgetInfo.SPELL_LVL_6_ENCHANT, false); + setSpellHidden(WidgetInfo.SPELL_TELEOTHER_CAMELOT, false); + setSpellHidden(WidgetInfo.SPELL_EARTH_SURGE, false); + setSpellHidden(WidgetInfo.SPELL_LVL_7_ENCHANT, false); + setSpellHidden(WidgetInfo.SPELL_BOUNTY_TARGET_TELEPORT2, false); + } + + if (spellbookID == 2) { + + if (client.getVar(Varbits.SPELLBOOK_HIDDEN) == 1) { + modifySpell(WidgetInfo.SPELL_VENGEANCE, 0, 0, 0); + } else { + modifySpell(WidgetInfo.SPELL_VENGEANCE, 0, 0, 0); + } + + if (config.shouldHideVengeance()) { + setSpellHidden(WidgetInfo.SPELL_VENGEANCE, false); + } + + setSpellHidden(WidgetInfo.SPELL_LUNAR_HOME_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_VENGEANCE_OTHER, false); + setSpellHidden(WidgetInfo.SPELL_BOUNTY_TARGET_TELEPORT3, false); + setSpellHidden(WidgetInfo.SPELL_BAKE_PIE, false); + setSpellHidden(WidgetInfo.SPELL_CURE_PLANT, false); + setSpellHidden(WidgetInfo.SPELL_MONSTER_EXAMINE, false); + setSpellHidden(WidgetInfo.SPELL_NPC_CONTACT, false); + setSpellHidden(WidgetInfo.SPELL_CURE_OTHER, false); + setSpellHidden(WidgetInfo.SPELL_HUMIDIFY, false); + setSpellHidden(WidgetInfo.SPELL_MOONCLAN_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_TELE_GROUP_MOONCLAN, false); + setSpellHidden(WidgetInfo.SPELL_CURE_ME, false); + setSpellHidden(WidgetInfo.SPELL_HUNTER_KIT, false); + setSpellHidden(WidgetInfo.SPELL_WATERBIRTH_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_TELE_GROUP_WATERBIRTH, false); + setSpellHidden(WidgetInfo.SPELL_CURE_GROUP, false); + setSpellHidden(WidgetInfo.SPELL_STAT_SPY, false); + setSpellHidden(WidgetInfo.SPELL_BARBARIAN_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_TELE_GROUP_BARBARIAN, false); + setSpellHidden(WidgetInfo.SPELL_SUPERGLASS_MAKE, false); + setSpellHidden(WidgetInfo.SPELL_TAN_LEATHER, false); + setSpellHidden(WidgetInfo.SPELL_KHAZARD_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_TELE_GROUP_KHAZARD, false); + setSpellHidden(WidgetInfo.SPELL_DREAM, false); + setSpellHidden(WidgetInfo.SPELL_STRING_JEWELLERY, false); + setSpellHidden(WidgetInfo.SPELL_STAT_RESTORE_POT_SHARE, false); + setSpellHidden(WidgetInfo.SPELL_MAGIC_IMBUE(, false); + setSpellHidden(WidgetInfo.SPELL_FERTILE_SOIL, false); + setSpellHidden(WidgetInfo.SPELL_BOOST_POTION_SHARE, false); + setSpellHidden(WidgetInfo.SPELL_FISHING_GUILD_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_TELE_GROUP_FISHING_GUILD, false); + setSpellHidden(WidgetInfo.SPELL_PLANK_MAKE, false); + setSpellHidden(WidgetInfo.SPELL_CATHERBY_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_TELE_GROUP_CATHERBY, false); + setSpellHidden(WidgetInfo.SPELL_RECHARGE_DRAGONSTONE, false); + setSpellHidden(WidgetInfo.SPELL_ICE_PLATEAU_TELEPORT, false); + setSpellHidden(WidgetInfo.SPELL_TELE_GROUP_ICE_PLATEAU, false); + setSpellHidden(WidgetInfo.SPELL_ENERGY_TRANSFER, false); + setSpellHidden(WidgetInfo.SPELL_HEAL_OTHER, false); + setSpellHidden(WidgetInfo.SPELL_HEAL_GROUP, false); + setSpellHidden(WidgetInfo.SPELL_SPELLBOOK_SWAP, false); + setSpellHidden(WidgetInfo.SPELL_GEOMANCY, false); + setSpellHidden(WidgetInfo.SPELL_SPIN_FLAX, false); + setSpellHidden(WidgetInfo.SPELL_OURANIA_TELEPORT, false); + } +*/ } catch (Exception e) { //swallow } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersConfig.java index 9da7fa9ece..57542c9771 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersConfig.java @@ -32,20 +32,8 @@ public interface WhaleWatchersConfig extends Config return true; } - @Alpha @ConfigItem( position = 3, - keyName = "damageBackgroundColor", - name = "Counter Background Color", - description = "The background color for the damage counter overlay" - ) - default Color damageBackgroundColor() - { - return Color.darkGray; - } - - @ConfigItem( - position = 4, keyName = "smiteableWarning", name = "Smite Warning", description = "Displays a warning overlay when your prayer is at a smiteable level" @@ -56,7 +44,7 @@ public interface WhaleWatchersConfig extends Config } @ConfigItem( - position = 5, + position = 4, keyName = "gloryWarning", name = "Glory Warning", description = "Displays a warning box while you are wearing an uncharged glory" diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java index 61bfaf0d47..12d2e5cc80 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java @@ -1,3 +1,12 @@ +/******************************************************************************* + * Copyright (c) 2019. PKLite + * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file. + * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the following authors: + * + * PKLite discord: https://discord.gg/Dp3HuFM + * Written by PKLite(ST0NEWALL, others) , 2019 + * + ******************************************************************************/ package net.runelite.client.plugins.whalewatchers; import java.awt.Color; @@ -15,9 +24,7 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.components.ImageComponent; import net.runelite.client.ui.overlay.components.PanelComponent; -import net.runelite.client.ui.overlay.components.TextComponent; import net.runelite.client.ui.overlay.components.TitleComponent; -import org.apache.commons.lang3.ObjectUtils; public class WhaleWatchersGloryOverlay extends Overlay { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java index a21d4cbaae..e951c4fe19 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java @@ -1,17 +1,31 @@ +/******************************************************************************* + * Copyright (c) 2019. PKLite + * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file. + * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the following authors: + * + * PKLite discord: https://discord.gg/Dp3HuFM + * Written by PKLite(ST0NEWALL, others) , 2019 + * + ******************************************************************************/ package net.runelite.client.plugins.whalewatchers; -import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; import net.runelite.api.Client; +import net.runelite.api.MenuAction; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; +import net.runelite.client.ui.overlay.OverlayMenuEntry; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; +/** + * The overlay for the Damage Counter + */ + public class WhaleWatchersOverlay extends Overlay { private Client client; @@ -19,16 +33,21 @@ public class WhaleWatchersOverlay extends Overlay private WhaleWatchersPlugin plugin; private PanelComponent panelComponent; private String lastOpponent = "-"; + private final OverlayMenuEntry resetMenuEntry = new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY, + "Reset", "Damage Counter"); + @Inject public WhaleWatchersOverlay(WhaleWatchersConfig config, Client client, WhaleWatchersPlugin plugin) { + this.getMenuEntries().add(resetMenuEntry); this.client = client; this.config = config; this.plugin = plugin; setLayer(OverlayLayer.ABOVE_WIDGETS); - setPriority(OverlayPriority.HIGH); - setPosition(OverlayPosition.DETACHED); + setPriority(OverlayPriority.HIGHEST); + setPosition(OverlayPosition.DYNAMIC); + this.setPreferredPosition(OverlayPosition.TOP_CENTER); panelComponent = new PanelComponent(); } @@ -39,40 +58,33 @@ public class WhaleWatchersOverlay extends Overlay if (plugin.inCombat && config.showDamageCounter()) { - panelComponent.setBackgroundColor(config.damageBackgroundColor()); + panelComponent.setOrientation(PanelComponent.Orientation.HORIZONTAL); + panelComponent.setWrapping(5); String opp = client.getLocalPlayer().getInteracting() != null ? client.getLocalPlayer().getInteracting().getName() : lastOpponent; if (client.getLocalPlayer().getInteracting() != null) { lastOpponent = client.getLocalPlayer().getInteracting().getName(); } - final String opponent = "Fight vs " + opp; String damageTaken = "Damage Taken: " + plugin.damageTaken; String damageDealt = "Damage Dealt: " + plugin.damageDone; panelComponent.getChildren().add(TitleComponent.builder() - .text(opponent) - .color(Color.BLACK) + .text(lastOpponent) .build()); panelComponent.getChildren().add(TitleComponent.builder() .text(damageDealt) - .color(Color.BLACK) .build()); panelComponent.getChildren().add(TitleComponent.builder() .text(damageTaken) - .color(Color.BLACK) .build()); - - panelComponent.setPreferredSize(new Dimension( - graphics.getFontMetrics().stringWidth(damageDealt) + - + graphics.getFontMetrics().stringWidth(opponent) + 10,0)); - } else { panelComponent.getChildren().clear(); + } return panelComponent.render(graphics); } 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 86f33b2704..cdbc5a2e70 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 @@ -1,89 +1,69 @@ +/******************************************************************************* + * Copyright (c) 2019. PKLite + * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file. + * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the following authors: + * + * PKLite discord: https://discord.gg/Dp3HuFM + * Written by PKLite(ST0NEWALL, others) , 2019 + * + ******************************************************************************/ + package net.runelite.client.plugins.whalewatchers; import com.google.inject.Provides; -import java.util.Arrays; -import java.util.List; -import java.util.function.Predicate; import javax.inject.Inject; import lombok.Getter; -import net.runelite.api.Actor; import net.runelite.api.Client; -import net.runelite.api.GameState; import net.runelite.api.InventoryID; -import net.runelite.api.ItemContainer; import net.runelite.api.ItemID; import net.runelite.api.MenuAction; -import net.runelite.api.Player; -import net.runelite.api.PlayerComposition; import net.runelite.api.Skill; import net.runelite.api.SkullIcon; import net.runelite.api.VarPlayer; import net.runelite.api.Varbits; -import net.runelite.api.WorldType; -import static net.runelite.api.WorldType.*; -import net.runelite.api.events.ExperienceChanged; -import net.runelite.api.events.GameStateChanged; +import static net.runelite.api.WorldType.HIGH_RISK; +import static net.runelite.api.WorldType.PVP; +import static net.runelite.api.WorldType.isPvpWorld; import net.runelite.api.events.GameTick; import net.runelite.api.events.HitsplatApplied; -import net.runelite.api.events.InteractingChanged; import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.MenuOptionClicked; -import net.runelite.api.events.PlayerMenuOptionClicked; import net.runelite.api.events.VarbitChanged; import net.runelite.api.kit.KitType; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; -import net.runelite.client.game.ItemManager; +import net.runelite.client.events.OverlayMenuClicked; 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; -import org.jetbrains.annotations.NotNull; @PluginDescriptor( name = "Whale Watchers", description = "A Plugin to save help whales in the wild", - tags = {"whale watchers", "whale", "protect item", "warning", "pklite"}, - enabledByDefault = true, - hidden = false, - developerPlugin = false, - type = PluginType.PVP, - loadWhenOutdated = false + tags = {"whale watchers", "whale", "protect item", "warning", "pklite"} ) public class WhaleWatchersPlugin extends Plugin { - @Inject - private Client client; - - @Inject - private WhaleWatchersConfig config; - - @Inject - private WhaleWatchersOverlay overlay; - - @Inject - private WhaleWatchersProtOverlay whaleWatchersProtOverlay; - - @Inject - private WhaleWatchersSmiteableOverlay whaleWatchersSmiteableOverlay; - - @Inject - private WhaleWatchersGloryOverlay whaleWatchersGloryOverlay; - - @Inject - private OverlayManager overlayManager; - - @Inject - private ItemManager itemManager; - public boolean enableOverlay = false; - private int lastXP = 0; public int damageDone = 0; public int damageTaken = 0; public boolean inCombat = false; + @Inject + private Client client; + @Inject + private WhaleWatchersConfig config; + @Inject + private WhaleWatchersOverlay overlay; + @Inject + private WhaleWatchersProtOverlay whaleWatchersProtOverlay; + @Inject + private WhaleWatchersSmiteableOverlay whaleWatchersSmiteableOverlay; + @Inject + private WhaleWatchersGloryOverlay whaleWatchersGloryOverlay; + @Inject + private OverlayManager overlayManager; private int tickCountdown = 0; @Getter private boolean displaySmiteOverlay; @@ -96,9 +76,26 @@ public class WhaleWatchersPlugin extends Plugin return configManager.getConfig(WhaleWatchersConfig.class); } + @Subscribe + public void onOverlayMenuClicked(OverlayMenuClicked event) + { + if (!event.getOverlay().equals(overlay)) + { + return; + } + else + { + if (event.getEntry().getOption().equals("Reset")) + { + resetDamageCounter(); + } + } + } + @Override protected void startUp() throws Exception { + overlayManager.add(overlay); overlayManager.add(whaleWatchersProtOverlay); overlayManager.add(whaleWatchersSmiteableOverlay); @@ -112,6 +109,7 @@ public class WhaleWatchersPlugin extends Plugin overlayManager.remove(whaleWatchersProtOverlay); overlayManager.remove(whaleWatchersSmiteableOverlay); overlayManager.remove(whaleWatchersGloryOverlay); + resetDamageCounter(); } @@ -125,14 +123,12 @@ public class WhaleWatchersPlugin extends Plugin { return; } - if (isAttackingPlayer(client) || inCombat) + if (isAttackingPlayer() || inCombat) { inCombat = true; - if (event.getActor() == client.getLocalPlayer()) { damageTaken += event.getHitsplat().getAmount(); - } if (event.getActor() == client.getLocalPlayer().getInteracting()) { @@ -143,31 +139,6 @@ public class WhaleWatchersPlugin extends Plugin } - /** - * final Player target = (Player) event.getTarget(); - * if (lastInteracting == null) - * { - * lastInteracting = target; - * inCombat = true; - * interactingStarted = System.currentTimeMillis(); - * } - * List optionsList = Arrays.asList(client.getPlayerOptions()); - *

- * if (target == lastInteracting || target == null) - * { - * inCombat = true; - * lastInteracting = target; - * interactingStarted = System.currentTimeMillis(); - * } - * if (target != lastInteracting && target != null && lastInteracting != null) - * { - * damageDone = 0; - * damageTaken = 0; - * interactingStarted = System.currentTimeMillis(); - * inCombat = true; - * } - **/ - @Subscribe public void onItemContainerChanged(ItemContainerChanged event) { @@ -190,20 +161,6 @@ public class WhaleWatchersPlugin extends Plugin } } - @Subscribe - public void onExperienceChanged(ExperienceChanged event) - { - final Skill skill = event.getSkill(); - final Player player = client.getLocalPlayer(); - if (skill.equals(Skill.HITPOINTS)) - { - if (player.getInteracting() instanceof Player) - { - //lient.getLogger().info(String.valueOf(Math.round((client.getSkillExperience(skill) - lastXP) / 1.33)) + 2); - lastXP = client.getSkillExperience(skill); - } - } - } @Subscribe public void onMenuOptionClicked(MenuOptionClicked event) @@ -223,8 +180,6 @@ public class WhaleWatchersPlugin extends Plugin { if (inCombat) { - //damageTaken = 0; - //damageDone = 0; tickCountdown = 10; } } @@ -262,36 +217,26 @@ public class WhaleWatchersPlugin extends Plugin @Subscribe public void onGameTick(GameTick event) { - - if (tickCountdown > 0 && tickCountdown < 11) + if (config.showDamageCounter()) { - tickCountdown--; - if (tickCountdown == 1) + if (tickCountdown > 0 && tickCountdown < 11) { - if (!isAttackingPlayer(client)) + tickCountdown--; + if (tickCountdown == 1) { inCombat = false; - damageDone = 0; - damageTaken = 0; + resetDamageCounter(); return; } } } - if (config.smiteableWarning() && (client.getVar(Varbits.IN_WILDERNESS) == 1 || isPvpWorld(client.getWorldType()))) { if (client.getLocalPlayer().getSkullIcon() != null && client.getLocalPlayer().getSkullIcon().equals(SkullIcon.SKULL)) { final int currentHealth = client.getLocalPlayer().getHealth(); final int currentPrayer = client.getBoostedSkillLevel(Skill.PRAYER); - if (currentPrayer <= (Math.ceil(currentHealth / 4))) - { - displaySmiteOverlay = true; - } - else - { - displaySmiteOverlay = false; - } + displaySmiteOverlay = currentPrayer <= (Math.ceil(currentHealth / 4)); } else { @@ -304,14 +249,24 @@ public class WhaleWatchersPlugin extends Plugin } } - public boolean isAttackingPlayer(@NotNull Client c) + /** + * Checks to see if client is attacking another player + * @return returns true if they are, false otherwise + */ + private boolean isAttackingPlayer() { if (client.getVar(Varbits.IN_WILDERNESS) == 1 && client.getLocalPlayer().getInteracting() != null) { return true; } - int varp = c.getVar(VarPlayer.ATTACKING_PLAYER); + int varp = client.getVar(VarPlayer.ATTACKING_PLAYER); return varp != -1; } + private void resetDamageCounter() + { + damageTaken = 0; + damageDone = 0; + } + } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java index 9e6e081931..2b025b1063 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java @@ -1,3 +1,14 @@ + +/******************************************************************************* + * Copyright (c) 2019. PKLite + * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file. + * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the following authors: + * + * PKLite discord: https://discord.gg/Dp3HuFM + * Written by PKLite(ST0NEWALL, others) , 2019 + * + ******************************************************************************/ + package net.runelite.client.plugins.whalewatchers; import java.awt.BasicStroke; @@ -16,7 +27,7 @@ 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.ui.overlay.components.PanelComponent; + public class WhaleWatchersProtOverlay extends Overlay { @@ -34,7 +45,6 @@ public class WhaleWatchersProtOverlay extends Overlay setLayer(OverlayLayer.ABOVE_WIDGETS); setPriority(OverlayPriority.HIGH); setPosition(OverlayPosition.DYNAMIC); - } @Override diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java index 6e4d502851..55b0ef23c7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java @@ -1,10 +1,20 @@ + +/******************************************************************************* + * Copyright (c) 2019. PKLite + * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file. + * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the following authors: + * + * PKLite discord: https://discord.gg/Dp3HuFM + * Written by PKLite(ST0NEWALL, others) , 2019 + * + ******************************************************************************/ + package net.runelite.client.plugins.whalewatchers; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; -import net.runelite.api.Client; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; @@ -12,21 +22,22 @@ import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; +/** + * The overlay for the smiteable warning + */ public class WhaleWatchersSmiteableOverlay extends Overlay { - private Client client; private WhaleWatchersPlugin plugin; private PanelComponent panelComponent; @Inject - public WhaleWatchersSmiteableOverlay( WhaleWatchersPlugin plugin) + public WhaleWatchersSmiteableOverlay(WhaleWatchersPlugin plugin) { this.plugin = plugin; setLayer(OverlayLayer.ABOVE_WIDGETS); setPriority(OverlayPriority.HIGH); setPosition(OverlayPosition.BOTTOM_RIGHT); - panelComponent = new PanelComponent(); }