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

chore: rev 188

Browse Source
This commit is contained in:
Owain van Brakel
2020-01-29 14:20:08 +01:00
parent c785d0015b
commit add4ca8005
357 changed files with 41366 additions and 41447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,121 +8,101 @@ 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("ar")
@ObfuscatedName("ak")
@Implements("WorldMapManager")
public final class WorldMapManager {
@ObfuscatedName("dd")
@ObfuscatedSignature(
signature = "Lif;"
)
@Export("archive9")
static Archive archive9;
@ObfuscatedName("hq")
@ObfuscatedGetter(
intValue = -652889909
)
static int field314;
@ObfuscatedName("jp")
@ObfuscatedSignature(
signature = "Lha;"
)
static Widget field312;
@ObfuscatedName("ku")
@ObfuscatedGetter(
intValue = -1617122989
)
@Export("menuY")
static int menuY;
@ObfuscatedName("f")
@ObfuscatedName("a")
@Export("BZip2Decompressor_block")
static int[] BZip2Decompressor_block;
@ObfuscatedName("c")
@Export("loaded")
boolean loaded;
@ObfuscatedName("i")
@ObfuscatedName("t")
@Export("loadStarted")
boolean loadStarted;
@ObfuscatedName("y")
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "Lay;"
signature = "Law;"
)
@Export("mapAreaData")
WorldMapAreaData mapAreaData;
@ObfuscatedName("w")
@ObfuscatedName("e")
@ObfuscatedSignature(
signature = "Lls;"
signature = "Llt;"
)
@Export("compositeTextureSprite")
Sprite compositeTextureSprite;
@ObfuscatedName("p")
@ObfuscatedName("i")
@Export("icons")
HashMap icons;
@ObfuscatedName("b")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "[[Las;"
signature = "[[Lax;"
)
@Export("regions")
WorldMapRegion[][] regions;
@ObfuscatedName("e")
HashMap field297;
@ObfuscatedName("x")
@ObfuscatedName("d")
HashMap field324;
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "[Lli;"
)
@Export("mapSceneSprites")
IndexedSprite[] mapSceneSprites;
@ObfuscatedName("a")
@ObfuscatedName("j")
@ObfuscatedSignature(
signature = "Lhz;"
signature = "Lii;"
)
@Export("geographyArchive")
final AbstractArchive geographyArchive;
@ObfuscatedName("d")
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "Lhz;"
signature = "Lii;"
)
@Export("groundArchive")
final AbstractArchive groundArchive;
@ObfuscatedName("c")
@ObfuscatedName("p")
@Export("fonts")
final HashMap fonts;
@ObfuscatedName("o")
@ObfuscatedName("h")
@ObfuscatedGetter(
intValue = -880496543
intValue = 792568209
)
@Export("tileX")
int tileX;
@ObfuscatedName("v")
@ObfuscatedGetter(
intValue = -457247813
intValue = -394276419
)
@Export("tileY")
int tileY;
@ObfuscatedName("k")
@ObfuscatedName("n")
@ObfuscatedGetter(
intValue = -2082991249
intValue = -744573755
)
@Export("tileWidth")
int tileWidth;
@ObfuscatedName("s")
@ObfuscatedName("x")
@ObfuscatedGetter(
intValue = 1520705984
intValue = 439051201
)
@Export("tileHeight")
int tileHeight;
@ObfuscatedName("l")
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = -1382078931
intValue = -139789011
)
@Export("pixelsPerTile")
public int pixelsPerTile;
@ObfuscatedSignature(
signature = "([Lli;Ljava/util/HashMap;Lhz;Lhz;)V"
signature = "([Lli;Ljava/util/HashMap;Lii;Lii;)V"
)
public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) {
this.loaded = false;
this.loadStarted = false;
this.field297 = new HashMap();
this.field324 = new HashMap();
this.pixelsPerTile = 0;
this.mapSceneSprites = var1;
this.fonts = var2;
@@ -130,10 +110,10 @@ public final class WorldMapManager {
this.groundArchive = var4;
}
@ObfuscatedName("f")
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(Lhz;Ljava/lang/String;ZI)V",
garbageValue = "1815825171"
signature = "(Lii;Ljava/lang/String;ZI)V",
garbageValue = "1034038969"
)
@Export("load")
public void load(AbstractArchive var1, String var2, boolean var3) {
@@ -141,10 +121,10 @@ public final class WorldMapManager {
this.loaded = false;
this.loadStarted = true;
System.nanoTime();
int var4 = var1.getGroupId(WorldMapCacheName.field291.name);
int var4 = var1.getGroupId(WorldMapCacheName.field313.name);
int var5 = var1.getFileId(var4, var2);
Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field291.name, var2));
Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field286.name, var2));
Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field313.name, var2));
Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field309.name, var2));
System.nanoTime();
System.nanoTime();
this.mapAreaData = new WorldMapAreaData();
@@ -158,10 +138,10 @@ public final class WorldMapManager {
this.mapAreaData.getOriginX();
this.mapAreaData.getOriginPlane();
this.mapAreaData.getOriginY();
this.tileX = this.mapAreaData.getRegionLowX() * 4096;
this.tileY = this.mapAreaData.getRegionLowY() * 4096;
this.tileX = this.mapAreaData.getRegionLowX() * 64;
this.tileY = this.mapAreaData.getRegionLowY() * 64;
this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 64;
this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 4096;
this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 64;
int var16 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1;
int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1;
System.nanoTime();
@@ -191,9 +171,9 @@ public final class WorldMapManager {
System.nanoTime();
System.nanoTime();
if (var1.isValidFileName(WorldMapCacheName.field287.name, var2)) {
byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field287.name, var2);
this.compositeTextureSprite = GrandExchangeOfferTotalQuantityComparator.convertJpgToSprite(var20);
if (var1.isValidFileName(WorldMapCacheName.field310.name, var2)) {
byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field310.name, var2);
this.compositeTextureSprite = class14.convertJpgToSprite(var20);
}
System.nanoTime();
@@ -203,20 +183,20 @@ public final class WorldMapManager {
}
}
@ObfuscatedName("i")
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "(B)V",
garbageValue = "29"
signature = "(I)V",
garbageValue = "-2129677243"
)
@Export("clearIcons")
public final void clearIcons() {
this.icons = null;
}
@ObfuscatedName("y")
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "(IIIIIIIIB)V",
garbageValue = "-92"
garbageValue = "-91"
)
@Export("drawTiles")
public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
@@ -229,49 +209,49 @@ public final class WorldMapManager {
float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1);
int var15 = (int)Math.ceil((double)var14);
this.pixelsPerTile = var15;
if (!this.field297.containsKey(var15)) {
if (!this.field324.containsKey(var15)) {
class40 var16 = new class40(var15);
var16.init();
this.field297.put(var15, var16);
this.field324.put(var15, var16);
}
int var23 = var13.x + var13.width - 1;
int var17 = var13.height + var13.y - 1;
int var23 = var13.width + var13.x - 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.field297.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive);
this.regions[var18][var19].drawTile(var15, (class40)this.field324.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive);
}
}
Rasterizer2D.Rasterizer2D_replace(var9, var10, var11);
Rasterizer2D.Rasterizer2D_setClipArray(var12);
var18 = (int)(var14 * 64.0F);
var19 = this.tileX * 64 + var1;
int var20 = this.tileY * 64 + var2;
var18 = (int)(64.0F * var14);
var19 = this.tileX * 4096 + var1;
int var20 = this.tileY * 4096 + var2;
for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) {
for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) {
this.regions[var21][var22].method417(var5 + var18 * (this.regions[var21][var22].regionX * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].regionY * 64 - var20 + 64) / 64, var18);
for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) {
this.regions[var21][var22].method442(var5 + var18 * (this.regions[var21][var22].regionX * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].regionY * 64 - var20 + 64) / 64, var18);
}
}
}
@ObfuscatedName("w")
@ObfuscatedName("e")
@ObfuscatedSignature(
signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V",
garbageValue = "64885901"
garbageValue = "952569644"
)
@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) {
WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4);
float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1);
int var16 = (int)(var15 * 64.0F);
int var17 = this.tileX * 64 + var1;
int var18 = this.tileY * 64 + var2;
int var17 = this.tileX * 4096 + var1;
int var18 = this.tileY * 4096 + var2;
int var19;
int var20;
@@ -281,13 +261,13 @@ public final class WorldMapManager {
this.regions[var19][var20].initWorldMapIcon1s();
}
this.regions[var19][var20].method427(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].method452(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.width + var14.x; ++var19) {
for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) {
for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) {
this.regions[var19][var20].flashElements(var10, var11, var12);
}
}
@@ -295,10 +275,10 @@ public final class WorldMapManager {
}
@ObfuscatedName("p")
@ObfuscatedName("i")
@ObfuscatedSignature(
signature = "(IIIILjava/util/HashSet;IIS)V",
garbageValue = "5037"
signature = "(IIIILjava/util/HashSet;IIB)V",
garbageValue = "-1"
)
@Export("drawOverview")
public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) {
@@ -326,8 +306,8 @@ public final class WorldMapManager {
while (var11.hasNext()) {
AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next();
int var13 = var3 * (var12.coord2.x - this.tileX * 64) / (this.tileWidth * 4096);
int var14 = var4 - var4 * (var12.coord2.y - this.tileY * 64) / (this.tileHeight * 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 * 4096);
Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256);
}
}
@@ -335,25 +315,25 @@ public final class WorldMapManager {
}
}
@ObfuscatedName("b")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "(IIIIIIIIIIB)Ljava/util/List;",
garbageValue = "-26"
garbageValue = "-89"
)
public List method647(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
public List method643(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 var15 = this.tileX * 64 + var1;
int var16 = this.tileY * 64 + var2;
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.width + var12.x; ++var17) {
for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) {
List var19 = this.regions[var17][var18].method498(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.y + var12.height; ++var18) {
List var19 = this.regions[var17][var18].method472(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);
}
@@ -364,18 +344,18 @@ public final class WorldMapManager {
}
}
@ObfuscatedName("e")
@ObfuscatedName("d")
@ObfuscatedSignature(
signature = "(IIIII)Lm;",
garbageValue = "1308551287"
signature = "(IIIII)Lr;",
garbageValue = "1051811475"
)
@Export("createWorldMapRectangle")
WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) {
WorldMapRectangle var5 = new WorldMapRectangle(this);
int var6 = this.tileX * 64 + var1;
int var7 = this.tileY * 64 + var2;
int var8 = var3 + this.tileX * 64;
int var9 = this.tileY * 64 + var4;
int var6 = this.tileX * 4096 + var1;
int var7 = this.tileY * 4096 + var2;
int var8 = var3 + this.tileX * 4096;
int var9 = this.tileY * 4096 + var4;
int var10 = var6 / 64;
int var11 = var7 / 64;
int var12 = var8 / 64;
@@ -407,20 +387,20 @@ public final class WorldMapManager {
return var5;
}
@ObfuscatedName("x")
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "(B)Z",
garbageValue = "1"
garbageValue = "0"
)
@Export("isLoaded")
public boolean isLoaded() {
return this.loaded;
}
@ObfuscatedName("a")
@ObfuscatedName("j")
@ObfuscatedSignature(
signature = "(I)Ljava/util/HashMap;",
garbageValue = "1748000895"
signature = "(B)Ljava/util/HashMap;",
garbageValue = "-24"
)
@Export("buildIcons")
public HashMap buildIcons() {
@@ -428,10 +408,10 @@ public final class WorldMapManager {
return this.icons;
}
@ObfuscatedName("d")
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "-1796142123"
garbageValue = "241719352"
)
@Export("buildIcons0")
void buildIcons0() {
@@ -465,10 +445,10 @@ public final class WorldMapManager {
}
@ObfuscatedName("c")
@ObfuscatedName("p")
@ObfuscatedSignature(
signature = "(III)F",
garbageValue = "2117368488"
signature = "(IIB)F",
garbageValue = "76"
)
@Export("getPixelsPerTile")
float getPixelsPerTile(int var1, int var2) {
@@ -483,151 +463,33 @@ public final class WorldMapManager {
}
}
@ObfuscatedName("w")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "(ILcu;ZB)I",
garbageValue = "0"
signature = "(II)Z",
garbageValue = "487477583"
)
static int method656(int var0, Script var1, boolean var2) {
int var3;
int var4;
if (var0 == ScriptOpcodes.CC_CREATE) {
class188.Interpreter_intStackSize -= 3;
var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
int var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2];
if (var4 == 0) {
throw new RuntimeException();
} else {
Widget var6 = Tile.getWidget(var3);
if (var6.children == null) {
var6.children = new Widget[var5 + 1];
}
if (var6.children.length <= var5) {
Widget[] var7 = new Widget[var5 + 1];
for (int var8 = 0; var8 < var6.children.length; ++var8) {
var7[var8] = var6.children[var8];
}
var6.children = var7;
}
if (var5 > 0 && var6.children[var5 - 1] == null) {
throw new RuntimeException("" + (var5 - 1));
} else {
Widget var12 = new Widget();
var12.type = var4;
var12.parentId = var12.id = var6.id;
var12.childIndex = var5;
var12.isIf3 = true;
var6.children[var5] = var12;
if (var2) {
UserComparator7.field1946 = var12;
} else {
class197.field2398 = var12;
}
LoginPacket.invalidateWidget(var6);
return 1;
}
}
} else {
Widget var9;
if (var0 == ScriptOpcodes.CC_DELETE) {
var9 = var2 ? UserComparator7.field1946 : class197.field2398;
Widget var10 = Tile.getWidget(var9.id);
var10.children[var9.childIndex] = null;
LoginPacket.invalidateWidget(var10);
return 1;
} else if (var0 == ScriptOpcodes.CC_DELETEALL) {
var9 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]);
var9.children = null;
LoginPacket.invalidateWidget(var9);
return 1;
} else if (var0 != ScriptOpcodes.CC_FIND) {
if (var0 == ScriptOpcodes.IF_FIND) {
var9 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]);
if (var9 != null) {
Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1;
if (var2) {
UserComparator7.field1946 = var9;
} else {
class197.field2398 = var9;
}
} else {
Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0;
}
return 1;
} else {
return 2;
}
} else {
class188.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
Widget var11 = BZip2State.getWidgetChild(var3, var4);
if (var11 != null && var4 != -1) {
Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1;
if (var2) {
UserComparator7.field1946 = var11;
} else {
class197.field2398 = var11;
}
} else {
Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0;
}
return 1;
}
}
public static boolean method673(int var0) {
return (var0 >> 30 & 1) != 0;
}
@ObfuscatedName("d")
@ObfuscatedName("ik")
@ObfuscatedSignature(
signature = "(CI)Z",
garbageValue = "1068485725"
signature = "(B)V",
garbageValue = "9"
)
@Export("isCharAlphabetic")
public static boolean isCharAlphabetic(char var0) {
return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
}
@ObfuscatedName("ha")
@ObfuscatedSignature(
signature = "(III)I",
garbageValue = "1926930622"
)
static int method635(int var0, int var1) {
int var2 = var1 - 334;
if (var2 < 0) {
var2 = 0;
} else if (var2 > 100) {
var2 = 100;
}
int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight;
return var0 * var3 / 256;
}
@ObfuscatedName("lh")
@ObfuscatedSignature(
signature = "(Ljava/lang/String;I)Ljava/lang/String;",
garbageValue = "933243539"
)
static String method662(String var0) {
PlayerType[] var1 = MusicPatchPcmStream.PlayerType_values();
for (int var2 = 0; var2 < var1.length; ++var2) {
PlayerType var3 = var1[var2];
if (var3.modIcon != -1 && var0.startsWith(ChatChannel.method2269(var3.modIcon))) {
var0 = var0.substring(6 + Integer.toString(var3.modIcon).length());
break;
@Export("Widget_runOnTargetLeave")
static void Widget_runOnTargetLeave() {
if (Client.isSpellSelected) {
Widget var0 = SpriteMask.getWidgetChild(FontName.selectedSpellWidget, Client.selectedSpellChildIndex);
if (var0 != null && var0.onTargetLeave != null) {
ScriptEvent var1 = new ScriptEvent();
var1.widget = var0;
var1.args = var0.onTargetLeave;
class4.runScriptEvent(var1);
}
}
return var0;
Client.isSpellSelected = false;
NPCDefinition.invalidateWidget(var0);
}
}
}