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

Merge remote-tracking branch 'runelite-extended/master' into PluginType

Browse Source
This commit is contained in:
Scott Burns
2019-04-22 22:55:52 +02:00
parent d57e56c961 ad0fdc7154
commit 54aff52b0d
23 changed files with 277 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
View File

@@ -47,6 +47,7 @@ import net.runelite.api.NullItemID;
import net.runelite.api.RenderOverview;
import net.runelite.api.Renderable;
import net.runelite.api.WorldMapManager;
import net.runelite.api.events.BeforeMenuRender;
import net.runelite.api.events.BeforeRender;
import net.runelite.api.events.GameTick;
import net.runelite.api.hooks.Callbacks;
@@ -508,4 +509,11 @@ public class Hooks implements Callbacks
overlayManager.getItemWidgets().add(widgetItem);
}
}
public static boolean drawMenu()
{
BeforeMenuRender event = new BeforeMenuRender();
client.getCallbacks().post(event);
return event.isConsumed();
}
}

2
runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
View File

@@ -398,4 +398,4 @@ public class BarbarianAssaultPlugin extends Plugin {
{
return clockImage;
}
}
}

4
runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java
View File

@@ -80,7 +80,7 @@ import net.runelite.client.util.Text;
name = "BA Tools",
description = "Custom tools for Barbarian Assault",
tags = {"minigame", "overlay", "timer"},
type = PluginType.UTILITY
type = PluginType.PVM
)
public class BAToolsPlugin extends Plugin implements KeyListener
{
@@ -642,4 +642,4 @@ public class BAToolsPlugin extends Plugin implements KeyListener
shiftDown = false;
}
}
}
}

4
runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java
View File

@@ -37,7 +37,7 @@ import java.util.concurrent.ScheduledExecutorService;
@PluginDescriptor(
name = "Equipment Inspector",
enabledByDefault = false,
type = PluginType.UTILITY
type = PluginType.PVP
)
@Slf4j
@@ -226,4 +226,4 @@ public class EquipmentInspectorPlugin extends Plugin {
});
}
}
}
}

4
runelite-client/src/main/java/net/runelite/client/plugins/hydra/HydraPlugin.java
View File

@@ -16,7 +16,7 @@ import java.util.HashMap;
import java.util.Map;
@PluginDescriptor(
name = "Hydra",
name = "Hydra Helper",
description = "Hydra Helper",
tags = {"Hydra", "Helper"},
type = PluginType.PVM
@@ -144,4 +144,4 @@ public class HydraPlugin extends Plugin
}
}
}
}
}

10
runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesConfig.java
View File

@@ -52,4 +52,14 @@ public interface InterfaceStylesConfig extends Config
{
return false;
}
@ConfigItem(
keyName = "hdMenu",
name = "High Detail menu",
description = "Replaces game menu with the RuneScape High Detail mode design"
)
default boolean hdMenu()
{
return false;
}
}

11
runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
View File

@@ -34,6 +34,7 @@ import net.runelite.api.Client;
import net.runelite.api.HealthBarOverride;
import net.runelite.api.SpriteID;
import net.runelite.api.SpritePixels;
import net.runelite.api.events.BeforeMenuRender;
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.WidgetPositioned;
import net.runelite.api.widgets.Widget;
@@ -115,6 +116,16 @@ public class InterfaceStylesPlugin extends Plugin
overrideHealthBars();
}
@Subscribe
public void onBeforeMenuRender(BeforeMenuRender event)
{
if (config.hdMenu())
{
client.draw2010Menu();
event.consume();
}
}
private void overrideSprites()
{
for (SpriteOverride spriteOverride : SpriteOverride.values())

2
runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java
View File

@@ -36,7 +36,7 @@ import javax.inject.Inject;
name = "PvP Looting Bag Viewer",
description = "Add an overlay showing the contents of your looting bag",
tags = {"alternate", "items", "overlay", "second"},
type = PluginType.UTILITY,
type = PluginType.PVP,
enabledByDefault = false
)
public class LootingBagViewerPlugin extends Plugin

