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

357
runescape-client/src/main/java/WorldMapArea.java
View File

@@ -1,5 +1,4 @@
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
@@ -7,67 +6,80 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("av")
@ObfuscatedName("ag")
@Implements("WorldMapArea")
public class WorldMapArea {
@ObfuscatedName("s")
@ObfuscatedName("qq")
@ObfuscatedGetter(
intValue = 1092118655
intValue = 1818020345
)
static int field211;
@ObfuscatedName("bs")
static String field217;
@ObfuscatedName("df")
@ObfuscatedSignature(
signature = "Lio;"
)
@Export("archive18")
static Archive archive18;
@ObfuscatedName("c")
@ObfuscatedGetter(
intValue = -1655735229
)
@Export("id")
int id;
@ObfuscatedName("j")
@ObfuscatedName("x")
@Export("internalName")
String internalName;
@ObfuscatedName("i")
@ObfuscatedName("t")
@Export("externalName")
String externalName;
@ObfuscatedName("k")
@ObfuscatedName("g")
@ObfuscatedGetter(
intValue = -254766629
intValue = 1137317827
)
@Export("backGroundColor")
int backGroundColor;
@ObfuscatedName("u")
@ObfuscatedName("l")
@ObfuscatedGetter(
intValue = -1599697543
intValue = -1994031909
)
@Export("zoom")
int zoom;
@ObfuscatedName("n")
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "Lhd;"
signature = "Lhj;"
)
@Export("origin")
Coord origin;
@ObfuscatedName("t")
@ObfuscatedName("j")
@ObfuscatedGetter(
intValue = -798691043
intValue = -1491107613
)
@Export("regionLowX")
int regionLowX;
@ObfuscatedName("q")
@ObfuscatedName("v")
@ObfuscatedGetter(
intValue = -415983949
intValue = 606325911
)
@Export("regionHighX")
int regionHighX;
@ObfuscatedName("x")
@ObfuscatedName("d")
@ObfuscatedGetter(
intValue = -103515401
intValue = -2012001011
)
@Export("regionLowY")
int regionLowY;
@ObfuscatedName("d")
@ObfuscatedName("z")
@ObfuscatedGetter(
intValue = 1136743993
intValue = -303428785
)
@Export("regionHighY")
int regionHighY;
@ObfuscatedName("f")
@ObfuscatedName("n")
@Export("isMain")
boolean isMain;
@ObfuscatedName("c")
@ObfuscatedName("h")
@Export("sections")
LinkedList sections;
@@ -83,10 +95,10 @@ public class WorldMapArea {
this.isMain = false;
}
@ObfuscatedName("s")
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(Lky;IB)V",
garbageValue = "25"
signature = "(Lkz;II)V",
garbageValue = "-895936628"
)
@Export("read")
public void read(Buffer var1, int var2) {
@@ -108,30 +120,30 @@ public class WorldMapArea {
this.setBounds();
}
@ObfuscatedName("j")
@ObfuscatedName("x")
@ObfuscatedSignature(
signature = "(Lky;I)Lac;",
garbageValue = "1253292592"
signature = "(Lkz;B)Lab;",
garbageValue = "-54"
)
@Export("readWorldMapSection")
WorldMapSection readWorldMapSection(Buffer var1) {
int var2 = var1.readUnsignedByte();
WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE1};
WorldMapSectionType var4 = (WorldMapSectionType)FriendSystem.findEnumerated(var3, var2);
WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE2};
WorldMapSectionType var4 = (WorldMapSectionType)ServerPacket.findEnumerated(var3, var2);
Object var5 = null;
switch(var4.type) {
case 0:
var5 = new WorldMapSection0();
break;
case 1:
var5 = new WorldMapSection1();
break;
case 2:
case 1:
var5 = new class42();
break;
case 3:
case 2:
var5 = new WorldMapSection2();
break;
case 3:
var5 = new WorldMapSection0();
break;
default:
throw new IllegalStateException("");
}
@@ -140,10 +152,10 @@ public class WorldMapArea {
return (WorldMapSection)var5;
}
@ObfuscatedName("i")
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "(IIIB)Z",
garbageValue = "-80"
signature = "(IIII)Z",
garbageValue = "937674966"
)
@Export("containsCoord")
public boolean containsCoord(int var1, int var2, int var3) {
@@ -161,10 +173,10 @@ public class WorldMapArea {
return true;
}
@ObfuscatedName("k")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "(III)Z",
garbageValue = "1925873214"
garbageValue = "1788477948"
)
@Export("containsPosition")
public boolean containsPosition(int var1, int var2) {
@@ -192,10 +204,10 @@ public class WorldMapArea {
}
}
@ObfuscatedName("u")
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "(IIII)[I",
garbageValue = "1386977444"
signature = "(IIIB)[I",
garbageValue = "124"
)
@Export("position")
public int[] position(int var1, int var2, int var3) {
@@ -213,10 +225,10 @@ public class WorldMapArea {
return var5.getBorderTileLengths(var1, var2, var3);
}
@ObfuscatedName("n")
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "(III)Lhd;",
garbageValue = "-1952348656"
signature = "(IIB)Lhj;",
garbageValue = "-63"
)
@Export("coord")
public Coord coord(int var1, int var2) {
@@ -234,10 +246,10 @@ public class WorldMapArea {
return var4.coord(var1, var2);
}
@ObfuscatedName("t")
@ObfuscatedName("j")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "-205538232"
garbageValue = "1096430580"
)
@Export("setBounds")
void setBounds() {
@@ -250,195 +262,286 @@ public class WorldMapArea {
}
@ObfuscatedName("q")
@ObfuscatedName("v")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "-848943890"
signature = "(B)I",
garbageValue = "-25"
)
@Export("getId")
public int getId() {
return this.id;
}
@ObfuscatedName("x")
@ObfuscatedName("d")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "-731208789"
signature = "(B)Z",
garbageValue = "63"
)
@Export("getIsMain")
public boolean getIsMain() {
return this.isMain;
}
@ObfuscatedName("d")
@ObfuscatedName("z")
@ObfuscatedSignature(
signature = "(B)Ljava/lang/String;",
garbageValue = "5"
signature = "(I)Ljava/lang/String;",
garbageValue = "1625444828"
)
@Export("getInternalName")
public String getInternalName() {
return this.internalName;
}
@ObfuscatedName("f")
@ObfuscatedName("s")
@ObfuscatedSignature(
signature = "(I)Ljava/lang/String;",
garbageValue = "-10827335"
signature = "(B)Ljava/lang/String;",
garbageValue = "69"
)
@Export("getExternalName")
public String getExternalName() {
return this.externalName;
}
@ObfuscatedName("c")
@ObfuscatedName("p")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "-1129400396"
garbageValue = "1831557755"
)
@Export("getBackGroundColor")
int getBackGroundColor() {
return this.backGroundColor;
}
@ObfuscatedName("r")
@ObfuscatedName("e")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "-1627458520"
garbageValue = "201981881"
)
@Export("getZoom")
public int getZoom() {
return this.zoom;
}
@ObfuscatedName("y")
@ObfuscatedName("i")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "-1112975954"
garbageValue = "-1169721837"
)
@Export("getRegionLowX")
public int getRegionLowX() {
return this.regionLowX;
}
@ObfuscatedName("p")
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "-1527013006"
signature = "(S)I",
garbageValue = "255"
)
@Export("getRegionHighX")
public int getRegionHighX() {
return this.regionHighX;
}
@ObfuscatedName("g")
@ObfuscatedName("r")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "-492028203"
garbageValue = "-1241081128"
)
@Export("getRegionLowY")
public int getRegionLowY() {
return this.regionLowY;
}
@ObfuscatedName("e")
@ObfuscatedName("k")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "789236832"
garbageValue = "-711950518"
)
@Export("getRegionHighY")
public int getRegionHighY() {
return this.regionHighY;
}
@ObfuscatedName("z")
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "1012366175"
signature = "(B)I",
garbageValue = "35"
)
@Export("getOriginX")
public int getOriginX() {
return this.origin.x;
}
@ObfuscatedName("w")
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(B)I",
garbageValue = "50"
signature = "(I)I",
garbageValue = "-377438716"
)
@Export("getOriginPlane")
public int getOriginPlane() {
return this.origin.plane;
}
@ObfuscatedName("l")
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "840568751"
garbageValue = "2063463136"
)
@Export("getOriginY")
public int getOriginY() {
return this.origin.y;
}
@ObfuscatedName("h")
@ObfuscatedName("a")
@ObfuscatedSignature(
signature = "(B)Lhd;",
garbageValue = "63"
signature = "(I)Lhj;",
garbageValue = "-1241114474"
)
@Export("getOrigin")
public Coord getOrigin() {
return new Coord(this.origin);
}
@ObfuscatedName("s")
@ObfuscatedName("x")
@ObfuscatedSignature(
signature = "(Lhz;Lhz;I)V",
garbageValue = "-1168462803"
signature = "(IILfw;Lfj;I)Z",
garbageValue = "-2082294853"
)
@Export("NpcDefinition_setArchives")
public static void NpcDefinition_setArchives(AbstractArchive var0, AbstractArchive var1) {
NPCDefinition.NpcDefinition_archive = var0;
NPCDefinition.NpcDefinition_modelArchive = var1;
}
static final boolean method315(int var0, int var1, RouteStrategy var2, CollisionMap var3) {
int var4 = var0;
int var5 = var1;
byte var6 = 64;
byte var7 = 64;
int var8 = var0 - var6;
int var9 = var1 - var7;
class173.directions[var6][var7] = 99;
class173.distances[var6][var7] = 0;
byte var10 = 0;
int var11 = 0;
class173.bufferX[var10] = var0;
byte var10001 = var10;
int var18 = var10 + 1;
class173.bufferY[var10001] = var1;
int[][] var12 = var3.flags;
@ObfuscatedName("aj")
@ObfuscatedSignature(
signature = "(Ldz;S)V",
garbageValue = "7503"
)
@Export("PcmStream_disable")
static final void PcmStream_disable(PcmStream var0) {
var0.active = false;
if (var0.sound != null) {
var0.sound.position = 0;
}
for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) {
PcmStream_disable(var1);
}
}
@ObfuscatedName("fn")
@ObfuscatedSignature(
signature = "(ZI)V",
garbageValue = "-1974361592"
)
static final void method358(boolean var0) {
if (var0) {
Client.field870 = Login.field1171 ? class160.field1982 : class160.field1983;
} else {
LinkedHashMap var1 = GrandExchangeOffer.clientPreferences.parameters;
String var3 = Login.Login_username;
int var4 = var3.length();
int var5 = 0;
for (int var6 = 0; var6 < var4; ++var6) {
var5 = (var5 << 5) - var5 + var3.charAt(var6);
while (var11 != var18) {
var4 = class173.bufferX[var11];
var5 = class173.bufferY[var11];
var11 = var11 + 1 & 4095;
int var16 = var4 - var8;
int var17 = var5 - var9;
int var13 = var4 - var3.xInset;
int var14 = var5 - var3.yInset;
if (var2.hasArrived(2, var4, var5, var3)) {
class173.field2063 = var4;
class173.field2068 = var5;
return true;
}
Client.field870 = var1.containsKey(var5) ? class160.field1988 : class160.field1984;
int var15 = class173.distances[var16][var17] + 1;
if (var16 > 0 && class173.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) {
class173.bufferX[var18] = var4 - 1;
class173.bufferY[var18] = var5;
var18 = var18 + 1 & 4095;
class173.directions[var16 - 1][var17] = 2;
class173.distances[var16 - 1][var17] = var15;
}
if (var16 < 126 && class173.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) {
class173.bufferX[var18] = var4 + 1;
class173.bufferY[var18] = var5;
var18 = var18 + 1 & 4095;
class173.directions[var16 + 1][var17] = 8;
class173.distances[var16 + 1][var17] = var15;
}
if (var17 > 0 && class173.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) {
class173.bufferX[var18] = var4;
class173.bufferY[var18] = var5 - 1;
var18 = var18 + 1 & 4095;
class173.directions[var16][var17 - 1] = 1;
class173.distances[var16][var17 - 1] = var15;
}
if (var17 < 126 && class173.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) {
class173.bufferX[var18] = var4;
class173.bufferY[var18] = var5 + 1;
var18 = var18 + 1 & 4095;
class173.directions[var16][var17 + 1] = 4;
class173.distances[var16][var17 + 1] = var15;
}
if (var16 > 0 && var17 > 0 && class173.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) {
class173.bufferX[var18] = var4 - 1;
class173.bufferY[var18] = var5 - 1;
var18 = var18 + 1 & 4095;
class173.directions[var16 - 1][var17 - 1] = 3;
class173.distances[var16 - 1][var17 - 1] = var15;
}
if (var16 < 126 && var17 > 0 && class173.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) {
class173.bufferX[var18] = var4 + 1;
class173.bufferY[var18] = var5 - 1;
var18 = var18 + 1 & 4095;
class173.directions[var16 + 1][var17 - 1] = 9;
class173.distances[var16 + 1][var17 - 1] = var15;
}
if (var16 > 0 && var17 < 126 && class173.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) {
class173.bufferX[var18] = var4 - 1;
class173.bufferY[var18] = var5 + 1;
var18 = var18 + 1 & 4095;
class173.directions[var16 - 1][var17 + 1] = 6;
class173.distances[var16 - 1][var17 + 1] = var15;
}
if (var16 < 126 && var17 < 126 && class173.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) {
class173.bufferX[var18] = var4 + 1;
class173.bufferY[var18] = var5 + 1;
var18 = var18 + 1 & 4095;
class173.directions[var16 + 1][var17 + 1] = 12;
class173.distances[var16 + 1][var17 + 1] = var15;
}
}
class173.field2063 = var4;
class173.field2068 = var5;
return false;
}
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "(IIIIB)V",
garbageValue = "127"
)
@Export("itemContainerSetItem")
static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
if (var4 == null) {
var4 = new ItemContainer();
ItemContainer.itemContainers.put(var4, (long)var0);
}
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) {
var5[var7] = var4.ids[var7];
var6[var7] = var4.quantities[var7];
}
for (var7 = var4.ids.length; var7 < var1; ++var7) {
var5[var7] = -1;
var6[var7] = 0;
}
var4.ids = var5;
var4.quantities = var6;
}
var4.ids[var1] = var2;
var4.quantities[var1] = var3;
}
}