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

197
runescape-client/src/main/java/WorldMapManager.java
View File

@@ -40,7 +40,7 @@ public final class WorldMapManager {
@Export("regions")
WorldMapRegion[][] regions;
@ObfuscatedName("g")
HashMap __g;
HashMap field1045;
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "[Llq;"
@@ -51,12 +51,12 @@ public final class WorldMapManager {
@ObfuscatedSignature(
signature = "Lir;"
)
final AbstractIndexCache __e;
final AbstractIndexCache field1046;
@ObfuscatedName("x")
@ObfuscatedSignature(
signature = "Lir;"
)
final AbstractIndexCache __x;
final AbstractIndexCache field1047;
@ObfuscatedName("d")
@Export("fonts")
final HashMap fonts;
@@ -76,17 +76,17 @@ public final class WorldMapManager {
@ObfuscatedGetter(
intValue = 1729323633
)
int __i;
int field1048;
@ObfuscatedName("a")
@ObfuscatedGetter(
intValue = -395718741
)
int __a;
int field1049;
@ObfuscatedName("z")
@ObfuscatedGetter(
intValue = 1085359673
)
public int __z;
public int field1050;
@ObfuscatedSignature(
signature = "([Llq;Ljava/util/HashMap;Lir;Lir;)V"
@@ -94,12 +94,12 @@ public final class WorldMapManager {
public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractIndexCache var3, AbstractIndexCache var4) {
this.isLoaded0 = false;
this.loadStarted = false;
this.__g = new HashMap();
this.__z = 0;
this.field1045 = new HashMap();
this.field1050 = 0;
this.mapSceneSprites = var1;
this.fonts = var2;
this.__e = var3;
this.__x = var4;
this.field1046 = var3;
this.field1047 = var4;
}
@ObfuscatedName("m")
@@ -109,7 +109,7 @@ public final class WorldMapManager {
)
@Export("load")
public void load(AbstractIndexCache var1, String var2, boolean var3) {
if(!this.loadStarted) {
if (!this.loadStarted) {
this.isLoaded0 = false;
this.loadStarted = true;
System.nanoTime();
@@ -122,8 +122,8 @@ public final class WorldMapManager {
this.mapAreaData = new WorldMapAreaData();
try {
this.mapAreaData.__ce_76(var6, var7, var5, var3);
} catch (IllegalStateException var19) {
this.mapAreaData.method387(var6, var7, var5, var3);
} catch (IllegalStateException var16) {
return;
}
@@ -132,47 +132,49 @@ public final class WorldMapManager {
this.mapAreaData.originY();
this.surfaceOffsetX = this.mapAreaData.minX() * 64;
this.surfaceOffsetY = this.mapAreaData.minY() * 64;
this.__i = (this.mapAreaData.maxX() - this.mapAreaData.minX() + 1) * 64;
this.__a = (this.mapAreaData.maxY() - this.mapAreaData.minY() + 1) * 64;
int var16 = this.mapAreaData.maxX() - this.mapAreaData.minX() + 1;
this.field1048 = (this.mapAreaData.maxX() - this.mapAreaData.minX() + 1) * 64;
this.field1049 = (this.mapAreaData.maxY() - this.mapAreaData.minY() + 1) * 64;
int var8 = this.mapAreaData.maxX() - this.mapAreaData.minX() + 1;
int var9 = this.mapAreaData.maxY() - this.mapAreaData.minY() + 1;
System.nanoTime();
System.nanoTime();
SoundSystem.method2456();
this.regions = new WorldMapRegion[var16][var9];
Iterator var10 = this.mapAreaData.__n.iterator();
this.regions = new WorldMapRegion[var8][var9];
Iterator var10 = this.mapAreaData.field1016.iterator();
while(var10.hasNext()) {
int var12;
while (var10.hasNext()) {
class15 var11 = (class15)var10.next();
int var12 = var11.field149;
var12 = var11.field149;
int var13 = var11.field146;
int var14 = var12 - this.mapAreaData.minX();
int var15 = var13 - this.mapAreaData.minY();
this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.__a_39(), this.fonts);
this.regions[var14][var15].method447(var11, this.mapAreaData.__a);
this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.method386(), this.fonts);
this.regions[var14][var15].method447(var11, this.mapAreaData.field1018);
}
for(int var17 = 0; var17 < var16; ++var17) {
for(int var18 = 0; var18 < var9; ++var18) {
if(this.regions[var17][var18] == null) {
this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.minX() + var17, this.mapAreaData.minY() + var18, this.mapAreaData.__a_39(), this.fonts);
this.regions[var17][var18].__u_41(this.mapAreaData.__i, this.mapAreaData.__a);
for (int var17 = 0; var17 < var8; ++var17) {
for (var12 = 0; var12 < var9; ++var12) {
if (this.regions[var17][var12] == null) {
this.regions[var17][var12] = new WorldMapRegion(this.mapAreaData.minX() + var17, this.mapAreaData.minY() + var12, this.mapAreaData.method386(), this.fonts);
this.regions[var17][var12].method405(this.mapAreaData.field1017, this.mapAreaData.field1018);
}
}
}
System.nanoTime();
System.nanoTime();
if(var1.__ag_401(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2)) {
byte[] var20 = var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2);
this.overviewSprite = class27.convertJpgToSprite(var20);
if (var1.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2)) {
byte[] var18 = var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2);
this.overviewSprite = class27.convertJpgToSprite(var18);
}
System.nanoTime();
var1.__y_398();
var1.__b_400();
var1.method6();
var1.method8();
this.isLoaded0 = true;
}
}
@ObfuscatedName("f")
@@ -190,7 +192,7 @@ public final class WorldMapManager {
signature = "(IIIIIIIII)V",
garbageValue = "1619301748"
)
public final void __q_72(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
public final void method401(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
int[] var9 = Rasterizer2D.Rasterizer2D_pixels;
int var10 = Rasterizer2D.Rasterizer2D_width;
int var11 = Rasterizer2D.Rasterizer2D_height;
@@ -199,11 +201,11 @@ public final class WorldMapManager {
class22 var13 = this.method643(var1, var2, var3, var4);
float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1);
int var15 = (int)Math.ceil((double)var14);
this.__z = var15;
if(!this.__g.containsKey(Integer.valueOf(var15))) {
this.field1050 = var15;
if (!this.field1045.containsKey(var15)) {
class40 var16 = new class40(var15);
var16.method763();
this.__g.put(Integer.valueOf(var15), var16);
this.field1045.put(var15, var16);
}
int var23 = var13.field166 + var13.field169 - 1;
@@ -211,9 +213,9 @@ public final class WorldMapManager {
int var18;
int var19;
for(var18 = var13.field166; var18 <= var23; ++var18) {
for(var19 = var13.field167; var19 <= var17; ++var19) {
this.regions[var18][var19].method455(var15, (class40)this.__g.get(Integer.valueOf(var15)), this.mapSceneSprites, this.__e, this.__x);
for (var18 = var13.field166; var18 <= var23; ++var18) {
for (var19 = var13.field167; var19 <= var17; ++var19) {
this.regions[var18][var19].method455(var15, (class40)this.field1045.get(var15), this.mapSceneSprites, this.field1046, this.field1047);
}
}
@@ -223,9 +225,9 @@ public final class WorldMapManager {
var19 = this.surfaceOffsetX + var1;
int var20 = var2 + this.surfaceOffsetY;
for(int var21 = var13.field166; var21 < var13.field166 + var13.field169; ++var21) {
for(int var22 = var13.field167; var22 < var13.field167 + var13.field164; ++var22) {
this.regions[var21][var22].__w_40(var5 + var18 * (this.regions[var21][var22].x * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].y * 64 - var20 + 64) / 64, var18);
for (int var21 = var13.field166; var21 < var13.field166 + var13.field169; ++var21) {
for (int var22 = var13.field167; var22 < var13.field167 + var13.field164; ++var22) {
this.regions[var21][var22].method404(var5 + var18 * (this.regions[var21][var22].x * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].y * 64 - var20 + 64) / 64, var18);
}
}
@@ -236,7 +238,7 @@ public final class WorldMapManager {
signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V",
garbageValue = "-71"
)
public final void __w_73(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) {
public final void method402(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) {
class22 var14 = this.method643(var1, var2, var3, var4);
float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1);
int var16 = (int)(var15 * 64.0F);
@@ -245,20 +247,20 @@ public final class WorldMapManager {
int var19;
int var20;
for(var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) {
for(var20 = var14.field167; var20 < var14.field164 + var14.field167; ++var20) {
if(var13) {
this.regions[var19][var20].__e_42();
for (var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) {
for (var20 = var14.field167; var20 < var14.field164 + var14.field167; ++var20) {
if (var13) {
this.regions[var19][var20].method406();
}
this.regions[var19][var20].__j_46(var5 + var16 * (this.regions[var19][var20].x * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].y * 64 - var18 + 64) / 64, var16, var9);
this.regions[var19][var20].method410(var5 + var16 * (this.regions[var19][var20].x * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].y * 64 - var18 + 64) / 64, var16, var9);
}
}
if(var10 != null && var11 > 0) {
for(var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) {
for(var20 = var14.field167; var20 < var14.field167 + var14.field164; ++var20) {
this.regions[var19][var20].__s_47(var10, var11, var12);
if (var10 != null && var11 > 0) {
for (var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) {
for (var20 = var14.field167; var20 < var14.field167 + var14.field164; ++var20) {
this.regions[var19][var20].method411(var10, var11, var12);
}
}
}
@@ -272,37 +274,38 @@ public final class WorldMapManager {
)
@Export("drawOverview")
public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) {
if(this.overviewSprite != null) {
this.overviewSprite.__j_506(var1, var2, var3, var4);
if(var6 > 0 && var6 % var7 < var7 / 2) {
if(this.icons == null) {
if (this.overviewSprite != null) {
this.overviewSprite.method309(var1, var2, var3, var4);
if (var6 > 0 && var6 % var7 < var7 / 2) {
if (this.icons == null) {
this.buildIcons0();
}
Iterator var8 = var5.iterator();
while(true) {
List var10;
while (true) {
List var9;
do {
if(!var8.hasNext()) {
if (!var8.hasNext()) {
return;
}
int var9 = ((Integer)var8.next()).intValue();
var10 = (List)this.icons.get(Integer.valueOf(var9));
} while(var10 == null);
int var10 = (Integer)var8.next();
var9 = (List)this.icons.get(var10);
} while(var9 == null);
Iterator var11 = var10.iterator();
Iterator var14 = var9.iterator();
while(var11.hasNext()) {
AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next();
int var13 = var3 * (var12.coord2.x - this.surfaceOffsetX) / this.__i;
int var14 = var4 - (var12.coord2.y - this.surfaceOffsetY) * var4 / this.__a;
Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256);
while (var14.hasNext()) {
AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var14.next();
int var12 = var3 * (var11.coord2.x - this.surfaceOffsetX) / this.field1048;
int var13 = var4 - (var11.coord2.y - this.surfaceOffsetY) * var4 / this.field1049;
Rasterizer2D.Rasterizer2D_drawCircleAlpha(var12 + var1, var13 + var2, 2, 16776960, 256);
}
}
}
}
}
@ObfuscatedName("u")
@@ -310,9 +313,9 @@ public final class WorldMapManager {
signature = "(IIIIIIIIIII)Ljava/util/List;",
garbageValue = "1185703832"
)
public List __u_74(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
public List method403(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
LinkedList var11 = new LinkedList();
if(!this.isLoaded0) {
if (!this.isLoaded0) {
return var11;
} else {
class22 var12 = this.method643(var1, var2, var3, var4);
@@ -321,10 +324,10 @@ public final class WorldMapManager {
int var15 = this.surfaceOffsetX + var1;
int var16 = var2 + this.surfaceOffsetY;
for(int var17 = var12.field166; var17 < var12.field166 + var12.field169; ++var17) {
for(int var18 = var12.field167; var18 < var12.field164 + var12.field167; ++var18) {
List var19 = this.regions[var17][var18].__ae_57(var5 + var14 * (this.regions[var17][var18].x * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].y * 64 - var16 + 64) / 64, var14, var9, var10);
if(!var19.isEmpty()) {
for (int var17 = var12.field166; var17 < var12.field166 + var12.field169; ++var17) {
for (int var18 = var12.field167; var18 < var12.field164 + var12.field167; ++var18) {
List var19 = this.regions[var17][var18].method421(var5 + var14 * (this.regions[var17][var18].x * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].y * 64 - var16 + 64) / 64, var14, var9, var10);
if (!var19.isEmpty()) {
var11.addAll(var19);
}
}
@@ -353,21 +356,21 @@ public final class WorldMapManager {
var5.field164 = var13 - var11 + 1;
var5.field166 = var10 - this.mapAreaData.minX();
var5.field167 = var11 - this.mapAreaData.minY();
if(var5.field166 < 0) {
if (var5.field166 < 0) {
var5.field169 += var5.field166;
var5.field166 = 0;
}
if(var5.field166 > this.regions.length - var5.field169) {
if (var5.field166 > this.regions.length - var5.field169) {
var5.field169 = this.regions.length - var5.field166;
}
if(var5.field167 < 0) {
if (var5.field167 < 0) {
var5.field164 += var5.field167;
var5.field167 = 0;
}
if(var5.field167 > this.regions[0].length - var5.field164) {
if (var5.field167 > this.regions[0].length - var5.field164) {
var5.field164 = this.regions[0].length - var5.field167;
}
@@ -404,27 +407,27 @@ public final class WorldMapManager {
)
@Export("buildIcons0")
void buildIcons0() {
if(this.icons == null) {
if (this.icons == null) {
this.icons = new HashMap();
}
this.icons.clear();
for(int var1 = 0; var1 < this.regions.length; ++var1) {
for(int var2 = 0; var2 < this.regions[var1].length; ++var2) {
for (int var1 = 0; var1 < this.regions.length; ++var1) {
for (int var2 = 0; var2 < this.regions[var1].length; ++var2) {
List var3 = this.regions[var1][var2].icons();
Iterator var4 = var3.iterator();
while(var4.hasNext()) {
while (var4.hasNext()) {
AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next();
if(var5.__h_67()) {
int var6 = var5.__m_15();
if(!this.icons.containsKey(Integer.valueOf(var6))) {
if (var5.method19()) {
int var6 = var5.vmethod395();
if (!this.icons.containsKey(var6)) {
LinkedList var7 = new LinkedList();
var7.add(var5);
this.icons.put(Integer.valueOf(var6), var7);
this.icons.put(var6, var7);
} else {
List var8 = (List)this.icons.get(Integer.valueOf(var6));
List var8 = (List)this.icons.get(var6);
var8.add(var5);
}
}
@@ -442,13 +445,13 @@ public final class WorldMapManager {
@Export("getPixelsPerTile")
float getPixelsPerTile(int var1, int var2) {
float var3 = (float)var1 / (float)var2;
if(var3 > 8.0F) {
if (var3 > 8.0F) {
return 8.0F;
} else if(var3 < 1.0F) {
} else if (var3 < 1.0F) {
return 1.0F;
} else {
int var4 = Math.round(var3);
return Math.abs((float)var4 - var3) < 0.05F?(float)var4:var3;
return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3;
}
}
@@ -460,22 +463,22 @@ public final class WorldMapManager {
@Export("itemContainerSetItem")
static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
if(var4 == null) {
if (var4 == null) {
var4 = new ItemContainer();
ItemContainer.itemContainers.put(var4, (long)var0);
}
if(var4.ids.length <= var1) {
if (var4.ids.length <= var1) {
int[] var5 = new int[var1 + 1];
int[] var6 = new int[var1 + 1];
int var7;
for(var7 = 0; var7 < var4.ids.length; ++var7) {
for (var7 = 0; var7 < var4.ids.length; ++var7) {
var5[var7] = var4.ids[var7];
var6[var7] = var4.quantities[var7];
}
for(var7 = var4.ids.length; var7 < var1; ++var7) {
for (var7 = var4.ids.length; var7 < var1; ++var7) {
var5[var7] = -1;
var6[var7] = 0;
}
@@ -495,8 +498,8 @@ public final class WorldMapManager {
)
public static void method673() {
ObjectDefinition.ObjectDefinition_cached.clear();
ObjectDefinition.__jr_o.clear();
ObjectDefinition.__jr_u.clear();
ObjectDefinition.field641.clear();
ObjectDefinition.field642.clear();
ObjectDefinition.ObjectDefinition_cachedModels.clear();
}
@@ -516,6 +519,6 @@ public final class WorldMapManager {
garbageValue = "1341489301"
)
static final void method668() {
Client.__client_na = Client.cycleCntr;
Client.field105 = Client.cycleCntr;
}
}