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

@@ -48,33 +48,18 @@ public class Interpreter {
@Export("Interpreter_calendar")
static Calendar Interpreter_calendar;
@ObfuscatedName("z")
static final String[] __bv_z;
static final String[] field422;
@ObfuscatedName("s")
static boolean __bv_s;
static boolean field423;
@ObfuscatedName("t")
static boolean __bv_t;
static boolean field424;
@ObfuscatedName("y")
@ObfuscatedGetter(
intValue = -1019558835
)
static int __bv_y;
static int field425;
@ObfuscatedName("r")
static final double __bv_r;
static {
Interpreter_arrayLengths = new int[5];
Interpreter_arrays = new int[5][5000];
Interpreter_intStack = new int[1000];
Interpreter_stringStack = new String[1000];
Interpreter_frameDepth = 0;
Interpreter_frames = new ScriptFrame[50];
Interpreter_calendar = Calendar.getInstance();
__bv_z = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
__bv_s = false;
__bv_t = false;
__bv_y = 0;
__bv_r = Math.log(2.0D);
}
static final double field426;
@ObfuscatedName("m")
@ObfuscatedSignature(
@@ -83,29 +68,29 @@ public class Interpreter {
)
public static PacketBufferNode method1915(ClientPacket var0, IsaacCipher var1) {
PacketBufferNode var2;
if(PacketBufferNode.__gg_u == 0) {
if (PacketBufferNode.field668 == 0) {
var2 = new PacketBufferNode();
} else {
var2 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.__gg_u];
var2 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.field668];
}
var2.__m = var0;
var2.__f = var0.length;
if(var2.__f == -1) {
var2.field669 = var0;
var2.field670 = var0.length;
if (var2.field670 == -1) {
var2.packetBuffer = new PacketBuffer(260);
} else if(var2.__f == -2) {
} else if (var2.field670 == -2) {
var2.packetBuffer = new PacketBuffer(10000);
} else if(var2.__f <= 18) {
} else if (var2.field670 <= 18) {
var2.packetBuffer = new PacketBuffer(20);
} else if(var2.__f <= 98) {
} else if (var2.field670 <= 98) {
var2.packetBuffer = new PacketBuffer(100);
} else {
var2.packetBuffer = new PacketBuffer(260);
}
var2.packetBuffer.setIsaacCipher(var1);
var2.packetBuffer.writeByteIsaac(var2.__m.id);
var2.__w = 0;
var2.packetBuffer.writeByteIsaac(var2.field669.id);
var2.field671 = 0;
return var2;
}
@@ -117,12 +102,12 @@ public class Interpreter {
@Export("getEnum")
public static EnumDefinition getEnum(int var0) {
EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0);
if(var1 != null) {
if (var1 != null) {
return var1;
} else {
byte[] var2 = EnumDefinition.EnumDefinition_indexCache.takeRecord(8, var0);
var1 = new EnumDefinition();
if(var2 != null) {
if (var2 != null) {
var1.read(new Buffer(var2));
}
@@ -144,8 +129,8 @@ public class Interpreter {
var3[0] = var1;
int var4 = 1;
for(int var5 = 0; var5 < 4; ++var5) {
if(World.sortOption1[var5] != var0) {
for (int var5 = 0; var5 < 4; ++var5) {
if (World.sortOption1[var5] != var0) {
var2[var4] = World.sortOption1[var5];
var3[var4] = World.sortOption2[var5];
++var4;
@@ -165,33 +150,32 @@ public class Interpreter {
public static void method1976() {
try {
File var0 = new File(WorldMapSection1.userHomeDirectory, "random.dat");
int var2;
if(var0.exists()) {
int var1;
if (var0.exists()) {
class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0);
} else {
label38:
for(int var1 = 0; var1 < Canvas.__ao_s.length; ++var1) {
for(var2 = 0; var2 < WorldMapSection2.cacheDirectoryLocations.length; ++var2) {
File var3 = new File(WorldMapSection2.cacheDirectoryLocations[var2] + Canvas.__ao_s[var1] + File.separatorChar + "random.dat");
if(var3.exists()) {
label34:
for (int var2 = 0; var2 < Canvas.field94.length; ++var2) {
for (var1 = 0; var1 < WorldMapSection2.cacheDirectoryLocations.length; ++var1) {
File var3 = new File(WorldMapSection2.cacheDirectoryLocations[var1] + Canvas.field94[var2] + File.separatorChar + "random.dat");
if (var3.exists()) {
class168.randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0);
break label38;
break label34;
}
}
}
}
if(class168.randomDat == null) {
RandomAccessFile var4 = new RandomAccessFile(var0, "rw");
var2 = var4.read();
var4.seek(0L);
var4.write(var2);
var4.seek(0L);
var4.close();
if (class168.randomDat == null) {
RandomAccessFile var5 = new RandomAccessFile(var0, "rw");
var1 = var5.read();
var5.seek(0L);
var5.write(var1);
var5.seek(0L);
var5.close();
class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0);
}
} catch (IOException var5) {
;
} catch (IOException var4) {
}
}
@@ -203,23 +187,35 @@ public class Interpreter {
)
@Export("drawWidgets")
static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
if(GroundItemPile.loadWidgetGroup(var0)) {
class279.__jx_ne = null;
if (GroundItemPile.loadWidgetGroup(var0)) {
class279.field1145 = null;
DevicePcmPlayerProvider.drawWidgetGroup(Widget.widgets[var0], -1, var1, var2, var3, var4, var5, var6, var7);
if(class279.__jx_ne != null) {
DevicePcmPlayerProvider.drawWidgetGroup(class279.__jx_ne, -1412584499, var1, var2, var3, var4, class54.__bs_nb, class157.__fw_nm, var7);
class279.__jx_ne = null;
if (class279.field1145 != null) {
DevicePcmPlayerProvider.drawWidgetGroup(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, class157.field1114, var7);
class279.field1145 = null;
}
} else if (var7 != -1) {
Client.field100[var7] = true;
} else {
if(var7 != -1) {
Client.__client_od[var7] = true;
} else {
for(int var8 = 0; var8 < 100; ++var8) {
Client.__client_od[var8] = true;
}
for (int var8 = 0; var8 < 100; ++var8) {
Client.field100[var8] = true;
}
}
}
static {
Interpreter_arrayLengths = new int[5];
Interpreter_arrays = new int[5][5000];
Interpreter_intStack = new int[1000];
Interpreter_stringStack = new String[1000];
Interpreter_frameDepth = 0;
Interpreter_frames = new ScriptFrame[50];
Interpreter_calendar = Calendar.getInstance();
field422 = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
field423 = false;
field424 = false;
field425 = 0;
field426 = Math.log(2.0D);
}
}