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

@@ -23,7 +23,7 @@ public class SecureRandomCallable implements Callable {
garbageValue = "64"
)
static class27 method1145(byte[] var0) {
return var0 == null?new class27():new class27(class27.convertJpgToSprite(var0).pixels);
return var0 == null ? new class27() : new class27(class27.convertJpgToSprite(var0).pixels);
}
@ObfuscatedName("m")
@@ -33,12 +33,12 @@ public class SecureRandomCallable implements Callable {
)
public static VarpDefinition method1140(int var0) {
VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0);
if(var1 != null) {
if (var1 != null) {
return var1;
} else {
byte[] var2 = VarpDefinition.__ix_m.takeRecord(16, var0);
byte[] var2 = VarpDefinition.field943.takeRecord(16, var0);
var1 = new VarpDefinition();
if(var2 != null) {
if (var2 != null) {
var1.read(new Buffer(var2));
}
@@ -60,17 +60,17 @@ public class SecureRandomCallable implements Callable {
DevicePcmPlayerProvider.method845(var1);
Widget var4 = Huffman.getWidget(var0);
class22.method295(var4);
if(Client.__client_mo != null) {
class22.method295(Client.__client_mo);
Client.__client_mo = null;
if (Client.field127 != null) {
class22.method295(Client.field127);
Client.field127 = null;
}
int var5;
int var6;
for(var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
if(WorldMapManager.isWidgetMenuOpcode(Client.menuOpcodes[var5])) {
if(var5 < Client.menuOptionsCount - 1) {
for(var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) {
for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
if (WorldMapManager.isWidgetMenuOpcode(Client.menuOpcodes[var5])) {
if (var5 < Client.menuOptionsCount - 1) {
for (var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) {
Client.menuActions[var6] = Client.menuActions[var6 + 1];
Client.menuTargetNames[var6] = Client.menuTargetNames[var6 + 1];
Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1];
@@ -91,19 +91,19 @@ public class SecureRandomCallable implements Callable {
int var7 = class2.fontBold12.stringWidth("Choose Option");
int var8;
for(var8 = 0; var8 < Client.menuOptionsCount; ++var8) {
for (var8 = 0; var8 < Client.menuOptionsCount; ++var8) {
Font var9 = class2.fontBold12;
String var10;
if(var8 < 0) {
if (var8 < 0) {
var10 = "";
} else if(Client.menuTargetNames[var8].length() > 0) {
} else if (Client.menuTargetNames[var8].length() > 0) {
var10 = Client.menuActions[var8] + " " + Client.menuTargetNames[var8];
} else {
var10 = Client.menuActions[var8];
}
int var11 = var9.stringWidth(var10);
if(var11 > var7) {
if (var11 > var7) {
var7 = var11;
}
}
@@ -111,20 +111,20 @@ public class SecureRandomCallable implements Callable {
var7 += 8;
var8 = Client.menuOptionsCount * 15 + 22;
int var12 = var5 - var7 / 2;
if(var12 + var7 > SoundCache.canvasWidth) {
if (var12 + var7 > SoundCache.canvasWidth) {
var12 = SoundCache.canvasWidth - var7;
}
if(var12 < 0) {
if (var12 < 0) {
var12 = 0;
}
int var13 = var6;
if(var8 + var6 > Huffman.canvasHeight) {
if (var8 + var6 > Huffman.canvasHeight) {
var13 = Huffman.canvasHeight - var8;
}
if(var13 < 0) {
if (var13 < 0) {
var13 = 0;
}
@@ -134,7 +134,7 @@ public class SecureRandomCallable implements Callable {
AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22;
class39.revalidateWidgetScroll(Widget.widgets[var0 >> 16], var4, false);
WorldMapSection3.runWidgetOnLoadListener(var1);
if(Client.rootWidgetGroup != -1) {
if (Client.rootWidgetGroup != -1) {
GrandExchangeEvents.method74(Client.rootWidgetGroup, 1);
}