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

Merge pull request #370 from Lucwousin/1234567890fuck_menu_entries

Browse Source 
Fix ezscape construction (hopefully forever)
This commit is contained in:
Tyler Bochard
2019-05-22 22:18:31 -04:00
committed by GitHub
parent d83209da7a 48e2fad599
commit 99ed6249fc
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
View File

@@ -649,6 +649,14 @@ public class MenuManager
} }
} }
/**
* Adds to the map of swaps. Strict options, not strict target but target1=target2
*/
public void addSwap(String option, String target, String option2)
{
addSwap(option, target, option2, target, true, false);
}
/** /**
* Adds to the map of swaps. * Adds to the map of swaps.
*/ */

40
runelite-client/src/main/java/net/runelite/client/plugins/easyscape/EasyscapePlugin.java
View File

@@ -44,6 +44,7 @@ import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.events.VarbitChanged;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe; import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.menus.MenuManager; import net.runelite.client.menus.MenuManager;
@@ -65,6 +66,7 @@ public class EasyscapePlugin extends Plugin
private MenuEntry[] entries; private MenuEntry[] entries;
private final Set<Integer> leftClickConstructionIDs = new HashSet<>(); private final Set<Integer> leftClickConstructionIDs = new HashSet<>();
private boolean buildingMode;
@Inject @Inject
private Client client; private Client client;
@@ -106,6 +108,12 @@ public class EasyscapePlugin extends Plugin
loadConstructionIDs(config.getConstructionItems()); loadConstructionIDs(config.getConstructionItems());
} }
@Subscribe
public void onVarbitChanged(VarbitChanged event)
{
buildingMode = client.getVar(BUILDING_MODE) == 1;
}
@Subscribe @Subscribe
public void onMenuEntryAdded(MenuEntryAdded event) public void onMenuEntryAdded(MenuEntryAdded event)
{ {
@@ -394,63 +402,63 @@ public class EasyscapePlugin extends Plugin
{ {
if (config.getBurningAmulet()) if (config.getBurningAmulet())
{ {
menuManager.addSwap("remove", "burning amulet", config.getBurningAmuletMode().toString(), "burning amulet", true, false); menuManager.addSwap("remove", "burning amulet", config.getBurningAmuletMode().toString());
} }
if (config.getCombatBracelet()) if (config.getCombatBracelet())
{ {
menuManager.addSwap("remove", "combat bracelet", config.getCombatBraceletMode().toString(), "combat bracelet", true, false); menuManager.addSwap("remove", "combat bracelet", config.getCombatBraceletMode().toString());
} }
if (config.getGamesNecklace()) if (config.getGamesNecklace())
{ {
menuManager.addSwap("remove", "games necklace", config.getGamesNecklaceMode().toString(), "games necklace", true, false); menuManager.addSwap("remove", "games necklace", config.getGamesNecklaceMode().toString());
} }
if (config.getDuelingRing()) if (config.getDuelingRing())
{ {
menuManager.addSwap("remove", "ring of dueling", config.getDuelingRingMode().toString(), "ring of dueling", true, false); menuManager.addSwap("remove", "ring of dueling", config.getDuelingRingMode().toString());
} }
if (config.getGlory()) if (config.getGlory())
{ {
menuManager.addSwap("remove", "amulet of glory", config.getGloryMode().toString(), "amulet of glory", true, false); menuManager.addSwap("remove", "amulet of glory", config.getGloryMode().toString());
menuManager.addSwap("remove", "amulet of eternal glory", config.getGloryMode().toString(), "amulet of eternal glory", true, false); menuManager.addSwap("remove", "amulet of eternal glory", config.getGloryMode().toString());
} }
if (config.getSkillsNecklace()) if (config.getSkillsNecklace())
{ {
menuManager.addSwap("remove", "skills necklace", config.getSkillsNecklaceMode().toString(), "skills necklace", true, false); menuManager.addSwap("remove", "skills necklace", config.getSkillsNecklaceMode().toString());
} }
if (config.getNecklaceofPassage()) if (config.getNecklaceofPassage())
{ {
menuManager.addSwap("remove", "necklace of passage", config.getNecklaceofPassageMode().toString(), "necklace of passage", true, false); menuManager.addSwap("remove", "necklace of passage", config.getNecklaceofPassageMode().toString());
} }
if (config.getDigsitePendant()) if (config.getDigsitePendant())
{ {
menuManager.addSwap("remove", "digsite pendant", config.getDigsitePendantMode().toString(), "digsite pendant", true, false); menuManager.addSwap("remove", "digsite pendant", config.getDigsitePendantMode().toString());
} }
if (config.getSlayerRing()) if (config.getSlayerRing())
{ {
menuManager.addSwap("remove", "slayer ring", config.getSlayerRingMode().toString(), "slayer ring", true, false); menuManager.addSwap("remove", "slayer ring", config.getSlayerRingMode().toString());
} }
else if (config.getXericsTalisman()) if (config.getXericsTalisman())
{ {
menuManager.addSwap("remove", "xeric's talisman", config.getXericsTalismanMode().toString(), "xeric's talisman", true, false); menuManager.addSwap("remove", "xeric's talisman", config.getXericsTalismanMode().toString());
} }
if (config.getRingofWealth()) if (config.getRingofWealth())
{ {
menuManager.addSwap("remove", "ring of wealth", config.getRingofWealthMode().toString(), "ring of wealth", true, false); menuManager.addSwap("remove", "ring of wealth", config.getRingofWealthMode().toString());
} }
if (config.swapMax()) if (config.swapMax())
{ {
menuManager.addSwap("remove", "max cape", config.maxMode().toString(), "max cape", true, false); menuManager.addSwap("remove", "max cape", config.maxMode().toString());
} }
} }
@@ -517,9 +525,9 @@ public class EasyscapePlugin extends Plugin
leftClickConstructionIDs.clear(); leftClickConstructionIDs.clear();
} }
if (!config.getEasyConstruction() && if (config.getEasyConstruction() &&
!Strings.isNullOrEmpty(from) && !Strings.isNullOrEmpty(from) &&
client.getVar(BUILDING_MODE) == 1) buildingMode)
{ {
for (String s : Text.fromCSV(from)) for (String s : Text.fromCSV(from))
{ {