Merge remote-tracking branch 'upstream/master' into master

Nice insider info btw, be nice if you shared it, so-called "open source" client.
This commit is contained in:
ThatGamerBlue
2021-05-28 21:39:25 +01:00
481 changed files with 53410 additions and 51723 deletions

View File

@@ -1,101 +1,92 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.Reflection;
@ObfuscatedName("hz")
@ObfuscatedName("hj")
@Implements("GameObject")
public final class GameObject {
@ObfuscatedName("sn")
@ObfuscatedSignature(
descriptor = "Lms;"
)
@Export("platformInfo")
static PlatformInfo platformInfo;
@ObfuscatedName("h")
@ObfuscatedName("v")
@ObfuscatedGetter(
intValue = 1006788737
intValue = -254047513
)
@Export("plane")
int plane;
@ObfuscatedName("c")
@ObfuscatedName("n")
@ObfuscatedGetter(
intValue = 537985055
intValue = -1917415421
)
@Export("height")
int height;
@ObfuscatedName("o")
@ObfuscatedName("f")
@ObfuscatedGetter(
intValue = 1950826709
intValue = 1140262961
)
@Export("centerX")
int centerX;
@ObfuscatedName("g")
@ObfuscatedName("y")
@ObfuscatedGetter(
intValue = -1652041871
intValue = 364858457
)
@Export("centerY")
int centerY;
@ObfuscatedName("l")
@ObfuscatedName("p")
@ObfuscatedSignature(
descriptor = "Lge;"
descriptor = "Lgl;"
)
@Export("renderable")
public Renderable renderable;
@ObfuscatedName("z")
@ObfuscatedName("j")
@ObfuscatedGetter(
intValue = -1185454061
intValue = -202388443
)
@Export("orientation")
int orientation;
@ObfuscatedName("t")
@ObfuscatedName("r")
@ObfuscatedGetter(
intValue = -982826151
intValue = 1674574095
)
@Export("startX")
int startX;
@ObfuscatedName("v")
@ObfuscatedName("b")
@ObfuscatedGetter(
intValue = 1670448045
intValue = -2078907755
)
@Export("endX")
int endX;
@ObfuscatedName("b")
@ObfuscatedName("d")
@ObfuscatedGetter(
intValue = 470621493
intValue = 1202737381
)
@Export("startY")
int startY;
@ObfuscatedName("q")
@ObfuscatedName("s")
@ObfuscatedGetter(
intValue = -994471517
intValue = -129893675
)
@Export("endY")
int endY;
@ObfuscatedName("i")
@ObfuscatedName("u")
@ObfuscatedGetter(
intValue = -296238485
intValue = -327316739
)
int field2543;
@ObfuscatedName("x")
int field2554;
@ObfuscatedName("l")
@ObfuscatedGetter(
intValue = 1322032331
intValue = -137941941
)
@Export("lastDrawn")
int lastDrawn;
@ObfuscatedName("k")
@ObfuscatedName("o")
@ObfuscatedGetter(
longValue = 6995464757226252125L
longValue = 1142152799211342585L
)
@Export("tag")
public long tag;
@ObfuscatedName("r")
@ObfuscatedName("c")
@ObfuscatedGetter(
intValue = -1823541423
intValue = -2139353773
)
@Export("flags")
int flags;
@@ -105,149 +96,15 @@ public final class GameObject {
this.flags = 0; // L: 17
} // L: 19
@ObfuscatedName("g")
@ObfuscatedName("gj")
@ObfuscatedSignature(
descriptor = "(Lnk;IB)V",
garbageValue = "8"
descriptor = "(B)V",
garbageValue = "7"
)
@Export("readReflectionCheck")
public static void readReflectionCheck(Buffer var0, int var1) {
ReflectionCheck var2 = new ReflectionCheck(); // L: 133
var2.size = var0.readUnsignedByte(); // L: 134
var2.id = var0.readInt(); // L: 135
var2.operations = new int[var2.size]; // L: 136
var2.creationErrors = new int[var2.size]; // L: 137
var2.fields = new Field[var2.size]; // L: 138
var2.intReplaceValues = new int[var2.size]; // L: 139
var2.methods = new Method[var2.size]; // L: 140
var2.arguments = new byte[var2.size][][]; // L: 141
for (int var3 = 0; var3 < var2.size; ++var3) { // L: 142
try {
int var4 = var0.readUnsignedByte(); // L: 144
String var5;
String var6;
int var7;
if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 145
if (var4 == 3 || var4 == 4) { // L: 155
var5 = var0.readStringCp1252NullTerminated(); // L: 156
var6 = var0.readStringCp1252NullTerminated(); // L: 157
var7 = var0.readUnsignedByte(); // L: 158
String[] var8 = new String[var7]; // L: 159
for (int var9 = 0; var9 < var7; ++var9) { // L: 160
var8[var9] = var0.readStringCp1252NullTerminated();
}
String var20 = var0.readStringCp1252NullTerminated(); // L: 161
byte[][] var10 = new byte[var7][]; // L: 162
int var12;
if (var4 == 3) { // L: 163
for (int var11 = 0; var11 < var7; ++var11) { // L: 164
var12 = var0.readInt(); // L: 165
var10[var11] = new byte[var12]; // L: 166
var0.readBytes(var10[var11], 0, var12); // L: 167
}
}
var2.operations[var3] = var4; // L: 170
Class[] var21 = new Class[var7]; // L: 171
for (var12 = 0; var12 < var7; ++var12) { // L: 172
var21[var12] = class34.loadClassFromDescriptor(var8[var12]);
}
Class var22 = class34.loadClassFromDescriptor(var20); // L: 173
if (class34.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 174
throw new SecurityException();
}
Method[] var13 = class34.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 175
Method[] var14 = var13; // L: 177
for (int var15 = 0; var15 < var14.length; ++var15) { // L: 178
Method var16 = var14[var15]; // L: 179
if (Reflection.getMethodName(var16).equals(var6)) { // L: 181
Class[] var17 = Reflection.getParameterTypes(var16); // L: 182
if (var21.length == var17.length) { // L: 183
boolean var18 = true; // L: 184
for (int var19 = 0; var19 < var21.length; ++var19) { // L: 185
if (var21[var19] != var17[var19]) { // L: 186
var18 = false; // L: 187
break; // L: 188
}
}
if (var18 && var22 == var16.getReturnType()) { // L: 191
var2.methods[var3] = var16; // L: 192
}
}
}
}
var2.arguments[var3] = var10; // L: 199
}
} else {
var5 = var0.readStringCp1252NullTerminated(); // L: 146
var6 = var0.readStringCp1252NullTerminated(); // L: 147
var7 = 0; // L: 148
if (var4 == 1) { // L: 149
var7 = var0.readInt();
}
var2.operations[var3] = var4; // L: 150
var2.intReplaceValues[var3] = var7;
if (class34.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 152
throw new SecurityException();
}
var2.fields[var3] = Reflection.findField(class34.loadClassFromDescriptor(var5), var6); // L: 153
}
} catch (ClassNotFoundException var24) { // L: 202
var2.creationErrors[var3] = -1; // L: 203
} catch (SecurityException var25) { // L: 205
var2.creationErrors[var3] = -2; // L: 206
} catch (NullPointerException var26) { // L: 208
var2.creationErrors[var3] = -3; // L: 209
} catch (Exception var27) { // L: 211
var2.creationErrors[var3] = -4; // L: 212
} catch (Throwable var28) { // L: 214
var2.creationErrors[var3] = -5; // L: 215
}
static void method4279() {
if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4346
NetSocket.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4347
}
class69.reflectionChecks.addFirst(var2); // L: 218
} // L: 219
@ObfuscatedName("l")
@ObfuscatedSignature(
descriptor = "(Ljp;Ljava/lang/String;Ljava/lang/String;B)[Lof;",
garbageValue = "-66"
)
public static IndexedSprite[] method4235(AbstractArchive var0, String var1, String var2) {
int var3 = var0.getGroupId(var1); // L: 116
int var4 = var0.getFileId(var3, var2); // L: 117
return WorldMapDecoration.method3571(var0, var3, var4); // L: 118
}
@ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(CB)Z",
garbageValue = "-36"
)
@Export("isCharAlphabetic")
public static boolean isCharAlphabetic(char var0) {
return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 151
}
@ObfuscatedName("jv")
@ObfuscatedSignature(
descriptor = "(S)Z",
garbageValue = "10491"
)
@Export("getTapToDrop")
static boolean getTapToDrop() {
return Client.tapToDrop; // L: 10455
}
} // L: 4349
}