diff --git a/injector-plugin/src/main/java/net/runelite/injector/MixinInjector.java b/injector-plugin/src/main/java/net/runelite/injector/MixinInjector.java index fc871fa152..bf4627c785 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/MixinInjector.java +++ b/injector-plugin/src/main/java/net/runelite/injector/MixinInjector.java @@ -525,7 +525,7 @@ public class MixinInjector String deobMethodName = (String) replaceAnnotation.getElement().getValue(); ClassFile deobCf = inject.toDeobClass(cf); - Method deobMethod = findDeobMethod(deobCf, deobMethodName, method); + Method deobMethod = findDeobMethod(deobCf, deobMethodName, method.getDescriptor()); if (deobMethod == null) { @@ -739,16 +739,14 @@ public class MixinInjector } } - private Method findDeobMethod(ClassFile deobCf, String deobMethodName, Method mixinMethod) + private Method findDeobMethod(ClassFile deobCf, String deobMethodName, Signature descriptor) throws InjectionException { - final Signature descriptor = mixinMethod.getDescriptor(); - final List matchingMethods = new ArrayList<>(); - final boolean stat = mixinMethod.isStatic(); + List matchingMethods = new ArrayList<>(); for (Method m : deobCf.getMethods()) { - if (!deobMethodName.equals(m.getName()) || m.isStatic() != stat) + if (!deobMethodName.equals(m.getName())) { continue; } @@ -968,7 +966,7 @@ public class MixinInjector String hookName = methodHook.getElement().getString(); boolean end = methodHook.getElements().size() == 2 && methodHook.getElements().get(1).getValue().equals(true); ClassFile deobCf = inject.toDeobClass(cf); - Method targetMethod = findDeobMethod(deobCf, hookName, method); + Method targetMethod = findDeobMethod(deobCf, hookName, method.getDescriptor()); if (targetMethod == null) { diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index a23b30e93f..da1be940f5 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -832,7 +832,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { if (var2 != 1007) { if (var2 == 1011 || var2 == 1008 || var2 == 1010 || var2 == 1009 || var2 == 1012) { - Login.worldMap.menuAction(var2, var3, new Coord(var0), new Coord(var1)); + Login.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); } break label795; } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 5cfc358139..f72eda916b 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -1375,8 +1375,8 @@ public class WorldMap { signature = "(IILhf;Lhf;B)V", garbageValue = "0" ) - @Export("menuAction") - public void menuAction(int var1, int var2, Coord var3, Coord var4) { + @Export("worldMapMenuAction") + public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { ScriptEvent var5 = new ScriptEvent(); WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); var5.setArgs(new Object[]{var6});