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,71 +23,64 @@ public class IndexStoreActionHandler implements Runnable {
@ObfuscatedGetter(
intValue = -1282224505
)
static int __iv_q;
static int field412;
@ObfuscatedName("w")
@Export("IndexStoreActionHandler_lock")
static Object IndexStoreActionHandler_lock;
static {
IndexStoreActionHandler_requestQueue = new NodeDeque();
IndexStoreActionHandler_responseQueue = new NodeDeque();
__iv_q = 0;
IndexStoreActionHandler_lock = new Object();
}
@Export("run")
@ObfuscatedName("run")
public void run() {
try {
while(true) {
NodeDeque var2 = IndexStoreActionHandler_requestQueue;
IndexStoreAction var1;
while (true) {
NodeDeque var1 = IndexStoreActionHandler_requestQueue;
IndexStoreAction var2;
synchronized(IndexStoreActionHandler_requestQueue) {
var1 = (IndexStoreAction)IndexStoreActionHandler_requestQueue.last();
var2 = (IndexStoreAction)IndexStoreActionHandler_requestQueue.last();
}
Object var14;
if(var1 != null) {
if(var1.type == 0) {
var1.indexStore.write((int)var1.key, var1.data, var1.data.length);
var2 = IndexStoreActionHandler_requestQueue;
Object var3;
if (var2 != null) {
if (var2.type == 0) {
var2.indexStore.write((int)var2.key, var2.data, var2.data.length);
var1 = IndexStoreActionHandler_requestQueue;
synchronized(IndexStoreActionHandler_requestQueue) {
var1.remove();
var2.remove();
}
} else if(var1.type == 1) {
var1.data = var1.indexStore.read((int)var1.key);
var2 = IndexStoreActionHandler_requestQueue;
} else if (var2.type == 1) {
var2.data = var2.indexStore.read((int)var2.key);
var1 = IndexStoreActionHandler_requestQueue;
synchronized(IndexStoreActionHandler_requestQueue) {
IndexStoreActionHandler_responseQueue.addFirst(var1);
IndexStoreActionHandler_responseQueue.addFirst(var2);
}
}
var14 = IndexStoreActionHandler_lock;
var3 = IndexStoreActionHandler_lock;
synchronized(IndexStoreActionHandler_lock) {
if(__iv_q <= 1) {
__iv_q = 0;
if (field412 <= 1) {
field412 = 0;
IndexStoreActionHandler_lock.notifyAll();
return;
}
__iv_q = 600;
field412 = 600;
}
} else {
class203.method4010(100L);
var14 = IndexStoreActionHandler_lock;
var3 = IndexStoreActionHandler_lock;
synchronized(IndexStoreActionHandler_lock) {
if(__iv_q <= 1) {
__iv_q = 0;
if (field412 <= 1) {
field412 = 0;
IndexStoreActionHandler_lock.notifyAll();
return;
}
--__iv_q;
--field412;
}
}
}
} catch (Exception var13) {
NpcDefinition.sendStackTrace((String)null, var13);
} catch (Exception var14) {
NPCDefinition.sendStackTrace((String)null, var14);
}
}
@@ -97,11 +90,19 @@ public class IndexStoreActionHandler implements Runnable {
garbageValue = "67"
)
static final void method4655(String var0) {
if(PacketWriter.clanChat != null) {
PacketBufferNode var1 = Interpreter.method1915(ClientPacket.__gs_i, Client.packetWriter.isaacCipher);
if (PacketWriter.clanChat != null) {
PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field235, Client.packetWriter.isaacCipher);
var1.packetBuffer.writeByte(WorldMapRegion.method550(var0));
var1.packetBuffer.writeStringCp1252NullTerminated(var0);
Client.packetWriter.__q_167(var1);
Client.packetWriter.method241(var1);
}
}
static {
IndexStoreActionHandler_requestQueue = new NodeDeque();
IndexStoreActionHandler_responseQueue = new NodeDeque();
field412 = 0;
IndexStoreActionHandler_lock = new Object();
}
}