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

Changes made as per feedback.

Browse Source
This commit is contained in:
lulwut
2019-05-17 13:49:58 +12:00
parent 72f1d0ab6f
commit 833e1523e8
1 changed files with 60 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java
View File

@@ -53,8 +53,6 @@ import net.runelite.api.events.ItemContainerChanged;
import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.NpcSpawned;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.Notifier; import net.runelite.client.Notifier;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe; import net.runelite.client.eventbus.Subscribe;
@@ -169,74 +167,68 @@ public class RunecraftPlugin extends Plugin
@Subscribe @Subscribe
public void onMenuEntryAdded(MenuEntryAdded entry) public void onMenuEntryAdded(MenuEntryAdded entry)
{ {
if (client.getGameState() != GameState.LOGGED_IN) if (wearingCape || wearingTiara)
{ {
return; final String option = Text.removeTags(entry.getOption()).toLowerCase();
} final String target = Text.removeTags(entry.getTarget()).toLowerCase();
final int id = entry.getIdentifier();
final int type = entry.getType();
Widget loginScreenOne = client.getWidget(WidgetInfo.LOGIN_CLICK_TO_PLAY_SCREEN); if (target.contains("pouch") && !target.startsWith("rune"))
Widget loginScreenTwo = client.getWidget(WidgetInfo.LOGIN_CLICK_TO_PLAY_SCREEN_MESSAGE_OF_THE_DAY);
if (loginScreenOne != null || loginScreenTwo != null)
{
return;
}
final String option = Text.removeTags(entry.getOption()).toLowerCase();
final String target = Text.removeTags(entry.getTarget()).toLowerCase();
Widget widgetBankTitleBar = client.getWidget(WidgetInfo.BANK_TITLE_BAR);
if (isEssencePouch(target))
{
if (widgetBankTitleBar == null || widgetBankTitleBar.isHidden())
{ //swap pouches based on empty/full and in bank
swap(client, "Empty", option, target);
}
else
{ {
swap(client, "Fill", option, target); //Due to RuneLite issues the "Deposit" menutext will always show even though it is on fill if (option.contains("deposit") && type == 57 && id == 2) //swap pouches based on empty/full and in ban
{
swap(client, "fill", option, target);
swap(client, "cancel", option, "", target);
}
else if (option.equals("fill") && id != 9)
{
swap(client, "empty", option, target); //Due to RuneLite issues the "Deposit" menutext will always show even though it is on fill
}
} }
} if (target.contains("ring of dueling") && option.contains("withdraw"))//withdraw-1 ring of dueling
else if (target.contains("ring of dueling") && option.contains("withdraw")) {
{ //withdraw-1 ring of dueling swap(client, "withdraw-1", option, target);
swap(client, "withdraw-1", option, target); }
} else if (target.contains("binding necklace") && option.contains("withdraw")) //withdraw-1 binding necklace
else if (target.contains("binding necklace") && option.contains("withdraw")) {
{ //withdraw-1 binding necklace swap(client, "withdraw-1", option, target);
swap(client, "withdraw-1", option, target); }
} else if (target.contains("stamina") && option.contains("withdraw"))
else if (target.contains("ring of dueling") && option.contains("remove")) { //withdraw-1 stam
{ swap(client, "withdraw-1", option, target);
if (client.getLocalPlayer().getWorldLocation().getRegionID() != 10315) }
{ //changes duel ring teleport options based on location else if (target.contains("ring of dueling") && option.contains("remove"))
swap(client, "duel arena", option, target); {
} if (client.getLocalPlayer().getWorldLocation().getRegionID() != 10315)
else if (client.getLocalPlayer().getWorldLocation().getRegionID() == 10315) { //changes duel ring teleport options based on location
{ swap(client, "duel arena", option, target);
swap(client, "castle wars", option, target); }
} else if (client.getLocalPlayer().getWorldLocation().getRegionID() == 10315)
} {
else if (target.contains("crafting cape") && option.contains("remove")) swap(client, "castle wars", option, target);
{ //teleport for crafting cape }
swap(client, "Teleport", option, target); }
} else if (target.contains("crafting cape") && option.contains("remove")) //teleport for crafting cape
else if (target.contains("max cape") && option.contains("remove")) {
{ //teleport for max cape swap(client, "Teleport", option, target);
swap(client, "Crafting Guild", option, target); }
} else if (target.contains("max cape") && option.contains("remove")) //teleport for max cape
else if (target.contains("altar") && option.contains("craft")) // Don't accidentally click the altar to craft {
{ swap(client, "Crafting Guild", option, target);
hide(option, target, true); }
} else if (target.contains("altar") && option.contains("craft")) // Don't accidentally click the altar to craft
else if (target.contains("pure")) // Don't accidentally use pure essence on altar {
{ hide(option, target, true);
hide("use", target, true); }
hide("drop", target, true); else if (target.contains("pure") && option.contains("use")) // Don't accidentally use pure essence on altar
} {
hide("use", target, true);
} hide("drop", target, true);
}
}
}
private void hide(String option, String target, boolean contains) private void hide(String option, String target, boolean contains)
{ {
final MenuEntry[] entries = client.getMenuEntries(); final MenuEntry[] entries = client.getMenuEntries();
@@ -282,11 +274,6 @@ public class RunecraftPlugin extends Plugin
} }
private boolean isEssencePouch(String target)
{
return (target.equalsIgnoreCase("Small Pouch") || target.equalsIgnoreCase("Medium Pouch") || target.equalsIgnoreCase("Large Pouch") || target.equalsIgnoreCase("Giant Pouch"));
}
@Subscribe @Subscribe
public void onDecorativeObjectSpawned(DecorativeObjectSpawned event) public void onDecorativeObjectSpawned(DecorativeObjectSpawned event)
{ {
@@ -334,8 +321,9 @@ public class RunecraftPlugin extends Plugin
{ {
final Item[] items = event.getItemContainer().getItems(); final Item[] items = event.getItemContainer().getItems();
wearingTiara = config.Lavas() && items[EquipmentInventorySlot.HEAD.getSlotIdx()].getId() == ItemID.FIRE_TIARA; wearingTiara = config.Lavas() && items[EquipmentInventorySlot.HEAD.getSlotIdx()].getId() == ItemID.FIRE_TIARA;
wearingCape = config.Lavas() && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.RUNECRAFT_CAPE || items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.RUNECRAFT_CAPET; wearingCape = config.Lavas() && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.RUNECRAFT_CAPE || config.Lavas() && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.RUNECRAFT_CAPET || config.Lavas() && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.MAX_CAPE_13342;
System.out.println("item changed");
System.out.println("item changed" + wearingCape);
} }
} }