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

@@ -5,20 +5,13 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ht")
public class class226 {
@ObfuscatedName("m")
public static final short[] __ht_m;
public static final short[] field1132;
@ObfuscatedName("f")
public static final short[][] __ht_f;
public static final short[][] field1133;
@ObfuscatedName("q")
public static final short[] __ht_q;
public static final short[] field1134;
@ObfuscatedName("w")
public static final short[][] __ht_w;
static {
__ht_m = new short[]{(short)6798, (short)8741, (short)25238, (short)4626, (short)4550};
__ht_f = new short[][]{{(short)6798, (short)107, (short)10283, (short)16, (short)4797, (short)7744, (short)5799, (short)4634, (short)-31839, (short)22433, (short)2983, (short)-11343, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)8741, (short)12, (short)-1506, (short)-22374, (short)7735, (short)8404, (short)1701, (short)-27106, (short)24094, (short)10153, (short)-8915, (short)4783, (short)1341, (short)16578, (short)-30533, (short)25239, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)25238, (short)8742, (short)12, (short)-1506, (short)-22374, (short)7735, (short)8404, (short)1701, (short)-27106, (short)24094, (short)10153, (short)-8915, (short)4783, (short)1341, (short)16578, (short)-30533, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)4626, (short)11146, (short)6439, (short)12, (short)4758, (short)10270}, {(short)4550, (short)4537, (short)5681, (short)5673, (short)5790, (short)6806, (short)8076, (short)4574, (short)17050, (short)0, (short)127, (short)-31821, (short)-17991}};
__ht_q = new short[]{(short)-10304, (short)9104, (short)-1, (short)-1, (short)-1};
__ht_w = new short[][]{{(short)6554, (short)115, (short)10304, (short)28, (short)5702, (short)7756, (short)5681, (short)4510, (short)-31835, (short)22437, (short)2859, (short)-11339, (short)16, (short)5157, (short)10446, (short)3658, (short)-27314, (short)-21965, (short)472, (short)580, (short)784, (short)21966, (short)28950, (short)-15697, (short)-14002}, {(short)9104, (short)10275, (short)7595, (short)3610, (short)7975, (short)8526, (short)918, (short)-26734, (short)24466, (short)10145, (short)-6882, (short)5027, (short)1457, (short)16565, (short)-30545, (short)25486, (short)24, (short)5392, (short)10429, (short)3673, (short)-27335, (short)-21957, (short)192, (short)687, (short)412, (short)21821, (short)28835, (short)-15460, (short)-14019}, new short[0], new short[0], new short[0]};
}
public static final short[][] field1135;
@ObfuscatedName("d")
@ObfuscatedSignature(
@@ -27,54 +20,54 @@ public class class226 {
)
@Export("getItemSprite")
public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) {
if(var1 == -1) {
if (var1 == -1) {
var4 = 0;
} else if(var4 == 2 && var1 != 1) {
} else if (var4 == 2 && var1 != 1) {
var4 = 1;
}
long var6 = ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40) + ((long)var3 << 42);
Sprite var8;
if(!var5) {
if (!var5) {
var8 = (Sprite)ItemDefinition.Sprite_cached.get(var6);
if(var8 != null) {
if (var8 != null) {
return var8;
}
}
ItemDefinition var9 = Skills.getItemDefinition(var0);
if(var1 > 1 && var9.__az != null) {
if (var1 > 1 && var9.field436 != null) {
int var10 = -1;
for(int var11 = 0; var11 < 10; ++var11) {
if(var1 >= var9.__au[var11] && var9.__au[var11] != 0) {
var10 = var9.__az[var11];
for (int var11 = 0; var11 < 10; ++var11) {
if (var1 >= var9.field437[var11] && var9.field437[var11] != 0) {
var10 = var9.field436[var11];
}
}
if(var10 != -1) {
if (var10 != -1) {
var9 = Skills.getItemDefinition(var10);
}
}
Model var19 = var9.getModel(1);
if(var19 == null) {
if (var19 == null) {
return null;
} else {
Sprite var20 = null;
if(var9.noteTemplate != -1) {
if (var9.noteTemplate != -1) {
var20 = getItemSprite(var9.note, 10, 1, 0, 0, true);
if(var20 == null) {
if (var20 == null) {
return null;
}
} else if(var9.notedId != -1) {
} else if (var9.notedId != -1) {
var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false);
if(var20 == null) {
if (var20 == null) {
return null;
}
} else if(var9.placeholderTemplate != -1) {
} else if (var9.placeholderTemplate != -1) {
var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false);
if(var20 == null) {
if (var20 == null) {
return null;
}
}
@@ -89,56 +82,63 @@ public class class226 {
Rasterizer2D.Rasterizer2D_clear();
Rasterizer3D.Rasterizer3D_method1();
Rasterizer3D.method2989(16, 16);
Rasterizer3D.__et_w = false;
if(var9.placeholderTemplate != -1) {
Rasterizer3D.field741 = false;
if (var9.placeholderTemplate != -1) {
var20.drawAt2(0, 0);
}
int var16 = var9.zoom2d;
if(var5) {
if (var5) {
var16 = (int)((double)var16 * 1.5D);
} else if(var2 == 2) {
} else if (var2 == 2) {
var16 = (int)((double)var16 * 1.04D);
}
int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16;
int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16;
var19.calculateBoundsCylinder();
var19.__c_234(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d);
if(var9.notedId != -1) {
var19.method199(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d);
if (var9.notedId != -1) {
var20.drawAt2(0, 0);
}
if(var2 >= 1) {
var8.__l_502(1);
if (var2 >= 1) {
var8.method307(1);
}
if(var2 >= 2) {
var8.__l_502(16777215);
if (var2 >= 2) {
var8.method307(16777215);
}
if(var3 != 0) {
var8.__e_503(var3);
if (var3 != 0) {
var8.method308(var3);
}
Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
if(var9.noteTemplate != -1) {
if (var9.noteTemplate != -1) {
var20.drawAt2(0, 0);
}
if(var4 == 1 || var4 == 2 && var9.isStackable == 1) {
class204.__gx_n.draw(class196.method3735(var1), 0, 9, 16776960, 1);
if (var4 == 1 || var4 == 2 && var9.isStackable == 1) {
class204.field1122.draw(class196.method3735(var1), 0, 9, 16776960, 1);
}
if(!var5) {
if (!var5) {
ItemDefinition.Sprite_cached.put(var8, var6);
}
Rasterizer2D.Rasterizer2D_replace(var12, var13, var14);
Rasterizer2D.Rasterizer2D_setClipArray(var15);
Rasterizer3D.Rasterizer3D_method1();
Rasterizer3D.__et_w = true;
Rasterizer3D.field741 = true;
return var8;
}
}
static {
field1132 = new short[]{6798, 8741, 25238, 4626, 4550};
field1133 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}};
field1134 = new short[]{-10304, 9104, -1, -1, -1};
field1135 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]};
}
}