project: Rev update

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

View File

@@ -1,56 +1,52 @@
import java.awt.image.BufferedImage;
import java.awt.image.PixelGrabber;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import javax.imageio.ImageIO;
import net.runelite.mapping.Export;
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("av")
@ObfuscatedName("ak")
@Implements("WorldMapSection1")
public class WorldMapSection1 implements WorldMapSection {
@ObfuscatedName("br")
@ObfuscatedName("n")
@ObfuscatedSignature(
signature = "Lgw;"
signature = "[Lmb;"
)
@Export("clientLanguage")
static Language clientLanguage;
@ObfuscatedName("a")
@Export("JagexCache_idxFiles")
public static BufferedFile[] JagexCache_idxFiles;
@ObfuscatedName("u")
@ObfuscatedGetter(
intValue = 1154068221
intValue = 1685599607
)
@Export("minPlane")
int minPlane;
@ObfuscatedName("t")
@ObfuscatedName("f")
@ObfuscatedGetter(
intValue = -1054158347
intValue = 1999692887
)
@Export("planes")
int planes;
@ObfuscatedName("n")
@ObfuscatedName("b")
@ObfuscatedGetter(
intValue = -1028854111
intValue = -942650023
)
@Export("regionStartX")
int regionStartX;
@ObfuscatedName("q")
@ObfuscatedName("g")
@ObfuscatedGetter(
intValue = -1350471723
intValue = 867361781
)
@Export("regionStartY")
int regionStartY;
@ObfuscatedName("v")
@ObfuscatedName("z")
@ObfuscatedGetter(
intValue = -1028705705
intValue = -101152241
)
@Export("regionEndX")
int regionEndX;
@ObfuscatedName("l")
@ObfuscatedName("p")
@ObfuscatedGetter(
intValue = -615162757
intValue = -1283345723
)
@Export("regionEndY")
int regionEndY;
@@ -58,10 +54,10 @@ public class WorldMapSection1 implements WorldMapSection {
WorldMapSection1() {
}
@ObfuscatedName("a")
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "(Laa;B)V",
garbageValue = "-111"
signature = "(Laf;I)V",
garbageValue = "-567179164"
)
@Export("expandBounds")
public void expandBounds(WorldMapArea var1) {
@@ -83,10 +79,10 @@ public class WorldMapSection1 implements WorldMapSection {
}
@ObfuscatedName("t")
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "(IIII)Z",
garbageValue = "-1417818612"
signature = "(IIIB)Z",
garbageValue = "0"
)
@Export("containsCoord")
public boolean containsCoord(int var1, int var2, int var3) {
@@ -97,20 +93,20 @@ public class WorldMapSection1 implements WorldMapSection {
}
}
@ObfuscatedName("n")
@ObfuscatedName("b")
@ObfuscatedSignature(
signature = "(III)Z",
garbageValue = "-2132898041"
garbageValue = "110675609"
)
@Export("containsPosition")
public boolean containsPosition(int var1, int var2) {
return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY;
}
@ObfuscatedName("q")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "(IIII)[I",
garbageValue = "1209167521"
signature = "(IIIB)[I",
garbageValue = "69"
)
@Export("getBorderTileLengths")
public int[] getBorderTileLengths(int var1, int var2, int var3) {
@@ -122,10 +118,10 @@ public class WorldMapSection1 implements WorldMapSection {
}
}
@ObfuscatedName("v")
@ObfuscatedName("z")
@ObfuscatedSignature(
signature = "(IIS)Lhf;",
garbageValue = "7283"
signature = "(III)Lhx;",
garbageValue = "1062204141"
)
@Export("coord")
public Coord coord(int var1, int var2) {
@@ -138,10 +134,10 @@ public class WorldMapSection1 implements WorldMapSection {
}
}
@ObfuscatedName("l")
@ObfuscatedName("p")
@ObfuscatedSignature(
signature = "(Lkc;I)V",
garbageValue = "-568369534"
signature = "(Lkg;I)V",
garbageValue = "-179898655"
)
@Export("read")
public void read(Buffer var1) {
@@ -154,77 +150,193 @@ public class WorldMapSection1 implements WorldMapSection {
this.postRead();
}
@ObfuscatedName("c")
@ObfuscatedName("h")
@ObfuscatedSignature(
signature = "(B)V",
garbageValue = "0"
signature = "(S)V",
garbageValue = "24453"
)
@Export("postRead")
void postRead() {
}
@ObfuscatedName("a")
static double method636(double var0, double var2, double var4) {
double var8 = (var0 - var2) / var4;
double var6 = Math.exp(var8 * -var8 / 2.0D) / Math.sqrt(6.283185307179586D);
return var6 / var4;
@ObfuscatedName("ad")
@ObfuscatedSignature(
signature = "(ILci;ZI)I",
garbageValue = "2067756787"
)
static int method608(int var0, Script var1, boolean var2) {
if (var0 == ScriptOpcodes.CLIENTCLOCK) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.cycle;
return 1;
} else {
int var3;
int var4;
if (var0 == ScriptOpcodes.INV_GETOBJ) {
GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = AttackOption.method2098(var3, var4);
return 1;
} else if (var0 == ScriptOpcodes.INV_GETNUM) {
GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = class286.ItemContainer_getCount(var3, var4);
return 1;
} else if (var0 == ScriptOpcodes.INV_TOTAL) {
GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = class96.method2314(var3, var4);
return 1;
} else if (var0 == ScriptOpcodes.INV_SIZE) {
var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = TextureProvider.getInvDefinition(var3).size;
return 1;
} else if (var0 == ScriptOpcodes.STAT) {
var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.currentLevels[var3];
return 1;
} else if (var0 == ScriptOpcodes.STAT_BASE) {
var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.levels[var3];
return 1;
} else if (var0 == ScriptOpcodes.STAT_XP) {
var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.experience[var3];
return 1;
} else {
int var5;
if (var0 == ScriptOpcodes.COORD) {
var3 = ClientPacket.Client_plane;
var4 = class51.baseX * 64 + (class215.localPlayer.x >> 7);
var5 = VarcInt.baseY * 64 + (class215.localPlayer.y >> 7);
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28);
return 1;
} else if (var0 == ScriptOpcodes.COORDX) {
var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 >> 14 & 16383;
return 1;
} else if (var0 == ScriptOpcodes.COORDZ) {
var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 >> 28;
return 1;
} else if (var0 == ScriptOpcodes.COORDY) {
var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 & 16383;
return 1;
} else if (var0 == ScriptOpcodes.MAP_MEMBERS) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0;
return 1;
} else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) {
GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] + 32768;
var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = AttackOption.method2098(var3, var4);
return 1;
} else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) {
GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] + 32768;
var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = class286.ItemContainer_getCount(var3, var4);
return 1;
} else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) {
GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] + 32768;
var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = class96.method2314(var3, var4);
return 1;
} else if (var0 == ScriptOpcodes.STAFFMODLEVEL) {
if (Client.staffModLevel >= 2) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.staffModLevel;
} else {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0;
}
return 1;
} else if (var0 == ScriptOpcodes.REBOOTTIMER) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.rebootTimer;
return 1;
} else if (var0 == ScriptOpcodes.MAP_WORLD) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.worldId;
return 1;
} else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.runEnergy;
return 1;
} else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.weight;
return 1;
} else if (var0 == ScriptOpcodes.PLAYERMOD) {
if (Client.playerMod) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 1;
} else {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0;
}
return 1;
} else if (var0 == ScriptOpcodes.WORLDFLAGS) {
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.worldProperties;
return 1;
} else if (var0 == ScriptOpcodes.MOVECOORD) {
GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 4;
var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
var5 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2];
int var6 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 3];
var3 += var4 << 14;
var3 += var5 << 28;
var3 += var6;
Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3;
return 1;
} else {
return 2;
}
}
}
}
@ObfuscatedName("a")
@ObfuscatedName("iy")
@ObfuscatedSignature(
signature = "([BS)Llx;",
garbageValue = "-10858"
signature = "(Lhl;IIZI)V",
garbageValue = "-521938970"
)
@Export("convertJpgToSprite")
public static final Sprite convertJpgToSprite(byte[] var0) {
BufferedImage var1 = null;
try {
var1 = ImageIO.read(new ByteArrayInputStream(var0));
int var2 = var1.getWidth();
int var3 = var1.getHeight();
int[] var4 = new int[var2 * var3];
PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2);
var5.grabPixels();
return new Sprite(var4, var2, var3);
} catch (IOException var7) {
} catch (InterruptedException var8) {
@Export("alignWidgetSize")
static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) {
int var4 = var0.width;
int var5 = var0.height;
if (var0.widthAlignment == 0) {
var0.width = var0.rawWidth;
} else if (var0.widthAlignment == 1) {
var0.width = var1 - var0.rawWidth;
} else if (var0.widthAlignment == 2) {
var0.width = var0.rawWidth * var1 >> 14;
}
return new Sprite(0, 0);
}
@ObfuscatedName("hf")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "-1373255332"
)
static final void method622() {
Client.field745 = 0;
int var0 = UserComparator8.baseX * 64 + (class215.localPlayer.x >> 7);
int var1 = HealthBar.baseY * 64 + (class215.localPlayer.y >> 7);
if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) {
Client.field745 = 1;
if (var0.heightAlignment == 0) {
var0.height = var0.rawHeight;
} else if (var0.heightAlignment == 1) {
var0.height = var2 - var0.rawHeight;
} else if (var0.heightAlignment == 2) {
var0.height = var2 * var0.rawHeight >> 14;
}
if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) {
Client.field745 = 1;
if (var0.widthAlignment == 4) {
var0.width = var0.field2594 * var0.height / var0.field2694;
}
if (Client.field745 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) {
Client.field745 = 0;
if (var0.heightAlignment == 4) {
var0.height = var0.width * var0.field2694 / var0.field2594;
}
}
if (var0.contentType == 1337) {
Client.viewportWidget = var0;
}
@ObfuscatedName("lk")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "1886233259"
)
static void method650() {
if (Client.oculusOrbState == 1) {
Client.field645 = true;
if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) {
ScriptEvent var6 = new ScriptEvent();
var6.widget = var0;
var6.args = var0.onResize;
Client.scriptEvents.addFirst(var6);
}
}