2
runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java
View File

@@ -59,7 +59,7 @@ import net.runelite.client.util.WildcardMatcher;
name = "Player Indicators",
description = "Highlight players on-screen and/or on the minimap",
tags = {"highlight", "minimap", "overlay", "players"},
type = PluginType.UTILITY
type = PluginType.PVP
)
public class PlayerIndicatorsPlugin extends Plugin
{

10
runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java
View File

@@ -21,11 +21,19 @@ import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType;
import net.runelite.client.ui.ClientToolbar;
import net.runelite.client.ui.NavigationButton;
import net.runelite.client.util.ImageUtil;
@PluginDescriptor(name="Account Switcher", description="Allow for a allows you to easily switch between multiple OSRS Accounts", tags={"profile", "account", "login", "log in"})
@PluginDescriptor(
name="Account Switcher",
description="Allow for a allows you to easily switch between multiple OSRS Accounts",
tags={"profile", "account", "login", "log in"},
type = PluginType.UTILITY
)
public class ProfilesPlugin
extends Plugin {
@Inject

2
runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java
View File

@@ -51,6 +51,7 @@ import net.runelite.client.config.ConfigManager;
import net.runelite.client.game.ItemManager;
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.ui.overlay.infobox.InfoBoxManager;
@@ -58,6 +59,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
name = "PyramidPlunder",
description = "Highlights doors and spear traps in pyramid plunder and adds a numerical timer",
tags = {"pyramidplunder", "pyramid", "plunder", "overlay", "skilling", "thieving"},
type = PluginType.UTILITY,
enabledByDefault = false
)

4
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
View File

@@ -74,6 +74,7 @@ import net.runelite.client.game.SpriteManager;
import net.runelite.client.input.KeyManager;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType;
import net.runelite.client.plugins.raids.solver.Layout;
import net.runelite.client.plugins.raids.solver.LayoutSolver;
import net.runelite.client.plugins.raids.solver.RotationSolver;
@@ -87,7 +88,8 @@ import net.runelite.client.util.HotkeyListener;
@PluginDescriptor(
name = "Chambers Of Xeric",
description = "Show helpful information for the Chambers of Xeric raid",
tags = {"combat", "raid", "overlay", "pve", "pvm", "bosses", "cox", "olm"}
tags = {"combat", "raid", "overlay", "pve", "pvm", "bosses", "cox", "olm"},
type = PluginType.PVM
)
@Slf4j
public class RaidsPlugin extends Plugin

2
runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java
View File

@@ -64,7 +64,7 @@ import java.awt.image.BufferedImage;
name = "Supplies Used Tracker",
description = "Tracks supplies used during the session",
tags = {"cost"},
type = PluginType.PVM,
type = PluginType.UTILITY,
enabledByDefault = false
)
@Slf4j

2
runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java
View File

@@ -41,7 +41,7 @@ import java.util.HashMap;
import java.util.Map;
@PluginDescriptor(
name = "Vetion",
name = "Vetion Helper",
description = "Tracks Vet'ion's special attacks",
tags = {"bosses", "combat", "pve", "overlay"},
type = PluginType.PVM

4
runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java
View File

@@ -15,10 +15,10 @@ import net.runelite.client.ui.overlay.OverlayManager;
import org.apache.commons.lang3.ArrayUtils;
@PluginDescriptor(
name = "Vorkath",
name = "Vorkath Helper",
description = "Vorkath Helper",
tags = {"Vorkath", "Helper"},
type = PluginType.PVM
type = PluginType.PVM
)
public class VorkathPlugin extends Plugin
{

4
runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java
View File

@@ -22,10 +22,10 @@ import net.runelite.client.ui.overlay.OverlayManager;
import net.runelite.client.util.ImageUtil;
@PluginDescriptor(
name = "Zulrah",
name = "Zulrah Helper",
description = "Zulrah Helper",
tags = {"Zulrah", "Helper"},
type = PluginType.PVM
type = PluginType.PVM
)
public class ZulrahPlugin extends Plugin
{