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

279
runescape-client/src/main/java/class21.java
View File

@@ -1,5 +1,4 @@
import java.util.LinkedList;
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@@ -7,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("b")
public abstract class class21 {
@ObfuscatedName("by")
static String __b_by;
static String field1123;
@ObfuscatedName("m")
@ObfuscatedGetter(
intValue = -474193537
@@ -96,15 +95,15 @@ public abstract class class21 {
garbageValue = "-108"
)
void method263(AbstractIndexCache var1) {
if(!this.method271()) {
if (!this.method271()) {
byte[] var2 = var1.takeRecord(this.field150, this.field152);
if(var2 != null) {
if (var2 != null) {
this.vmethod715(new Buffer(var2));
this.field157 = true;
this.field153 = true;
}
}
}
@ObfuscatedName("x")
@@ -113,11 +112,11 @@ public abstract class class21 {
garbageValue = "-2111523326"
)
void method282() {
this.field151 = null;
this.field145 = null;
this.field154 = null;
this.field155 = null;
this.field144 = null;
this.field151 = (short[][][])null;
this.field145 = (short[][][])null;
this.field154 = (byte[][][])null;
this.field155 = (byte[][][])null;
this.field144 = (class25[][][][])null;
this.field157 = false;
this.field153 = false;
}
@@ -129,14 +128,14 @@ public abstract class class21 {
)
void method259(int var1, int var2, Buffer var3) {
int var4 = var3.readUnsignedByte();
if(var4 != 0) {
if((var4 & 1) != 0) {
if (var4 != 0) {
if ((var4 & 1) != 0) {
this.method260(var1, var2, var3, var4);
} else {
this.method257(var1, var2, var3, var4);
}
}
}
@ObfuscatedName("a")
@@ -146,7 +145,7 @@ public abstract class class21 {
)
void method260(int var1, int var2, Buffer var3, int var4) {
boolean var5 = (var4 & 2) != 0;
if(var5) {
if (var5) {
this.field145[0][var1][var2] = (short)var3.readUnsignedByte();
}
@@ -165,31 +164,31 @@ public abstract class class21 {
this.field151[0][var1][var2] = (short)var3.readUnsignedByte();
int var8;
int var9;
int var11;
if(var6) {
int var10;
if (var6) {
var8 = var3.readUnsignedByte();
for(var9 = 0; var9 < var8; ++var9) {
int var10 = var3.readUnsignedByte();
if(var10 != 0) {
this.field145[var9][var1][var2] = (short)var10;
var11 = var3.readUnsignedByte();
this.field154[var9][var1][var2] = (byte)(var11 >> 2);
this.field155[var9][var1][var2] = (byte)(var11 & 3);
for (var9 = 0; var9 < var8; ++var9) {
int var11 = var3.readUnsignedByte();
if (var11 != 0) {
this.field145[var9][var1][var2] = (short)var11;
var10 = var3.readUnsignedByte();
this.field154[var9][var1][var2] = (byte)(var10 >> 2);
this.field155[var9][var1][var2] = (byte)(var10 & 3);
}
}
}
if(var7) {
for(var8 = 0; var8 < var5; ++var8) {
if (var7) {
for (var8 = 0; var8 < var5; ++var8) {
var9 = var3.readUnsignedByte();
if(var9 != 0) {
if (var9 != 0) {
class25[] var14 = this.field144[var8][var1][var2] = new class25[var9];
for(var11 = 0; var11 < var9; ++var11) {
int var12 = var3.__ap_310();
for (var10 = 0; var10 < var9; ++var10) {
int var12 = var3.method51();
int var13 = var3.readUnsignedByte();
var14[var11] = new class25(var12, var13 >> 2, var13 & 3);
var14[var10] = new class25(var12, var13 >> 2, var13 & 3);
}
}
}
@@ -221,115 +220,115 @@ public abstract class class21 {
garbageValue = "-3"
)
static final void method293(PacketBuffer var0) {
for(int var1 = 0; var1 < Players.__cq_n; ++var1) {
int var2 = Players.__cq_i[var1];
for (int var1 = 0; var1 < Players.field736; ++var1) {
int var2 = Players.field737[var1];
Player var3 = Client.players[var2];
int var4 = var0.readUnsignedByte();
if((var4 & 8) != 0) {
if ((var4 & 8) != 0) {
var4 += var0.readUnsignedByte() << 8;
}
byte var5 = -1;
int var6;
int var7;
int var8;
int var9;
int var10;
int var13;
if((var4 & 64) != 0) {
var6 = var0.__bb_317();
int var8;
if ((var4 & 64) != 0) {
var6 = var0.method58();
int var11;
int var12;
if(var6 > 0) {
for(var7 = 0; var7 < var6; ++var7) {
int var13;
if (var6 > 0) {
for (var7 = 0; var7 < var6; ++var7) {
var8 = -1;
var9 = -1;
var10 = -1;
var11 = -1;
var8 = var0.__ae_307();
if(var8 == 32767) {
var8 = var0.__ae_307();
var10 = var0.__ae_307();
var9 = var0.__ae_307();
var11 = var0.__ae_307();
} else if(var8 != 32766) {
var10 = var0.__ae_307();
var12 = -1;
var11 = var0.method48();
if (var11 == 32767) {
var11 = var0.method48();
var9 = var0.method48();
var8 = var0.method48();
var12 = var0.method48();
} else if (var11 != 32766) {
var9 = var0.method48();
} else {
var8 = -1;
var11 = -1;
}
var12 = var0.__ae_307();
var3.addHitSplat(var8, var10, var9, var11, Client.cycle, var12);
var13 = var0.method48();
var3.addHitSplat(var11, var9, var8, var12, Client.cycle, var13);
}
}
var7 = var0.readUnsignedByteNegate();
if(var7 > 0) {
for(var8 = 0; var8 < var7; ++var8) {
var9 = var0.__ae_307();
var10 = var0.__ae_307();
if(var10 != 32767) {
var11 = var0.__ae_307();
var12 = var0.__bb_317();
var13 = var10 > 0?var0.readUnsignedByte():var12;
var3.addHealthBar(var9, Client.cycle, var10, var11, var12, var13);
if (var7 > 0) {
for (var11 = 0; var11 < var7; ++var11) {
var8 = var0.method48();
var9 = var0.method48();
if (var9 != 32767) {
var12 = var0.method48();
var13 = var0.method58();
var10 = var9 > 0 ? var0.readUnsignedByte() : var13;
var3.addHealthBar(var8, Client.cycle, var9, var12, var13, var10);
} else {
var3.removeHealthBar(var9);
var3.removeHealthBar(var8);
}
}
}
}
if((var4 & 512) != 0) {
var3.spotAnimation = var0.__bm_326();
var6 = var0.__bp_331();
if ((var4 & 512) != 0) {
var3.spotAnimation = var0.method67();
var6 = var0.method72();
var3.heightOffset = var6 >> 16;
var3.__bt = (var6 & 65535) + Client.cycle;
var3.field14 = (var6 & 65535) + Client.cycle;
var3.spotAnimationFrame = 0;
var3.spotAnimationFrameCycle = 0;
if(var3.__bt > Client.cycle) {
if (var3.field14 > Client.cycle) {
var3.spotAnimationFrame = -1;
}
if(var3.spotAnimation == 65535) {
if (var3.spotAnimation == 65535) {
var3.spotAnimation = -1;
}
}
if((var4 & 4096) != 0) {
var5 = var0.__bn_319();
if ((var4 & 4096) != 0) {
var5 = var0.method60();
}
if((var4 & 1024) != 0) {
var3.__bf = var0.__bd_321();
var3.__be = var0.__bn_319();
var3.__bh = var0.__bn_319();
var3.__bv = var0.__bd_321();
var3.__bw = var0.__bu_325() + Client.cycle;
var3.__cr = var0.__by_324() + Client.cycle;
var3.__cv = var0.__ag_302();
if(var3.__ag) {
var3.__bf += var3.tileX;
var3.__be += var3.tileY;
var3.__bh += var3.tileX;
var3.__bv += var3.tileY;
if ((var4 & 1024) != 0) {
var3.field15 = var0.method62();
var3.field17 = var0.method60();
var3.field16 = var0.method60();
var3.field18 = var0.method62();
var3.field19 = var0.method66() + Client.cycle;
var3.field20 = var0.method65() + Client.cycle;
var3.field21 = var0.method43();
if (var3.field725) {
var3.field15 += var3.tileX;
var3.field17 += var3.tileY;
var3.field16 += var3.tileX;
var3.field18 += var3.tileY;
var3.pathLength = 0;
} else {
var3.__bf += var3.pathX[0];
var3.__be += var3.pathY[0];
var3.__bh += var3.pathX[0];
var3.__bv += var3.pathY[0];
var3.field15 += var3.pathX[0];
var3.field17 += var3.pathY[0];
var3.field16 += var3.pathX[0];
var3.field18 += var3.pathY[0];
var3.pathLength = 1;
}
var3.__ch = 0;
var3.field25 = 0;
}
if((var4 & 32) != 0) {
if ((var4 & 32) != 0) {
var3.overheadText = var0.readStringCp1252NullTerminated();
if(var3.overheadText.charAt(0) == '~') {
if (var3.overheadText.charAt(0) == '~') {
var3.overheadText = var3.overheadText.substring(1);
WorldMapIcon1.method219(2, var3.username.getName(), var3.overheadText);
} else if(var3 == Canvas.localPlayer) {
} else if (var3 == Canvas.localPlayer) {
WorldMapIcon1.method219(2, var3.username.getName(), var3.overheadText);
}
@@ -339,83 +338,83 @@ public abstract class class21 {
var3.overheadTextCyclesRemaining = 150;
}
if((var4 & 4) != 0) {
var3.__bc = var0.__by_324();
if(var3.pathLength == 0) {
var3.orientation = var3.__bc;
var3.__bc = -1;
if ((var4 & 4) != 0) {
var3.field12 = var0.method65();
if (var3.pathLength == 0) {
var3.orientation = var3.field12;
var3.field12 = -1;
}
}
if((var4 & 1) != 0) {
var6 = var0.__bq_318();
byte[] var14 = new byte[var6];
Buffer var15 = new Buffer(var14);
var0.__bh_333(var14, 0, var6);
Players.__cq_o[var2] = var15;
var3.read(var15);
if ((var4 & 1) != 0) {
var6 = var0.method59();
byte[] var15 = new byte[var6];
Buffer var16 = new Buffer(var15);
var0.method74(var15, 0, var6);
Players.field733[var2] = var16;
var3.read(var16);
}
if((var4 & 2) != 0) {
var3.targetIndex = var0.__bu_325();
if(var3.targetIndex == 65535) {
if ((var4 & 2) != 0) {
var3.targetIndex = var0.method66();
if (var3.targetIndex == 65535) {
var3.targetIndex = -1;
}
}
if((var4 & 2048) != 0) {
Players.__cq_w[var2] = var0.__bn_319();
if ((var4 & 2048) != 0) {
Players.field732[var2] = var0.method60();
}
if((var4 & 16) != 0) {
var6 = var0.__bu_325();
PlayerType var20 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var0.readUnsignedByte());
if ((var4 & 16) != 0) {
var6 = var0.method66();
PlayerType var17 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var0.readUnsignedByte());
boolean var18 = var0.readUnsignedByteNegate() == 1;
var9 = var0.readUnsignedByte();
var10 = var0.index;
if(var3.username != null && var3.appearance != null) {
var8 = var0.readUnsignedByte();
var9 = var0.index;
if (var3.username != null && var3.appearance != null) {
boolean var19 = false;
if(var20.isUser && WorldMapArea.friendSystem.isIgnored(var3.username)) {
if (var17.isUser && WorldMapArea.friendSystem.isIgnored(var3.username)) {
var19 = true;
}
if(!var19 && Client.__client_jc == 0 && !var3.isHidden) {
Players.__cq_a.index = 0;
var0.__al_305(Players.__cq_a.array, 0, var9);
Players.__cq_a.index = 0;
String var16 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(Players.__cq_a)));
var3.overheadText = var16.trim();
if (!var19 && Client.field208 == 0 && !var3.isHidden) {
Players.field738.index = 0;
var0.method46(Players.field738.array, 0, var8);
Players.field738.index = 0;
String var14 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(Players.field738)));
var3.overheadText = var14.trim();
var3.overheadTextColor = var6 >> 8;
var3.overheadTextEffect = var6 & 255;
var3.overheadTextCyclesRemaining = 150;
var3.isAutoChatting = var18;
var3.__az = var3 != Canvas.localPlayer && var20.isUser && "" != Client.__client_pz && var16.toLowerCase().indexOf(Client.__client_pz) == -1;
if(var20.isPrivileged) {
var13 = var18?91:1;
var3.field11 = var3 != Canvas.localPlayer && var17.isUser && "" != Client.field158 && var14.toLowerCase().indexOf(Client.field158) == -1;
if (var17.isPrivileged) {
var10 = var18 ? 91 : 1;
} else {
var13 = var18?90:2;
var10 = var18 ? 90 : 2;
}
if(var20.modIcon != -1) {
WorldMapIcon1.method219(var13, ItemContainer.method1170(var20.modIcon) + var3.username.getName(), var16);
if (var17.modIcon != -1) {
WorldMapIcon1.method219(var10, ItemContainer.method1170(var17.modIcon) + var3.username.getName(), var14);
} else {
WorldMapIcon1.method219(var13, var3.username.getName(), var16);
WorldMapIcon1.method219(var10, var3.username.getName(), var14);
}
}
}
var0.index = var10 + var9;
var0.index = var9 + var8;
}
if((var4 & 256) != 0) {
for(var6 = 0; var6 < 3; ++var6) {
if ((var4 & 256) != 0) {
for (var6 = 0; var6 < 3; ++var6) {
var3.actions[var6] = var0.readStringCp1252NullTerminated();
}
}
if((var4 & 128) != 0) {
var6 = var0.__ag_302();
if(var6 == 65535) {
if ((var4 & 128) != 0) {
var6 = var0.method43();
if (var6 == 65535) {
var6 = -1;
}
@@ -423,18 +422,18 @@ public abstract class class21 {
class234.method4534(var3, var6, var7);
}
if(var3.__ag) {
if(var5 == 127) {
if (var3.field725) {
if (var5 == 127) {
var3.resetPath(var3.tileX, var3.tileY);
} else {
byte var17;
if(var5 != -1) {
var17 = var5;
byte var20;
if (var5 != -1) {
var20 = var5;
} else {
var17 = Players.__cq_w[var2];
var20 = Players.field732[var2];
}
var3.__x_130(var3.tileX, var3.tileY, var17);
var3.method254(var3.tileX, var3.tileY, var20);
}
}
}