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

update client to rev 183

Browse Source
This commit is contained in:
ThatGamerBlue
2019-09-12 14:00:01 +01:00
parent 0446151736
commit 12c08b271a
342 changed files with 41159 additions and 41468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,5 @@
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -8,98 +10,99 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.ScriptOpcodes;
@ObfuscatedName("ao")
@ObfuscatedName("aj")
@Implements("WorldMapManager")
public final class WorldMapManager {
@ObfuscatedName("s")
@ObfuscatedName("c")
@Export("loaded")
boolean loaded;
@ObfuscatedName("j")
@ObfuscatedName("x")
@Export("loadStarted")
boolean loadStarted;
@ObfuscatedName("i")
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "Lar;"
signature = "Laf;"
)
@Export("mapAreaData")
WorldMapAreaData mapAreaData;
@ObfuscatedName("k")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "Lls;"
signature = "Lli;"
)
@Export("compositeTextureSprite")
Sprite compositeTextureSprite;
@ObfuscatedName("u")
@ObfuscatedName("l")
@Export("icons")
HashMap icons;
@ObfuscatedName("n")
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "[[Laf;"
signature = "[[Lav;"
)
@Export("regions")
WorldMapRegion[][] regions;
@ObfuscatedName("t")
HashMap field302;
@ObfuscatedName("q")
@ObfuscatedName("j")
HashMap field316;
@ObfuscatedName("v")
@ObfuscatedSignature(
signature = "[Llq;"
signature = "[Llt;"
)
@Export("mapSceneSprites")
IndexedSprite[] mapSceneSprites;
@ObfuscatedName("x")
@ObfuscatedName("d")
@ObfuscatedSignature(
signature = "Lhz;"
)
@Export("geographyArchive")
final AbstractArchive geographyArchive;
@ObfuscatedName("d")
@ObfuscatedName("z")
@ObfuscatedSignature(
signature = "Lhz;"
)
@Export("groundArchive")
final AbstractArchive groundArchive;
@ObfuscatedName("f")
@ObfuscatedName("n")
@Export("fonts")
final HashMap fonts;
@ObfuscatedName("c")
@ObfuscatedName("h")
@ObfuscatedGetter(
intValue = 1743305305
intValue = 1330898357
)
@Export("tileX")
int tileX;
@ObfuscatedName("r")
@ObfuscatedName("f")
@ObfuscatedGetter(
intValue = -1546792937
intValue = 1132932451
)
@Export("tileY")
int tileY;
@ObfuscatedName("y")
@ObfuscatedName("s")
@ObfuscatedGetter(
intValue = -1288809152
intValue = 1471356409
)
@Export("tileWidth")
int tileWidth;
@ObfuscatedName("p")
@ObfuscatedGetter(
intValue = -1862567616
intValue = -937081536
)
@Export("tileHeight")
int tileHeight;
@ObfuscatedName("b")
@ObfuscatedName("e")
@ObfuscatedGetter(
intValue = 1246718237
intValue = 1622137941
)
@Export("pixelsPerTile")
public int pixelsPerTile;
@ObfuscatedSignature(
signature = "([Llq;Ljava/util/HashMap;Lhz;Lhz;)V"
signature = "([Llt;Ljava/util/HashMap;Lhz;Lhz;)V"
)
public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) {
this.loaded = false;
this.loadStarted = false;
this.field302 = new HashMap();
this.field316 = new HashMap();
this.pixelsPerTile = 0;
this.mapSceneSprites = var1;
this.fonts = var2;
@@ -107,10 +110,10 @@ public final class WorldMapManager {
this.groundArchive = var4;
}
@ObfuscatedName("s")
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(Lhz;Ljava/lang/String;ZI)V",
garbageValue = "763570790"
garbageValue = "1921148815"
)
@Export("load")
public void load(AbstractArchive var1, String var2, boolean var3) {
@@ -118,10 +121,10 @@ public final class WorldMapManager {
this.loaded = false;
this.loadStarted = true;
System.nanoTime();
int var4 = var1.getGroupId(WorldMapCacheName.field295.name);
int var4 = var1.getGroupId(WorldMapCacheName.field294.name);
int var5 = var1.getFileId(var4, var2);
Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field295.name, var2));
Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field290.name, var2));
Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field294.name, var2));
Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field295.name, var2));
System.nanoTime();
System.nanoTime();
this.mapAreaData = new WorldMapAreaData();
@@ -137,13 +140,13 @@ public final class WorldMapManager {
this.mapAreaData.getOriginY();
this.tileX = this.mapAreaData.getRegionLowX() * 64;
this.tileY = this.mapAreaData.getRegionLowY() * 64;
this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 4096;
this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 64;
this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 4096;
int var16 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1;
int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1;
System.nanoTime();
System.nanoTime();
class247.WorldMapRegion_clearCachedSprites();
ScriptFrame.WorldMapRegion_clearCachedSprites();
this.regions = new WorldMapRegion[var16][var9];
Iterator var10 = this.mapAreaData.worldMapData0Set.iterator();
@@ -168,9 +171,9 @@ public final class WorldMapManager {
System.nanoTime();
System.nanoTime();
if (var1.isValidFileName(WorldMapCacheName.field291.name, var2)) {
byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field291.name, var2);
this.compositeTextureSprite = WorldMapIcon_0.convertJpgToSprite(var20);
if (var1.isValidFileName(WorldMapCacheName.field296.name, var2)) {
byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field296.name, var2);
this.compositeTextureSprite = class16.convertJpgToSprite(var20);
}
System.nanoTime();
@@ -180,20 +183,20 @@ public final class WorldMapManager {
}
}
@ObfuscatedName("j")
@ObfuscatedName("x")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "-1852285013"
signature = "(B)V",
garbageValue = "23"
)
@Export("clearIcons")
public final void clearIcons() {
this.icons = null;
}
@ObfuscatedName("i")
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "(IIIIIIIII)V",
garbageValue = "-77241448"
garbageValue = "1356275131"
)
@Export("drawTiles")
public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
@@ -206,41 +209,41 @@ public final class WorldMapManager {
float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1);
int var15 = (int)Math.ceil((double)var14);
this.pixelsPerTile = var15;
if (!this.field302.containsKey(var15)) {
if (!this.field316.containsKey(var15)) {
class40 var16 = new class40(var15);
var16.init();
this.field302.put(var15, var16);
this.field316.put(var15, var16);
}
int var23 = var13.width + var13.x - 1;
int var23 = var13.x + var13.width - 1;
int var17 = var13.y + var13.height - 1;
int var18;
int var19;
for (var18 = var13.x; var18 <= var23; ++var18) {
for (var19 = var13.y; var19 <= var17; ++var19) {
this.regions[var18][var19].drawTile(var15, (class40)this.field302.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive);
this.regions[var18][var19].drawTile(var15, (class40)this.field316.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive);
}
}
Rasterizer2D.Rasterizer2D_replace(var9, var10, var11);
Rasterizer2D.Rasterizer2D_setClipArray(var12);
var18 = (int)(var14 * 64.0F);
var18 = (int)(64.0F * var14);
var19 = this.tileX * 4096 + var1;
int var20 = this.tileY * 4096 + var2;
for (int var21 = var13.x; var21 < var13.x + var13.width; ++var21) {
for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) {
for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) {
this.regions[var21][var22].method476(var5 + var18 * (this.regions[var21][var22].regionX * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].regionY * 64 - var20 + 64) / 64, var18);
this.regions[var21][var22].method384(var5 + var18 * (this.regions[var21][var22].regionX * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].regionY * 64 - var20 + 64) / 64, var18);
}
}
}
@ObfuscatedName("k")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V",
garbageValue = "-63"
signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V",
garbageValue = "-1964916849"
)
@Export("drawElements")
public final void drawElements(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) {
@@ -253,18 +256,18 @@ public final class WorldMapManager {
int var19;
int var20;
for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) {
for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) {
for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) {
if (var13) {
this.regions[var19][var20].initWorldMapIcon1s();
}
this.regions[var19][var20].method408(var5 + var16 * (this.regions[var19][var20].regionX * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].regionY * 64 - var18 + 64) / 64, var16, var9);
this.regions[var19][var20].method390(var5 + var16 * (this.regions[var19][var20].regionX * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].regionY * 64 - var18 + 64) / 64, var16, var9);
}
}
if (var10 != null && var11 > 0) {
for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) {
for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) {
for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) {
this.regions[var19][var20].flashElements(var10, var11, var12);
}
}
@@ -272,10 +275,10 @@ public final class WorldMapManager {
}
@ObfuscatedName("u")
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "(IIIILjava/util/HashSet;III)V",
garbageValue = "-394950327"
signature = "(IIIILjava/util/HashSet;IIB)V",
garbageValue = "-15"
)
@Export("drawOverview")
public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) {
@@ -303,7 +306,7 @@ public final class WorldMapManager {
while (var11.hasNext()) {
AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next();
int var13 = var3 * (var12.coord2.x - this.tileX * 4096) / (this.tileWidth * 64);
int var13 = var3 * (var12.coord2.x - this.tileX * 4096) / (this.tileWidth * 4096);
int var14 = var4 - (var12.coord2.y - this.tileY * 4096) * var4 / (this.tileHeight * 64);
Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256);
}
@@ -312,25 +315,25 @@ public final class WorldMapManager {
}
}
@ObfuscatedName("n")
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "(IIIIIIIIIII)Ljava/util/List;",
garbageValue = "458020889"
garbageValue = "1014404462"
)
public List method629(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
public List method601(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.loaded) {
return var11;
} else {
WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4);
float var13 = this.getPixelsPerTile(var7, var3 - var1);
int var14 = (int)(var13 * 64.0F);
int var14 = (int)(64.0F * var13);
int var15 = this.tileX * 4096 + var1;
int var16 = this.tileY * 4096 + var2;
for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) {
for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) {
List var19 = this.regions[var17][var18].method439(var5 + var14 * (this.regions[var17][var18].regionX * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].regionY * 64 - var16 + 64) / 64, var14, var9, var10);
for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) {
List var19 = this.regions[var17][var18].method415(var5 + var14 * (this.regions[var17][var18].regionX * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].regionY * 64 - var16 + 64) / 64, var14, var9, var10);
if (!var19.isEmpty()) {
var11.addAll(var19);
}
@@ -341,10 +344,10 @@ public final class WorldMapManager {
}
}
@ObfuscatedName("t")
@ObfuscatedName("j")
@ObfuscatedSignature(
signature = "(IIIII)Lh;",
garbageValue = "11285133"
signature = "(IIIIB)Lm;",
garbageValue = "72"
)
@Export("createWorldMapRectangle")
WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) {
@@ -384,20 +387,20 @@ public final class WorldMapManager {
return var5;
}
@ObfuscatedName("q")
@ObfuscatedName("v")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "-238758713"
garbageValue = "2078225278"
)
@Export("isLoaded")
public boolean isLoaded() {
return this.loaded;
}
@ObfuscatedName("x")
@ObfuscatedName("d")
@ObfuscatedSignature(
signature = "(I)Ljava/util/HashMap;",
garbageValue = "2030529445"
garbageValue = "99820694"
)
@Export("buildIcons")
public HashMap buildIcons() {
@@ -405,10 +408,10 @@ public final class WorldMapManager {
return this.icons;
}
@ObfuscatedName("d")
@ObfuscatedName("z")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "65536"
garbageValue = "1308712327"
)
@Export("buildIcons0")
void buildIcons0() {
@@ -442,10 +445,10 @@ public final class WorldMapManager {
}
@ObfuscatedName("f")
@ObfuscatedName("s")
@ObfuscatedSignature(
signature = "(III)F",
garbageValue = "610428928"
garbageValue = "1710515807"
)
@Export("getPixelsPerTile")
float getPixelsPerTile(int var1, int var2) {
@@ -460,41 +463,103 @@ public final class WorldMapManager {
}
}
@ObfuscatedName("hi")
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "(Lbm;I)V",
garbageValue = "-798263374"
signature = "(Ljava/io/File;Ljava/io/File;I)V",
garbageValue = "788469236"
)
static final void method607(PendingSpawn var0) {
long var1 = 0L;
static void method611(File var0, File var1) {
try {
AccessFile var2 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L);
Buffer var3 = new Buffer(500);
var3.writeByte(3);
var3.writeByte(var1 != null ? 1 : 0);
var3.writeCESU8(var0.getPath());
if (var1 != null) {
var3.writeCESU8("");
}
var2.write(var3.array, 0, var3.offset);
var2.close();
} catch (IOException var4) {
var4.printStackTrace();
}
}
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "(ILcu;ZB)I",
garbageValue = "-62"
)
static int method626(int var0, Script var1, boolean var2) {
int var3 = -1;
int var4 = 0;
int var5 = 0;
if (var0.type == 0) {
var1 = Player.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y);
Widget var4;
if (var0 >= 2000) {
var0 -= 1000;
var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
var4 = Player.getWidget(var3);
} else {
var4 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410;
}
if (var0.type == 1) {
var1 = Player.scene.getWallDecorationTag(var0.plane, var0.x, var0.y);
}
if (var0 == ScriptOpcodes.CC_SETPOSITION) {
class160.Interpreter_intStackSize -= 4;
var4.rawX = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
var4.rawY = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
var4.xAlignment = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2];
var4.yAlignment = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3];
WorldMapID.invalidateWidget(var4);
Coord.client.alignWidget(var4);
if (var3 != -1 && var4.type == 0) {
class197.revalidateWidgetScroll(class289.Widget_interfaceComponents[var3 >> 16], var4, false);
}
if (var0.type == 2) {
var1 = Player.scene.getGameObjectTag(var0.plane, var0.x, var0.y);
}
return 1;
} else if (var0 == ScriptOpcodes.CC_SETSIZE) {
class160.Interpreter_intStackSize -= 4;
var4.rawWidth = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
var4.rawHeight = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
var4.widthAlignment = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2];
var4.heightAlignment = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3];
WorldMapID.invalidateWidget(var4);
Coord.client.alignWidget(var4);
if (var3 != -1 && var4.type == 0) {
class197.revalidateWidgetScroll(class289.Widget_interfaceComponents[var3 >> 16], var4, false);
}
if (var0.type == 3) {
var1 = Player.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y);
}
return 1;
} else if (var0 == ScriptOpcodes.CC_SETHIDE) {
boolean var5 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1;
if (var5 != var4.isHidden) {
var4.isHidden = var5;
WorldMapID.invalidateWidget(var4);
}
if (var1 != 0L) {
int var6 = Player.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1);
var3 = BoundaryObject.Entity_unpackID(var1);
var4 = var6 & 31;
var5 = var6 >> 6 & 3;
return 1;
} else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) {
var4.noClickThrough = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1;
return 1;
} else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) {
var4.noScrollThrough = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1;
return 1;
} else {
return 2;
}
}
var0.objectId = var3;
var0.field903 = var4;
var0.field907 = var5;
@ObfuscatedName("d")
@ObfuscatedSignature(
signature = "(II)I",
garbageValue = "-1672724249"
)
@Export("Messages_getNextChatID")
static int Messages_getNextChatID(int var0) {
Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
if (var1 == null) {
return -1;
} else {
return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count;
}
}
}