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

@@ -14,7 +14,7 @@ public final class PacketBuffer extends Buffer {
@ObfuscatedGetter(
intValue = 701739159
)
public static int __hx_z;
public static int field667;
@ObfuscatedName("e")
@ObfuscatedSignature(
signature = "Lhn;"
@@ -28,10 +28,6 @@ public final class PacketBuffer extends Buffer {
@Export("bitIndex")
int bitIndex;
static {
PacketBuffer_masks = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1};
}
public PacketBuffer(int var1) {
super(var1);
}
@@ -63,7 +59,7 @@ public final class PacketBuffer extends Buffer {
)
@Export("writeByteIsaac")
public void writeByteIsaac(int var1) {
super.array[++super.index - 1] = (byte)(var1 + this.isaacCipher0.__m_336());
super.array[++super.index - 1] = (byte)(var1 + this.isaacCipher0.method136());
}
@ObfuscatedName("ii")
@@ -73,7 +69,7 @@ public final class PacketBuffer extends Buffer {
)
@Export("readByteIsaac")
public int readByteIsaac() {
return super.array[++super.index - 1] - this.isaacCipher0.__m_336() & 255;
return super.array[++super.index - 1] - this.isaacCipher0.method136() & 255;
}
@ObfuscatedName("ig")
@@ -81,8 +77,8 @@ public final class PacketBuffer extends Buffer {
signature = "(B)Z",
garbageValue = "101"
)
public boolean __ig_334() {
int var1 = super.array[super.index] - this.isaacCipher0.__f_337() & 255;
public boolean method236() {
int var1 = super.array[super.index] - this.isaacCipher0.method137() & 255;
return var1 >= 128;
}
@@ -93,8 +89,8 @@ public final class PacketBuffer extends Buffer {
)
@Export("readSmartByteShortIsaac")
public int readSmartByteShortIsaac() {
int var1 = super.array[++super.index - 1] - this.isaacCipher0.__m_336() & 255;
return var1 < 128?var1:(var1 - 128 << 8) + (super.array[++super.index - 1] - this.isaacCipher0.__m_336() & 255);
int var1 = super.array[++super.index - 1] - this.isaacCipher0.method136() & 255;
return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.index - 1] - this.isaacCipher0.method136() & 255);
}
@ObfuscatedName("jb")
@@ -102,9 +98,9 @@ public final class PacketBuffer extends Buffer {
signature = "([BIII)V",
garbageValue = "-1168019189"
)
public void __jb_335(byte[] var1, int var2, int var3) {
for(int var4 = 0; var4 < var3; ++var4) {
var1[var4 + var2] = (byte)(super.array[++super.index - 1] - this.isaacCipher0.__m_336());
public void method237(byte[] var1, int var2, int var3) {
for (int var4 = 0; var4 < var3; ++var4) {
var1[var4 + var2] = (byte)(super.array[++super.index - 1] - this.isaacCipher0.method136());
}
}
@@ -130,12 +126,12 @@ public final class PacketBuffer extends Buffer {
int var3 = 8 - (this.bitIndex & 7);
int var4 = 0;
for(this.bitIndex += var1; var1 > var3; var3 = 8) {
for (this.bitIndex += var1; var1 > var3; var3 = 8) {
var4 += (super.array[var2++] & PacketBuffer_masks[var3]) << var1 - var3;
var1 -= var3;
}
if(var3 == var1) {
if (var3 == var1) {
var4 += super.array[var2] & PacketBuffer_masks[var3];
} else {
var4 += super.array[var2] >> var3 - var1 & PacketBuffer_masks[var1];
@@ -182,22 +178,21 @@ public final class PacketBuffer extends Buffer {
static void requestNetFile(IndexCache var0, int var1, int var2, int var3, byte var4, boolean var5) {
long var6 = (long)((var1 << 16) + var2);
NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6);
if(var8 == null) {
if (var8 == null) {
var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6);
if(var8 == null) {
if (var8 == null) {
var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6);
if(var8 != null) {
if(var5) {
if (var8 != null) {
if (var5) {
var8.removeDual();
NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
--NetCache.NetCache_pendingWritesCount;
++NetCache.NetCache_pendingPriorityWritesCount;
}
} else {
if(!var5) {
if (!var5) {
var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6);
if(var8 != null) {
if (var8 != null) {
return;
}
}
@@ -206,7 +201,7 @@ public final class PacketBuffer extends Buffer {
var8.indexCache = var0;
var8.crc = var3;
var8.padding = var4;
if(var5) {
if (var5) {
NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
++NetCache.NetCache_pendingPriorityWritesCount;
} else {
@@ -214,10 +209,10 @@ public final class PacketBuffer extends Buffer {
NetCache.NetCache_pendingWrites.put(var8, var6);
++NetCache.NetCache_pendingWritesCount;
}
}
}
}
}
@ObfuscatedName("f")
@@ -228,4 +223,8 @@ public final class PacketBuffer extends Buffer {
public static int method4081(int var0, int var1) {
return (var0 + 40000 << 8) + var1;
}
static {
PacketBuffer_masks = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1};
}
}