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

Merge branch 'master' of https://github.com/runelite/runelite into upstream-2601

Browse Source
This commit is contained in:
zjustin
2022-02-08 18:23:32 +11:00
parent 4416fa5486 2d52f6d1b4
commit e3b9b83e49
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
View File

@@ -57,7 +57,7 @@ enum Task
BASILISKS("Basilisks", ItemID.BASILISK), BASILISKS("Basilisks", ItemID.BASILISK),
BATS("Bats", ItemID.GIRAL_BAT_2, "Death wing"), BATS("Bats", ItemID.GIRAL_BAT_2, "Death wing"),
BEARS("Bears", ItemID.ENSOULED_BEAR_HEAD), BEARS("Bears", ItemID.ENSOULED_BEAR_HEAD),
BIRDS("Birds", ItemID.FEATHER, "Chicken", "Rooster", "Terrorbird", "Seagull", "Vulture", "Duck"), BIRDS("Birds", ItemID.FEATHER, "Chicken", "Rooster", "Terrorbird", "Seagull", "Vulture", "Duck", "Penguin"),
BLACK_DEMONS("Black demons", ItemID.BLACK_DEMON_MASK), BLACK_DEMONS("Black demons", ItemID.BLACK_DEMON_MASK),
BLACK_DRAGONS("Black dragons", ItemID.BLACK_DRAGON_MASK, "Baby black dragon"), BLACK_DRAGONS("Black dragons", ItemID.BLACK_DRAGON_MASK, "Baby black dragon"),
BLACK_KNIGHTS("Black Knights", ItemID.BLACK_FULL_HELM, "Black Knight"), BLACK_KNIGHTS("Black Knights", ItemID.BLACK_FULL_HELM, "Black Knight"),

15
runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java
View File

@@ -40,6 +40,7 @@ import javax.inject.Singleton;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetID;
import net.runelite.api.widgets.WidgetItem; import net.runelite.api.widgets.WidgetItem;
import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigGroup;
@@ -53,6 +54,7 @@ import net.runelite.client.events.PluginChanged;
* Manages state of all game overlays * Manages state of all game overlays
*/ */
@Singleton @Singleton
@Slf4j
public class OverlayManager public class OverlayManager
{ {
public static final String OPTION_CONFIGURE = "Configure"; public static final String OPTION_CONFIGURE = "Configure";
@@ -317,7 +319,18 @@ public class OverlayManager
final Dimension size = loadOverlaySize(overlay); final Dimension size = loadOverlaySize(overlay);
overlay.setPreferredSize(size); overlay.setPreferredSize(size);
final OverlayPosition position = loadOverlayPosition(overlay); final OverlayPosition position = loadOverlayPosition(overlay);
overlay.setPreferredPosition(position); if (position != null)
{
if (overlay.getPosition() != OverlayPosition.DYNAMIC && overlay.getPosition() != OverlayPosition.TOOLTIP)
{
overlay.setPreferredPosition(position);
}
else
{
log.info("Resetting preferred position of dynamic overlay {}", overlay.getClass().getSimpleName());
saveOverlayPosition(overlay);
}
}
} }
private void updateOverlayConfig(final Overlay overlay) private void updateOverlayConfig(final Overlay overlay)