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

149
runescape-client/src/main/java/class31.java
View File

@@ -21,11 +21,6 @@ public class class31 {
)
final int field255;
static {
field259 = new class31(0);
field254 = new class31(1);
}
class31(int var1) {
this.field255 = var1;
}
@@ -37,10 +32,10 @@ public class class31 {
)
@Export("changeWorld")
static void changeWorld(World var0) {
if(var0.isMembersOnly() != Client.isMembersWorld) {
if (var0.isMembersOnly() != Client.isMembersWorld) {
Client.isMembersWorld = var0.isMembersOnly();
boolean var1 = var0.isMembersOnly();
if(var1 != class30.inMembersWorld) {
if (var1 != class30.inMembersWorld) {
LoginScreenAnimation.method1780();
class30.inMembersWorld = var1;
}
@@ -49,8 +44,8 @@ public class class31 {
class50.worldHost = var0.host;
Client.worldId = var0.id;
Client.worldProperties = var0.properties;
class2.port1 = Client.gameBuild == 0?43594:var0.id + 40000;
WorldMapArea.port2 = Client.gameBuild == 0?443:var0.id + 50000;
class2.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000;
WorldMapArea.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000;
class203.port3 = class2.port1;
}
@@ -60,14 +55,14 @@ public class class31 {
garbageValue = "130306081"
)
static int method573(int var0, Script var1, boolean var2) {
if(var0 == 6500) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ClientParameter.loadWorlds()?1:0;
if (var0 == 6500) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ClientParameter.loadWorlds() ? 1 : 0;
return 1;
} else {
World var3;
if(var0 == 6501) {
if (var0 == 6501) {
var3 = class190.method3672();
if(var3 != null) {
if (var3 != null) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.properties;
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity;
@@ -84,9 +79,9 @@ public class class31 {
}
return 1;
} else if(var0 == 6502) {
} else if (var0 == 6502) {
var3 = Fonts.method5647();
if(var3 != null) {
if (var3 != null) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.properties;
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity;
@@ -106,19 +101,19 @@ public class class31 {
} else {
World var4;
int var5;
int var7;
if(var0 == 6506) {
var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
int var6;
if (var0 == 6506) {
var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
var4 = null;
for(var5 = 0; var5 < World.worldsCount; ++var5) {
if(var7 == ItemContainer.worlds[var5].id) {
for (var5 = 0; var5 < World.worldsCount; ++var5) {
if (var6 == ItemContainer.worlds[var5].id) {
var4 = ItemContainer.worlds[var5];
break;
}
}
if(var4 != null) {
if (var4 != null) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.id;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.properties;
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity;
@@ -135,94 +130,94 @@ public class class31 {
}
return 1;
} else if(var0 == 6507) {
} else if (var0 == 6507) {
RouteStrategy.Interpreter_intStackSize -= 4;
var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
boolean var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
boolean var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
boolean var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3] == 1;
WorldMapSectionType.method248(var7, var10, var5, var6);
boolean var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3] == 1;
WorldMapSectionType.method248(var6, var9, var5, var10);
return 1;
} else if(var0 != 6511) {
if(var0 == 6512) {
} else if (var0 != 6511) {
if (var0 == 6512) {
Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
return 1;
} else {
int var8;
ParamKeyDefinition var9;
if(var0 == 6513) {
int var7;
ParamKeyDefinition var8;
if (var0 == 6513) {
RouteStrategy.Interpreter_intStackSize -= 2;
var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var9 = class229.getParamKeyDefinition(var8);
if(var9.isString()) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var7).getStringParam(var8, var9.keyString);
var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var8 = class229.getParamKeyDefinition(var7);
if (var8.isString()) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getStringParam(var7, var8.keyString);
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var7).getIntParam(var8, var9.keyInt);
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getIntParam(var7, var8.keyInt);
}
return 1;
} else if(var0 == 6514) {
} else if (var0 == 6514) {
RouteStrategy.Interpreter_intStackSize -= 2;
var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var9 = class229.getParamKeyDefinition(var8);
if(var9.isString()) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var7).getStringParam(var8, var9.keyString);
var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var8 = class229.getParamKeyDefinition(var7);
if (var8.isString()) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var6).getStringParam(var7, var8.keyString);
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var7).getIntParam(var8, var9.keyInt);
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var6).getIntParam(var7, var8.keyInt);
}
return 1;
} else if(var0 == 6515) {
} else if (var0 == 6515) {
RouteStrategy.Interpreter_intStackSize -= 2;
var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var9 = class229.getParamKeyDefinition(var8);
if(var9.isString()) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var7).getStringParam(var8, var9.keyString);
var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var8 = class229.getParamKeyDefinition(var7);
if (var8.isString()) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var6).getStringParam(var7, var8.keyString);
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var7).getIntParam(var8, var9.keyInt);
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var6).getIntParam(var7, var8.keyInt);
}
return 1;
} else if(var0 == 6516) {
} else if (var0 == 6516) {
RouteStrategy.Interpreter_intStackSize -= 2;
var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var9 = class229.getParamKeyDefinition(var8);
if(var9.isString()) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var7).getStringParam(var8, var9.keyString);
var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var8 = class229.getParamKeyDefinition(var7);
if (var8.isString()) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var6).getStringParam(var7, var8.keyString);
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var7).getIntParam(var8, var9.keyInt);
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var6).getIntParam(var7, var8.keyInt);
}
return 1;
} else if(var0 == 6518) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_bl?1:0;
} else if (var0 == 6518) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field162 ? 1 : 0;
return 1;
} else if(var0 == 6519) {
} else if (var0 == 6519) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.clientType & 3;
return 1;
} else if(var0 == 6520) {
} else if (var0 == 6520) {
return 1;
} else if(var0 == 6521) {
} else if (var0 == 6521) {
return 1;
} else if(var0 == 6522) {
} else if (var0 == 6522) {
--Interpreter.Interpreter_stringStackSize;
--RouteStrategy.Interpreter_intStackSize;
return 1;
} else if(var0 == 6523) {
} else if (var0 == 6523) {
--Interpreter.Interpreter_stringStackSize;
--RouteStrategy.Interpreter_intStackSize;
return 1;
} else if(var0 == 6524) {
} else if (var0 == 6524) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
return 1;
} else if(var0 == 6525) {
} else if (var0 == 6525) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
return 1;
} else if(var0 == 6526) {
} else if (var0 == 6526) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
return 1;
} else {
@@ -230,9 +225,9 @@ public class class31 {
}
}
} else {
var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
if(var7 >= 0 && var7 < World.worldsCount) {
var4 = ItemContainer.worlds[var7];
var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
if (var6 >= 0 && var6 < World.worldsCount) {
var4 = ItemContainer.worlds[var6];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.id;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.properties;
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity;
@@ -260,11 +255,17 @@ public class class31 {
garbageValue = "-110"
)
static final void method574(String var0) {
if(!var0.equals("")) {
PacketBufferNode var1 = Interpreter.method1915(ClientPacket.__gs_cr, Client.packetWriter.isaacCipher);
if (!var0.equals("")) {
PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field300, Client.packetWriter.isaacCipher);
var1.packetBuffer.writeByte(WorldMapRegion.method550(var0));
var1.packetBuffer.writeStringCp1252NullTerminated(var0);
Client.packetWriter.__q_167(var1);
Client.packetWriter.method241(var1);
}
}
static {
field259 = new class31(0);
field254 = new class31(1);
}
}