Merge pull request #7554 from Rheon-D/overlay-config

Remove invalid OverlayMenuEntries
This commit is contained in:
Tomas Slusny
2019-01-25 20:17:26 +00:00
committed by GitHub
2 changed files with 1 additions and 11 deletions

View File

@@ -28,11 +28,8 @@ import java.awt.Dimension;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.client.game.SkillIconManager; import net.runelite.client.game.SkillIconManager;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
import net.runelite.client.ui.overlay.OverlayMenuEntry;
import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.ImageComponent; import net.runelite.client.ui.overlay.components.ImageComponent;
import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.PanelComponent;
@@ -47,12 +44,10 @@ public class CerberusOverlay extends Overlay
@Inject @Inject
CerberusOverlay(final CerberusPlugin plugin, final SkillIconManager iconManager) CerberusOverlay(final CerberusPlugin plugin, final SkillIconManager iconManager)
{ {
super(plugin);
this.plugin = plugin; this.plugin = plugin;
this.iconManager = iconManager; this.iconManager = iconManager;
setPosition(OverlayPosition.BOTTOM_RIGHT); setPosition(OverlayPosition.BOTTOM_RIGHT);
panelComponent.setOrientation(PanelComponent.Orientation.HORIZONTAL); panelComponent.setOrientation(PanelComponent.Orientation.HORIZONTAL);
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Cerberus overlay"));
} }
@Override @Override

View File

@@ -33,11 +33,8 @@ import net.runelite.api.Client;
import net.runelite.api.InventoryID; import net.runelite.api.InventoryID;
import net.runelite.api.Item; import net.runelite.api.Item;
import net.runelite.api.ItemContainer; import net.runelite.api.ItemContainer;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemManager;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
import net.runelite.client.ui.overlay.OverlayMenuEntry;
import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.ImageComponent; import net.runelite.client.ui.overlay.components.ImageComponent;
import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.PanelComponent;
@@ -55,16 +52,14 @@ class InventoryViewerOverlay extends Overlay
private final PanelComponent panelComponent = new PanelComponent(); private final PanelComponent panelComponent = new PanelComponent();
@Inject @Inject
private InventoryViewerOverlay(InventoryViewerPlugin plugin, Client client, ItemManager itemManager) private InventoryViewerOverlay(Client client, ItemManager itemManager)
{ {
super(plugin);
setPosition(OverlayPosition.BOTTOM_RIGHT); setPosition(OverlayPosition.BOTTOM_RIGHT);
panelComponent.setWrapping(4); panelComponent.setWrapping(4);
panelComponent.setGap(new Point(6, 4)); panelComponent.setGap(new Point(6, 4));
panelComponent.setOrientation(PanelComponent.Orientation.HORIZONTAL); panelComponent.setOrientation(PanelComponent.Orientation.HORIZONTAL);
this.itemManager = itemManager; this.itemManager = itemManager;
this.client = client; this.client = client;
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Inventory viewer overlay"));
} }
@Override @Override