ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Use newer version of fernflower and remove __xx names

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

90
runescape-client/src/main/java/class1.java
View File

@@ -8,7 +8,7 @@ final class class1 implements class0 {
@ObfuscatedSignature(
signature = "Lir;"
)
public static AbstractIndexCache __f_m;
public static AbstractIndexCache field1105;
@ObfuscatedName("m")
@ObfuscatedSignature(
@@ -25,7 +25,7 @@ final class class1 implements class0 {
garbageValue = "704451908"
)
public Object vmethod46(Buffer var1) {
return Integer.valueOf(var1.readInt());
return var1.readInt();
}
@ObfuscatedName("g")
@@ -34,7 +34,7 @@ final class class1 implements class0 {
garbageValue = "-254123307"
)
void method6(Integer var1, Buffer var2) {
var2.writeInt(var1.intValue());
var2.writeInt(var1);
}
@ObfuscatedName("q")
@@ -53,15 +53,15 @@ final class class1 implements class0 {
)
static int method18(int var0, int var1) {
ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
if(var2 == null) {
if (var2 == null) {
return 0;
} else if(var1 == -1) {
} else if (var1 == -1) {
return 0;
} else {
int var3 = 0;
for(int var4 = 0; var4 < var2.quantities.length; ++var4) {
if(var2.ids[var4] == var1) {
for (int var4 = 0; var4 < var2.quantities.length; ++var4) {
if (var2.ids[var4] == var1) {
var3 += var2.quantities[var4];
}
}
@@ -78,15 +78,15 @@ final class class1 implements class0 {
static int method8(int var0, Script var1, boolean var2) {
int var3 = -1;
Widget var4;
if(var0 >= 2000) {
if (var0 >= 2000) {
var0 -= 1000;
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
var4 = Huffman.getWidget(var3);
} else {
var4 = var2?WorldMapIcon1.__t_i:class12.__n_n;
var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
}
if(var0 == 1000) {
if (var0 == 1000) {
RouteStrategy.Interpreter_intStackSize -= 4;
var4.rawX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4.rawY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
@@ -94,12 +94,12 @@ final class class1 implements class0 {
var4.yAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
class22.method295(var4);
TextureProvider.client.alignWidget(var4);
if(var3 != -1 && var4.type == 0) {
if (var3 != -1 && var4.type == 0) {
class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false);
}
return 1;
} else if(var0 == 1001) {
} else if (var0 == 1001) {
RouteStrategy.Interpreter_intStackSize -= 4;
var4.rawWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4.rawHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
@@ -107,23 +107,23 @@ final class class1 implements class0 {
var4.heightAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
class22.method295(var4);
TextureProvider.client.alignWidget(var4);
if(var3 != -1 && var4.type == 0) {
if (var3 != -1 && var4.type == 0) {
class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false);
}
return 1;
} else if(var0 == 1003) {
} else if (var0 == 1003) {
boolean var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
if(var5 != var4.isHidden) {
if (var5 != var4.isHidden) {
var4.isHidden = var5;
class22.method295(var4);
}
return 1;
} else if(var0 == 1005) {
} else if (var0 == 1005) {
var4.noClickThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
return 1;
} else if(var0 == 1006) {
} else if (var0 == 1006) {
var4.noScrollThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
return 1;
} else {
@@ -138,107 +138,107 @@ final class class1 implements class0 {
)
static int method16(int var0, Script var1, boolean var2) {
int var3;
if(var0 == 4200) {
if (var0 == 4200) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var3).name;
return 1;
} else {
int var4;
ItemDefinition var5;
if(var0 == 4201) {
if (var0 == 4201) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var5 = Skills.getItemDefinition(var3);
if(var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1];
} else {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
}
return 1;
} else if(var0 == 4202) {
} else if (var0 == 4202) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var5 = Skills.getItemDefinition(var3);
if(var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) {
if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1];
} else {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
}
return 1;
} else if(var0 == 4203) {
} else if (var0 == 4203) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).price;
return 1;
} else if(var0 == 4204) {
} else if (var0 == 4204) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isStackable == 1?1:0;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isStackable == 1 ? 1 : 0;
return 1;
} else {
ItemDefinition var6;
if(var0 == 4205) {
if (var0 == 4205) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
var6 = Skills.getItemDefinition(var3);
if(var6.noteTemplate == -1 && var6.note >= 0) {
if (var6.noteTemplate == -1 && var6.note >= 0) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.note;
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3;
}
return 1;
} else if(var0 == 4206) {
} else if (var0 == 4206) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
var6 = Skills.getItemDefinition(var3);
if(var6.noteTemplate >= 0 && var6.note >= 0) {
if (var6.noteTemplate >= 0 && var6.note >= 0) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.note;
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3;
}
return 1;
} else if(var0 == 4207) {
} else if (var0 == 4207) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isMembersOnly?1:0;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isMembersOnly ? 1 : 0;
return 1;
} else if(var0 == 4208) {
} else if (var0 == 4208) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
var6 = Skills.getItemDefinition(var3);
if(var6.placeholderTemplate == -1 && var6.placeholder >= 0) {
if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.placeholder;
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3;
}
return 1;
} else if(var0 == 4209) {
} else if (var0 == 4209) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
var6 = Skills.getItemDefinition(var3);
if(var6.placeholderTemplate >= 0 && var6.placeholder >= 0) {
if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.placeholder;
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3;
}
return 1;
} else if(var0 == 4210) {
} else if (var0 == 4210) {
String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class50.method900(var7, var4 == 1);
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection0.__y_sn;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection0.field1055;
return 1;
} else if(var0 != 4211) {
if(var0 == 4212) {
class231.__hb_sg = 0;
} else if (var0 != 4211) {
if (var0 == 4212) {
class231.field1139 = 0;
return 1;
} else {
return 2;
}
} else {
if(AttackOption.__cj_sp != null && class231.__hb_sg < WorldMapSection0.__y_sn) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.__cj_sp[++class231.__hb_sg - 1] & '\uffff';
if (AttackOption.field30 != null && class231.field1139 < WorldMapSection0.field1055) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.field30[++class231.field1139 - 1] & '\uffff';
} else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
}
@@ -255,8 +255,8 @@ final class class1 implements class0 {
garbageValue = "-370289311"
)
static boolean method15(int var0) {
for(int var1 = 0; var1 < Client.__client_pm; ++var1) {
if(Client.__client_pn[var1] == var0) {
for (int var1 = 0; var1 < Client.field137; ++var1) {
if (Client.field145[var1] == var0) {
return true;
}
}
@@ -272,6 +272,6 @@ final class class1 implements class0 {
@Export("getWidgetClickMask")
static int getWidgetClickMask(Widget var0) {
IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get(((long)var0.id << 32) + (long)var0.childIndex);
return var1 != null?var1.integer:var0.clickMask;
return var1 != null ? var1.integer : var0.clickMask;
}
}