chore: revision 189
This commit is contained in:
ThatGamerBlue
@@ -4,110 +4,104 @@ import net.runelite.mapping.ObfuscatedGetter;
|
||||
import net.runelite.mapping.ObfuscatedName;
|
||||
import net.runelite.mapping.ObfuscatedSignature;
|
||||
|
||||
@ObfuscatedName("a")
|
||||
@ObfuscatedName("at")
|
||||
@Implements("WorldMapSection2")
|
||||
public class WorldMapSection2 implements WorldMapSection {
|
||||
@ObfuscatedName("sp")
|
||||
@ObfuscatedSignature(
|
||||
signature = "Lbj;"
|
||||
)
|
||||
@Export("clientPreferences")
|
||||
static ClientPreferences clientPreferences;
|
||||
@ObfuscatedName("ea")
|
||||
@ObfuscatedName("ix")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 1716794499
|
||||
intValue = 1088959325
|
||||
)
|
||||
@Export("port3")
|
||||
static int port3;
|
||||
@ObfuscatedName("c")
|
||||
@Export("selectedItemWidget")
|
||||
static int selectedItemWidget;
|
||||
@ObfuscatedName("x")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 62157229
|
||||
intValue = 108027763
|
||||
)
|
||||
@Export("minPlane")
|
||||
int minPlane;
|
||||
@ObfuscatedName("t")
|
||||
@ObfuscatedName("m")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 808318479
|
||||
intValue = -970262457
|
||||
)
|
||||
@Export("planes")
|
||||
int planes;
|
||||
@ObfuscatedName("o")
|
||||
@ObfuscatedName("k")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 521626037
|
||||
intValue = 1813632253
|
||||
)
|
||||
@Export("regionStartX")
|
||||
int regionStartX;
|
||||
@ObfuscatedName("e")
|
||||
@ObfuscatedName("d")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 694874349
|
||||
intValue = 460883399
|
||||
)
|
||||
@Export("regionStartY")
|
||||
int regionStartY;
|
||||
@ObfuscatedName("i")
|
||||
@ObfuscatedName("w")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 316477089
|
||||
intValue = -2027857729
|
||||
)
|
||||
@Export("regionEndX")
|
||||
int regionEndX;
|
||||
@ObfuscatedName("g")
|
||||
@ObfuscatedName("v")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 911714159
|
||||
intValue = -848152655
|
||||
)
|
||||
@Export("regionEndY")
|
||||
int regionEndY;
|
||||
@ObfuscatedName("d")
|
||||
@ObfuscatedName("q")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 1254748989
|
||||
intValue = -2043506095
|
||||
)
|
||||
int field214;
|
||||
@ObfuscatedName("l")
|
||||
int field232;
|
||||
@ObfuscatedName("z")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 389719751
|
||||
intValue = -1803971443
|
||||
)
|
||||
int field216;
|
||||
@ObfuscatedName("j")
|
||||
int field239;
|
||||
@ObfuscatedName("t")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -363427247
|
||||
intValue = 1772744581
|
||||
)
|
||||
int field215;
|
||||
@ObfuscatedName("m")
|
||||
int field234;
|
||||
@ObfuscatedName("e")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 467774707
|
||||
intValue = -1804974207
|
||||
)
|
||||
int field217;
|
||||
int field241;
|
||||
|
||||
WorldMapSection2() {
|
||||
}
|
||||
|
||||
@ObfuscatedName("c")
|
||||
@ObfuscatedName("x")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(Lae;I)V",
|
||||
garbageValue = "-1034100543"
|
||||
signature = "(Las;I)V",
|
||||
garbageValue = "1890497148"
|
||||
)
|
||||
@Export("expandBounds")
|
||||
public void expandBounds(WorldMapArea var1) {
|
||||
if (var1.regionLowX > this.field214) {
|
||||
var1.regionLowX = this.field214;
|
||||
if (var1.regionLowX > this.field232) {
|
||||
var1.regionLowX = this.field232;
|
||||
}
|
||||
|
||||
if (var1.regionHighX < this.field215) {
|
||||
var1.regionHighX = this.field215;
|
||||
if (var1.regionHighX < this.field234) {
|
||||
var1.regionHighX = this.field234;
|
||||
}
|
||||
|
||||
if (var1.regionLowY > this.field216) {
|
||||
var1.regionLowY = this.field216;
|
||||
if (var1.regionLowY > this.field239) {
|
||||
var1.regionLowY = this.field239;
|
||||
}
|
||||
|
||||
if (var1.regionHighY < this.field217) {
|
||||
var1.regionHighY = this.field217;
|
||||
if (var1.regionHighY < this.field241) {
|
||||
var1.regionHighY = this.field241;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ObfuscatedName("t")
|
||||
@ObfuscatedName("m")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(IIIB)Z",
|
||||
garbageValue = "-110"
|
||||
signature = "(IIII)Z",
|
||||
garbageValue = "-65934716"
|
||||
)
|
||||
@Export("containsCoord")
|
||||
public boolean containsCoord(int var1, int var2, int var3) {
|
||||
@@ -118,51 +112,51 @@ public class WorldMapSection2 implements WorldMapSection {
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("o")
|
||||
@ObfuscatedName("k")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(IIB)Z",
|
||||
garbageValue = "37"
|
||||
signature = "(III)Z",
|
||||
garbageValue = "-240937232"
|
||||
)
|
||||
@Export("containsPosition")
|
||||
public boolean containsPosition(int var1, int var2) {
|
||||
return var1 >> 6 >= this.field214 && var1 >> 6 <= this.field215 && var2 >> 6 >= this.field216 && var2 >> 6 <= this.field217;
|
||||
return var1 >> 6 >= this.field232 && var1 >> 6 <= this.field234 && var2 >> 6 >= this.field239 && var2 >> 6 <= this.field241;
|
||||
}
|
||||
|
||||
@ObfuscatedName("e")
|
||||
@ObfuscatedName("d")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(IIII)[I",
|
||||
garbageValue = "-96920779"
|
||||
garbageValue = "1656767825"
|
||||
)
|
||||
@Export("getBorderTileLengths")
|
||||
public int[] getBorderTileLengths(int var1, int var2, int var3) {
|
||||
if (!this.containsCoord(var1, var2, var3)) {
|
||||
return null;
|
||||
} else {
|
||||
int[] var4 = new int[]{this.field214 * 64 - this.regionStartX * 64 + var2, var3 + (this.field216 * 64 - this.regionStartY * 64)};
|
||||
int[] var4 = new int[]{var2 + (this.field232 * 64 - this.regionStartX * 64), var3 + (this.field239 * 64 - this.regionStartY * 64)};
|
||||
return var4;
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("i")
|
||||
@ObfuscatedName("w")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(III)Lhj;",
|
||||
garbageValue = "911083222"
|
||||
garbageValue = "-226825052"
|
||||
)
|
||||
@Export("coord")
|
||||
public Coord coord(int var1, int var2) {
|
||||
if (!this.containsPosition(var1, var2)) {
|
||||
return null;
|
||||
} else {
|
||||
int var3 = this.regionStartX * 64 - this.field214 * 64 + var1;
|
||||
int var4 = this.regionStartY * 64 - this.field216 * 64 + var2;
|
||||
int var3 = this.regionStartX * 64 - this.field232 * 64 + var1;
|
||||
int var4 = var2 + (this.regionStartY * 64 - this.field239 * 64);
|
||||
return new Coord(this.minPlane, var3, var4);
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("g")
|
||||
@ObfuscatedName("v")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(Lkp;B)V",
|
||||
garbageValue = "76"
|
||||
signature = "(Lkb;I)V",
|
||||
garbageValue = "-1393433755"
|
||||
)
|
||||
@Export("read")
|
||||
public void read(Buffer var1) {
|
||||
@@ -172,133 +166,66 @@ public class WorldMapSection2 implements WorldMapSection {
|
||||
this.regionStartY = var1.readUnsignedShort();
|
||||
this.regionEndX = var1.readUnsignedShort();
|
||||
this.regionEndY = var1.readUnsignedShort();
|
||||
this.field214 = var1.readUnsignedShort();
|
||||
this.field216 = var1.readUnsignedShort();
|
||||
this.field215 = var1.readUnsignedShort();
|
||||
this.field217 = var1.readUnsignedShort();
|
||||
this.field232 = var1.readUnsignedShort();
|
||||
this.field239 = var1.readUnsignedShort();
|
||||
this.field234 = var1.readUnsignedShort();
|
||||
this.field241 = var1.readUnsignedShort();
|
||||
this.postRead();
|
||||
}
|
||||
|
||||
@ObfuscatedName("d")
|
||||
@ObfuscatedName("q")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(I)V",
|
||||
garbageValue = "-1425625159"
|
||||
garbageValue = "-1585844448"
|
||||
)
|
||||
@Export("postRead")
|
||||
void postRead() {
|
||||
}
|
||||
|
||||
@ObfuscatedName("c")
|
||||
@ObfuscatedName("x")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(II)Lio;",
|
||||
garbageValue = "-1814151694"
|
||||
signature = "(I)[Lgh;",
|
||||
garbageValue = "-615033295"
|
||||
)
|
||||
@Export("KitDefinition_get")
|
||||
public static KitDefinition KitDefinition_get(int var0) {
|
||||
KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0);
|
||||
public static class194[] method434() {
|
||||
return new class194[]{class194.field2324, class194.field2325, class194.field2327, class194.field2326, class194.field2332, class194.field2328, class194.field2329, class194.field2330, class194.field2331, class194.field2323};
|
||||
}
|
||||
|
||||
@ObfuscatedName("m")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(II)Ljw;",
|
||||
garbageValue = "1650295452"
|
||||
)
|
||||
@Export("getObjectDefinition")
|
||||
public static ObjectDefinition getObjectDefinition(int var0) {
|
||||
ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0);
|
||||
if (var1 != null) {
|
||||
return var1;
|
||||
} else {
|
||||
byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0);
|
||||
var1 = new KitDefinition();
|
||||
byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0);
|
||||
var1 = new ObjectDefinition();
|
||||
var1.id = var0;
|
||||
if (var2 != null) {
|
||||
var1.decode(new Buffer(var2));
|
||||
}
|
||||
|
||||
KitDefinition.KitDefinition_cached.put(var1, (long)var0);
|
||||
var1.postDecode();
|
||||
if (var1.isSolid) {
|
||||
var1.interactType = 0;
|
||||
var1.boolean1 = false;
|
||||
}
|
||||
|
||||
ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0);
|
||||
return var1;
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("o")
|
||||
@ObfuscatedName("z")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(I)V",
|
||||
garbageValue = "-1693295942"
|
||||
signature = "(CI)Z",
|
||||
garbageValue = "65280"
|
||||
)
|
||||
public static void method342() {
|
||||
VarbitDefinition.VarbitDefinition_cached.clear();
|
||||
}
|
||||
|
||||
@ObfuscatedName("o")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(III)I",
|
||||
garbageValue = "-1579745096"
|
||||
)
|
||||
static int method340(int var0, int var1) {
|
||||
ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
|
||||
if (var2 == null) {
|
||||
return 0;
|
||||
} else if (var1 == -1) {
|
||||
return 0;
|
||||
} else {
|
||||
int var3 = 0;
|
||||
|
||||
for (int var4 = 0; var4 < var2.quantities.length; ++var4) {
|
||||
if (var2.ids[var4] == var1) {
|
||||
var3 += var2.quantities[var4];
|
||||
}
|
||||
}
|
||||
|
||||
return var3;
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("j")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(I)V",
|
||||
garbageValue = "-1868356098"
|
||||
)
|
||||
static void method344() {
|
||||
Login.Login_username = Login.Login_username.trim();
|
||||
if (Login.Login_username.length() == 0) {
|
||||
Tiles.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
|
||||
} else {
|
||||
long var1 = class30.method567();
|
||||
int var0;
|
||||
if (0L == var1) {
|
||||
var0 = 5;
|
||||
} else {
|
||||
var0 = GraphicsObject.method2060(var1, Login.Login_username);
|
||||
}
|
||||
|
||||
switch(var0) {
|
||||
case 2:
|
||||
Tiles.setLoginResponseString(Strings.field3036, Strings.field3037, Strings.field2933);
|
||||
Login.loginIndex = 6;
|
||||
break;
|
||||
case 3:
|
||||
Tiles.setLoginResponseString("", "Error connecting to server.", "");
|
||||
break;
|
||||
case 4:
|
||||
Tiles.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later.");
|
||||
break;
|
||||
case 5:
|
||||
Tiles.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later.");
|
||||
break;
|
||||
case 6:
|
||||
Tiles.setLoginResponseString("", "Error connecting to server.", "");
|
||||
break;
|
||||
case 7:
|
||||
Tiles.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username.");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("x")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;",
|
||||
garbageValue = "11"
|
||||
)
|
||||
public static String method321(CharSequence var0) {
|
||||
int var2 = var0.length();
|
||||
char[] var3 = new char[var2];
|
||||
|
||||
for (int var4 = 0; var4 < var2; ++var4) {
|
||||
var3[var4] = '*';
|
||||
}
|
||||
|
||||
String var1 = new String(var3);
|
||||
return var1;
|
||||
static boolean method433(char var0) {
|
||||
return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user