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

@@ -29,22 +29,22 @@ public class ViewportMouse {
@ObfuscatedGetter(
intValue = 1135175963
)
static int __dm_u;
static int field951;
@ObfuscatedName("g")
@ObfuscatedGetter(
intValue = 262104267
)
static int __dm_g;
static int field952;
@ObfuscatedName("l")
@ObfuscatedGetter(
intValue = -2071972829
)
static int __dm_l;
static int field953;
@ObfuscatedName("k")
@ObfuscatedGetter(
intValue = -852671813
)
static int __dm_k;
static int field954;
@ObfuscatedName("i")
@ObfuscatedGetter(
intValue = -2140977119
@@ -55,15 +55,6 @@ public class ViewportMouse {
@Export("ViewportMouse_entityTags")
public static long[] ViewportMouse_entityTags;
static {
ViewportMouse_isInViewport = false;
ViewportMouse_x = 0;
ViewportMouse_y = 0;
ViewportMouse_false0 = false;
ViewportMouse_entityCount = 0;
ViewportMouse_entityTags = new long[1000];
}
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(IB)Lic;",
@@ -71,7 +62,7 @@ public class ViewportMouse {
)
@Export("getWorldMapElement")
public static WorldMapElement getWorldMapElement(int var0) {
return var0 >= 0 && var0 < Widget.WorldMapElement_cached.length && Widget.WorldMapElement_cached[var0] != null?Widget.WorldMapElement_cached[var0]:new WorldMapElement(var0);
return var0 >= 0 && var0 < Widget.WorldMapElement_cached.length && Widget.WorldMapElement_cached[var0] != null ? Widget.WorldMapElement_cached[var0] : new WorldMapElement(var0);
}
@ObfuscatedName("h")
@@ -81,22 +72,22 @@ public class ViewportMouse {
)
static int method2983(int var0, Script var1, boolean var2) {
Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
if(var0 == 2500) {
if (var0 == 2500) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.x;
return 1;
} else if(var0 == 2501) {
} else if (var0 == 2501) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.y;
return 1;
} else if(var0 == 2502) {
} else if (var0 == 2502) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.width;
return 1;
} else if(var0 == 2503) {
} else if (var0 == 2503) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.height;
return 1;
} else if(var0 == 2504) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden?1:0;
} else if (var0 == 2504) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
return 1;
} else if(var0 == 2505) {
} else if (var0 == 2505) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.parentId;
return 1;
} else {
@@ -111,40 +102,49 @@ public class ViewportMouse {
)
static final boolean method2957(Widget var0) {
int var1 = var0.contentType;
if(var1 == 205) {
Client.__client_fd = 250;
if (var1 == 205) {
Client.field175 = 250;
return true;
} else {
int var2;
int var3;
if(var1 >= 300 && var1 <= 313) {
if (var1 >= 300 && var1 <= 313) {
var2 = (var1 - 300) / 2;
var3 = var1 & 1;
Client.__client_ru.__f_386(var2, var3 == 1);
Client.field119.method257(var2, var3 == 1);
}
if(var1 >= 314 && var1 <= 323) {
if (var1 >= 314 && var1 <= 323) {
var2 = (var1 - 314) / 2;
var3 = var1 & 1;
Client.__client_ru.__q_387(var2, var3 == 1);
Client.field119.method258(var2, var3 == 1);
}
if(var1 == 324) {
Client.__client_ru.__w_388(false);
if (var1 == 324) {
Client.field119.method259(false);
}
if(var1 == 325) {
Client.__client_ru.__w_388(true);
if (var1 == 325) {
Client.field119.method259(true);
}
if(var1 == 326) {
PacketBufferNode var4 = Interpreter.method1915(ClientPacket.__gs_n, Client.packetWriter.isaacCipher);
Client.__client_ru.__o_389(var4.packetBuffer);
Client.packetWriter.__q_167(var4);
if (var1 == 326) {
PacketBufferNode var4 = Interpreter.method1915(ClientPacket.field234, Client.packetWriter.isaacCipher);
Client.field119.method260(var4.packetBuffer);
Client.packetWriter.method241(var4);
return true;
} else {
return false;
}
}
}
static {
ViewportMouse_isInViewport = false;
ViewportMouse_x = 0;
ViewportMouse_y = 0;
ViewportMouse_false0 = false;
ViewportMouse_entityCount = 0;
ViewportMouse_entityTags = new long[1000];
}
}