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

Use newer version of fernflower and remove __xx names

Browse Source
This commit is contained in:
Lucas
2019-07-04 23:51:52 +02:00
parent 1f2a9b21d6
commit a8d801d830
294 changed files with 27369 additions and 27322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
runescape-client/src/main/java/WorldMapLabel.java
View File

@@ -21,7 +21,7 @@ public class WorldMapLabel {
@ObfuscatedGetter(
intValue = -1536028937
)
public static int __aj_e;
public static int field1039;
@ObfuscatedName("m")
@Export("text")
String text;
@@ -61,96 +61,97 @@ public class WorldMapLabel {
)
public static void method443(PacketBuffer var0) {
ReflectionCheck var1 = (ReflectionCheck)class322.reflectionChecks.last();
if(var1 != null) {
if (var1 != null) {
int var2 = var0.index;
var0.writeInt(var1.id);
for(int var3 = 0; var3 < var1.size; ++var3) {
if(var1.creationErrors[var3] != 0) {
for (int var3 = 0; var3 < var1.size; ++var3) {
if (var1.creationErrors[var3] != 0) {
var0.writeByte(var1.creationErrors[var3]);
} else {
try {
int var4 = var1.operations[var3];
Field var5;
int var6;
if(var4 == 0) {
if (var4 == 0) {
var5 = var1.fields[var3];
var6 = Reflection.getInt(var5, (Object)null);
var0.writeByte(0);
var0.writeInt(var6);
} else if(var4 == 1) {
} else if (var4 == 1) {
var5 = var1.fields[var3];
Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]);
var0.writeByte(0);
} else if(var4 == 2) {
} else if (var4 == 2) {
var5 = var1.fields[var3];
var6 = var5.getModifiers();
var0.writeByte(0);
var0.writeInt(var6);
}
Method var25;
if(var4 != 3) {
if(var4 == 4) {
var25 = var1.methods[var3];
var6 = var25.getModifiers();
Method var7;
if (var4 != 3) {
if (var4 == 4) {
var7 = var1.methods[var3];
var6 = var7.getModifiers();
var0.writeByte(0);
var0.writeInt(var6);
}
} else {
var25 = var1.methods[var3];
byte[][] var10 = var1.arguments[var3];
Object[] var7 = new Object[var10.length];
var7 = var1.methods[var3];
byte[][] var8 = var1.arguments[var3];
Object[] var9 = new Object[var8.length];
for(int var8 = 0; var8 < var10.length; ++var8) {
ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8]));
var7[var8] = var9.readObject();
for (int var10 = 0; var10 < var8.length; ++var10) {
ObjectInputStream var11 = new ObjectInputStream(new ByteArrayInputStream(var8[var10]));
var9[var10] = var11.readObject();
}
Object var11 = Reflection.invoke(var25, (Object)null, var7);
if(var11 == null) {
Object var24 = Reflection.invoke(var7, (Object)null, var9);
if (var24 == null) {
var0.writeByte(0);
} else if(var11 instanceof Number) {
} else if (var24 instanceof Number) {
var0.writeByte(1);
var0.writeLong(((Number)var11).longValue());
} else if(var11 instanceof String) {
var0.writeLong(((Number)var24).longValue());
} else if (var24 instanceof String) {
var0.writeByte(2);
var0.writeStringCp1252NullTerminated((String)var11);
var0.writeStringCp1252NullTerminated((String)var24);
} else {
var0.writeByte(4);
}
}
} catch (ClassNotFoundException var13) {
} catch (ClassNotFoundException var12) {
var0.writeByte(-10);
} catch (InvalidClassException var14) {
} catch (InvalidClassException var13) {
var0.writeByte(-11);
} catch (StreamCorruptedException var15) {
} catch (StreamCorruptedException var14) {
var0.writeByte(-12);
} catch (OptionalDataException var16) {
} catch (OptionalDataException var15) {
var0.writeByte(-13);
} catch (IllegalAccessException var17) {
} catch (IllegalAccessException var16) {
var0.writeByte(-14);
} catch (IllegalArgumentException var18) {
} catch (IllegalArgumentException var17) {
var0.writeByte(-15);
} catch (InvocationTargetException var19) {
} catch (InvocationTargetException var18) {
var0.writeByte(-16);
} catch (SecurityException var20) {
} catch (SecurityException var19) {
var0.writeByte(-17);
} catch (IOException var21) {
} catch (IOException var20) {
var0.writeByte(-18);
} catch (NullPointerException var22) {
} catch (NullPointerException var21) {
var0.writeByte(-19);
} catch (Exception var23) {
} catch (Exception var22) {
var0.writeByte(-20);
} catch (Throwable var24) {
} catch (Throwable var23) {
var0.writeByte(-21);
}
}
}
var0.__aa_312(var2);
var0.method53(var2);
var1.remove();
}
}
@ObfuscatedName("f")
@@ -160,7 +161,7 @@ public class WorldMapLabel {
)
static int method442(int var0, int var1) {
ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
return var2 == null?0:(var1 >= 0 && var1 < var2.quantities.length?var2.quantities[var1]:0);
return var2 == null ? 0 : (var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0);
}
@ObfuscatedName("u")
@@ -172,7 +173,7 @@ public class WorldMapLabel {
public static IndexedSprite[] createIndexedSpriteArray() {
IndexedSprite[] var0 = new IndexedSprite[class328.indexedSpriteCount];
for(int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) {
for (int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) {
IndexedSprite var2 = var0[var1] = new IndexedSprite();
var2.width = class328.indexedSpriteWidth;
var2.height = class328.indexedSpriteHeight;
@@ -189,7 +190,7 @@ public class WorldMapLabel {
VarbitDefinition.indexedSpriteWidths = null;
SecureRandomCallable.indexedSpriteHeights = null;
class328.indexedSpritePalette = null;
class328.spritePixels = null;
class328.spritePixels = (byte[][])null;
return var0;
}
@@ -200,22 +201,22 @@ public class WorldMapLabel {
)
@Export("compareWorlds")
static int compareWorlds(World var0, World var1, int var2, boolean var3) {
if(var2 == 1) {
if (var2 == 1) {
int var4 = var0.population;
int var5 = var1.population;
if(!var3) {
if(var4 == -1) {
if (!var3) {
if (var4 == -1) {
var4 = 2001;
}
if(var5 == -1) {
if (var5 == -1) {
var5 = 2001;
}
}
return var4 - var5;
} else {
return var2 == 2?var0.location - var1.location:(var2 == 3?(var0.activity.equals("-")?(var1.activity.equals("-")?0:(var3?-1:1)):(var1.activity.equals("-")?(var3?1:-1):var0.activity.compareTo(var1.activity))):(var2 == 4?(var0.__a_147()?(var1.__a_147()?0:1):(var1.__a_147()?-1:0)):(var2 == 5?(var0.__x_145()?(var1.__x_145()?0:1):(var1.__x_145()?-1:0)):(var2 == 6?(var0.isPvp()?(var1.isPvp()?0:1):(var1.isPvp()?-1:0)):(var2 == 7?(var0.isMembersOnly()?(var1.isMembersOnly()?0:1):(var1.isMembersOnly()?-1:0)):var0.id - var1.id)))));
return var2 == 2 ? var0.location - var1.location : (var2 == 3 ? (var0.activity.equals("-") ? (var1.activity.equals("-") ? 0 : (var3 ? -1 : 1)) : (var1.activity.equals("-") ? (var3 ? 1 : -1) : var0.activity.compareTo(var1.activity))) : (var2 == 4 ? (var0.method357() ? (var1.method357() ? 0 : 1) : (var1.method357() ? -1 : 0)) : (var2 == 5 ? (var0.method356() ? (var1.method356() ? 0 : 1) : (var1.method356() ? -1 : 0)) : (var2 == 6 ? (var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0)) : (var2 == 7 ? (var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0)) : var0.id - var1.id)))));
}
}
@@ -225,8 +226,8 @@ public class WorldMapLabel {
garbageValue = "60"
)
public static void method440() {
NpcDefinition.NpcDefinition_cached.clear();
NpcDefinition.NpcDefinition_cachedModels.clear();
NPCDefinition.NpcDefinition_cached.clear();
NPCDefinition.NpcDefinition_cachedModels.clear();
}
@ObfuscatedName("gx")
@@ -236,7 +237,7 @@ public class WorldMapLabel {
)
@Export("worldToScreen")
static final void worldToScreen(int var0, int var1, int var2) {
if(var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) {
if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) {
int var3 = class32.getTileHeight(var0, var1, SoundSystem.plane) - var2;
var0 -= WorldMapSection1.cameraX;
var3 -= GrandExchangeEvents.cameraY;
@@ -250,17 +251,17 @@ public class WorldMapLabel {
var0 = var8;
var8 = var3 * var5 - var4 * var1 >> 16;
var1 = var5 * var1 + var3 * var4 >> 16;
if(var1 >= 50) {
if (var1 >= 50) {
Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2;
Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2;
} else {
Client.viewportTempX = -1;
Client.viewportTempY = -1;
}
} else {
Client.viewportTempX = -1;
Client.viewportTempY = -1;
}
}
}