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 45bed73945..744e434f64 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 @@ -772,7 +772,7 @@ public class WidgetID static final int KILLDEATH_RATIO = 26; static final int SKULL_CONTAINER = 45; static final int SAFE_ZONE = 47; - static final int WILDERNESS_LEVEL = 49; // this can also be the Deadman Mode "Protection" text + static final int WILDERNESS_LEVEL = 50; // this can also be the Deadman Mode "Protection" text } static class KourendFavour diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java index 0d401d8e13..13b60c0bbe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java @@ -40,7 +40,6 @@ import net.runelite.api.events.GameTick; import net.runelite.api.events.ScriptPostFired; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; -import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; @@ -59,19 +58,11 @@ public class CombatLevelPlugin extends Plugin private static final String CONFIG_GROUP = "combatlevel"; private static final String ATTACK_RANGE_CONFIG_KEY = "wildernessAttackLevelRange"; private static final Pattern WILDERNESS_LEVEL_PATTERN = Pattern.compile("^Level: (\\d+)$"); - private static final int SKULL_CONTAINER_ADJUSTED_ORIGINAL_Y = 6; - private static final int WILDERNESS_LEVEL_TEXT_ADJUSTED_ORIGINAL_Y = 3; private static final int MIN_COMBAT_LEVEL = 3; - private int originalWildernessLevelTextPosition = -1; - private int originalSkullContainerPosition = -1; - @Inject private Client client; - @Inject - private ClientThread clientThread; - @Inject private CombatLevelConfig config; @@ -187,25 +178,10 @@ public class CombatLevelPlugin extends Plugin return; } - final Widget skullContainer = client.getWidget(WidgetInfo.PVP_SKULL_CONTAINER); - if (originalWildernessLevelTextPosition == -1) - { - originalWildernessLevelTextPosition = wildernessLevelWidget.getOriginalY(); - } - if (originalSkullContainerPosition == -1) - { - originalSkullContainerPosition = skullContainer.getRelativeY(); - } - final int wildernessLevel = Integer.parseInt(m.group(1)); final int combatLevel = client.getLocalPlayer().getCombatLevel(); wildernessLevelWidget.setText(wildernessLevelText + "
" + combatAttackRange(combatLevel, wildernessLevel)); - wildernessLevelWidget.setOriginalY(WILDERNESS_LEVEL_TEXT_ADJUSTED_ORIGINAL_Y); - skullContainer.setOriginalY(SKULL_CONTAINER_ADJUSTED_ORIGINAL_Y); - - clientThread.invoke(wildernessLevelWidget::revalidate); - clientThread.invoke(skullContainer::revalidate); } private void shutDownAttackLevelRange() @@ -223,18 +199,7 @@ public class CombatLevelPlugin extends Plugin { wildernessLevelWidget.setText(wildernessLevelText.substring(0, wildernessLevelText.indexOf("
"))); } - wildernessLevelWidget.setOriginalY(originalWildernessLevelTextPosition); - clientThread.invoke(wildernessLevelWidget::revalidate); } - originalWildernessLevelTextPosition = -1; - - final Widget skullContainer = client.getWidget(WidgetInfo.PVP_SKULL_CONTAINER); - if (skullContainer != null) - { - skullContainer.setOriginalY(originalSkullContainerPosition); - clientThread.invoke(skullContainer::revalidate); - } - originalSkullContainerPosition = -1; } private static String combatAttackRange(final int combatLevel, final int wildernessLevel)