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

@@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature;
@Implements("Formatting")
public class Formatting {
@ObfuscatedName("d")
static int[] __cy_d;
static int[] field353;
@ObfuscatedName("dh")
@ObfuscatedSignature(
signature = "Lit;"
@@ -21,19 +21,19 @@ public class Formatting {
garbageValue = "1654486766"
)
static int method2023(int var0, Script var1, boolean var2) {
Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
if(var0 == 1700) {
Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
if (var0 == 1700) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemId;
return 1;
} else if(var0 == 1701) {
if(var3.itemId != -1) {
} else if (var0 == 1701) {
if (var3.itemId != -1) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemQuantity;
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
}
return 1;
} else if(var0 == 1702) {
} else if (var0 == 1702) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.childIndex;
return 1;
} else {
@@ -49,34 +49,34 @@ public class Formatting {
static int method2022(int var0, Script var1, boolean var2) {
int var3;
int var4;
int var6;
if(var0 == 3400) {
int var5;
EnumDefinition var9;
if (var0 == 3400) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
EnumDefinition var5 = Interpreter.getEnum(var3);
if(var5.valType != 's') {
;
var9 = Interpreter.getEnum(var3);
if (var9.valType != 's') {
}
for(var6 = 0; var6 < var5.size0; ++var6) {
if(var4 == var5.keys[var6]) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.stringVals[var6];
var5 = null;
for (var5 = 0; var5 < var9.size0; ++var5) {
if (var4 == var9.keys[var5]) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.stringVals[var5];
var9 = null;
break;
}
}
if(var5 != null) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.defaultString;
if (var9 != null) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.defaultString;
}
return 1;
} else if(var0 != 3408) {
if(var0 == 3411) {
} else if (var0 != 3408) {
if (var0 == 3411) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
EnumDefinition var10 = Interpreter.getEnum(var3);
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.size();
var9 = Interpreter.getEnum(var3);
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var9.size();
return 1;
} else {
return 2;
@@ -85,13 +85,13 @@ public class Formatting {
RouteStrategy.Interpreter_intStackSize -= 4;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
int var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
EnumDefinition var7 = Interpreter.getEnum(var9);
if(var3 == var7.keyType && var4 == var7.valType) {
for(int var8 = 0; var8 < var7.size0; ++var8) {
if(var6 == var7.keys[var8]) {
if(var4 == 115) {
int var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
EnumDefinition var7 = Interpreter.getEnum(var6);
if (var3 == var7.keyType && var4 == var7.valType) {
for (int var8 = 0; var8 < var7.size0; ++var8) {
if (var5 == var7.keys[var8]) {
if (var4 == 115) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.stringVals[var8];
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.intVals[var8];
@@ -102,8 +102,8 @@ public class Formatting {
}
}
if(var7 != null) {
if(var4 == 115) {
if (var7 != null) {
if (var4 == 115) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultString;
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.defaultInt;
@@ -112,7 +112,7 @@ public class Formatting {
return 1;
} else {
if(var4 == 115) {
if (var4 == 115) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "null";
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;