Use newer version of fernflower and remove __xx names

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

View File

@@ -20,7 +20,7 @@ public class WorldMapSection1 implements WorldMapSection {
@ObfuscatedGetter(
intValue = -1516124929
)
static int __as_ey;
static int field1071;
@ObfuscatedName("ha")
@ObfuscatedGetter(
intValue = 1052834531
@@ -31,52 +31,52 @@ public class WorldMapSection1 implements WorldMapSection {
@ObfuscatedGetter(
intValue = -1971304641
)
int __m;
int field1072;
@ObfuscatedName("f")
@ObfuscatedGetter(
intValue = 1483447179
)
int __f;
int field1073;
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = -1875803617
)
int __q;
int field1074;
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = 284566685
)
int __w;
int field1075;
@ObfuscatedName("o")
@ObfuscatedGetter(
intValue = -1513010233
)
int __o;
int field1076;
@ObfuscatedName("u")
@ObfuscatedGetter(
intValue = -1383826035
)
int __u;
int field1077;
@ObfuscatedName("g")
@ObfuscatedGetter(
intValue = 1526007343
)
int __g;
int field1078;
@ObfuscatedName("l")
@ObfuscatedGetter(
intValue = -890169045
)
int __l;
int field1079;
@ObfuscatedName("e")
@ObfuscatedGetter(
intValue = -1797724181
)
int __e;
int field1080;
@ObfuscatedName("x")
@ObfuscatedGetter(
intValue = 325777555
)
int __x;
int field1081;
@ObfuscatedName("m")
@ObfuscatedSignature(
@@ -85,20 +85,20 @@ public class WorldMapSection1 implements WorldMapSection {
)
@Export("expandBounds")
public void expandBounds(WorldMapArea var1) {
if(var1.minX0 > this.__o) {
var1.minX0 = this.__o;
if (var1.minX0 > this.field1076) {
var1.minX0 = this.field1076;
}
if(var1.maxX0 < this.__o) {
var1.maxX0 = this.__o;
if (var1.maxX0 < this.field1076) {
var1.maxX0 = this.field1076;
}
if(var1.minY0 > this.__u) {
var1.minY0 = this.__u;
if (var1.minY0 > this.field1077) {
var1.minY0 = this.field1077;
}
if(var1.maxY0 < this.__u) {
var1.maxY0 = this.__u;
if (var1.maxY0 < this.field1077) {
var1.maxY0 = this.field1077;
}
}
@@ -110,7 +110,7 @@ public class WorldMapSection1 implements WorldMapSection {
)
@Export("containsCoord")
public boolean containsCoord(int var1, int var2, int var3) {
return var1 >= this.__m && var1 < this.__m + this.__f?var2 >= (this.__q << 6) + (this.__g << 3) && var2 <= (this.__q << 6) + (this.__g << 3) + 7 && var3 >= (this.__w << 6) + (this.__l << 3) && var3 <= (this.__w << 6) + (this.__l << 3) + 7:false;
return var1 >= this.field1072 && var1 < this.field1072 + this.field1073 ? var2 >= (this.field1074 << 6) + (this.field1078 << 3) && var2 <= (this.field1074 << 6) + (this.field1078 << 3) + 7 && var3 >= (this.field1075 << 6) + (this.field1079 << 3) && var3 <= (this.field1075 << 6) + (this.field1079 << 3) + 7 : false;
}
@ObfuscatedName("q")
@@ -120,7 +120,7 @@ public class WorldMapSection1 implements WorldMapSection {
)
@Export("containsPosition")
public boolean containsPosition(int var1, int var2) {
return var1 >= (this.__o << 6) + (this.__e << 3) && var1 <= (this.__o << 6) + (this.__e << 3) + 7 && var2 >= (this.__u << 6) + (this.__x << 3) && var2 <= (this.__u << 6) + (this.__x << 3) + 7;
return var1 >= (this.field1076 << 6) + (this.field1080 << 3) && var1 <= (this.field1076 << 6) + (this.field1080 << 3) + 7 && var2 >= (this.field1077 << 6) + (this.field1081 << 3) && var2 <= (this.field1077 << 6) + (this.field1081 << 3) + 7;
}
@ObfuscatedName("w")
@@ -130,10 +130,10 @@ public class WorldMapSection1 implements WorldMapSection {
)
@Export("position")
public int[] position(int var1, int var2, int var3) {
if(!this.containsCoord(var1, var2, var3)) {
if (!this.containsCoord(var1, var2, var3)) {
return null;
} else {
int[] var4 = new int[]{this.__o * 64 - this.__q * 64 + var2 + (this.__e * 8 - this.__g * 8), var3 + (this.__u * 64 - this.__w * 64) + (this.__x * 8 - this.__l * 8)};
int[] var4 = new int[]{this.field1076 * 64 - this.field1074 * 64 + var2 + (this.field1080 * 8 - this.field1078 * 8), var3 + (this.field1077 * 64 - this.field1075 * 64) + (this.field1081 * 8 - this.field1079 * 8)};
return var4;
}
}
@@ -145,12 +145,12 @@ public class WorldMapSection1 implements WorldMapSection {
)
@Export("coord")
public TileLocation coord(int var1, int var2) {
if(!this.containsPosition(var1, var2)) {
if (!this.containsPosition(var1, var2)) {
return null;
} else {
int var3 = this.__q * 64 - this.__o * 64 + (this.__g * 8 - this.__e * 8) + var1;
int var4 = this.__w * 64 - this.__u * 64 + var2 + (this.__l * 8 - this.__x * 8);
return new TileLocation(this.__m, var3, var4);
int var3 = this.field1074 * 64 - this.field1076 * 64 + (this.field1078 * 8 - this.field1080 * 8) + var1;
int var4 = this.field1075 * 64 - this.field1077 * 64 + var2 + (this.field1079 * 8 - this.field1081 * 8);
return new TileLocation(this.field1072, var3, var4);
}
}
@@ -161,17 +161,17 @@ public class WorldMapSection1 implements WorldMapSection {
)
@Export("read")
public void read(Buffer var1) {
this.__m = var1.readUnsignedByte();
this.__f = var1.readUnsignedByte();
this.__q = var1.__ag_302();
this.__g = var1.readUnsignedByte();
this.__w = var1.__ag_302();
this.__l = var1.readUnsignedByte();
this.__o = var1.__ag_302();
this.__e = var1.readUnsignedByte();
this.__u = var1.__ag_302();
this.__x = var1.readUnsignedByte();
this.__g_84();
this.field1072 = var1.readUnsignedByte();
this.field1073 = var1.readUnsignedByte();
this.field1074 = var1.method43();
this.field1078 = var1.readUnsignedByte();
this.field1075 = var1.method43();
this.field1079 = var1.readUnsignedByte();
this.field1076 = var1.method43();
this.field1080 = var1.readUnsignedByte();
this.field1077 = var1.method43();
this.field1081 = var1.readUnsignedByte();
this.method424();
}
@ObfuscatedName("g")
@@ -179,7 +179,7 @@ public class WorldMapSection1 implements WorldMapSection {
signature = "(I)V",
garbageValue = "2026323437"
)
void __g_84() {
void method424() {
}
@ObfuscatedName("m")
@@ -190,12 +190,12 @@ public class WorldMapSection1 implements WorldMapSection {
@Export("getKitDefinition")
public static KitDefinition getKitDefinition(int var0) {
KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0);
if(var1 != null) {
if (var1 != null) {
return var1;
} else {
byte[] var2 = KitDefinition.KitDefinition_indexCache.takeRecord(3, var0);
var1 = new KitDefinition();
if(var2 != null) {
if (var2 != null) {
var1.read(new Buffer(var2));
}
@@ -212,20 +212,20 @@ public class WorldMapSection1 implements WorldMapSection {
static void method808() {
Client.mouseLastLastPressedTimeMillis = 1L;
Projectile.mouseRecorder.index = 0;
class230.__hy_az = true;
Client.__client_cw = true;
Client.__client_pp = -1L;
class230.field1138 = true;
Client.field166 = true;
Client.field126 = -1L;
class68.method1694();
Client.packetWriter.__m_165();
Client.packetWriter.method239();
Client.packetWriter.packetBuffer.index = 0;
Client.packetWriter.serverPacket0 = null;
Client.packetWriter.__k = null;
Client.packetWriter.__n = null;
Client.packetWriter.__i = null;
Client.packetWriter.field676 = null;
Client.packetWriter.field677 = null;
Client.packetWriter.field678 = null;
Client.packetWriter.serverPacket0Length = 0;
Client.packetWriter.__x = 0;
Client.packetWriter.field674 = 0;
Client.rebootTimer = 0;
Client.__client_fd = 0;
Client.field175 = 0;
Client.hintArrowType = 0;
Client.menuOptionsCount = 0;
Client.isMenuOpen = false;
@@ -238,7 +238,7 @@ public class WorldMapSection1 implements WorldMapSection {
Client.oculusOrbState = 0;
ClientParameter.field3645 = null;
Client.minimapState = 0;
Client.__client_ph = -1;
Client.field125 = -1;
Client.destinationX = 0;
Client.destinationY = 0;
Client.playerAttackOption = AttackOption.AttackOption_hidden;
@@ -247,16 +247,16 @@ public class WorldMapSection1 implements WorldMapSection {
Players.Players_count = 0;
int var0;
for(var0 = 0; var0 < 2048; ++var0) {
Players.__cq_o[var0] = null;
Players.__cq_w[var0] = 1;
for (var0 = 0; var0 < 2048; ++var0) {
Players.field733[var0] = null;
Players.field732[var0] = 1;
}
for(var0 = 0; var0 < 2048; ++var0) {
for (var0 = 0; var0 < 2048; ++var0) {
Client.players[var0] = null;
}
for(var0 = 0; var0 < 32768; ++var0) {
for (var0 = 0; var0 < 32768; ++var0) {
Client.npcs[var0] = null;
}
@@ -264,20 +264,20 @@ public class WorldMapSection1 implements WorldMapSection {
Client.projectiles.clear();
Client.graphicsObjects.clear();
for(var0 = 0; var0 < 4; ++var0) {
for(int var1 = 0; var1 < 104; ++var1) {
for(int var2 = 0; var2 < 104; ++var2) {
for (var0 = 0; var0 < 4; ++var0) {
for (int var1 = 0; var1 < 104; ++var1) {
for (int var2 = 0; var2 < 104; ++var2) {
Client.groundItems[var0][var1][var2] = null;
}
}
}
Client.__client_kh = new NodeDeque();
Client.field214 = new NodeDeque();
WorldMapArea.friendSystem.clear();
for(var0 = 0; var0 < VarpDefinition.__ix_f; ++var0) {
for (var0 = 0; var0 < VarpDefinition.field944; ++var0) {
VarpDefinition var3 = SecureRandomCallable.method1140(var0);
if(var3 != null) {
if (var3 != null) {
Varps.Varps_temp[var0] = 0;
Varps.Varps_main[var0] = 0;
}
@@ -285,22 +285,22 @@ public class WorldMapSection1 implements WorldMapSection {
class196.varcs.clearTransient();
Client.followerIndex = -1;
if(Client.rootWidgetGroup != -1) {
if (Client.rootWidgetGroup != -1) {
AbstractByteArrayCopier.unloadWidgetGroup(Client.rootWidgetGroup);
}
for(WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.first(); var4 != null; var4 = (WidgetGroupParent)Client.widgetGroupParents.next()) {
for (WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.first(); var4 != null; var4 = (WidgetGroupParent)Client.widgetGroupParents.next()) {
MenuAction.closeWidgetGroup(var4, true);
}
Client.rootWidgetGroup = -1;
Client.widgetGroupParents = new NodeHashTable(8);
Client.__client_mo = null;
Client.field127 = null;
Client.menuOptionsCount = 0;
Client.isMenuOpen = false;
Client.__client_ru.__m_385((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1);
Client.field119.method256((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1);
for(var0 = 0; var0 < 8; ++var0) {
for (var0 = 0; var0 < 8; ++var0) {
Client.playerMenuActions[var0] = null;
Client.playerOptionsPriorities[var0] = false;
}
@@ -308,14 +308,14 @@ public class WorldMapSection1 implements WorldMapSection {
SpriteMask.method4389();
Client.isLoading = true;
for(var0 = 0; var0 < 100; ++var0) {
Client.__client_od[var0] = true;
for (var0 = 0; var0 < 100; ++var0) {
Client.field100[var0] = true;
}
AbstractByteArrayCopier.method4024();
PacketWriter.clanChat = null;
for(var0 = 0; var0 < 8; ++var0) {
for (var0 = 0; var0 < 8; ++var0) {
Client.grandExchangeOffers[var0] = new GrandExchangeOffer();
}