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

Re-enable type correcting in menumanager

Browse Source
This commit is contained in:
Lucas
2019-06-13 22:41:50 +02:00
parent d66fbda67e
commit a0d8f67e19
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -484,8 +484,8 @@ public class MenuManager
{ {
continue; continue;
} }
//todo once bytecodes work again, re-enable
/* event.consume(); event.consume();
client.invokeMenuAction( client.invokeMenuAction(
event.getActionParam(), event.getActionParam(),
@@ -496,7 +496,7 @@ public class MenuManager
"do not edit", "do not edit",
client.getMouseCanvasPosition().getX(), client.getMouseCanvasPosition().getX(),
client.getMouseCanvasPosition().getY() client.getMouseCanvasPosition().getY()
);*/ );
break; break;
} }
@@ -504,17 +504,14 @@ public class MenuManager
if (!event.getMenuTarget().equals("do not edit") && if (!event.getMenuTarget().equals("do not edit") &&
!leftClickObjects.isEmpty() && !leftClickObjects.isEmpty() &&
event.getMenuAction() == MenuAction.GAME_OBJECT_FIRST_OPTION && event.getMenuAction() == MenuAction.GAME_OBJECT_FIRST_OPTION && (
( leftClickObjects.contains(event.getId()) ||
leftClickObjects.contains(event.getId())
||
client.getObjectDefinition(event.getId()) != null && client.getObjectDefinition(event.getId()) != null &&
client.getObjectDefinition(event.getId()).getImpostorIds() != null && client.getObjectDefinition(event.getId()).getImpostorIds() != null &&
client.getObjectDefinition(event.getId()).getImpostor() != null && client.getObjectDefinition(event.getId()).getImpostor() != null &&
client.getObjectDefinition(event.getId()).getImpostor().getId() == event.getId())) client.getObjectDefinition(event.getId()).getImpostor().getId() == event.getId()))
{ {
//todo once bytecodes work again, re-enable event.consume();
/* event.consume();
client.invokeMenuAction( client.invokeMenuAction(
event.getActionParam(), event.getActionParam(),
@@ -525,7 +522,7 @@ public class MenuManager
"do not edit", "do not edit",
client.getMouseCanvasPosition().getX(), client.getMouseCanvasPosition().getX(),
client.getMouseCanvasPosition().getY() client.getMouseCanvasPosition().getY()
);*/ );
} }
if (event.getMenuAction() != MenuAction.RUNELITE) if (event.getMenuAction() != MenuAction.RUNELITE)
@@ -648,6 +645,11 @@ public class MenuManager
addSwap(option, target, option2, target, true, false); addSwap(option, target, option2, target, true, false);
} }
public void removeSwap(String option, String target, String option2)
{
removeSwap(option, target, option2, target, true, false);
}
/** /**
* Adds to the map of swaps. * Adds to the map of swaps.
*/ */
@@ -835,7 +837,7 @@ public class MenuManager
} }
/** /**
* Adds to the set of hidden entries - Pre-baked Abstract entry * Adds to the set of hidden entries - Pre-baked Comparable entry
*/ */
public void addHiddenEntry(ComparableEntry entry) public void addHiddenEntry(ComparableEntry entry)
{ {