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

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

@@ -3,85 +3,85 @@ 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("as")
@ObfuscatedName("ap")
@Implements("AbstractWorldMapIcon")
public abstract class AbstractWorldMapIcon {
@ObfuscatedName("bi")
@ObfuscatedName("la")
@ObfuscatedSignature(
signature = "Llq;"
signature = "Lhy;"
)
@Export("worldSelectLeftSprite")
static IndexedSprite worldSelectLeftSprite;
@ObfuscatedName("t")
static Widget field292;
@ObfuscatedName("j")
@ObfuscatedSignature(
signature = "Lhd;"
signature = "Lhj;"
)
@Export("coord2")
public final Coord coord2;
@ObfuscatedName("q")
@ObfuscatedName("v")
@ObfuscatedSignature(
signature = "Lhd;"
signature = "Lhj;"
)
@Export("coord1")
public final Coord coord1;
@ObfuscatedName("x")
@ObfuscatedName("d")
@ObfuscatedGetter(
intValue = 318036895
intValue = 870912939
)
@Export("screenX")
int screenX;
@ObfuscatedName("d")
@ObfuscatedName("z")
@ObfuscatedGetter(
intValue = 1985838427
intValue = -1786217753
)
@Export("screenY")
int screenY;
@ObfuscatedSignature(
signature = "(Lhd;Lhd;)V"
signature = "(Lhj;Lhj;)V"
)
AbstractWorldMapIcon(Coord var1, Coord var2) {
this.coord1 = var1;
this.coord2 = var2;
}
@ObfuscatedName("s")
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(B)I",
garbageValue = "78"
signature = "(I)I",
garbageValue = "861849893"
)
@Export("getElement")
public abstract int getElement();
@ObfuscatedName("j")
@ObfuscatedName("x")
@ObfuscatedSignature(
signature = "(B)Lai;",
garbageValue = "1"
signature = "(I)Lao;",
garbageValue = "1066707711"
)
@Export("getLabel")
abstract WorldMapLabel getLabel();
@ObfuscatedName("i")
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "1930584854"
garbageValue = "-1386026878"
)
@Export("getSubWidth")
abstract int getSubWidth();
@ObfuscatedName("k")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "(B)I",
garbageValue = "-56"
signature = "(I)I",
garbageValue = "174908718"
)
@Export("getSubHeight")
abstract int getSubHeight();
@ObfuscatedName("g")
@ObfuscatedName("a")
@ObfuscatedSignature(
signature = "(III)Z",
garbageValue = "505598061"
signature = "(IIB)Z",
garbageValue = "1"
)
@Export("fitsScreen")
boolean fitsScreen(int var1, int var2) {
@@ -92,36 +92,35 @@ public abstract class AbstractWorldMapIcon {
}
}
@ObfuscatedName("e")
@ObfuscatedName("b")
@ObfuscatedSignature(
signature = "(S)Z",
garbageValue = "256"
signature = "(I)Z",
garbageValue = "1217113364"
)
@Export("hasValidElement")
boolean hasValidElement() {
return this.getElement() >= 0;
}
@ObfuscatedName("z")
@ObfuscatedName("ag")
@ObfuscatedSignature(
signature = "(IIS)Z",
garbageValue = "-26498"
signature = "(III)Z",
garbageValue = "682818721"
)
@Export("elementFitsScreen")
boolean elementFitsScreen(int var1, int var2) {
if (!this.hasValidElement()) {
return false;
} else {
WorldMapElement var3 = WorldMapData_0.WorldMapElement_get(this.getElement());
WorldMapElement var3 = WorldMapSection1.WorldMapElement_get(this.getElement());
int var4 = this.getSubWidth();
int var5 = this.getSubHeight();
switch(var3.horizontalAlignment.value) {
case 0:
if (var1 >= this.screenX && var1 < var4 + this.screenX) {
break;
if (var1 < this.screenX || var1 >= var4 + this.screenX) {
return false;
}
return false;
break;
case 1:
if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) {
break;
@@ -136,18 +135,17 @@ public abstract class AbstractWorldMapIcon {
switch(var3.verticalAlignment.value) {
case 0:
if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) {
break;
if (var2 < this.screenY || var2 >= var5 + this.screenY) {
return false;
}
return false;
break;
case 1:
if (var2 <= this.screenY - var5 || var2 > this.screenY) {
return false;
}
break;
case 2:
if (var2 < this.screenY || var2 >= var5 + this.screenY) {
if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) {
return false;
}
}
@@ -156,10 +154,10 @@ public abstract class AbstractWorldMapIcon {
}
}
@ObfuscatedName("w")
@ObfuscatedName("at")
@ObfuscatedSignature(
signature = "(IIB)Z",
garbageValue = "66"
signature = "(IIS)Z",
garbageValue = "3172"
)
@Export("labelFitsScreen")
boolean labelFitsScreen(int var1, int var2) {
@@ -173,15 +171,91 @@ public abstract class AbstractWorldMapIcon {
}
}
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(B)I",
garbageValue = "6"
)
static int method587() {
return 11;
}
@ObfuscatedName("r")
@ObfuscatedSignature(
signature = "(Ljava/lang/String;I)V",
garbageValue = "261353448"
signature = "(ILcu;ZI)I",
garbageValue = "131093374"
)
static final void method591(String var0) {
StringBuilder var10000 = (new StringBuilder()).append(var0);
Object var10001 = null;
String var1 = var10000.append(" is already on your ignore list").toString();
DirectByteArrayCopier.addGameMessage(30, "", var1);
static int method576(int var0, Script var1, boolean var2) {
Widget var3 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410;
if (var0 == ScriptOpcodes.CC_GETTARGETMASK) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WorldMapElement.method4390(class60.getWidgetClickMask(var3));
return 1;
} else if (var0 != ScriptOpcodes.CC_GETOP) {
if (var0 == ScriptOpcodes.CC_GETOPBASE) {
if (var3.dataText == null) {
Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
} else {
Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.dataText;
}
return 1;
} else {
return 2;
}
} else {
int var4 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
--var4;
if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.actions[var4];
} else {
Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
}
return 1;
}
}
@ObfuscatedName("he")
@ObfuscatedSignature(
signature = "(II)V",
garbageValue = "-1120874637"
)
static final void method572(int var0) {
if (var0 >= 0) {
int var1 = Client.menuArguments1[var0];
int var2 = Client.menuArguments2[var0];
int var3 = Client.menuOpcodes[var0];
int var4 = Client.menuIdentifiers[var0];
String var5 = Client.menuActions[var0];
String var6 = Client.menuTargets[var0];
EnumDefinition.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
}
}
@ObfuscatedName("ii")
@ObfuscatedSignature(
signature = "(IIIIIIIIB)V",
garbageValue = "-109"
)
@Export("drawWidgets")
static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
if (TaskHandler.loadInterface(var0)) {
SoundCache.field1410 = null;
MusicPatchPcmStream.drawInterface(class289.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7);
if (SoundCache.field1410 != null) {
MusicPatchPcmStream.drawInterface(SoundCache.field1410, -1412584499, var1, var2, var3, var4, WorldMapSection0.field138, GrandExchangeOfferNameComparator.field79, var7);
SoundCache.field1410 = null;
}
} else {
if (var7 != -1) {
Client.field827[var7] = true;
} else {
for (int var8 = 0; var8 < 100; ++var8) {
Client.field827[var8] = true;
}
}
}
}
}