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

revert injector change to do it safe way for now

Browse Source
This commit is contained in:
Lucwousin
2019-10-31 17:32:51 +01:00
parent 2a87b2f2e8
commit d795ebdfc2
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
injector-plugin/src/main/java/net/runelite/injector/MixinInjector.java
View File

@@ -525,7 +525,7 @@ public class MixinInjector
String deobMethodName = (String) replaceAnnotation.getElement().getValue(); String deobMethodName = (String) replaceAnnotation.getElement().getValue();
ClassFile deobCf = inject.toDeobClass(cf); ClassFile deobCf = inject.toDeobClass(cf);
Method deobMethod = findDeobMethod(deobCf, deobMethodName, method); Method deobMethod = findDeobMethod(deobCf, deobMethodName, method.getDescriptor());
if (deobMethod == null) 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 throws InjectionException
{ {
final Signature descriptor = mixinMethod.getDescriptor(); List<Method> matchingMethods = new ArrayList<>();
final List<Method> matchingMethods = new ArrayList<>();
final boolean stat = mixinMethod.isStatic();
for (Method m : deobCf.getMethods()) for (Method m : deobCf.getMethods())
{ {
if (!deobMethodName.equals(m.getName()) || m.isStatic() != stat) if (!deobMethodName.equals(m.getName()))
{ {
continue; continue;
} }
@@ -968,7 +966,7 @@ public class MixinInjector
String hookName = methodHook.getElement().getString(); String hookName = methodHook.getElement().getString();
boolean end = methodHook.getElements().size() == 2 && methodHook.getElements().get(1).getValue().equals(true); boolean end = methodHook.getElements().size() == 2 && methodHook.getElements().get(1).getValue().equals(true);
ClassFile deobCf = inject.toDeobClass(cf); ClassFile deobCf = inject.toDeobClass(cf);
Method targetMethod = findDeobMethod(deobCf, hookName, method); Method targetMethod = findDeobMethod(deobCf, hookName, method.getDescriptor());
if (targetMethod == null) if (targetMethod == null)
{ {

2
runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
View File

@@ -832,7 +832,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
if (var2 != 1007) { if (var2 != 1007) {
if (var2 == 1011 || var2 == 1008 || var2 == 1010 || var2 == 1009 || var2 == 1012) { 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; break label795;
} }

4
runescape-client/src/main/java/WorldMap.java
View File

@@ -1375,8 +1375,8 @@ public class WorldMap {
signature = "(IILhf;Lhf;B)V", signature = "(IILhf;Lhf;B)V",
garbageValue = "0" garbageValue = "0"
) )
@Export("menuAction") @Export("worldMapMenuAction")
public void menuAction(int var1, int var2, Coord var3, Coord var4) { public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) {
ScriptEvent var5 = new ScriptEvent(); ScriptEvent var5 = new ScriptEvent();
WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4);
var5.setArgs(new Object[]{var6}); var5.setArgs(new Object[]{var6});