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

project: Rev update

Browse Source
This commit is contained in:
Owain van Brakel
2019-11-28 16:31:53 +01:00
parent 34f8560da9
commit 74726ae17a
343 changed files with 41411 additions and 41094 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
runescape-client/src/main/java/AbstractWorldMapIcon.java
View File

@@ -3,91 +3,102 @@ 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("am")
@ObfuscatedName("aa")
@Implements("AbstractWorldMapIcon")
public abstract class AbstractWorldMapIcon {
@ObfuscatedName("qa")
@ObfuscatedSignature(
signature = "Ldo;"
@ObfuscatedName("qk")
@ObfuscatedGetter(
intValue = 1263704437
)
@Export("decimator")
static Decimator decimator;
@ObfuscatedName("dz")
static int field299;
@ObfuscatedName("as")
@Export("client")
@ObfuscatedSignature(
signature = "Lclient;"
)
static Client client;
@ObfuscatedName("ey")
@ObfuscatedSignature(
signature = "Lij;"
)
@Export("archive2")
static Archive archive2;
@ObfuscatedName("c")
@Export("archive17")
static Archive archive17;
@ObfuscatedName("ef")
@ObfuscatedGetter(
intValue = 821874025
)
static int field292;
@ObfuscatedName("h")
@ObfuscatedSignature(
signature = "Lhf;"
signature = "Lhx;"
)
@Export("coord2")
public final Coord coord2;
@ObfuscatedName("o")
@ObfuscatedName("y")
@ObfuscatedSignature(
signature = "Lhf;"
signature = "Lhx;"
)
@Export("coord1")
public final Coord coord1;
@ObfuscatedName("i")
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = 2101295301
intValue = 148025221
)
@Export("screenX")
int screenX;
@ObfuscatedName("d")
@ObfuscatedName("i")
@ObfuscatedGetter(
intValue = 1809390745
intValue = 316665889
)
@Export("screenY")
int screenY;
@ObfuscatedSignature(
signature = "(Lhf;Lhf;)V"
signature = "(Lhx;Lhx;)V"
)
AbstractWorldMapIcon(Coord var1, Coord var2) {
this.coord1 = var1;
this.coord2 = var2;
}
@ObfuscatedName("a")
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "-1878632225"
garbageValue = "-871583687"
)
@Export("getElement")
public abstract int getElement();
@ObfuscatedName("t")
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "(I)Lar;",
garbageValue = "-77909992"
signature = "(I)Lam;",
garbageValue = "969160497"
)
@Export("getLabel")
abstract WorldMapLabel getLabel();
@ObfuscatedName("n")
@ObfuscatedName("b")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "60677286"
garbageValue = "-55298135"
)
@Export("getSubWidth")
abstract int getSubWidth();
@ObfuscatedName("q")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "(B)I",
garbageValue = "-92"
garbageValue = "-51"
)
@Export("getSubHeight")
abstract int getSubHeight();
@ObfuscatedName("e")
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(III)Z",
garbageValue = "1408503186"
signature = "(IIB)Z",
garbageValue = "34"
)
@Export("fitsScreen")
boolean fitsScreen(int var1, int var2) {
@@ -101,47 +112,48 @@ public abstract class AbstractWorldMapIcon {
@ObfuscatedName("s")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "1618081006"
garbageValue = "1140208309"
)
@Export("hasValidElement")
boolean hasValidElement() {
return this.getElement() >= 0;
}
@ObfuscatedName("b")
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "(III)Z",
garbageValue = "471623513"
signature = "(IIB)Z",
garbageValue = "75"
)
@Export("elementFitsScreen")
boolean elementFitsScreen(int var1, int var2) {
if (!this.hasValidElement()) {
return false;
} else {
WorldMapElement var3 = class65.WorldMapElement_get(this.getElement());
WorldMapElement var3 = Varcs.WorldMapElement_get(this.getElement());
int var4 = this.getSubWidth();
int var5 = this.getSubHeight();
switch(var3.horizontalAlignment.value) {
case 0:
if (var1 <= this.screenX - var4 || var1 > this.screenX) {
return false;
if (var1 >= this.screenX && var1 < var4 + this.screenX) {
break;
}
break;
return false;
case 1:
if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) {
if (var1 > this.screenX - var4 && var1 <= this.screenX) {
break;
}
return false;
case 2:
if (var1 < this.screenX || var1 >= var4 + this.screenX) {
if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) {
return false;
}
}
switch(var3.verticalAlignment.value) {
case 0:
if (var2 <= this.screenY - var5 || var2 > this.screenY) {
if (var2 < this.screenY || var2 >= var5 + this.screenY) {
return false;
}
break;
@@ -151,7 +163,7 @@ public abstract class AbstractWorldMapIcon {
}
break;
case 2:
if (var2 < this.screenY || var2 >= var5 + this.screenY) {
if (var2 <= this.screenY - var5 || var2 > this.screenY) {
return false;
}
}
@@ -160,10 +172,10 @@ public abstract class AbstractWorldMapIcon {
}
}
@ObfuscatedName("w")
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(III)Z",
garbageValue = "1082527847"
garbageValue = "-1821247860"
)
@Export("labelFitsScreen")
boolean labelFitsScreen(int var1, int var2) {
@@ -171,52 +183,89 @@ public abstract class AbstractWorldMapIcon {
if (var3 == null) {
return false;
} else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) {
return var2 >= this.screenY && var2 <= var3.height + this.screenY;
return var2 >= this.screenY && var2 <= this.screenY + var3.height;
} else {
return false;
}
}
@ObfuscatedName("o")
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "(CI)Z",
garbageValue = "93178768"
signature = "(Lhf;Lhf;ZB)V",
garbageValue = "28"
)
static boolean method679(char var0) {
return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1;
public static void method625(AbstractArchive var0, AbstractArchive var1, boolean var2) {
ObjectDefinition.ObjectDefinition_archive = var0;
ObjectDefinition.ObjectDefinition_modelsArchive = var1;
ObjectDefinition.ObjectDefinition_isLowDetail = var2;
}
@ObfuscatedName("fa")
@ObfuscatedName("h")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "30161399"
signature = "(B)V",
garbageValue = "1"
)
static final void method652() {
if (Client.logoutTimer > 0) {
class1.logOut();
static void method623() {
Messages.Messages_channels.clear();
Messages.Messages_hashTable.clear();
Messages.Messages_queue.clear();
Messages.Messages_count = 0;
}
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(ILci;ZI)I",
garbageValue = "1136599608"
)
static int method618(int var0, Script var1, boolean var2) {
Widget var3 = Language.getWidget(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]);
if (var0 == ScriptOpcodes.IF_GETSCROLLX) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollX;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETSCROLLY) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollY;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETTEXT) {
Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.text;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollWidth;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollHeight;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelZoom;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelAngleX;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelAngleZ;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelAngleY;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.transparencyTop;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.transparencyBot;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETCOLOUR) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.color;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.color2;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETFILLMODE) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal();
return 1;
} else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0;
return 1;
} else {
Client.timer.method5123();
Tile.updateGameState(40);
Tiles.field499 = Client.packetWriter.getSocket();
Client.packetWriter.removeSocket();
return 2;
}
}
@ObfuscatedName("fo")
@ObfuscatedSignature(
signature = "(II)V",
garbageValue = "542479713"
)
@Export("playSong")
static void playSong(int var0) {
if (var0 == -1 && !Client.field855) {
class197.midiPcmStream.clear();
class197.field2377 = 1;
class247.musicTrackArchive = null;
} else if (var0 != -1 && var0 != Client.currentTrackGroupId && Client.musicVolume != 0 && !Client.field855) {
WorldMapIcon_0.method253(2, class216.archive6, var0, 0, Client.musicVolume, false);
}
Client.currentTrackGroupId = var0;
}
}