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

@@ -74,7 +74,7 @@ public class ScriptEvent extends Node {
@ObfuscatedGetter(
intValue = -2138736593
)
int __d;
int field772;
@ObfuscatedName("k")
@ObfuscatedGetter(
intValue = -161292529
@@ -112,51 +112,51 @@ public class ScriptEvent extends Node {
garbageValue = "0"
)
static int method1185(int var0, Script var1, boolean var2) {
Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
if(var0 == 1600) {
Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
if (var0 == 1600) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollX;
return 1;
} else if(var0 == 1601) {
} else if (var0 == 1601) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollY;
return 1;
} else if(var0 == 1602) {
} else if (var0 == 1602) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text;
return 1;
} else if(var0 == 1603) {
} else if (var0 == 1603) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollWidth;
return 1;
} else if(var0 == 1604) {
} else if (var0 == 1604) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollHeight;
return 1;
} else if(var0 == 1605) {
} else if (var0 == 1605) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelZoom;
return 1;
} else if(var0 == 1606) {
} else if (var0 == 1606) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleX;
return 1;
} else if(var0 == 1607) {
} else if (var0 == 1607) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleZ;
return 1;
} else if(var0 == 1608) {
} else if (var0 == 1608) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleY;
return 1;
} else if(var0 == 1609) {
} else if (var0 == 1609) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.transparency;
return 1;
} else if(var0 == 1610) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__af;
} else if (var0 == 1610) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field960;
return 1;
} else if(var0 == 1611) {
} else if (var0 == 1611) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color;
return 1;
} else if(var0 == 1612) {
} else if (var0 == 1612) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color2;
return 1;
} else if(var0 == 1613) {
} else if (var0 == 1613) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal();
return 1;
} else if(var0 == 1614) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__bv?1:0;
} else if (var0 == 1614) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field964 ? 1 : 0;
return 1;
} else {
return 2;
@@ -169,119 +169,119 @@ public class ScriptEvent extends Node {
garbageValue = "1256509027"
)
static int method1187(int var0, Script var1, boolean var2) {
if(var0 == 3300) {
if (var0 == 3300) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cycle;
return 1;
} else {
int var3;
int var4;
if(var0 == 3301) {
if (var0 == 3301) {
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] = class83.method2027(var3, var4);
return 1;
} else if(var0 == 3302) {
} else if (var0 == 3302) {
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] = WorldMapLabel.method442(var3, var4);
return 1;
} else if(var0 == 3303) {
} else if (var0 == 3303) {
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] = class1.method18(var3, var4);
return 1;
} else if(var0 == 3304) {
} else if (var0 == 3304) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class231.method4523(var3).size;
return 1;
} else if(var0 == 3305) {
} else if (var0 == 3305) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.currentLevels[var3];
return 1;
} else if(var0 == 3306) {
} else if (var0 == 3306) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.levels[var3];
return 1;
} else if(var0 == 3307) {
} else if (var0 == 3307) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.experience[var3];
return 1;
} else {
int var5;
if(var0 == 3308) {
if (var0 == 3308) {
var3 = SoundSystem.plane;
var4 = (Canvas.localPlayer.x >> 7) + class50.baseX;
var5 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28);
return 1;
} else if(var0 == 3309) {
} else if (var0 == 3309) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 >> 14 & 16383;
return 1;
} else if(var0 == 3310) {
} else if (var0 == 3310) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 >> 28;
return 1;
} else if(var0 == 3311) {
} else if (var0 == 3311) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & 16383;
return 1;
} else if(var0 == 3312) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.isMembersWorld?1:0;
} else if (var0 == 3312) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0;
return 1;
} else if(var0 == 3313) {
} else if (var0 == 3313) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] + 32768;
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class83.method2027(var3, var4);
return 1;
} else if(var0 == 3314) {
} else if (var0 == 3314) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] + 32768;
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapLabel.method442(var3, var4);
return 1;
} else if(var0 == 3315) {
} else if (var0 == 3315) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] + 32768;
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class1.method18(var3, var4);
return 1;
} else if(var0 == 3316) {
if(Client.rights >= 2) {
} else if (var0 == 3316) {
if (Client.rights >= 2) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rights;
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
}
return 1;
} else if(var0 == 3317) {
} else if (var0 == 3317) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rebootTimer;
return 1;
} else if(var0 == 3318) {
} else if (var0 == 3318) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.worldId;
return 1;
} else if(var0 == 3321) {
} else if (var0 == 3321) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.runEnergy;
return 1;
} else if(var0 == 3322) {
} else if (var0 == 3322) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.weight;
return 1;
} else if(var0 == 3323) {
if(Client.__client_mn) {
} else if (var0 == 3323) {
if (Client.field155) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
}
return 1;
} else if(var0 == 3324) {
} else if (var0 == 3324) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.worldProperties;
return 1;
} else if(var0 == 3325) {
} else if (var0 == 3325) {
RouteStrategy.Interpreter_intStackSize -= 4;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
@@ -307,12 +307,12 @@ public class ScriptEvent extends Node {
static void method1183(int var0, int var1) {
int[] var2 = new int[9];
for(int var3 = 0; var3 < var2.length; ++var3) {
for (int var3 = 0; var3 < var2.length; ++var3) {
int var4 = var3 * 32 + 15 + 128;
int var5 = var4 * 3 + 600;
int var7 = Rasterizer3D.Rasterizer3D_sine[var4];
int var6 = method1176(var5, var1);
var2[var3] = var6 * var7 >> 16;
int var6 = Rasterizer3D.Rasterizer3D_sine[var4];
int var7 = method1176(var5, var1);
var2[var3] = var7 * var6 >> 16;
}
Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334);
@@ -325,13 +325,13 @@ public class ScriptEvent extends Node {
)
static int method1176(int var0, int var1) {
int var2 = var1 - 334;
if(var2 < 0) {
if (var2 < 0) {
var2 = 0;
} else if(var2 > 100) {
} else if (var2 > 100) {
var2 = 100;
}
int var3 = (Client.__client_rb - Client.__client_re) * var2 / 100 + Client.__client_re;
int var3 = (Client.field149 - Client.field150) * var2 / 100 + Client.field150;
return var0 * var3 / 256;
}
@@ -341,8 +341,8 @@ public class ScriptEvent extends Node {
garbageValue = "35"
)
static final void method1179() {
for(class68 var0 = (class68)Client.__client_kh.last(); var0 != null; var0 = (class68)Client.__client_kh.previous()) {
if(var0.field910 == -1) {
for (class68 var0 = (class68)Client.field214.last(); var0 != null; var0 = (class68)Client.field214.previous()) {
if (var0.field910 == -1) {
var0.field909 = 0;
class13.method165(var0);
} else {