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

@@ -66,11 +66,11 @@ public class TextureProvider implements TextureLoader {
this.remaining = this.capacity;
this.brightness0 = var4;
this.textureSize = var6;
int[] var7 = var1.__j_395(0);
int[] var7 = var1.method3(0);
int var8 = var7.length;
this.textures = new Texture[var1.__s_396(0)];
this.textures = new Texture[var1.method4(0)];
for(int var9 = 0; var9 < var8; ++var9) {
for (int var9 = 0; var9 < var8; ++var9) {
Buffer var10 = new Buffer(var1.takeRecord(0, var7[var9]));
this.textures[var7[var9]] = new Texture(var10);
}
@@ -82,27 +82,27 @@ public class TextureProvider implements TextureLoader {
signature = "(I)I",
garbageValue = "-1996487053"
)
public int __m_212() {
public int method323() {
int var1 = 0;
int var2 = 0;
Texture[] var3 = this.textures;
for(int var4 = 0; var4 < var3.length; ++var4) {
for (int var4 = 0; var4 < var3.length; ++var4) {
Texture var5 = var3[var4];
if(var5 != null && var5.records != null) {
if (var5 != null && var5.records != null) {
var1 += var5.records.length;
int[] var6 = var5.records;
for(int var7 = 0; var7 < var6.length; ++var7) {
for (int var7 = 0; var7 < var6.length; ++var7) {
int var8 = var6[var7];
if(this.indexCache.__u_393(var8)) {
if (this.indexCache.method1(var8)) {
++var2;
}
}
}
}
if(var1 == 0) {
if (var1 == 0) {
return 0;
} else {
return var2 * 100 / var1;
@@ -124,16 +124,16 @@ public class TextureProvider implements TextureLoader {
@Export("load")
public int[] load(int var1) {
Texture var2 = this.textures[var1];
if(var2 != null) {
if(var2.pixels != null) {
if (var2 != null) {
if (var2.pixels != null) {
this.deque.addLast(var2);
var2.isLoaded = true;
return var2.pixels;
}
boolean var3 = var2.__m_230(this.brightness0, this.textureSize, this.indexCache);
if(var3) {
if(this.remaining == 0) {
boolean var3 = var2.method320(this.brightness0, this.textureSize, this.indexCache);
if (var3) {
if (this.remaining == 0) {
Texture var4 = (Texture)this.deque.removeFirst();
var4.reset();
} else {
@@ -154,8 +154,8 @@ public class TextureProvider implements TextureLoader {
signature = "(II)I",
garbageValue = "-1641984961"
)
public int __w_213(int var1) {
return this.textures[var1] != null?this.textures[var1].int1:0;
public int vmethod324(int var1) {
return this.textures[var1] != null ? this.textures[var1].int1 : 0;
}
@ObfuscatedName("o")
@@ -163,8 +163,8 @@ public class TextureProvider implements TextureLoader {
signature = "(IB)Z",
garbageValue = "14"
)
public boolean __o_214(int var1) {
return this.textures[var1].__u;
public boolean vmethod325(int var1) {
return this.textures[var1].field893;
}
@ObfuscatedName("u")
@@ -184,8 +184,8 @@ public class TextureProvider implements TextureLoader {
)
@Export("clear")
public void clear() {
for(int var1 = 0; var1 < this.textures.length; ++var1) {
if(this.textures[var1] != null) {
for (int var1 = 0; var1 < this.textures.length; ++var1) {
if (this.textures[var1] != null) {
this.textures[var1].reset();
}
}
@@ -201,9 +201,9 @@ public class TextureProvider implements TextureLoader {
)
@Export("animate")
public void animate(int var1) {
for(int var2 = 0; var2 < this.textures.length; ++var2) {
for (int var2 = 0; var2 < this.textures.length; ++var2) {
Texture var3 = this.textures[var2];
if(var3 != null && var3.animationDirection != 0 && var3.isLoaded) {
if (var3 != null && var3.animationDirection != 0 && var3.isLoaded) {
var3.Texture_animate(var1);
var3.isLoaded = false;
}
@@ -220,7 +220,7 @@ public class TextureProvider implements TextureLoader {
int var2 = var0.index;
byte[] var3 = class230.method4516(var1);
var0.writeSmartByteShort(var3.length);
var0.index += class303.huffman.__m_293(var3, 0, var3.length, var0.array, var0.index);
var0.index += class303.huffman.method127(var3, 0, var3.length, var0.array, var0.index);
return var0.index - var2;
}
@@ -231,19 +231,19 @@ public class TextureProvider implements TextureLoader {
)
@Export("byteArrayFromObject")
public static byte[] byteArrayFromObject(Object var0, boolean var1) {
if(var0 == null) {
if (var0 == null) {
return null;
} else if(var0 instanceof byte[]) {
byte[] var6 = (byte[])((byte[])var0);
if(var1) {
int var4 = var6.length;
byte[] var5 = new byte[var4];
System.arraycopy(var6, 0, var5, 0, var4);
return var5;
} else if (var0 instanceof byte[]) {
byte[] var5 = (byte[])((byte[])((byte[])var0));
if (var1) {
int var3 = var5.length;
byte[] var4 = new byte[var3];
System.arraycopy(var5, 0, var4, 0, var3);
return var4;
} else {
return var6;
return var5;
}
} else if(var0 instanceof AbstractByteArrayCopier) {
} else if (var0 instanceof AbstractByteArrayCopier) {
AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0;
return var2.get();
} else {
@@ -261,10 +261,10 @@ public class TextureProvider implements TextureLoader {
Buffer var4 = new Buffer(var0);
int var5 = -1;
label69:
while(true) {
int var6 = var4.__at_308();
if(var6 == 0) {
label71:
while (true) {
int var6 = var4.method49();
if (var6 == 0) {
return var3;
}
@@ -272,39 +272,51 @@ public class TextureProvider implements TextureLoader {
int var7 = 0;
boolean var8 = false;
while(true) {
int var9;
while(!var8) {
var9 = var4.__ae_307();
if(var9 == 0) {
continue label69;
}
while (true) {
int var12;
ObjectDefinition var15;
do {
int var13;
int var14;
do {
do {
do {
do {
int var9;
while (var8) {
var9 = var4.method48();
if (var9 == 0) {
continue label71;
}
var7 += var9 - 1;
int var10 = var7 & 63;
int var11 = var7 >> 6 & 63;
int var12 = var4.readUnsignedByte() >> 2;
int var13 = var11 + var1;
int var14 = var10 + var2;
if(var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) {
ObjectDefinition var15 = class50.getObjectDefinition(var5);
if(var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) {
if(!var15.__g_422()) {
++Client.__client_fk;
var3 = false;
}
var4.readUnsignedByte();
}
var8 = true;
}
}
var9 = var4.method48();
if (var9 == 0) {
continue label71;
}
var7 += var9 - 1;
int var10 = var7 & 63;
int var11 = var7 >> 6 & 63;
var12 = var4.readUnsignedByte() >> 2;
var13 = var11 + var1;
var14 = var10 + var2;
} while(var13 <= 0);
} while(var14 <= 0);
} while(var13 >= 103);
} while(var14 >= 103);
var15 = class50.getObjectDefinition(var5);
} while(var12 == 22 && Client.isLowDetail && var15.int1 == 0 && var15.interactType != 1 && !var15.boolean2);
if (!var15.method231()) {
++Client.field179;
var3 = false;
}
var9 = var4.__ae_307();
if(var9 == 0) {
break;
}
var4.readUnsignedByte();
var8 = true;
}
}
}
@@ -317,93 +329,93 @@ public class TextureProvider implements TextureLoader {
static int method2752(int var0, Script var1, boolean var2) {
int var3;
int var4;
if(var0 == 4000) {
if (var0 == 4000) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + var4;
return 1;
} else if(var0 == 4001) {
} else if (var0 == 4001) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 - var4;
return 1;
} else if(var0 == 4002) {
} else if (var0 == 4002) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 * var3;
return 1;
} else if(var0 == 4003) {
} else if (var0 == 4003) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 / var4;
return 1;
} else if(var0 == 4004) {
} else if (var0 == 4004) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3);
return 1;
} else if(var0 == 4005) {
} else if (var0 == 4005) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1));
return 1;
} else if(var0 == 4006) {
} else if (var0 == 4006) {
RouteStrategy.Interpreter_intStackSize -= 5;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
int var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
int var11 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
int var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
int var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5);
int var12 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + (var12 - var11) * (var4 - var3) / (var6 - var11);
return 1;
} else if(var0 == 4007) {
} else if (var0 == 4007) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100;
return 1;
} else if(var0 == 4008) {
} else if (var0 == 4008) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 | 1 << var4;
return 1;
} else if(var0 == 4009) {
} else if (var0 == 4009) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4);
return 1;
} else if(var0 == 4010) {
} else if (var0 == 4010) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0?1:0;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0;
return 1;
} else if(var0 == 4011) {
} else if (var0 == 4011) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 % var4;
return 1;
} else if(var0 == 4012) {
} else if (var0 == 4012) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
if(var3 == 0) {
if (var3 == 0) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4);
}
return 1;
} else if(var0 == 4013) {
} else if (var0 == 4013) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
if(var3 == 0) {
if (var3 == 0) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
return 1;
} else {
@@ -429,24 +441,24 @@ public class TextureProvider implements TextureLoader {
return 1;
}
} else if(var0 == 4014) {
} else if (var0 == 4014) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & var4;
return 1;
} else if(var0 == 4015) {
} else if (var0 == 4015) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 | var4;
return 1;
} else if(var0 == 4018) {
} else if (var0 == 4018) {
RouteStrategy.Interpreter_intStackSize -= 3;
long var9 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
long var11 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
long var13 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11);
long var5 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
long var7 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
long var9 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(var9 * var5 / var7);
return 1;
} else {
return 2;
@@ -463,14 +475,14 @@ public class TextureProvider implements TextureLoader {
FontName.method5641();
class65.scene.clear();
for(int var0 = 0; var0 < 4; ++var0) {
for (int var0 = 0; var0 < 4; ++var0) {
Client.collisionMaps[var0].clear();
}
System.gc();
AbstractSocket.method3488(2);
Client.__client_qy = -1;
Client.__client_qq = false;
Client.field112 = -1;
Client.field107 = false;
SpriteMask.method4390();
GameShell.updateGameState(10);
}