chore: rev 190

This commit is contained in:
ThatGamerBlue
2020-06-18 12:15:38 +01:00
parent c97f7b196e
commit 655106b9df
351 changed files with 41484 additions and 41558 deletions

View File

@@ -4,114 +4,84 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ax")
@ObfuscatedName("af")
@Implements("AbstractWorldMapIcon")
public abstract class AbstractWorldMapIcon {
@ObfuscatedName("sq")
@ObfuscatedGetter(
intValue = -1106675929
)
@Export("foundItemIndex")
static int foundItemIndex;
@ObfuscatedName("dx")
@ObfuscatedName("es")
@ObfuscatedSignature(
signature = "Lih;"
signature = "Lig;"
)
@Export("archive6")
static Archive archive6;
@ObfuscatedName("dy")
@Export("archive17")
static Archive archive17;
@ObfuscatedName("n")
@ObfuscatedSignature(
signature = "Lih;"
)
@Export("archive7")
static Archive archive7;
@ObfuscatedName("fp")
@ObfuscatedSignature(
signature = "Lfr;"
)
@Export("socketTask")
static Task socketTask;
@ObfuscatedName("la")
@ObfuscatedSignature(
signature = "Lci;"
)
@Export("tempMenuAction")
static MenuAction tempMenuAction;
@ObfuscatedName("my")
@ObfuscatedGetter(
intValue = 468589673
)
@Export("selectedSpellFlags")
static int selectedSpellFlags;
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "Lhj;"
signature = "Lhg;"
)
@Export("coord2")
public final Coord coord2;
@ObfuscatedName("z")
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "Lhj;"
signature = "Lhg;"
)
@Export("coord1")
public final Coord coord1;
@ObfuscatedName("t")
@ObfuscatedName("a")
@ObfuscatedGetter(
intValue = -1506769643
intValue = -702767977
)
@Export("screenX")
int screenX;
@ObfuscatedName("e")
@ObfuscatedName("z")
@ObfuscatedGetter(
intValue = -896182235
intValue = 2041834837
)
@Export("screenY")
int screenY;
@ObfuscatedSignature(
signature = "(Lhj;Lhj;)V"
signature = "(Lhg;Lhg;)V"
)
AbstractWorldMapIcon(Coord var1, Coord var2) {
this.coord1 = var1;
this.coord2 = var2;
}
@ObfuscatedName("x")
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(B)I",
garbageValue = "16"
garbageValue = "0"
)
@Export("getElement")
public abstract int getElement();
@ObfuscatedName("m")
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "(I)Lau;",
garbageValue = "2077771117"
signature = "(B)Lar;",
garbageValue = "35"
)
@Export("getLabel")
abstract WorldMapLabel getLabel();
@ObfuscatedName("k")
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "650401890"
garbageValue = "1804331962"
)
@Export("getSubWidth")
abstract int getSubWidth();
@ObfuscatedName("d")
@ObfuscatedName("j")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "-1828864081"
garbageValue = "-1265869629"
)
@Export("getSubHeight")
abstract int getSubHeight();
@ObfuscatedName("a")
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "(III)Z",
garbageValue = "-57056512"
garbageValue = "422348755"
)
@Export("fitsScreen")
boolean fitsScreen(int var1, int var2) {
@@ -122,40 +92,41 @@ public abstract class AbstractWorldMapIcon {
}
}
@ObfuscatedName("o")
@ObfuscatedName("x")
@ObfuscatedSignature(
signature = "(S)Z",
garbageValue = "-32437"
signature = "(I)Z",
garbageValue = "807957820"
)
@Export("hasValidElement")
boolean hasValidElement() {
return this.getElement() >= 0;
}
@ObfuscatedName("c")
@ObfuscatedName("ah")
@ObfuscatedSignature(
signature = "(III)Z",
garbageValue = "1127928990"
garbageValue = "872444562"
)
@Export("elementFitsScreen")
boolean elementFitsScreen(int var1, int var2) {
if (!this.hasValidElement()) {
return false;
} else {
WorldMapElement var3 = class25.WorldMapElement_get(this.getElement());
WorldMapElement var3 = Client.WorldMapElement_get(this.getElement());
int var4 = this.getSubWidth();
int var5 = this.getSubHeight();
switch(var3.horizontalAlignment.value) {
case 0:
if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) {
return false;
}
break;
case 1:
if (var1 >= this.screenX && var1 < var4 + this.screenX) {
break;
}
return false;
case 1:
if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) {
break;
}
return false;
case 2:
if (var1 <= this.screenX - var4 || var1 > this.screenX) {
@@ -165,17 +136,18 @@ public abstract class AbstractWorldMapIcon {
switch(var3.verticalAlignment.value) {
case 0:
if (var2 <= this.screenY - var5 || var2 > this.screenY) {
return false;
if (var2 >= this.screenY && var2 < var5 + this.screenY) {
break;
}
break;
return false;
case 1:
if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) {
return false;
}
break;
case 2:
if (var2 < this.screenY || var2 >= var5 + this.screenY) {
if (var2 <= this.screenY - var5 || var2 > this.screenY) {
return false;
}
}
@@ -184,10 +156,10 @@ public abstract class AbstractWorldMapIcon {
}
}
@ObfuscatedName("f")
@ObfuscatedName("ai")
@ObfuscatedSignature(
signature = "(III)Z",
garbageValue = "-411865092"
signature = "(IIB)Z",
garbageValue = "1"
)
@Export("labelFitsScreen")
boolean labelFitsScreen(int var1, int var2) {
@@ -195,19 +167,46 @@ 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 <= this.screenY + var3.height;
return var2 >= this.screenY && var2 <= var3.height + this.screenY;
} else {
return false;
}
}
@ObfuscatedName("t")
@ObfuscatedName("p")
@ObfuscatedSignature(
signature = "(CB)Z",
garbageValue = "0"
signature = "(I)V",
garbageValue = "-288699605"
)
@Export("isAlphaNumeric")
public static boolean isAlphaNumeric(char var0) {
return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
public static void method687() {
synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
if (ArchiveDiskActionHandler.field3181 != 0) {
ArchiveDiskActionHandler.field3181 = 1;
try {
ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait();
} catch (InterruptedException var3) {
}
}
}
}
@ObfuscatedName("fk")
@ObfuscatedSignature(
signature = "(IIII)V",
garbageValue = "-886030498"
)
@Export("queueSoundEffect")
static void queueSoundEffect(int var0, int var1, int var2) {
if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) {
Client.soundEffectIds[Client.soundEffectCount] = var0;
Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1;
Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2;
Client.soundEffects[Client.soundEffectCount] = null;
Client.soundLocations[Client.soundEffectCount] = 0;
++Client.soundEffectCount;
}
}
}