Merge pull request #940 from Lucwousin/jehebnooitgeengeld

runescape-client: More refactoring
This commit is contained in:
Tyler Bochard
2019-07-08 19:29:29 -04:00
committed by GitHub
134 changed files with 2083 additions and 1975 deletions
@@ -45,6 +45,10 @@ public class AnnotationCleaner
{
assertEquals(c + " implements " + implementingName + " but is called " + c.getClassName(), implementingName, c.getClassName());
}
else
{
assertTrue(c + " isn't obfuscated but doesn't have @Implements", Deob.isObfuscated(c.getClassName()));
}
for (Field f : c.getFields())
{
@@ -40,8 +40,7 @@ public abstract class ClickboxMixin implements RSClient
return;
}
boolean bb = boundingboxCheck(model, _x, _y, _z);
if (!bb)
if (!boundingboxCheck(model, _x, _y, _z))
{
return;
}
@@ -27,13 +27,13 @@ public abstract class RSRasterizer2DMixin implements RSClient
pixels[index] = value & 0x00FFFFFF | outAlpha << 24;
}
@Copy("drawGradientAlpha")
private static void rs$raster2d6(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7)
@Copy("Rasterizer2D_fillRectangleGradientAlpha")
private static void rs$drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7)
{
throw new RuntimeException();
}
@Replace("drawGradientAlpha")
@Replace("Rasterizer2D_fillRectangleGradientAlpha")
private static void rl$drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7)
{
final int width = client.getGraphicsPixelsWidth();
@@ -45,7 +45,7 @@ public abstract class RSRasterizer2DMixin implements RSClient
if (!client.isGpu())
{
rs$raster2d6(var0, var1, var2, var3, var4, var5, var6, var7);
rs$drawGradientAlpha(var0, var1, var2, var3, var4, var5, var6, var7);
return;
}
@@ -981,7 +981,7 @@ public interface RSClient extends RSGameShell, Client
@Import("Rasterizer2D_drawVerticalLine")
void rasterizerDrawVerticalLine(int x, int y, int h, int rgb);
@Import("drawGradient")
@Import("Rasterizer2D_fillRectangleGradient")
void rasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom);
@Import("Rasterizer2D_fillRectangleAlpha")
@@ -5,7 +5,7 @@ import net.runelite.mapping.Import;
public interface RSWorldMapManager extends WorldMapManager
{
@Import("isLoaded0")
@Import("isLoaded")
@Override
boolean isLoaded();
@@ -97,9 +97,9 @@ public abstract class AbstractArchive {
@Export("shallowFiles")
boolean shallowFiles;
AbstractArchive(boolean var1, boolean var2) {
this.releaseGroups = var1;
this.shallowFiles = var2;
AbstractArchive(boolean releaseGroups, boolean shallowFiles) {
this.releaseGroups = releaseGroups;
this.shallowFiles = shallowFiles;
}
@ObfuscatedName("m")
@@ -446,8 +446,9 @@ public abstract class AbstractArchive {
signature = "(II)I",
garbageValue = "1178362496"
)
public int method4(int var1) {
return this.files[var1].length;
@Export("getGroupFileCount")
public int getGroupFileCount(int group) {
return this.files[group].length;
}
@ObfuscatedName("t")
@@ -455,7 +456,8 @@ public abstract class AbstractArchive {
signature = "(I)I",
garbageValue = "1702434573"
)
public int method5() {
@Export("getGroupCount")
public int getGroupCount() {
return this.files.length;
}
@@ -751,7 +753,7 @@ public abstract class AbstractArchive {
if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) {
while (Client.archiveLoaderArchive < Client.archiveLoaders.size()) {
ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoaderArchive);
if (!var0.method134()) {
if (!var0.isLoaded()) {
return false;
}
@@ -13,7 +13,8 @@ public abstract class AbstractByteArrayCopier {
@ObfuscatedSignature(
signature = "Lit;"
)
static Archive field0;
@Export("archive20")
static Archive archive20;
@ObfuscatedName("m")
@ObfuscatedSignature(
@@ -34,12 +34,14 @@ public abstract class AbstractWorldMapIcon {
@ObfuscatedGetter(
intValue = -521086143
)
int field5;
@Export("screenX")
int screenX;
@ObfuscatedName("x")
@ObfuscatedGetter(
intValue = -1065362217
)
int field6;
@Export("screenY")
int screenY;
@ObfuscatedSignature(
signature = "(Lhu;Lhu;)V"
@@ -109,38 +111,38 @@ public abstract class AbstractWorldMapIcon {
WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.getElement());
int var4 = this.vmethod397();
int var5 = this.vmethod398();
switch(var3.field3287.field3528) {
switch(var3.horizontalAlignment.value) {
case 0:
if (var1 >= this.field5 - var4 / 2 && var1 <= var4 / 2 + this.field5) {
if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) {
break;
}
return false;
case 1:
if (var1 >= this.field5 && var1 < var4 + this.field5) {
if (var1 >= this.screenX && var1 < var4 + this.screenX) {
break;
}
return false;
case 2:
if (var1 <= this.field5 - var4 || var1 > this.field5) {
if (var1 <= this.screenX - var4 || var1 > this.screenX) {
return false;
}
}
switch(var3.field3301.field3275) {
switch(var3.verticalAlignment.value) {
case 0:
if (var2 <= this.field6 - var5 || var2 > this.field6) {
if (var2 <= this.screenY - var5 || var2 > this.screenY) {
return false;
}
break;
case 1:
if (var2 < this.field6 - var5 / 2 || var2 > var5 / 2 + this.field6) {
if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) {
return false;
}
break;
case 2:
if (var2 < this.field6 || var2 >= var5 + this.field6) {
if (var2 < this.screenY || var2 >= var5 + this.screenY) {
return false;
}
}
@@ -156,7 +158,7 @@ public abstract class AbstractWorldMapIcon {
)
boolean method21(int var1, int var2) {
WorldMapLabel var3 = this.getLabel();
return var3 == null ? false : (var1 >= this.field5 - var3.width / 2 && var1 <= var3.width / 2 + this.field5 ? var2 >= this.field6 && var2 <= var3.height + this.field6 : false);
return var3 == null ? false : (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX ? var2 >= this.screenY && var2 <= var3.height + this.screenY : false);
}
@ObfuscatedName("es")
@@ -167,6 +169,6 @@ public abstract class AbstractWorldMapIcon {
static void method625(Archive var0, String var1) {
ArchiveLoader var2 = new ArchiveLoader(var0, var1);
Client.archiveLoaders.add(var2);
Client.field140 += var2.field408;
Client.field140 += var2.groupCount;
}
}
+5 -5
View File
@@ -919,7 +919,7 @@ public abstract class Actor extends Entity {
var13 = class204.getWidgetChild(argument2, argument1);
if (var13 != null) {
Player.method1281();
WorldMapDecoration.method350(argument2, argument1, class211.method4107(class1.getWidgetClickMask(var13)), var13.itemId);
WorldMapDecoration.method350(argument2, argument1, Calendar.method4107(class1.getWidgetClickMask(var13)), var13.itemId);
Client.isItemSelected = 0;
Client.selectedSpellActionName = class198.method3745(var13);
if (Client.selectedSpellActionName == null) {
@@ -967,7 +967,7 @@ public abstract class Actor extends Entity {
if (Client.field127 == null) {
TilePaint.method3060(argument2, argument1);
Client.field127 = class204.getWidgetChild(argument2, argument1);
class22.method295(Client.field127);
WorldMapRectangle.method295(Client.field127);
}
} else if (opcode == 31) {
var8 = Interpreter.method1915(ClientPacket.field285, Client.packetWriter.isaacCipher);
@@ -1045,7 +1045,7 @@ public abstract class Actor extends Entity {
HealthBarDefinition.selectedItemSlot = argument1;
ServerPacket.selectedItemWidget = argument2;
MenuAction.selectedItemId = argument0;
class22.method295(var13);
WorldMapRectangle.method295(var13);
Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(argument0).name + BufferedFile.colorStartTag(16777215);
if (Client.selectedItemName == null) {
Client.selectedItemName = "null";
@@ -1327,7 +1327,7 @@ public abstract class Actor extends Entity {
if (Client.isItemSelected != 0) {
Client.isItemSelected = 0;
class22.method295(Huffman.getWidget(ServerPacket.selectedItemWidget));
WorldMapRectangle.method295(Huffman.getWidget(ServerPacket.selectedItemWidget));
}
if (Client.isSpellSelected) {
@@ -1335,7 +1335,7 @@ public abstract class Actor extends Entity {
}
if (BoundaryObject.field40 != null && Client.field203 == 0) {
class22.method295(BoundaryObject.field40);
WorldMapRectangle.method295(BoundaryObject.field40);
}
}
@@ -79,19 +79,19 @@ public class Animation {
}
if ((var9 & 1) != 0) {
field27[var7] = var4.method47();
field27[var7] = var4.readShortSmart();
} else {
field27[var7] = var11;
}
if ((var9 & 2) != 0) {
field28[var7] = var4.method47();
field28[var7] = var4.readShortSmart();
} else {
field28[var7] = var11;
}
if ((var9 & 4) != 0) {
field29[var7] = var4.method47();
field29[var7] = var4.readShortSmart();
} else {
field29[var7] = var11;
}
+22 -22
View File
@@ -57,14 +57,14 @@ public class Archive extends AbstractArchive {
@ObfuscatedSignature(
signature = "(Lff;Lff;IZZZ)V"
)
public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) {
super(var4, var5);
public Archive(ArchiveDisk archiveDisk, ArchiveDisk masterDisk, int index, boolean releaseGroups, boolean shallowFiles, boolean var6) {
super(releaseGroups, shallowFiles);
this.field403 = false;
this.field404 = false;
this.field405 = -1;
this.archiveDisk = var1;
this.masterDisk = var2;
this.index = var3;
this.archiveDisk = archiveDisk;
this.masterDisk = masterDisk;
this.index = index;
this.field404 = var6;
int var7 = this.index;
if (Players.NetCache_reference != null) {
@@ -240,26 +240,26 @@ public class Archive extends AbstractArchive {
garbageValue = "-2045340856"
)
@Export("load")
void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
void load(ArchiveDisk var1, int group, byte[] data, boolean var4) {
int var5;
if (var1 == this.masterDisk) {
if (this.field403) {
throw new RuntimeException();
}
if (var3 == null) {
if (data == null) {
PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
} else {
Archive_crc.reset();
Archive_crc.update(var3, 0, var3.length);
Archive_crc.update(data, 0, data.length);
var5 = (int)Archive_crc.getValue();
if (var5 != this.indexCrc) {
PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
} else {
Buffer var6 = new Buffer(Strings.decompressBytes(var3));
Buffer var6 = new Buffer(Strings.decompressBytes(data));
int var7 = var6.readUnsignedByte();
if (var7 != 5 && var7 != 6) {
throw new RuntimeException(var7 + "," + this.index + "," + var2);
throw new RuntimeException(var7 + "," + this.index + "," + group);
}
int var8 = 0;
@@ -270,36 +270,36 @@ public class Archive extends AbstractArchive {
if (var8 != this.indexVersion) {
PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
} else {
this.decodeIndex(var3);
this.decodeIndex(data);
this.loadAllLocal();
}
}
}
} else {
if (!var4 && var2 == this.field405) {
if (!var4 && group == this.field405) {
this.field403 = true;
}
if (var3 != null && var3.length > 2) {
if (data != null && data.length > 2) {
Archive_crc.reset();
Archive_crc.update(var3, 0, var3.length - 2);
Archive_crc.update(data, 0, data.length - 2);
var5 = (int)Archive_crc.getValue();
int var9 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255);
if (var5 == super.groupCrcs[var2] && var9 == super.groupVersions[var2]) {
this.validGroups[var2] = true;
int var9 = ((data[data.length - 2] & 255) << 8) + (data[data.length - 1] & 255);
if (var5 == super.groupCrcs[group] && var9 == super.groupVersions[group]) {
this.validGroups[group] = true;
if (var4) {
super.groups[var2] = Projectile.byteArrayToObject(var3, false);
super.groups[group] = Projectile.byteArrayToObject(data, false);
}
} else {
this.validGroups[var2] = false;
this.validGroups[group] = false;
if (this.field404 || var4) {
PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
PacketBuffer.requestNetFile(this, this.index, group, super.groupCrcs[group], (byte)2, var4);
}
}
} else {
this.validGroups[var2] = false;
this.validGroups[group] = false;
if (this.field404 || var4) {
PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
PacketBuffer.requestNetFile(this, this.index, group, super.groupCrcs[group], (byte)2, var4);
}
}
}
@@ -38,20 +38,22 @@ public class ArchiveLoader {
@ObfuscatedGetter(
intValue = 1459455501
)
final int field408;
@Export("groupCount")
final int groupCount;
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = 782003089
)
int field409;
@Export("loadedCount")
int loadedCount;
@ObfuscatedSignature(
signature = "(Lit;Ljava/lang/String;)V"
)
ArchiveLoader(Archive var1, String var2) {
this.field409 = 0;
this.archive = var1;
this.field408 = var1.method5();
ArchiveLoader(Archive archive, String name) {
this.loadedCount = 0;
this.archive = archive;
this.groupCount = archive.getGroupCount();
}
@ObfuscatedName("m")
@@ -59,16 +61,17 @@ public class ArchiveLoader {
signature = "(I)Z",
garbageValue = "1352221725"
)
boolean method134() {
this.field409 = 0;
@Export("isLoaded")
boolean isLoaded() {
this.loadedCount = 0;
for (int var1 = 0; var1 < this.field408; ++var1) {
for (int var1 = 0; var1 < this.groupCount; ++var1) {
if (!this.archive.method133(var1) || this.archive.method132(var1)) {
++this.field409;
++this.loadedCount;
}
}
return this.field409 >= this.field408;
return this.loadedCount >= this.groupCount;
}
@ObfuscatedName("x")
@@ -92,7 +95,7 @@ public class ArchiveLoader {
boolean var11;
if (Login.worldSelectOpen) {
if (class30.worldSelectBackSprites == null) {
class30.worldSelectBackSprites = class2.method20(WorldMapSection3.archive8, "sl_back", "");
class30.worldSelectBackSprites = class2.method20(WorldMapSection1.archive8, "sl_back", "");
}
Archive var12;
@@ -100,7 +103,7 @@ public class ArchiveLoader {
int var14;
IndexedSprite[] var15;
if (Frames.worldSelectFlagSprites == null) {
var12 = WorldMapSection3.archive8;
var12 = WorldMapSection1.archive8;
var14 = var12.getGroupId("sl_flags");
var13 = var12.getFileId(var14, "");
if (!SpriteMask.loadSprite(var12, var14, var13)) {
@@ -113,7 +116,7 @@ public class ArchiveLoader {
}
if (AttackOption.worldSelectArrows == null) {
var12 = WorldMapSection3.archive8;
var12 = WorldMapSection1.archive8;
var14 = var12.getGroupId("sl_arrows");
var13 = var12.getFileId(var14, "");
if (!SpriteMask.loadSprite(var12, var14, var13)) {
@@ -126,7 +129,7 @@ public class ArchiveLoader {
}
if (UrlRequest.worldSelectStars == null) {
var12 = WorldMapSection3.archive8;
var12 = WorldMapSection1.archive8;
var14 = var12.getGroupId("sl_stars");
var13 = var12.getFileId(var14, "");
if (!SpriteMask.loadSprite(var12, var14, var13)) {
@@ -139,16 +142,16 @@ public class ArchiveLoader {
}
if (SecureRandomFuture.worldSelectLeftSprite == null) {
SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "leftarrow", "");
SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection1.archive8, "leftarrow", "");
}
if (NetSocket.worldSelectRightSprite == null) {
NetSocket.worldSelectRightSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "rightarrow", "");
NetSocket.worldSelectRightSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection1.archive8, "rightarrow", "");
}
Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0);
Rasterizer2D.drawGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624);
Rasterizer2D.drawGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513);
Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 0xbd9839, 0x8b6608);
Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 0x4f4f4f, 0x292929);
var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1);
if (UrlRequest.worldSelectStars != null) {
UrlRequest.worldSelectStars[1].drawAt(Login.xPadding + 140, 1);
@@ -700,7 +703,7 @@ public class ArchiveLoader {
var1.drawCentered("Click to switch", var39 / 2 + var10, var41 / 2 + var34 + 12, 16777215, 0);
}
} else {
class277.field1144 = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "sl_button", "");
class277.field1144 = MenuAction.loadIndexedSpriteByName(WorldMapSection1.archive8, "sl_button", "");
}
}
}
+17 -17
View File
@@ -8,13 +8,13 @@ public class AudioFilter {
@ObfuscatedName("u")
static float[][] field32;
@ObfuscatedName("g")
static int[][] field33;
static int[][] coefficients;
@ObfuscatedName("l")
static float field34;
@ObfuscatedName("e")
static int field35;
static int forwardMultiplier;
@ObfuscatedName("m")
int[] field36;
int[] pairs;
@ObfuscatedName("q")
int[][][] field37;
@ObfuscatedName("w")
@@ -23,7 +23,7 @@ public class AudioFilter {
int[] field39;
AudioFilter() {
this.field36 = new int[2];
this.pairs = new int[2];
this.field37 = new int[2][2][4];
this.field38 = new int[2][2][4];
this.field39 = new int[2];
@@ -44,16 +44,16 @@ public class AudioFilter {
}
@ObfuscatedName("w")
int method26(int var1, float var2) {
int compute(int var1, float var2) {
float var3;
if (var1 == 0) {
var3 = (float)this.field39[0] + (float)(this.field39[1] - this.field39[0]) * var2;
var3 *= 0.0030517578F;
field34 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
field35 = (int)(field34 * 65536.0F);
forwardMultiplier = (int)(field34 * 65536.0F);
}
if (this.field36[var1] == 0) {
if (this.pairs[var1] == 0) {
return 0;
} else {
var3 = this.method24(var1, 0, var2);
@@ -62,7 +62,7 @@ public class AudioFilter {
float[] var4;
int var5;
for (var5 = 1; var5 < this.field36[var1]; ++var5) {
for (var5 = 1; var5 < this.pairs[var1]; ++var5) {
var3 = this.method24(var1, var5, var2);
float var6 = -2.0F * var3 * (float)Math.cos((double)this.method25(var1, var5, var2));
float var7 = var3 * var3;
@@ -81,17 +81,17 @@ public class AudioFilter {
}
if (var1 == 0) {
for (var5 = 0; var5 < this.field36[0] * 2; ++var5) {
for (var5 = 0; var5 < this.pairs[0] * 2; ++var5) {
var4 = field32[0];
var4[var5] *= field34;
}
}
for (var5 = 0; var5 < this.field36[var1] * 2; ++var5) {
field33[var1][var5] = (int)(field32[var1][var5] * 65536.0F);
for (var5 = 0; var5 < this.pairs[var1] * 2; ++var5) {
coefficients[var1][var5] = (int)(field32[var1][var5] * 65536.0F);
}
return this.field36[var1] * 2;
return this.pairs[var1] * 2;
}
}
@@ -101,8 +101,8 @@ public class AudioFilter {
)
final void method27(Buffer var1, SoundEnvelope var2) {
int var3 = var1.readUnsignedByte();
this.field36[0] = var3 >> 4;
this.field36[1] = var3 & 15;
this.pairs[0] = var3 >> 4;
this.pairs[1] = var3 & 15;
if (var3 != 0) {
this.field39[0] = var1.readUnsignedShort();
this.field39[1] = var1.readUnsignedShort();
@@ -111,14 +111,14 @@ public class AudioFilter {
int var5;
int var6;
for (var5 = 0; var5 < 2; ++var5) {
for (var6 = 0; var6 < this.field36[var5]; ++var6) {
for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
this.field37[var5][0][var6] = var1.readUnsignedShort();
this.field38[var5][0][var6] = var1.readUnsignedShort();
}
}
for (var5 = 0; var5 < 2; ++var5) {
for (var6 = 0; var6 < this.field36[var5]; ++var6) {
for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
if ((var4 & 1 << var5 * 4 << var6) != 0) {
this.field37[var5][1][var6] = var1.readUnsignedShort();
this.field38[var5][1][var6] = var1.readUnsignedShort();
@@ -148,6 +148,6 @@ public class AudioFilter {
static {
field32 = new float[2][8];
field33 = new int[2][8];
coefficients = new int[2][8];
}
}
@@ -81,7 +81,7 @@ public final class BoundaryObject {
static final void doCheat(String var0) {
if (var0.equalsIgnoreCase("toggleroof")) {
ReflectionCheck.clientPreferences.roofsHidden = !ReflectionCheck.clientPreferences.roofsHidden;
WorldMapSection0.savePreferences();
WorldMapSection3.savePreferences();
if (ReflectionCheck.clientPreferences.roofsHidden) {
WorldMapIcon1.addGameMessage(99, "", "Roofs are now all hidden");
} else {
+45 -29
View File
@@ -9,9 +9,11 @@ import net.runelite.mapping.ObfuscatedSignature;
@Implements("Buffer")
public class Buffer extends Node {
@ObfuscatedName("q")
static int[] field45;
@Export("crc32Table")
static int[] crc32Table;
@ObfuscatedName("o")
static long[] field46;
@Export("crc64Table")
static long[] crc64Table;
@ObfuscatedName("m")
@Export("array")
public byte[] array;
@@ -163,7 +165,8 @@ public class Buffer extends Node {
signature = "(Ljava/lang/CharSequence;B)V",
garbageValue = "58"
)
public void method37(CharSequence var1) {
@Export("writeCESU8")
public void writeCESU8(CharSequence var1) {
int var2 = var1.length();
int var3 = 0;
@@ -179,7 +182,7 @@ public class Buffer extends Node {
}
this.array[++this.index - 1] = 0;
this.method42(var3);
this.writeVarInt(var3);
this.index += class16.method190(this.array, this.index, var1);
}
@@ -188,9 +191,10 @@ public class Buffer extends Node {
signature = "([BIII)V",
garbageValue = "-1915344405"
)
public void method38(byte[] var1, int var2, int var3) {
for (int var4 = var2; var4 < var3 + var2; ++var4) {
this.array[++this.index - 1] = var1[var4];
@Export("writeBytes")
public void writeBytes(byte[] bytes, int startIdx, int endIdx) {
for (int var4 = startIdx; var4 < endIdx + startIdx; ++var4) {
this.array[++this.index - 1] = bytes[var4];
}
}
@@ -200,7 +204,8 @@ public class Buffer extends Node {
signature = "(II)V",
garbageValue = "-225163682"
)
public void method39(int var1) {
@Export("writeLengthInt")
public void writeLengthInt(int var1) {
this.array[this.index - var1 - 4] = (byte)(var1 >> 24);
this.array[this.index - var1 - 3] = (byte)(var1 >> 16);
this.array[this.index - var1 - 2] = (byte)(var1 >> 8);
@@ -212,7 +217,8 @@ public class Buffer extends Node {
signature = "(II)V",
garbageValue = "-1298210761"
)
public void method40(int var1) {
@Export("writeLengthShort")
public void writeLengthShort(int var1) {
this.array[this.index - var1 - 2] = (byte)(var1 >> 8);
this.array[this.index - var1 - 1] = (byte)var1;
}
@@ -222,7 +228,8 @@ public class Buffer extends Node {
signature = "(II)V",
garbageValue = "-1839722163"
)
public void method41(int var1) {
@Export("writeLengthByte")
public void writeLengthByte(int var1) {
this.array[this.index - var1 - 1] = (byte)var1;
}
@@ -250,7 +257,8 @@ public class Buffer extends Node {
signature = "(II)V",
garbageValue = "820873705"
)
public void method42(int var1) {
@Export("writeVarInt")
public void writeVarInt(int var1) {
if ((var1 & -128) != 0) {
if ((var1 & -16384) != 0) {
if ((var1 & -2097152) != 0) {
@@ -306,7 +314,8 @@ public class Buffer extends Node {
signature = "(B)I",
garbageValue = "1"
)
public int method44() {
@Export("readShort")
public int readShort() {
this.index += 2;
int var1 = (this.array[this.index - 1] & 255) + ((this.array[this.index - 2] & 255) << 8);
if (var1 > 32767) {
@@ -417,12 +426,13 @@ public class Buffer extends Node {
signature = "(B)Ljava/lang/String;",
garbageValue = "-14"
)
public String method45() {
@Export("readCESU8")
public String readCESU8() {
byte var1 = this.array[++this.index - 1];
if (var1 != 0) {
throw new IllegalStateException("");
} else {
int var2 = this.method52();
int var2 = this.readVarInt();
if (var2 + this.index > this.array.length) {
throw new IllegalStateException("");
} else {
@@ -489,7 +499,8 @@ public class Buffer extends Node {
signature = "([BIIB)V",
garbageValue = "-122"
)
public void method46(byte[] var1, int var2, int var3) {
@Export("readBytes")
public void readBytes(byte[] var1, int var2, int var3) {
for (int var4 = var2; var4 < var3 + var2; ++var4) {
var1[var4] = this.array[++this.index - 1];
}
@@ -501,7 +512,8 @@ public class Buffer extends Node {
signature = "(B)I",
garbageValue = "-24"
)
public int method47() {
@Export("readShortSmart")
public int readShortSmart() {
int var1 = this.array[this.index] & 255;
return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152;
}
@@ -511,7 +523,8 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "1370512869"
)
public int method48() {
@Export("readUShortSmart")
public int readUShortSmart() {
int var1 = this.array[this.index] & 255;
return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768;
}
@@ -525,7 +538,7 @@ public class Buffer extends Node {
int var1 = 0;
int var2;
for (var2 = this.method48(); var2 == 32767; var2 = this.method48()) {
for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) {
var1 += 32767;
}
@@ -561,7 +574,8 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "984135559"
)
public int method52() {
@Export("readVarInt")
public int readVarInt() {
byte var1 = this.array[++this.index - 1];
int var2;
@@ -698,13 +712,13 @@ public class Buffer extends Node {
int var3 = this.index;
this.index = 0;
byte[] var4 = new byte[var3];
this.method46(var4, 0, var3);
this.readBytes(var4, 0, var3);
BigInteger var5 = new BigInteger(var4);
BigInteger var6 = var5.modPow(var1, var2);
byte[] var7 = var6.toByteArray();
this.index = 0;
this.writeShort(var7.length);
this.method38(var7, 0, var7.length);
this.writeBytes(var7, 0, var7.length);
}
@ObfuscatedName("aa")
@@ -712,13 +726,14 @@ public class Buffer extends Node {
signature = "(II)I",
garbageValue = "-484928770"
)
public int method53(int var1) {
@Export("writeCrc")
public int writeCrc(int var1) {
byte[] var2 = this.array;
int var3 = this.index;
int var4 = -1;
for (int var5 = var1; var5 < var3; ++var5) {
var4 = var4 >>> 8 ^ field45[(var4 ^ var2[var5]) & 255];
var4 = var4 >>> 8 ^ crc32Table[(var4 ^ var2[var5]) & 255];
}
var4 = ~var4;
@@ -731,7 +746,8 @@ public class Buffer extends Node {
signature = "(B)Z",
garbageValue = "-11"
)
public boolean method54() {
@Export("checkCrc")
public boolean checkCrc() {
this.index -= 4;
byte[] var1 = this.array;
int var2 = this.index;
@@ -739,7 +755,7 @@ public class Buffer extends Node {
int var4;
for (var4 = 0; var4 < var2; ++var4) {
var3 = var3 >>> 8 ^ field45[(var3 ^ var1[var4]) & 255];
var3 = var3 >>> 8 ^ crc32Table[(var3 ^ var1[var4]) & 255];
}
var3 = ~var3;
@@ -1023,7 +1039,7 @@ public class Buffer extends Node {
}
static {
field45 = new int[256];
crc32Table = new int[256];
int var0;
for (int var1 = 0; var1 < 256; ++var1) {
@@ -1037,10 +1053,10 @@ public class Buffer extends Node {
}
}
field45[var1] = var2;
crc32Table[var1] = var2;
}
field46 = new long[256];
crc64Table = new long[256];
for (var0 = 0; var0 < 256; ++var0) {
long var4 = (long)var0;
@@ -1053,7 +1069,7 @@ public class Buffer extends Node {
}
}
field46[var0] = var4;
crc64Table[var0] = var4;
}
}
@@ -83,9 +83,9 @@ public class ByteArrayPool {
if (field55[var3] != var0) {
if (var0 < field55[var3]) {
}
} else if (WorldMapSection2.field1082[var3] > 0) {
byte[] var4 = RouteStrategy.field760[var3][--WorldMapSection2.field1082[var3]];
RouteStrategy.field760[var3][WorldMapSection2.field1082[var3]] = null;
} else if (WorldMapSection0.field1082[var3] > 0) {
byte[] var4 = RouteStrategy.field760[var3][--WorldMapSection0.field1082[var3]];
RouteStrategy.field760[var3][WorldMapSection0.field1082[var3]] = null;
return var4;
}
}
@@ -44,7 +44,7 @@ public final class Bzip2Decompressor {
int var2 = var0.field70;
int var3 = var0.field78;
int var4 = var0.field76;
int[] var5 = WorldMapSection0.field1056;
int[] var5 = WorldMapSection3.field1056;
int var6 = var0.field75;
byte[] var7 = var0.field65;
int var8 = var0.field66;
@@ -159,7 +159,7 @@ public final class Bzip2Decompressor {
var0.field70 = var2;
var0.field78 = var3;
var0.field76 = var4;
WorldMapSection0.field1056 = var5;
WorldMapSection3.field1056 = var5;
var0.field75 = var6;
var0.field65 = var7;
var0.field66 = var8;
@@ -194,8 +194,8 @@ public final class Bzip2Decompressor {
int[] var21 = null;
int[] var22 = null;
var0.field73 = 1;
if (WorldMapSection0.field1056 == null) {
WorldMapSection0.field1056 = new int[var0.field73 * 100000];
if (WorldMapSection3.field1056 == null) {
WorldMapSection3.field1056 = new int[var0.field73 * 100000];
}
boolean var23 = true;
@@ -434,7 +434,7 @@ public final class Bzip2Decompressor {
}
var10003 = var0.field77[var0.field83[var24 & 255] & 255]++;
WorldMapSection0.field1056[var39] = var0.field83[var24 & 255] & 255;
WorldMapSection3.field1056[var39] = var0.field83[var24 & 255] & 255;
++var39;
if (var41 == 0) {
++var53;
@@ -493,7 +493,7 @@ public final class Bzip2Decompressor {
var46 = var0.field77;
for (var46[var24 & 255] += var48; var48 > 0; --var48) {
WorldMapSection0.field1056[var39] = var24 & 255;
WorldMapSection3.field1056[var39] = var24 & 255;
++var39;
}
}
@@ -513,16 +513,16 @@ public final class Bzip2Decompressor {
}
for (var25 = 0; var25 < var39; ++var25) {
var24 = (byte)(WorldMapSection0.field1056[var25] & 255);
var46 = WorldMapSection0.field1056;
var24 = (byte)(WorldMapSection3.field1056[var25] & 255);
var46 = WorldMapSection3.field1056;
var48 = var0.field79[var24 & 255];
var46[var48] |= var25 << 8;
++var0.field79[var24 & 255];
}
var0.field75 = WorldMapSection0.field1056[var0.field74] >> 8;
var0.field75 = WorldMapSection3.field1056[var0.field74] >> 8;
var0.field78 = 0;
var0.field75 = WorldMapSection0.field1056[var0.field75];
var0.field75 = WorldMapSection3.field1056[var0.field75];
var0.field76 = (byte)(var0.field75 & 255);
var0.field75 >>= 8;
++var0.field78;
@@ -1,19 +1,23 @@
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.ScriptOpcodes;
@ObfuscatedName("hg")
public class class211 {
@Implements("Calendar")
public class Calendar {
@ObfuscatedName("m")
static final String[][] field1124;
@Export("MONTH_NAMES_ENGLISH_GERMAN")
static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
@ObfuscatedName("f")
static final String[] field1125;
@Export("DAYS_OF_THE_WEEK")
static final String[] DAYS_OF_THE_WEEK;
@ObfuscatedName("q")
static Calendar field1126;
@Export("Calendar_calendar")
static java.util.Calendar Calendar_calendar;
@ObfuscatedName("em")
@ObfuscatedSignature(
signature = "Llg;"
@@ -70,7 +74,7 @@ public class class211 {
var6 = Interpreter.Interpreter_calendar.get(5);
int var15 = Interpreter.Interpreter_calendar.get(2);
int var16 = Interpreter.Interpreter_calendar.get(1);
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.field422[var15] + "-" + var16;
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var15] + "-" + var16;
return 1;
} else if (var0 != ScriptOpcodes.TEXT_GENDER) {
if (var0 == ScriptOpcodes.TOSTRING) {
@@ -210,9 +214,9 @@ public class class211 {
}
static {
field1124 = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}};
field1125 = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
Calendar.getInstance(TimeZone.getTimeZone("Europe/London"));
field1126 = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}};
DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
java.util.Calendar.getInstance(TimeZone.getTimeZone("Europe/London"));
Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
}
}
+3 -3
View File
@@ -157,7 +157,7 @@ public final class Canvas extends java.awt.Canvas {
GrandExchangeOfferAgeComparator.field1111 = var10;
}
class22.method295(var5);
WorldMapRectangle.method295(var5);
return 1;
}
}
@@ -167,12 +167,12 @@ public final class Canvas extends java.awt.Canvas {
var6 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
var5 = Huffman.getWidget(var6.id);
var5.children[var6.childIndex] = null;
class22.method295(var5);
WorldMapRectangle.method295(var5);
return 1;
} else if (var0 == ScriptOpcodes.CC_DELETEALL) {
var6 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
var6.children = null;
class22.method295(var6);
WorldMapRectangle.method295(var6);
return 1;
} else if (var0 != ScriptOpcodes.CC_FIND) {
if (var0 == ScriptOpcodes.IF_FIND) {
+126 -125
View File
@@ -236,7 +236,8 @@ public final class Client extends GameShell implements Usernamed {
@ObfuscatedSignature(
signature = "Lhi;"
)
static PlayerAppearance field119;
@Export("playerAppearance")
static PlayerAppearance playerAppearance;
@ObfuscatedName("qa")
@ObfuscatedGetter(
intValue = -1481002083
@@ -1518,7 +1519,7 @@ public final class Client extends GameShell implements Usernamed {
var10 = 0;
while (true) {
var11 = var26.method48();
var11 = var26.readUShortSmart();
if (var11 == 0) {
break;
}
@@ -1843,19 +1844,19 @@ public final class Client extends GameShell implements Usernamed {
if (var30 > 0) {
var43 = var30 - 1;
var44 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var43);
var44 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var43);
FloorOverlayDefinition var46;
if (var44 != null) {
var46 = var44;
} else {
byte[] var47 = FloorOverlayDefinition.field663.takeFile(4, var43);
byte[] var47 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var43);
var44 = new FloorOverlayDefinition();
if (var47 != null) {
var44.decode(new Buffer(var47), var43);
}
var44.postDecode();
FloorOverlayDefinition.field664.put(var44, (long)var43);
FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var44, (long)var43);
var46 = var44;
}
@@ -1881,18 +1882,18 @@ public final class Client extends GameShell implements Usernamed {
var42 = class32.field1157[var6][var12][var18] + 1;
byte var67 = class307.field1155[var6][var12][var18];
int var68 = var30 - 1;
FloorOverlayDefinition var69 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var68);
FloorOverlayDefinition var69 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var68);
if (var69 != null) {
var44 = var69;
} else {
byte[] var48 = FloorOverlayDefinition.field663.takeFile(4, var68);
byte[] var48 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var68);
var69 = new FloorOverlayDefinition();
if (var48 != null) {
var69.decode(new Buffer(var48), var68);
}
var69.postDecode();
FloorOverlayDefinition.field664.put(var69, (long)var68);
FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var69, (long)var68);
var44 = var69;
}
@@ -1902,7 +1903,7 @@ public final class Client extends GameShell implements Usernamed {
int var51;
int var52;
if (var70 >= 0) {
var50 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var70);
var50 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var70);
var49 = -1;
} else if (var44.rgb == 16711935) {
var49 = -2;
@@ -2422,48 +2423,48 @@ public final class Client extends GameShell implements Usernamed {
PacketBuffer.field667 = var27;
try {
class266.osName = System.getProperty("os.name");
HorizontalAlignment.osName = System.getProperty("os.name");
} catch (Exception var21) {
class266.osName = "Unknown";
HorizontalAlignment.osName = "Unknown";
}
WorldMapSection3.osNameLowerCase = class266.osName.toLowerCase();
WorldMapSection1.osNameLowerCase = HorizontalAlignment.osName.toLowerCase();
try {
WorldMapSection1.userHomeDirectory = System.getProperty("user.home");
if (WorldMapSection1.userHomeDirectory != null) {
WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/";
WorldMapSection2.userHomeDirectory = System.getProperty("user.home");
if (WorldMapSection2.userHomeDirectory != null) {
WorldMapSection2.userHomeDirectory = WorldMapSection2.userHomeDirectory + "/";
}
} catch (Exception var20) {
}
try {
if (WorldMapSection3.osNameLowerCase.startsWith("win")) {
if (WorldMapSection1.userHomeDirectory == null) {
WorldMapSection1.userHomeDirectory = System.getenv("USERPROFILE");
if (WorldMapSection1.osNameLowerCase.startsWith("win")) {
if (WorldMapSection2.userHomeDirectory == null) {
WorldMapSection2.userHomeDirectory = System.getenv("USERPROFILE");
}
} else if (WorldMapSection1.userHomeDirectory == null) {
WorldMapSection1.userHomeDirectory = System.getenv("HOME");
} else if (WorldMapSection2.userHomeDirectory == null) {
WorldMapSection2.userHomeDirectory = System.getenv("HOME");
}
if (WorldMapSection1.userHomeDirectory != null) {
WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/";
if (WorldMapSection2.userHomeDirectory != null) {
WorldMapSection2.userHomeDirectory = WorldMapSection2.userHomeDirectory + "/";
}
} catch (Exception var19) {
}
if (WorldMapSection1.userHomeDirectory == null) {
WorldMapSection1.userHomeDirectory = "~/";
if (WorldMapSection2.userHomeDirectory == null) {
WorldMapSection2.userHomeDirectory = "~/";
}
WorldMapSection2.cacheDirectoryLocations = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", WorldMapSection1.userHomeDirectory, "/tmp/", ""};
WorldMapSection0.cacheDirectoryLocations = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", WorldMapSection2.userHomeDirectory, "/tmp/", ""};
Canvas.field94 = new String[]{".jagex_cache_" + PacketBuffer.field667, ".file_store_" + PacketBuffer.field667};
var6 = 0;
label256:
while (var6 < 4) {
String var28 = var6 == 0 ? "" : "" + var6;
class337.clDat = new File(WorldMapSection1.userHomeDirectory, "jagex_cl_oldschool_" + var26 + var28 + ".dat");
class337.clDat = new File(WorldMapSection2.userHomeDirectory, "jagex_cl_oldschool_" + var26 + var28 + ".dat");
String var30 = null;
String var31 = null;
boolean var32 = false;
@@ -2499,9 +2500,9 @@ public final class Client extends GameShell implements Usernamed {
var31 = var15.readStringCp1252NullCircumfixed();
}
} else {
var30 = var15.method45();
var30 = var15.readCESU8();
if (var11 == 1) {
var31 = var15.method45();
var31 = var15.readCESU8();
}
}
@@ -2529,8 +2530,8 @@ public final class Client extends GameShell implements Usernamed {
if (var30 == null && var6 == 0) {
label232:
for (var3 = 0; var3 < Canvas.field94.length; ++var3) {
for (int var34 = 0; var34 < WorldMapSection2.cacheDirectoryLocations.length; ++var34) {
var36 = new File(WorldMapSection2.cacheDirectoryLocations[var34] + Canvas.field94[var3] + File.separatorChar + "oldschool" + File.separatorChar);
for (int var34 = 0; var34 < WorldMapSection0.cacheDirectoryLocations.length; ++var34) {
var36 = new File(WorldMapSection0.cacheDirectoryLocations[var34] + Canvas.field94[var3] + File.separatorChar + "oldschool" + File.separatorChar);
if (var36.exists() && DevicePcmPlayerProvider.method847(new File(var36, "test.dat"), true)) {
var30 = var36.toString();
var32 = true;
@@ -2541,7 +2542,7 @@ public final class Client extends GameShell implements Usernamed {
}
if (var30 == null) {
var30 = WorldMapSection1.userHomeDirectory + File.separatorChar + "jagexcache" + var28 + File.separatorChar + "oldschool" + File.separatorChar + var26 + File.separatorChar;
var30 = WorldMapSection2.userHomeDirectory + File.separatorChar + "jagexcache" + var28 + File.separatorChar + "oldschool" + File.separatorChar + var26 + File.separatorChar;
var32 = true;
}
@@ -2691,8 +2692,8 @@ public final class Client extends GameShell implements Usernamed {
class21.field1123 = var5;
break;
case 10:
class22.studioGame = (StudioGame)ScriptFrame.findEnumerated(ClientPacket.method3664(), Integer.parseInt(var5));
if (class22.studioGame == StudioGame.field892) {
WorldMapRectangle.studioGame = (StudioGame)ScriptFrame.findEnumerated(ClientPacket.method3664(), Integer.parseInt(var5));
if (WorldMapRectangle.studioGame == StudioGame.field892) {
KeyHandler.loginType = LoginType.field479;
} else {
KeyHandler.loginType = LoginType.field487;
@@ -2840,9 +2841,9 @@ public final class Client extends GameShell implements Usernamed {
int var21 = var17 == 0 ? 5 : 9;
ModelData0.NetCache_currentResponse = var20;
class22.NetCache_responseArchiveBuffer = new Buffer(var13 + var21 + ModelData0.NetCache_currentResponse.padding);
class22.NetCache_responseArchiveBuffer.writeByte(var17);
class22.NetCache_responseArchiveBuffer.writeInt(var13);
WorldMapRectangle.NetCache_responseArchiveBuffer = new Buffer(var13 + var21 + ModelData0.NetCache_currentResponse.padding);
WorldMapRectangle.NetCache_responseArchiveBuffer.writeByte(var17);
WorldMapRectangle.NetCache_responseArchiveBuffer.writeInt(var13);
NetCache.field630 = 8;
NetCache.NetCache_responseHeaderBuffer.index = 0;
} else if (NetCache.field630 == 0) {
@@ -2854,31 +2855,31 @@ public final class Client extends GameShell implements Usernamed {
}
}
} else {
var10 = class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding;
var10 = WorldMapRectangle.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding;
var11 = 512 - NetCache.field630;
if (var11 > var10 - class22.NetCache_responseArchiveBuffer.index) {
var11 = var10 - class22.NetCache_responseArchiveBuffer.index;
if (var11 > var10 - WorldMapRectangle.NetCache_responseArchiveBuffer.index) {
var11 = var10 - WorldMapRectangle.NetCache_responseArchiveBuffer.index;
}
if (var11 > var8) {
var11 = var8;
}
NetCache.NetCache_socket.read(class22.NetCache_responseArchiveBuffer.array, class22.NetCache_responseArchiveBuffer.index, var11);
NetCache.NetCache_socket.read(WorldMapRectangle.NetCache_responseArchiveBuffer.array, WorldMapRectangle.NetCache_responseArchiveBuffer.index, var11);
if (NetCache.field631 != 0) {
for (var12 = 0; var12 < var11; ++var12) {
var14 = class22.NetCache_responseArchiveBuffer.array;
var15 = class22.NetCache_responseArchiveBuffer.index + var12;
var14 = WorldMapRectangle.NetCache_responseArchiveBuffer.array;
var15 = WorldMapRectangle.NetCache_responseArchiveBuffer.index + var12;
var14[var15] ^= NetCache.field631;
}
}
var16 = class22.NetCache_responseArchiveBuffer;
var16 = WorldMapRectangle.NetCache_responseArchiveBuffer;
var16.index += var11;
NetCache.field630 += var11;
if (var10 == class22.NetCache_responseArchiveBuffer.index) {
if (var10 == WorldMapRectangle.NetCache_responseArchiveBuffer.index) {
if (16711935L == ModelData0.NetCache_currentResponse.key) {
Players.NetCache_reference = class22.NetCache_responseArchiveBuffer;
Players.NetCache_reference = WorldMapRectangle.NetCache_responseArchiveBuffer;
for (var12 = 0; var12 < 256; ++var12) {
Archive var25 = NetCache.NetCache_archives[var12];
@@ -2891,7 +2892,7 @@ public final class Client extends GameShell implements Usernamed {
}
} else {
NetCache.NetCache_crc.reset();
NetCache.NetCache_crc.update(class22.NetCache_responseArchiveBuffer.array, 0, var10);
NetCache.NetCache_crc.update(WorldMapRectangle.NetCache_responseArchiveBuffer.array, 0, var10);
var12 = (int)NetCache.NetCache_crc.getValue();
if (var12 != ModelData0.NetCache_currentResponse.crc) {
try {
@@ -2908,7 +2909,7 @@ public final class Client extends GameShell implements Usernamed {
NetCache.NetCache_crcMismatches = 0;
NetCache.NetCache_ioExceptions = 0;
ModelData0.NetCache_currentResponse.archive.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), GrandExchangeOfferWorldComparator.field988);
ModelData0.NetCache_currentResponse.archive.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), WorldMapRectangle.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), GrandExchangeOfferWorldComparator.field988);
}
ModelData0.NetCache_currentResponse.remove();
@@ -2920,7 +2921,7 @@ public final class Client extends GameShell implements Usernamed {
NetCache.field630 = 0;
ModelData0.NetCache_currentResponse = null;
class22.NetCache_responseArchiveBuffer = null;
WorldMapRectangle.NetCache_responseArchiveBuffer = null;
} else {
if (NetCache.field630 != 512) {
break;
@@ -3038,7 +3039,7 @@ public final class Client extends GameShell implements Usernamed {
UserComparator9.method3343(var2);
NetCache.NetCache_responseHeaderBuffer.index = 0;
ModelData0.NetCache_currentResponse = null;
class22.NetCache_responseArchiveBuffer = null;
WorldMapRectangle.NetCache_responseArchiveBuffer = null;
NetCache.field630 = 0;
while (true) {
@@ -3321,7 +3322,7 @@ public final class Client extends GameShell implements Usernamed {
var8.packetBuffer.writeInt(180);
var8.packetBuffer.writeInt(1);
var8.packetBuffer.writeByte(clientType);
var8.packetBuffer.method38(var6.array, 0, var6.index);
var8.packetBuffer.writeBytes(var6.array, 0, var6.index);
int var10 = var8.packetBuffer.index;
var8.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username);
var8.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0));
@@ -3332,7 +3333,7 @@ public final class Client extends GameShell implements Usernamed {
var8.packetBuffer.writeInt(AbstractArchive.field2);
Buffer var11 = new Buffer(WorldMapLabelSize.platformInfo.size());
WorldMapLabelSize.platformInfo.write(var11);
var8.packetBuffer.method38(var11.array, 0, var11.array.length);
var8.packetBuffer.writeBytes(var11.array, 0, var11.array.length);
var8.packetBuffer.writeByte(clientType);
var8.packetBuffer.writeInt(0);
var8.packetBuffer.writeInt(AbstractArchive.archive0.hash);
@@ -3343,21 +3344,21 @@ public final class Client extends GameShell implements Usernamed {
var8.packetBuffer.writeInt(SecureRandomFuture.archive5.hash);
var8.packetBuffer.writeInt(UserComparator3.archive6.hash);
var8.packetBuffer.writeInt(class40.archive7.hash);
var8.packetBuffer.writeInt(WorldMapSection3.archive8.hash);
var8.packetBuffer.writeInt(WorldMapSection1.archive8.hash);
var8.packetBuffer.writeInt(class238.archive9.hash);
var8.packetBuffer.writeInt(class16.archive10.hash);
var8.packetBuffer.writeInt(Login.archive11.hash);
var8.packetBuffer.writeInt(Formatting.archive12.hash);
var8.packetBuffer.writeInt(ByteArrayPool.archive13.hash);
var8.packetBuffer.writeInt(class2.archive14.hash);
var8.packetBuffer.writeInt(WorldMapSection1.archive15.hash);
var8.packetBuffer.writeInt(WorldMapSection2.archive15.hash);
var8.packetBuffer.writeInt(0);
var8.packetBuffer.writeInt(class22.archive16.hash);
var8.packetBuffer.writeInt(WorldMapLabelSize.field1040.hash);
var8.packetBuffer.writeInt(ItemContainer.field434.hash);
var8.packetBuffer.writeInt(AbstractByteArrayCopier.field0.hash);
var8.packetBuffer.writeInt(WorldMapRectangle.archive17.hash);
var8.packetBuffer.writeInt(WorldMapLabelSize.archive18.hash);
var8.packetBuffer.writeInt(ItemContainer.archive19.hash);
var8.packetBuffer.writeInt(AbstractByteArrayCopier.archive20.hash);
var8.packetBuffer.xteaEncrypt(var7, var10, var8.packetBuffer.index);
var8.packetBuffer.method40(var8.packetBuffer.index - var9);
var8.packetBuffer.writeLengthShort(var8.packetBuffer.index - var9);
packetWriter.method241(var8);
packetWriter.method240();
packetWriter.isaacCipher = new IsaacCipher(var7);
@@ -3396,12 +3397,12 @@ public final class Client extends GameShell implements Usernamed {
}
if (loginState == 7 && ((AbstractSocket)var1).available() > 0) {
WorldMapSection1.field1071 = ((AbstractSocket)var1).readUnsignedByte();
WorldMapSection2.field1071 = ((AbstractSocket)var1).readUnsignedByte();
loginState = 8;
}
if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection1.field1071) {
((AbstractSocket)var1).read(var2.array, 0, WorldMapSection1.field1071);
if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection2.field1071) {
((AbstractSocket)var1).read(var2.array, 0, WorldMapSection2.field1071);
var2.index = 0;
loginState = 6;
}
@@ -3449,7 +3450,7 @@ public final class Client extends GameShell implements Usernamed {
ReflectionCheck.clientPreferences.rememberedUsername = null;
}
WorldMapSection0.savePreferences();
WorldMapSection3.savePreferences();
staffModLevel = ((AbstractSocket)var1).readUnsignedByte();
playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1;
localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte();
@@ -3484,7 +3485,7 @@ public final class Client extends GameShell implements Usernamed {
var2.index = 0;
((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length);
timer.method332();
WorldMapSection1.method808();
WorldMapSection2.method808();
GrandExchangeOfferNameComparator.updatePlayer(var2);
GameObject.field359 = -1;
class50.loadRegions(false, var2);
@@ -3650,7 +3651,7 @@ public final class Client extends GameShell implements Usernamed {
var6.packetBuffer.writeByte(0);
var7 = var6.packetBuffer.index;
timer.write(var6.packetBuffer);
var6.packetBuffer.method41(var6.packetBuffer.index - var7);
var6.packetBuffer.writeLengthByte(var6.packetBuffer.index - var7);
packetWriter.method241(var6);
timer.method333();
}
@@ -3746,7 +3747,7 @@ public final class Client extends GameShell implements Usernamed {
}
if (var5 != null) {
var5.packetBuffer.method41(var5.packetBuffer.index - var4);
var5.packetBuffer.writeLengthByte(var5.packetBuffer.index - var4);
var12 = var5.packetBuffer.index;
var5.packetBuffer.index = var4;
var5.packetBuffer.writeByte(var10 / var11);
@@ -3815,7 +3816,7 @@ public final class Client extends GameShell implements Usernamed {
var6.packetBuffer.writeMedium((int)var21);
}
var6.packetBuffer.method40(var6.packetBuffer.index - var7);
var6.packetBuffer.writeLengthShort(var6.packetBuffer.index - var7);
packetWriter.method241(var6);
}
@@ -3854,7 +3855,7 @@ public final class Client extends GameShell implements Usernamed {
class60.worldMap0.method360();
}
class266.method5120();
HorizontalAlignment.method5120();
Message.method1228();
if (gameState != 30) {
return;
@@ -3898,7 +3899,7 @@ public final class Client extends GameShell implements Usernamed {
if (BoundaryObject.field40 != null) {
++field203;
if (field203 >= 15) {
class22.method295(BoundaryObject.field40);
WorldMapRectangle.method295(BoundaryObject.field40);
BoundaryObject.field40 = null;
}
}
@@ -3974,7 +3975,7 @@ public final class Client extends GameShell implements Usernamed {
PacketBufferNode var27;
if (DevicePcmPlayerProvider.dragInventoryWidget != null) {
class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
WorldMapRectangle.method295(DevicePcmPlayerProvider.dragInventoryWidget);
++itemDragDuration;
if (MouseHandler.MouseHandler_currentButton == 0) {
if (field207) {
@@ -4057,21 +4058,21 @@ public final class Client extends GameShell implements Usernamed {
if (var36 != Clock.mousedOverWidgetIf1) {
if (var36 != null) {
class22.method295(var36);
WorldMapRectangle.method295(var36);
}
if (Clock.mousedOverWidgetIf1 != null) {
class22.method295(Clock.mousedOverWidgetIf1);
WorldMapRectangle.method295(Clock.mousedOverWidgetIf1);
}
}
if (var23 != AccessFile.field8 && field218 == field219) {
if (var23 != null) {
class22.method295(var23);
WorldMapRectangle.method295(var23);
}
if (AccessFile.field8 != null) {
class22.method295(AccessFile.field8);
WorldMapRectangle.method295(AccessFile.field8);
}
}
@@ -4079,7 +4080,7 @@ public final class Client extends GameShell implements Usernamed {
if (field218 < field219) {
++field218;
if (field219 == field218) {
class22.method295(AccessFile.field8);
WorldMapRectangle.method295(AccessFile.field8);
}
}
} else if (field218 > 0) {
@@ -4091,17 +4092,17 @@ public final class Client extends GameShell implements Usernamed {
var4 = class3.field1146 * 128 + 64;
var9 = MusicPatchPcmStream.field602 * 128 + 64;
var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - AbstractWorldMapIcon.field4;
if (WorldMapSection1.cameraX < var4) {
WorldMapSection1.cameraX = (var4 - WorldMapSection1.cameraX) * class30.field1148 / 1000 + WorldMapSection1.cameraX + ClientPacket.field221;
if (WorldMapSection1.cameraX > var4) {
WorldMapSection1.cameraX = var4;
if (WorldMapSection2.cameraX < var4) {
WorldMapSection2.cameraX = (var4 - WorldMapSection2.cameraX) * class30.field1148 / 1000 + WorldMapSection2.cameraX + ClientPacket.field221;
if (WorldMapSection2.cameraX > var4) {
WorldMapSection2.cameraX = var4;
}
}
if (WorldMapSection1.cameraX > var4) {
WorldMapSection1.cameraX -= class30.field1148 * (WorldMapSection1.cameraX - var4) / 1000 + ClientPacket.field221;
if (WorldMapSection1.cameraX < var4) {
WorldMapSection1.cameraX = var4;
if (WorldMapSection2.cameraX > var4) {
WorldMapSection2.cameraX -= class30.field1148 * (WorldMapSection2.cameraX - var4) / 1000 + ClientPacket.field221;
if (WorldMapSection2.cameraX < var4) {
WorldMapSection2.cameraX = var4;
}
}
@@ -4136,7 +4137,7 @@ public final class Client extends GameShell implements Usernamed {
var4 = GrandExchangeOffer.field376 * 128 + 64;
var9 = KeyHandler.field445 * 128 + 64;
var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - ArchiveDiskAction.field410;
var11 = var4 - WorldMapSection1.cameraX;
var11 = var4 - WorldMapSection2.cameraX;
var12 = var10 - GrandExchangeEvents.cameraY;
var13 = var9 - GrandExchangeOfferNameComparator.cameraZ;
var14 = (int)Math.sqrt((double)(var13 * var13 + var11 * var11));
@@ -4202,7 +4203,7 @@ public final class Client extends GameShell implements Usernamed {
}
class196.varcs.tryWrite();
var4 = class22.method297();
var4 = WorldMapRectangle.method297();
var9 = KeyHandler.KeyHandler_idleCycles;
if (var4 > 15000 && var9 > 15000) {
field175 = 250;
@@ -4267,7 +4268,7 @@ public final class Client extends GameShell implements Usernamed {
var5.packetBuffer.writeByte(0);
var4 = var5.packetBuffer.index;
WorldMapLabel.method443(var5.packetBuffer);
var5.packetBuffer.method41(var5.packetBuffer.index - var4);
var5.packetBuffer.writeLengthByte(var5.packetBuffer.index - var4);
packetWriter.method241(var5);
}
}
@@ -4585,9 +4586,9 @@ public final class Client extends GameShell implements Usernamed {
ClientPacket.field221 = var3.readUnsignedByte();
class30.field1148 = var3.readUnsignedByte();
if (class30.field1148 >= 100) {
WorldMapSection1.cameraX = class3.field1146 * 128 + 64;
WorldMapSection2.cameraX = class3.field1146 * 128 + 64;
GrandExchangeOfferNameComparator.cameraZ = MusicPatchPcmStream.field602 * 128 + 64;
GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection1.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.field4;
GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection2.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.field4;
}
var1.serverPacket0 = null;
@@ -4614,7 +4615,7 @@ public final class Client extends GameShell implements Usernamed {
if (ServerPacket.field806 == var1.serverPacket0) {
Canvas.field95 = var3.method59();
WorldMapSection3.field1089 = var3.readUnsignedByteNegate();
WorldMapSection1.field1089 = var3.readUnsignedByteNegate();
while (var3.index < var1.serverPacket0Length) {
var38 = var3.readUnsignedByte();
@@ -4628,14 +4629,14 @@ public final class Client extends GameShell implements Usernamed {
Widget var8;
if (ServerPacket.field850 == var1.serverPacket0) {
var38 = var3.method44();
var38 = var3.readShort();
var6 = var3.method73();
var8 = Huffman.getWidget(var6);
if (var38 != var8.sequenceId || var38 == -1) {
var8.sequenceId = var38;
var8.modelFrame = 0;
var8.modelFrameCycle = 0;
class22.method295(var8);
WorldMapRectangle.method295(var8);
}
var1.serverPacket0 = null;
@@ -4648,7 +4649,7 @@ public final class Client extends GameShell implements Usernamed {
var9 = Huffman.getWidget(var38);
var9.modelType = 3;
var9.modelId = Canvas.localPlayer.appearance.getChatHeadId();
class22.method295(var9);
WorldMapRectangle.method295(var9);
var1.serverPacket0 = null;
return true;
}
@@ -4668,7 +4669,7 @@ public final class Client extends GameShell implements Usernamed {
var9.itemIds[var5] = 0;
}
class22.method295(var9);
WorldMapRectangle.method295(var9);
var1.serverPacket0 = null;
return true;
}
@@ -4716,7 +4717,7 @@ public final class Client extends GameShell implements Usernamed {
}
if (var8 != null) {
class22.method295(var8);
WorldMapRectangle.method295(var8);
}
GrandExchangeOfferAgeComparator.method159();
@@ -4738,7 +4739,7 @@ public final class Client extends GameShell implements Usernamed {
}
if (ServerPacket.field853 == var1.serverPacket0) {
WorldMapSection3.field1089 = var3.readUnsignedByteNegate();
WorldMapSection1.field1089 = var3.readUnsignedByteNegate();
Canvas.field95 = var3.method59();
var1.serverPacket0 = null;
return true;
@@ -4751,7 +4752,7 @@ public final class Client extends GameShell implements Usernamed {
var8 = Huffman.getWidget(var38);
if (var14 != var8.isHidden) {
var8.isHidden = var14;
class22.method295(var8);
WorldMapRectangle.method295(var8);
}
var1.serverPacket0 = null;
@@ -4798,7 +4799,7 @@ public final class Client extends GameShell implements Usernamed {
rootInterface = var38;
this.method87(false);
DevicePcmPlayerProvider.method845(var38);
WorldMapSection3.runWidgetOnLoadListener(rootInterface);
WorldMapSection1.runWidgetOnLoadListener(rootInterface);
for (var6 = 0; var6 < 100; ++var6) {
field100[var6] = true;
@@ -4827,7 +4828,7 @@ public final class Client extends GameShell implements Usernamed {
var15.modelAngleX = var38;
var15.modelAngleY = var5;
var15.modelZoom = var6;
class22.method295(var15);
WorldMapRectangle.method295(var15);
}
var1.serverPacket0 = null;
@@ -4936,7 +4937,7 @@ public final class Client extends GameShell implements Usernamed {
var16.modelAngleX = var41.xan2d;
var16.modelAngleY = var41.yan2d;
var16.modelZoom = var41.zoom2d * 100 / var5;
class22.method295(var16);
WorldMapRectangle.method295(var16);
} else {
var16.itemId = var6;
var16.itemQuantity = var5;
@@ -4959,7 +4960,7 @@ public final class Client extends GameShell implements Usernamed {
var16.modelZoom = var16.modelZoom * 32 / var16.rawWidth;
}
class22.method295(var16);
WorldMapRectangle.method295(var16);
}
var1.serverPacket0 = null;
@@ -4969,7 +4970,7 @@ public final class Client extends GameShell implements Usernamed {
String var17;
boolean var18;
if (ServerPacket.field792 == var1.serverPacket0) {
var38 = var3.method48();
var38 = var3.readUShortSmart();
var14 = var3.readUnsignedByte() == 1;
var17 = "";
var18 = false;
@@ -5142,7 +5143,7 @@ public final class Client extends GameShell implements Usernamed {
}
for (; var3.index < var1.serverPacket0Length; WorldMapManager.itemContainerSetItem(var6, var10, var11 - 1, var12)) {
var10 = var3.method48();
var10 = var3.readUShortSmart();
var11 = var3.readUnsignedShort();
var12 = 0;
if (var11 != 0) {
@@ -5159,7 +5160,7 @@ public final class Client extends GameShell implements Usernamed {
}
if (var8 != null) {
class22.method295(var8);
WorldMapRectangle.method295(var8);
}
GrandExchangeOfferAgeComparator.method159();
@@ -5187,7 +5188,7 @@ public final class Client extends GameShell implements Usernamed {
var16.rawY = var6;
var16.xAlignment = 0;
var16.yAlignment = 0;
class22.method295(var16);
WorldMapRectangle.method295(var16);
this.alignWidget(var16);
if (var16.type == 0) {
class39.revalidateWidgetScroll(Widget.interfaceComponents[var38 >> 16], var16, false);
@@ -5205,7 +5206,7 @@ public final class Client extends GameShell implements Usernamed {
if (var8.modelType != 2 || var38 != var8.modelId) {
var8.modelType = 2;
var8.modelId = var38;
class22.method295(var8);
WorldMapRectangle.method295(var8);
}
var1.serverPacket0 = null;
@@ -5257,12 +5258,12 @@ public final class Client extends GameShell implements Usernamed {
var15 = Huffman.getWidget(var6);
if (var15 != null) {
class22.method295(var15);
WorldMapRectangle.method295(var15);
}
var15 = Huffman.getWidget(var38);
if (var15 != null) {
class22.method295(var15);
WorldMapRectangle.method295(var15);
class39.revalidateWidgetScroll(Widget.interfaceComponents[var15.id >>> 16], var15, true);
}
@@ -5284,7 +5285,7 @@ public final class Client extends GameShell implements Usernamed {
Widget var48 = Huffman.getWidget(var38);
if (var12 != var48.color) {
var48.color = var12;
class22.method295(var48);
WorldMapRectangle.method295(var48);
}
var1.serverPacket0 = null;
@@ -5321,9 +5322,9 @@ public final class Client extends GameShell implements Usernamed {
if (ServerPacket.field814 == var1.serverPacket0) {
Canvas.field95 = var3.readUnsignedByteNegate();
WorldMapSection3.field1089 = var3.readUnsignedByte();
WorldMapSection1.field1089 = var3.readUnsignedByte();
for (var38 = WorldMapSection3.field1089; var38 < WorldMapSection3.field1089 + 8; ++var38) {
for (var38 = WorldMapSection1.field1089; var38 < WorldMapSection1.field1089 + 8; ++var38) {
for (var6 = Canvas.field95; var6 < Canvas.field95 + 8; ++var6) {
if (groundItems[SoundSystem.plane][var38][var6] != null) {
groundItems[SoundSystem.plane][var38][var6] = null;
@@ -5333,7 +5334,7 @@ public final class Client extends GameShell implements Usernamed {
}
for (PendingSpawn var46 = (PendingSpawn)pendingSpawns.last(); var46 != null; var46 = (PendingSpawn)pendingSpawns.previous()) {
if (var46.x >= WorldMapSection3.field1089 && var46.x < WorldMapSection3.field1089 + 8 && var46.y >= Canvas.field95 && var46.y < Canvas.field95 + 8 && var46.plane == SoundSystem.plane) {
if (var46.x >= WorldMapSection1.field1089 && var46.x < WorldMapSection1.field1089 + 8 && var46.y >= Canvas.field95 && var46.y < Canvas.field95 + 8 && var46.plane == SoundSystem.plane) {
var46.hitpoints = 0;
}
}
@@ -5349,7 +5350,7 @@ public final class Client extends GameShell implements Usernamed {
if (var8.modelType != 1 || var6 != var8.modelId) {
var8.modelType = 1;
var8.modelId = var6;
class22.method295(var8);
WorldMapRectangle.method295(var8);
}
var1.serverPacket0 = null;
@@ -5415,7 +5416,7 @@ public final class Client extends GameShell implements Usernamed {
var8 = Huffman.getWidget(var38);
if (!var4.equals(var8.text)) {
var8.text = var4;
class22.method295(var8);
WorldMapRectangle.method295(var8);
}
var1.serverPacket0 = null;
@@ -5450,7 +5451,7 @@ public final class Client extends GameShell implements Usernamed {
var38 = GrandExchangeOffer.field376 * 128 + 64;
var6 = KeyHandler.field445 * 128 + 64;
var5 = class32.getTileHeight(var38, var6, SoundSystem.plane) - ArchiveDiskAction.field410;
var10 = var38 - WorldMapSection1.cameraX;
var10 = var38 - WorldMapSection2.cameraX;
var11 = var5 - GrandExchangeEvents.cameraY;
var12 = var6 - GrandExchangeOfferNameComparator.cameraZ;
var13 = (int)Math.sqrt((double)(var12 * var12 + var10 * var10));
@@ -5484,7 +5485,7 @@ public final class Client extends GameShell implements Usernamed {
if (var6 != var8.scrollY) {
var8.scrollY = var6;
class22.method295(var8);
WorldMapRectangle.method295(var8);
}
}
@@ -5502,7 +5503,7 @@ public final class Client extends GameShell implements Usernamed {
if (ServerPacket.field846 == var1.serverPacket0) {
var3.index += 28;
if (var3.method54()) {
if (var3.checkCrc()) {
class234.method4535(var3, var3.index - 28);
}
@@ -5546,7 +5547,7 @@ public final class Client extends GameShell implements Usernamed {
if (ServerPacket.field860 == var1.serverPacket0) {
GrandExchangeOfferAgeComparator.method159();
weight = var3.method44();
weight = var3.readShort();
field124 = cycleCntr;
var1.serverPacket0 = null;
return true;
@@ -5598,7 +5599,7 @@ public final class Client extends GameShell implements Usernamed {
rootInterface = var6;
this.method87(false);
DevicePcmPlayerProvider.method845(rootInterface);
WorldMapSection3.runWidgetOnLoadListener(rootInterface);
WorldMapSection1.runWidgetOnLoadListener(rootInterface);
for (var10 = 0; var10 < 100; ++var10) {
field100[var10] = true;
@@ -5713,7 +5714,7 @@ public final class Client extends GameShell implements Usernamed {
}
if (field127 != null) {
class22.method295(field127);
WorldMapRectangle.method295(field127);
field127 = null;
}
@@ -5936,7 +5937,7 @@ public final class Client extends GameShell implements Usernamed {
}
if (var15 != -1) {
WorldMapSection0.method245(var15);
WorldMapSection3.method245(var15);
}
isMenuOpen = false;
@@ -5969,7 +5970,7 @@ public final class Client extends GameShell implements Usernamed {
}
if ((var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) && menuOptionsCount > 0) {
WorldMapSection0.method245(var2);
WorldMapSection3.method245(var2);
}
if (var11 == 2 && menuOptionsCount > 0) {
@@ -5989,7 +5990,7 @@ public final class Client extends GameShell implements Usernamed {
field207 = false;
itemDragDuration = 0;
if (DevicePcmPlayerProvider.dragInventoryWidget != null) {
class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
WorldMapRectangle.method295(DevicePcmPlayerProvider.dragInventoryWidget);
}
DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var13);
@@ -6005,7 +6006,7 @@ public final class Client extends GameShell implements Usernamed {
GrandExchangeOfferUnitPriceComparator.tempMenuAction.action = menuActions[var2];
}
class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
WorldMapRectangle.method295(DevicePcmPlayerProvider.dragInventoryWidget);
return;
}
}
@@ -6111,7 +6112,7 @@ public final class Client extends GameShell implements Usernamed {
var4 = var2.height;
}
WorldMapSection3.alignWidgetSize(component, var3, var4, false);
WorldMapSection1.alignWidgetSize(component, var3, var4, false);
FloorOverlayDefinition.alignWidgetPosition(component, var3, var4);
}
@@ -6121,7 +6122,7 @@ public final class Client extends GameShell implements Usernamed {
garbageValue = "715978124"
)
final void method88() {
class22.method295(clickedWidget);
WorldMapRectangle.method295(clickedWidget);
++MouseRecorder.widgetDragDuration;
if (field103 && field106) {
int var1 = MouseHandler.MouseHandler_x;
@@ -6528,7 +6529,7 @@ public final class Client extends GameShell implements Usernamed {
viewportWidth = 0;
viewportHeight = 0;
viewportZoom = 0;
field119 = new PlayerAppearance();
playerAppearance = new PlayerAppearance();
field118 = -1;
field120 = -1;
platformInfoProvider = new DesktopPlatformInfoProvider();
@@ -145,10 +145,10 @@ public class ClientParameter {
var2.host = var1.readStringCp1252NullTerminated();
var2.activity = var1.readStringCp1252NullTerminated();
var2.location = var1.readUnsignedByte();
var2.population = var1.method44();
var2.population = var1.readShort();
}
MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2);
MilliClock.sortWorlds(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2);
FriendLoginUpdate.field356 = null;
return true;
}
@@ -172,7 +172,8 @@ public class Decimator {
signature = "(Ldu;IIII)Z",
garbageValue = "555449756"
)
static final boolean method2491(Model var0, int var1, int var2, int var3) {
@Export("boundingBoxCheck")
static final boolean boundingBoxCheck(Model model, int x, int y, int z) {
boolean var4 = ViewportMouse.ViewportMouse_isInViewport;
if (!var4) {
return false;
@@ -219,12 +220,12 @@ public class Decimator {
class248.field1142 = Math.abs(Skeleton.field874);
}
var5 = var0.xMid + var1;
var6 = var2 + var0.yMid;
var7 = var3 + var0.zMid;
var8 = var0.xMidOffset;
var12 = var0.yMidOffset;
var13 = var0.zMidOffset;
var5 = model.xMid + x;
var6 = y + model.yMid;
var7 = z + model.zMid;
var8 = model.xMidOffset;
var12 = model.yMidOffset;
var13 = model.zMidOffset;
var9 = AccessFile.field7 - var5;
var10 = ViewportMouse.field951 - var6;
var11 = ViewportMouse.field952 - var7;
@@ -35,7 +35,7 @@ public class DefaultsGroup {
garbageValue = "-2017595575"
)
public static RectangleMode[] method5822() {
return new RectangleMode[]{RectangleMode.field758, RectangleMode.field757, RectangleMode.field759};
return new RectangleMode[]{RectangleMode.GRADIENT_COLOR, RectangleMode.SOLID, RectangleMode.GRADIENT_ALPHA};
}
static {
@@ -15,11 +15,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
@Export("get")
public PlatformInfo get() {
byte var1;
if (WorldMapSection3.osNameLowerCase.startsWith("win")) {
if (WorldMapSection1.osNameLowerCase.startsWith("win")) {
var1 = 1;
} else if (WorldMapSection3.osNameLowerCase.startsWith("mac")) {
} else if (WorldMapSection1.osNameLowerCase.startsWith("mac")) {
var1 = 2;
} else if (WorldMapSection3.osNameLowerCase.startsWith("linux")) {
} else if (WorldMapSection1.osNameLowerCase.startsWith("linux")) {
var1 = 3;
} else {
var1 = 4;
@@ -150,13 +150,13 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
garbageValue = "-1516599170"
)
@Export("drawInterface")
static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
Rasterizer3D.Rasterizer3D_method1();
static final void drawInterface(Widget[] components, int interfaceID, int xStart, int yStart, int xEnd, int yEnd, int var6, int var7, int var8) {
Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
for (int var9 = 0; var9 < var0.length; ++var9) {
Widget var10 = var0[var9];
if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) {
for (int var9 = 0; var9 < components.length; ++var9) {
Widget var10 = components[var9];
if (var10 != null && (var10.parentId == interfaceID || interfaceID == 0xabcdabcd && var10 == Client.clickedWidget)) {
int var11;
if (var8 == -1) {
Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6;
@@ -170,7 +170,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var10.rootIndex = var11;
var10.cycle = Client.cycle;
if (!var10.isIf3 || !PacketBufferNode.method3673(var10)) {
if (!var10.isIf3 || !PacketBufferNode.isComponentHidden(var10)) {
if (var10.contentType > 0) {
class15.method186(var10);
}
@@ -181,8 +181,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
int var15;
int var16;
if (var10 == Client.clickedWidget) {
if (var1 != -1412584499 && !var10.isScrollBar) {
class279.field1145 = var0;
if (interfaceID != -1412584499 && !var10.isScrollBar) {
class279.field1145 = components;
class54.field1161 = var6;
BuddyRankComparator.field1114 = var7;
continue;
@@ -225,10 +225,10 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
int var21;
int var22;
if (var10.type == 2) {
var15 = var2;
var16 = var3;
var17 = var4;
var18 = var5;
var15 = xStart;
var16 = yStart;
var17 = xEnd;
var18 = yEnd;
} else if (var10.type == 9) {
var22 = var12;
var19 = var13;
@@ -246,17 +246,17 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
++var20;
++var21;
var15 = var22 > var2 ? var22 : var2;
var16 = var19 > var3 ? var19 : var3;
var17 = var20 < var4 ? var20 : var4;
var18 = var21 < var5 ? var21 : var5;
var15 = var22 > xStart ? var22 : xStart;
var16 = var19 > yStart ? var19 : yStart;
var17 = var20 < xEnd ? var20 : xEnd;
var18 = var21 < yEnd ? var21 : yEnd;
} else {
var22 = var12 + var10.width;
var19 = var13 + var10.height;
var15 = var12 > var2 ? var12 : var2;
var16 = var13 > var3 ? var13 : var3;
var17 = var22 < var4 ? var22 : var4;
var18 = var19 < var5 ? var19 : var5;
var15 = var12 > xStart ? var12 : xStart;
var16 = var13 > yStart ? var13 : yStart;
var17 = var22 < xEnd ? var22 : xEnd;
var18 = var19 < yEnd ? var19 : yEnd;
}
if (!var10.isIf3 || var15 < var17 && var16 < var18) {
@@ -284,19 +284,19 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
Client.field217 = var13;
class40.drawEntities(var12, var13, var10.width, var10.height);
Client.field100[var10.rootIndex] = true;
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
continue;
}
if (var10.contentType == 1338) {
MouseRecorder.method1189(var10, var12, var13, var11);
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
continue;
}
if (var10.contentType == 1339) {
class22.method296(var10, var12, var13, var11);
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
WorldMapRectangle.method296(var10, var12, var13, var11);
Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
continue;
}
@@ -314,7 +314,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
}
if (var10.type == 0) {
if (!var10.isIf3 && PacketBufferNode.method3673(var10) && var10 != Clock.mousedOverWidgetIf1) {
if (!var10.isIf3 && PacketBufferNode.isComponentHidden(var10) && var10 != Clock.mousedOverWidgetIf1) {
continue;
}
@@ -328,7 +328,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
}
}
drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
drawInterface(components, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
if (var10.children != null) {
drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
}
@@ -338,8 +338,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
Interpreter.drawWidgets(var23.group, var15, var16, var17, var18, var12, var13, var11);
}
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
Rasterizer3D.Rasterizer3D_method1();
Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
}
if (Client.isResizable || Client.field101[var11] || Client.gameDrawingMode > 1) {
@@ -370,14 +370,14 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
if (var36 != null) {
var36.drawAt2(var21, var26);
} else if (Widget.field957) {
class22.method295(var10);
WorldMapRectangle.method295(var10);
}
}
} else {
boolean var35 = false;
boolean var46 = false;
var25 = var10.itemIds[var22] - 1;
if (var21 + 32 > var2 && var21 < var4 && var26 + 32 > var3 && var26 < var5 || var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) {
if (var21 + 32 > xStart && var21 < xEnd && var26 + 32 > yStart && var26 < yEnd || var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) {
Sprite var42;
if (Client.isItemSelected == 1 && var22 == HealthBarDefinition.selectedItemSlot && var10.id == ServerPacket.selectedItemWidget) {
var42 = class226.getItemSprite(var25, var10.itemQuantities[var22], 2, 0, 2, false);
@@ -403,8 +403,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
}
var42.method310(var21 + var33, var26 + var24, 128);
if (var1 != -1) {
Widget var47 = var0[var1 & 65535];
if (interfaceID != -1) {
Widget var47 = components[interfaceID & 65535];
int var45;
if (var26 + var24 < Rasterizer2D.Rasterizer2D_yClipStart && var47.scrollY > 0) {
var45 = (Rasterizer2D.Rasterizer2D_yClipStart - var26 - var24) * Client.field183 / 3;
@@ -418,7 +418,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var47.scrollY -= var45;
Client.field206 += var45;
class22.method295(var47);
WorldMapRectangle.method295(var47);
}
if (var24 + var26 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var47.scrollY < var47.scrollHeight - var47.height) {
@@ -433,7 +433,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var47.scrollY += var45;
Client.field206 -= var45;
class22.method295(var47);
WorldMapRectangle.method295(var47);
}
}
} else if (var10 == BoundaryObject.field40 && var22 == Client.field204) {
@@ -442,7 +442,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var42.drawAt2(var21, var26);
}
} else {
class22.method295(var10);
WorldMapRectangle.method295(var10);
}
}
}
@@ -464,12 +464,12 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
}
if (var10.fill) {
switch(var10.rectangleMode.id) {
switch(var10.rectangleMode.value) {
case 1:
Rasterizer2D.drawGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2);
Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2);
break;
case 2:
Rasterizer2D.drawGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparency & 255), 255 - (var10.field960 & 255));
Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparency & 255), 255 - (var10.field960 & 255));
break;
default:
if (var14 == 0) {
@@ -489,7 +489,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var27 = var10.getFont();
if (var27 == null) {
if (Widget.field957) {
class22.method295(var10);
WorldMapRectangle.method295(var10);
}
} else {
String var38 = var10.text;
@@ -539,7 +539,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
if (var37 != null) {
var37.drawAt2(var12, var13);
} else if (Widget.field957) {
class22.method295(var10);
WorldMapRectangle.method295(var10);
}
} else {
if (var10.itemId != -1) {
@@ -550,7 +550,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
if (var37 == null) {
if (Widget.field957) {
class22.method295(var10);
WorldMapRectangle.method295(var10);
}
} else {
var19 = var37.width;
@@ -583,7 +583,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
}
}
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
}
}
}
@@ -608,25 +608,25 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var43.calculateBoundsCylinder();
var21 = var43.height / 2;
} else {
class22.method295(var10);
WorldMapRectangle.method295(var10);
}
}
} else if (var10.modelType == 5) {
if (var10.modelId == 0) {
var43 = Client.field119.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
var43 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
} else {
var43 = Canvas.localPlayer.getModel();
}
} else if (var19 == -1) {
var43 = var10.getModel((SequenceDefinition)null, -1, var40, Canvas.localPlayer.appearance);
if (var43 == null && Widget.field957) {
class22.method295(var10);
WorldMapRectangle.method295(var10);
}
} else {
SequenceDefinition var44 = WorldMapAreaData.getSequenceDefinition(var19);
var43 = var10.getModel(var44, var10.modelFrame, var40, Canvas.localPlayer.appearance);
if (var43 == null && Widget.field957) {
class22.method295(var10);
WorldMapRectangle.method295(var10);
}
}
@@ -652,7 +652,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var27 = var10.getFont();
if (var27 == null) {
if (Widget.field957) {
class22.method295(var10);
WorldMapRectangle.method295(var10);
}
continue;
}
@@ -717,12 +717,12 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var33 = var12 + 5;
}
if (var22 + var33 > var4) {
var33 = var4 - var22;
if (var22 + var33 > xEnd) {
var33 = xEnd - var22;
}
if (var24 + var19 > var5) {
var24 = var5 - var19;
if (var24 + var19 > yEnd) {
var24 = yEnd - var19;
}
Rasterizer2D.Rasterizer2D_fillRectangle(var33, var24, var22, var19, 16777120);
@@ -421,7 +421,7 @@ public class DynamicObject extends Entity {
var10.packetBuffer.writeByte(var13);
var10.packetBuffer.writeByte(var14);
TextureProvider.method2777(var10.packetBuffer, var3);
var10.packetBuffer.method41(var10.packetBuffer.index - var11);
var10.packetBuffer.writeLengthByte(var10.packetBuffer.index - var11);
Client.packetWriter.method241(var10);
return 1;
} else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) {
@@ -433,7 +433,7 @@ public class DynamicObject extends Entity {
int var9 = var8.packetBuffer.index;
var8.packetBuffer.writeStringCp1252NullTerminated(var3);
TextureProvider.method2777(var8.packetBuffer, var7);
var8.packetBuffer.method40(var8.packetBuffer.index - var9);
var8.packetBuffer.writeLengthShort(var8.packetBuffer.index - var9);
Client.packetWriter.method241(var8);
return 1;
} else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) {
@@ -627,7 +627,7 @@ public class DynamicObject extends Entity {
Client.soundEffectCount = 0;
Client.isCameraLocked = false;
WorldMapSection1.cameraX -= var5 << 7;
WorldMapSection2.cameraX -= var5 << 7;
GrandExchangeOfferNameComparator.cameraZ -= var6 << 7;
MouseHandler.oculusOrbFocalPointX -= var5 << 7;
ScriptEvent.oculusOrbFocalPointY -= var6 << 7;
@@ -11,12 +11,14 @@ public class FloorOverlayDefinition extends DualNode {
@ObfuscatedSignature(
signature = "Lir;"
)
public static AbstractArchive field663;
@Export("FloorOverlayDefinition_archive")
public static AbstractArchive FloorOverlayDefinition_archive;
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "Ler;"
)
public static EvictingDualNodeHashTable field664;
@Export("FloorOverlayDefinition_cached")
public static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = -111851793
@@ -240,6 +242,6 @@ public class FloorOverlayDefinition extends DualNode {
}
static {
field664 = new EvictingDualNodeHashTable(64);
FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64);
}
}
@@ -176,8 +176,8 @@ public class FloorUnderlayDefinition extends DualNode {
signature = "(I)[Lip;",
garbageValue = "618327716"
)
static class249[] method4839() {
return new class249[]{class249.field3277, class249.field3273, class249.field3274};
static VerticalAlignment[] method4839() {
return new VerticalAlignment[]{VerticalAlignment.field3277, VerticalAlignment.field3273, VerticalAlignment.field3274};
}
static {
+1 -1
View File
@@ -485,7 +485,7 @@ public class FontName {
SecureRandomFuture.archive5.method8();
UserComparator3.archive6.method8();
class40.archive7.method8();
WorldMapSection3.archive8.method8();
WorldMapSection1.archive8.method8();
class238.archive9.method8();
class16.archive10.method8();
Login.archive11.method8();
+3 -2
View File
@@ -80,7 +80,8 @@ public class Fonts {
signature = "(I)Lbt;",
garbageValue = "2102006478"
)
static World method5647() {
return World.field987 < World.worldsCount ? ItemContainer.worlds[++World.field987 - 1] : null;
@Export("getNextWorldListWorld")
static World getNextWorldListWorld() {
return World.worldListWorldCount < World.worldsCount ? ItemContainer.worlds[++World.worldListWorldCount - 1] : null;
}
}
+1 -1
View File
@@ -28,7 +28,7 @@ public class Frames extends DualNode {
)
public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
NodeDeque var5 = new NodeDeque();
int var6 = var1.method4(var3);
int var6 = var1.getGroupFileCount(var3);
this.frames = new Animation[var6];
int[] var7 = var1.method3(var3);
@@ -202,7 +202,7 @@ public class FriendSystem {
var4 = "You can't add yourself to your own ignore list";
WorldMapIcon1.addGameMessage(30, "", var4);
} else if (this.isIgnored(var2)) {
class22.method294(var1);
WorldMapRectangle.method294(var1);
} else {
PacketBufferNode var5;
if (this.isFriended(var2, false)) {
@@ -1037,14 +1037,14 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
if (gameState != 5 && gameState != 10) {
if (gameState == 20) {
class2.method27(class16.archive10, WorldMapSection3.archive8, true, Client.gameState == 11 ? 4 : 0);
class2.method27(class16.archive10, WorldMapSection1.archive8, true, Client.gameState == 11 ? 4 : 0);
} else if (gameState == 11) {
class2.method27(class16.archive10, WorldMapSection3.archive8, false, 4);
class2.method27(class16.archive10, WorldMapSection1.archive8, false, 4);
} else {
class80.method2015();
}
} else {
class2.method27(class16.archive10, WorldMapSection3.archive8, true, 0);
class2.method27(class16.archive10, WorldMapSection1.archive8, true, 0);
}
Client.gameState = gameState;
@@ -238,7 +238,7 @@ public class GrandExchangeEvent {
Interpreter.Interpreter_stringLocals = var30.stringLocals;
} else if (var13 == ScriptOpcodes.GET_VARBIT) {
var11 = var6[var4];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection2.getVarbit(var11);
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection0.getVarbit(var11);
} else if (var13 == ScriptOpcodes.SET_VARBIT) {
var11 = var6[var4];
PendingSpawn.method1695(var11, Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
@@ -143,7 +143,7 @@ public class GrandExchangeOffer {
int var0 = 0;
for (int var1 = 0; var1 <= Client.archiveLoaderArchive; ++var1) {
var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).field409;
var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount;
}
return var0 * 10000 / Client.field140;
@@ -145,7 +145,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
var4 = (int)var0.key;
Widget var5 = Huffman.getWidget(var4);
if (var5 != null) {
class22.method295(var5);
WorldMapRectangle.method295(var5);
}
}
}
@@ -83,7 +83,7 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator {
var2 = Canvas.localPlayer.y >> 7;
}
int var3 = WorldMapSection1.cameraX >> 7;
int var3 = WorldMapSection2.cameraX >> 7;
int var4 = GrandExchangeOfferNameComparator.cameraZ >> 7;
if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) {
return SoundSystem.plane;
@@ -143,19 +143,19 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
var8 = -1;
var9 = -1;
var10 = -1;
var7 = var0.method48();
var7 = var0.readUShortSmart();
if (var7 == 32767) {
var7 = var0.method48();
var9 = var0.method48();
var8 = var0.method48();
var10 = var0.method48();
var7 = var0.readUShortSmart();
var9 = var0.readUShortSmart();
var8 = var0.readUShortSmart();
var10 = var0.readUShortSmart();
} else if (var7 != 32766) {
var9 = var0.method48();
var9 = var0.readUShortSmart();
} else {
var7 = -1;
}
var11 = var0.method48();
var11 = var0.readUShortSmart();
var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11);
}
}
@@ -163,10 +163,10 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
var6 = var0.method58();
if (var6 > 0) {
for (var7 = 0; var7 < var6; ++var7) {
var8 = var0.method48();
var9 = var0.method48();
var8 = var0.readUShortSmart();
var9 = var0.readUShortSmart();
if (var9 != 32767) {
var10 = var0.method48();
var10 = var0.readUShortSmart();
var11 = var0.readUnsignedByte();
int var12 = var9 > 0 ? var0.method59() : var11;
var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12);
@@ -74,7 +74,7 @@ public final class GroundItemPile {
} else if (!Widget.Widget_archive.tryLoadGroup(itf)) {
return false;
} else {
int var1 = Widget.Widget_archive.method4(itf);
int var1 = Widget.Widget_archive.getGroupFileCount(itf);
if (var1 == 0) {
Widget.loadedInterfaces[itf] = true;
return true;
@@ -173,19 +173,19 @@ public class HitSplatDefinition extends DualNode {
} else if (var2 == 6) {
this.field391 = var1.method51();
} else if (var2 == 7) {
this.field392 = var1.method44();
this.field392 = var1.readShort();
} else if (var2 == 8) {
this.field395 = var1.readStringCp1252NullCircumfixed();
} else if (var2 == 9) {
this.field387 = var1.readUnsignedShort();
} else if (var2 == 10) {
this.field393 = var1.method44();
this.field393 = var1.readShort();
} else if (var2 == 11) {
this.field394 = 0;
} else if (var2 == 12) {
this.field396 = var1.readUnsignedByte();
} else if (var2 == 13) {
this.field397 = var1.method44();
this.field397 = var1.readShort();
} else if (var2 == 14) {
this.field394 = var1.readUnsignedShort();
} else if (var2 == 17 || var2 == 18) {
@@ -231,7 +231,7 @@ public class HitSplatDefinition extends DualNode {
public final HitSplatDefinition transform() {
int var1 = -1;
if (this.transformVarbit != -1) {
var1 = WorldMapSection2.getVarbit(this.transformVarbit);
var1 = WorldMapSection0.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) {
var1 = Varps.Varps_main[this.transformVarp];
}
@@ -1,10 +1,12 @@
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;
@ObfuscatedName("ju")
public enum class266 implements Enumerated {
@Implements("HorizontalAlignment")
public enum HorizontalAlignment implements Enumerated {
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "Lju;"
@@ -28,7 +30,8 @@ public enum class266 implements Enumerated {
@ObfuscatedGetter(
intValue = -739868097
)
public final int field3528;
@Export("value")
public final int value;
@ObfuscatedName("o")
@ObfuscatedGetter(
intValue = -1327532101
@@ -36,8 +39,8 @@ public enum class266 implements Enumerated {
@Export("id")
final int id;
private class266(int var3, int var4) {
this.field3528 = var3;
private HorizontalAlignment(int var3, int var4) {
this.value = var3;
this.id = var4;
}
+41 -36
View File
@@ -16,18 +16,21 @@ public class Huffman {
@Export("canvasHeight")
public static int canvasHeight;
@ObfuscatedName("m")
int[] field399;
@Export("masks")
int[] masks;
@ObfuscatedName("f")
byte[] field400;
@Export("bits")
byte[] bits;
@ObfuscatedName("q")
int[] field401;
@Export("keys")
int[] keys;
public Huffman(byte[] var1) {
int var2 = var1.length;
this.field399 = new int[var2];
this.field400 = var1;
this.masks = new int[var2];
this.bits = var1;
int[] var3 = new int[33];
this.field401 = new int[8];
this.keys = new int[8];
int var4 = 0;
for (int var5 = 0; var5 < var2; ++var5) {
@@ -35,7 +38,7 @@ public class Huffman {
if (var6 != 0) {
int var7 = 1 << 32 - var6;
int var8 = var3[var6];
this.field399[var5] = var8;
this.masks[var5] = var8;
int var9;
int var10;
int var11;
@@ -74,29 +77,29 @@ public class Huffman {
for (var11 = 0; var11 < var6; ++var11) {
var12 = Integer.MIN_VALUE >>> var11;
if ((var8 & var12) != 0) {
if (this.field401[var10] == 0) {
this.field401[var10] = var4;
if (this.keys[var10] == 0) {
this.keys[var10] = var4;
}
var10 = this.field401[var10];
var10 = this.keys[var10];
} else {
++var10;
}
if (var10 >= this.field401.length) {
int[] var13 = new int[this.field401.length * 2];
if (var10 >= this.keys.length) {
int[] var13 = new int[this.keys.length * 2];
for (int var14 = 0; var14 < this.field401.length; ++var14) {
var13[var14] = this.field401[var14];
for (int var14 = 0; var14 < this.keys.length; ++var14) {
var13[var14] = this.keys[var14];
}
this.field401 = var13;
this.keys = var13;
}
var12 >>>= 1;
}
this.field401[var10] = ~var5;
this.keys[var10] = ~var5;
if (var10 >= var4) {
var4 = var10 + 1;
}
@@ -110,14 +113,15 @@ public class Huffman {
signature = "([BII[BIB)I",
garbageValue = "64"
)
public int method127(byte[] var1, int var2, int var3, byte[] var4, int var5) {
@Export("compress")
public int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) {
int var6 = 0;
int var7 = var5 << 3;
for (var3 += var2; var2 < var3; ++var2) {
int var8 = var1[var2] & 255;
int var9 = this.field399[var8];
byte var10 = this.field400[var8];
int var9 = this.masks[var8];
byte var10 = this.bits[var8];
if (var10 == 0) {
throw new RuntimeException("");
}
@@ -160,7 +164,8 @@ public class Huffman {
signature = "([BI[BIII)I",
garbageValue = "-2094399899"
)
public int method128(byte[] var1, int var2, byte[] var3, int var4, int var5) {
@Export("decompress")
public int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
if (var5 == 0) {
return 0;
} else {
@@ -171,13 +176,13 @@ public class Huffman {
while (true) {
byte var8 = var1[var7];
if (var8 < 0) {
var6 = this.field401[var6];
var6 = this.keys[var6];
} else {
++var6;
}
int var9;
if ((var9 = this.field401[var6]) < 0) {
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
@@ -187,12 +192,12 @@ public class Huffman {
}
if ((var8 & 64) != 0) {
var6 = this.field401[var6];
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.field401[var6]) < 0) {
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
@@ -202,12 +207,12 @@ public class Huffman {
}
if ((var8 & 32) != 0) {
var6 = this.field401[var6];
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.field401[var6]) < 0) {
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
@@ -217,12 +222,12 @@ public class Huffman {
}
if ((var8 & 16) != 0) {
var6 = this.field401[var6];
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.field401[var6]) < 0) {
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
@@ -232,12 +237,12 @@ public class Huffman {
}
if ((var8 & 8) != 0) {
var6 = this.field401[var6];
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.field401[var6]) < 0) {
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
@@ -247,12 +252,12 @@ public class Huffman {
}
if ((var8 & 4) != 0) {
var6 = this.field401[var6];
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.field401[var6]) < 0) {
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
@@ -262,12 +267,12 @@ public class Huffman {
}
if ((var8 & 2) != 0) {
var6 = this.field401[var6];
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.field401[var6]) < 0) {
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
@@ -277,12 +282,12 @@ public class Huffman {
}
if ((var8 & 1) != 0) {
var6 = this.field401[var6];
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.field401[var6]) < 0) {
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
+91 -82
View File
@@ -35,42 +35,50 @@ public class Instrument {
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field413;
@Export("pitch")
SoundEnvelope pitch;
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field414;
@Export("volume")
SoundEnvelope volume;
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field415;
@Export("pitchModifier")
SoundEnvelope pitchModifier;
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field416;
@Export("pitchModifierAmplitude")
SoundEnvelope pitchModifierAmplitude;
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field417;
@Export("volumeMultiplier")
SoundEnvelope volumeMultiplier;
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field418;
@Export("volumeMultiplierAmplitude")
SoundEnvelope volumeMultiplierAmplitude;
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field419;
@Export("release")
SoundEnvelope release;
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field420;
@Export("attack")
SoundEnvelope attack;
@ObfuscatedName("e")
@Export("oscillatorVolume")
int[] oscillatorVolume;
@@ -96,7 +104,8 @@ public class Instrument {
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field421;
@Export("filterEnvelope")
SoundEnvelope filterEnvelope;
@ObfuscatedName("z")
@Export("duration")
int duration;
@@ -122,26 +131,26 @@ public class Instrument {
return Instrument_samples;
} else {
double var3 = (double)var1 / ((double)var2 + 0.0D);
this.field413.reset();
this.field414.reset();
this.pitch.reset();
this.volume.reset();
int var5 = 0;
int var6 = 0;
int var7 = 0;
if (this.field415 != null) {
this.field415.reset();
this.field416.reset();
var5 = (int)((double)(this.field415.end - this.field415.start) * 32.768D / var3);
var6 = (int)((double)this.field415.start * 32.768D / var3);
if (this.pitchModifier != null) {
this.pitchModifier.reset();
this.pitchModifierAmplitude.reset();
var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3);
var6 = (int)((double)this.pitchModifier.start * 32.768D / var3);
}
int var8 = 0;
int var9 = 0;
int var10 = 0;
if (this.field417 != null) {
this.field417.reset();
this.field418.reset();
var8 = (int)((double)(this.field417.end - this.field417.start) * 32.768D / var3);
var9 = (int)((double)this.field417.start * 32.768D / var3);
if (this.volumeMultiplier != null) {
this.volumeMultiplier.reset();
this.volumeMultiplierAmplitude.reset();
var8 = (int)((double)(this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3);
var9 = (int)((double)this.volumeMultiplier.start * 32.768D / var3);
}
int var11;
@@ -150,8 +159,8 @@ public class Instrument {
Instrument_phases[var11] = 0;
Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3);
Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100;
Instrument_pitchSteps[var11] = (int)((double)(this.field413.end - this.field413.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3);
Instrument_pitchBaseSteps[var11] = (int)((double)this.field413.start * 32.768D / var3);
Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3);
Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3);
}
}
@@ -161,19 +170,19 @@ public class Instrument {
int var15;
int[] var16;
for (var11 = 0; var11 < var1; ++var11) {
var12 = this.field413.doStep(var1);
var13 = this.field414.doStep(var1);
if (this.field415 != null) {
var14 = this.field415.doStep(var1);
var15 = this.field416.doStep(var1);
var12 += this.evaluateWave(var7, var15, this.field415.form) >> 1;
var12 = this.pitch.doStep(var1);
var13 = this.volume.doStep(var1);
if (this.pitchModifier != null) {
var14 = this.pitchModifier.doStep(var1);
var15 = this.pitchModifierAmplitude.doStep(var1);
var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1;
var7 = var7 + var6 + (var14 * var5 >> 16);
}
if (this.field417 != null) {
var14 = this.field417.doStep(var1);
var15 = this.field418.doStep(var1);
var13 = var13 * ((this.evaluateWave(var10, var15, this.field417.form) >> 1) + 32768) >> 15;
if (this.volumeMultiplier != null) {
var14 = this.volumeMultiplier.doStep(var1);
var15 = this.volumeMultiplierAmplitude.doStep(var1);
var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15;
var10 = var10 + var9 + (var14 * var8 >> 16);
}
@@ -182,7 +191,7 @@ public class Instrument {
var15 = Instrument_delays[var14] + var11;
if (var15 < var1) {
var16 = Instrument_samples;
var16[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.field413.form);
var16[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form);
var16 = Instrument_phases;
var16[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14];
}
@@ -191,20 +200,20 @@ public class Instrument {
}
int var17;
if (this.field419 != null) {
this.field419.reset();
this.field420.reset();
if (this.release != null) {
this.release.reset();
this.attack.reset();
var11 = 0;
boolean var18 = false;
boolean var19 = true;
for (var14 = 0; var14 < var1; ++var14) {
var15 = this.field419.doStep(var1);
var17 = this.field420.doStep(var1);
var15 = this.release.doStep(var1);
var17 = this.attack.doStep(var1);
if (var19) {
var12 = (var15 * (this.field419.end - this.field419.start) >> 8) + this.field419.start;
var12 = (var15 * (this.release.end - this.release.start) >> 8) + this.release.start;
} else {
var12 = (var17 * (this.field419.end - this.field419.start) >> 8) + this.field419.start;
var12 = (var17 * (this.release.end - this.release.start) >> 8) + this.release.start;
}
var11 += 256;
@@ -228,11 +237,11 @@ public class Instrument {
}
}
if (this.filter.field36[0] > 0 || this.filter.field36[1] > 0) {
this.field421.reset();
var11 = this.field421.doStep(var1 + 1);
var12 = this.filter.method26(0, (float)var11 / 65536.0F);
var13 = this.filter.method26(1, (float)var11 / 65536.0F);
if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) {
this.filterEnvelope.reset();
var11 = this.filterEnvelope.doStep(var1 + 1);
var12 = this.filter.compute(0, (float)var11 / 65536.0F);
var13 = this.filter.compute(1, (float)var11 / 65536.0F);
if (var1 >= var12 + var13) {
var14 = 0;
var15 = var13;
@@ -242,18 +251,18 @@ public class Instrument {
int var20;
while (var14 < var15) {
var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16);
var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16);
for (var20 = 0; var20 < var12; ++var20) {
var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.field33[0][var20] >> 16);
var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.coefficients[0][var20] >> 16);
}
for (var20 = 0; var20 < var14; ++var20) {
var17 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.field33[1][var20] >> 16);
var17 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.coefficients[1][var20] >> 16);
}
Instrument_samples[var14] = var17;
var11 = this.field421.doStep(var1 + 1);
var11 = this.filterEnvelope.doStep(var1 + 1);
++var14;
}
@@ -266,18 +275,18 @@ public class Instrument {
int var21;
while (var14 < var15) {
var20 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16);
var20 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16);
for (var21 = 0; var21 < var12; ++var21) {
var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.field33[0][var21] >> 16);
var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.coefficients[0][var21] >> 16);
}
for (var21 = 0; var21 < var13; ++var21) {
var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.field33[1][var21] >> 16);
var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.coefficients[1][var21] >> 16);
}
Instrument_samples[var14] = var20;
var11 = this.field421.doStep(var1 + 1);
var11 = this.filterEnvelope.doStep(var1 + 1);
++var14;
}
@@ -286,22 +295,22 @@ public class Instrument {
var20 = 0;
for (var21 = var14 + var12 - var1; var21 < var12; ++var21) {
var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.field33[0][var21] >> 16);
var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.coefficients[0][var21] >> 16);
}
for (var21 = 0; var21 < var13; ++var21) {
var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.field33[1][var21] >> 16);
var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.coefficients[1][var21] >> 16);
}
Instrument_samples[var14] = var20;
this.field421.doStep(var1 + 1);
this.filterEnvelope.doStep(var1 + 1);
++var14;
}
break;
}
var12 = this.filter.method26(0, (float)var11 / 65536.0F);
var13 = this.filter.method26(1, (float)var11 / 65536.0F);
var12 = this.filter.compute(0, (float)var11 / 65536.0F);
var13 = this.filter.compute(1, (float)var11 / 65536.0F);
var15 += 128;
}
}
@@ -333,55 +342,55 @@ public class Instrument {
)
@Export("decode")
final void decode(Buffer buffer) {
this.field413 = new SoundEnvelope();
this.field413.decode(buffer);
this.field414 = new SoundEnvelope();
this.field414.decode(buffer);
this.pitch = new SoundEnvelope();
this.pitch.decode(buffer);
this.volume = new SoundEnvelope();
this.volume.decode(buffer);
int var2 = buffer.readUnsignedByte();
if (var2 != 0) {
--buffer.index;
this.field415 = new SoundEnvelope();
this.field415.decode(buffer);
this.field416 = new SoundEnvelope();
this.field416.decode(buffer);
this.pitchModifier = new SoundEnvelope();
this.pitchModifier.decode(buffer);
this.pitchModifierAmplitude = new SoundEnvelope();
this.pitchModifierAmplitude.decode(buffer);
}
var2 = buffer.readUnsignedByte();
if (var2 != 0) {
--buffer.index;
this.field417 = new SoundEnvelope();
this.field417.decode(buffer);
this.field418 = new SoundEnvelope();
this.field418.decode(buffer);
this.volumeMultiplier = new SoundEnvelope();
this.volumeMultiplier.decode(buffer);
this.volumeMultiplierAmplitude = new SoundEnvelope();
this.volumeMultiplierAmplitude.decode(buffer);
}
var2 = buffer.readUnsignedByte();
if (var2 != 0) {
--buffer.index;
this.field419 = new SoundEnvelope();
this.field419.decode(buffer);
this.field420 = new SoundEnvelope();
this.field420.decode(buffer);
this.release = new SoundEnvelope();
this.release.decode(buffer);
this.attack = new SoundEnvelope();
this.attack.decode(buffer);
}
for (int var3 = 0; var3 < 10; ++var3) {
int var4 = buffer.method48();
int var4 = buffer.readUShortSmart();
if (var4 == 0) {
break;
}
this.oscillatorVolume[var3] = var4;
this.oscillatorPitch[var3] = buffer.method47();
this.oscillatorDelays[var3] = buffer.method48();
this.oscillatorPitch[var3] = buffer.readShortSmart();
this.oscillatorDelays[var3] = buffer.readUShortSmart();
}
this.delayTime = buffer.method48();
this.delayDecay = buffer.method48();
this.delayTime = buffer.readUShortSmart();
this.delayDecay = buffer.readUShortSmart();
this.duration = buffer.readUnsignedShort();
this.offset = buffer.readUnsignedShort();
this.filter = new AudioFilter();
this.field421 = new SoundEnvelope();
this.filter.method27(buffer, this.field421);
this.filterEnvelope = new SoundEnvelope();
this.filter.method27(buffer, this.filterEnvelope);
}
static {
+11 -10
View File
@@ -48,7 +48,8 @@ public class Interpreter {
@Export("Interpreter_calendar")
static Calendar Interpreter_calendar;
@ObfuscatedName("z")
static final String[] field422;
@Export("Interpreter_MONTHS")
static final String[] Interpreter_MONTHS;
@ObfuscatedName("s")
static boolean field423;
@ObfuscatedName("t")
@@ -139,7 +140,7 @@ public class Interpreter {
World.sortOption1 = var2;
World.sortOption2 = var3;
MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2);
MilliClock.sortWorlds(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2);
}
@ObfuscatedName("w")
@@ -149,15 +150,15 @@ public class Interpreter {
)
public static void method1976() {
try {
File var0 = new File(WorldMapSection1.userHomeDirectory, "random.dat");
File var0 = new File(WorldMapSection2.userHomeDirectory, "random.dat");
int var1;
if (var0.exists()) {
class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0);
} else {
label34:
for (int var2 = 0; var2 < Canvas.field94.length; ++var2) {
for (var1 = 0; var1 < WorldMapSection2.cacheDirectoryLocations.length; ++var1) {
File var3 = new File(WorldMapSection2.cacheDirectoryLocations[var1] + Canvas.field94[var2] + File.separatorChar + "random.dat");
for (var1 = 0; var1 < WorldMapSection0.cacheDirectoryLocations.length; ++var1) {
File var3 = new File(WorldMapSection0.cacheDirectoryLocations[var1] + Canvas.field94[var2] + File.separatorChar + "random.dat");
if (var3.exists()) {
class168.randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0);
break label34;
@@ -186,12 +187,12 @@ public class Interpreter {
garbageValue = "-10"
)
@Export("drawWidgets")
static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
if (GroundItemPile.loadInterface(var0)) {
static final void drawWidgets(int interfaceID, int xStart, int yStart, int xEnd, int yEnd, int var5, int var6, int var7) {
if (GroundItemPile.loadInterface(interfaceID)) {
class279.field1145 = null;
DevicePcmPlayerProvider.drawInterface(Widget.interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7);
DevicePcmPlayerProvider.drawInterface(Widget.interfaceComponents[interfaceID], -1, xStart, yStart, xEnd, yEnd, var5, var6, var7);
if (class279.field1145 != null) {
DevicePcmPlayerProvider.drawInterface(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, BuddyRankComparator.field1114, var7);
DevicePcmPlayerProvider.drawInterface(class279.field1145, -1412584499, xStart, yStart, xEnd, yEnd, class54.field1161, BuddyRankComparator.field1114, var7);
class279.field1145 = null;
}
} else if (var7 != -1) {
@@ -212,7 +213,7 @@ public class Interpreter {
Interpreter_frameDepth = 0;
Interpreter_frames = new ScriptFrame[50];
Interpreter_calendar = Calendar.getInstance();
field422 = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
field423 = false;
field424 = false;
field425 = 0;
+83 -73
View File
@@ -1,3 +1,4 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
@@ -10,33 +11,39 @@ public final class IsaacCipher {
@ObfuscatedGetter(
intValue = 1514845493
)
int field428;
@Export("valuesRemaining")
int valuesRemaining;
@ObfuscatedName("o")
int[] field429;
@Export("results")
int[] results;
@ObfuscatedName("u")
int[] field430;
@Export("mm")
int[] mm;
@ObfuscatedName("g")
@ObfuscatedGetter(
intValue = -1670027699
)
int field431;
@Export("aa")
int aa;
@ObfuscatedName("l")
@ObfuscatedGetter(
intValue = -325762649
)
int field432;
@Export("bb")
int bb;
@ObfuscatedName("e")
@ObfuscatedGetter(
intValue = -1951204929
)
int field433;
@Export("cc")
int cc;
public IsaacCipher(int[] var1) {
this.field430 = new int[256];
this.field429 = new int[256];
public IsaacCipher(int[] seed) {
this.mm = new int[256];
this.results = new int[256];
for (int var2 = 0; var2 < var1.length; ++var2) {
this.field429[var2] = var1[var2];
for (int var2 = 0; var2 < seed.length; ++var2) {
this.results[var2] = seed[var2];
}
this.method139();
@@ -47,13 +54,14 @@ public final class IsaacCipher {
signature = "(I)I",
garbageValue = "-7509790"
)
final int method136() {
if (0 == --this.field428 + 1) {
this.method138();
this.field428 = 255;
@Export("nextInt")
final int nextInt() {
if (0 == --this.valuesRemaining + 1) {
this.generateMoreResults();
this.valuesRemaining = 255;
}
return this.field429[this.field428];
return this.results[this.valuesRemaining];
}
@ObfuscatedName("f")
@@ -62,12 +70,12 @@ public final class IsaacCipher {
garbageValue = "-506873526"
)
final int method137() {
if (this.field428 == 0) {
this.method138();
this.field428 = 256;
if (this.valuesRemaining == 0) {
this.generateMoreResults();
this.valuesRemaining = 256;
}
return this.field429[this.field428 - 1];
return this.results[this.valuesRemaining - 1];
}
@ObfuscatedName("q")
@@ -75,27 +83,28 @@ public final class IsaacCipher {
signature = "(B)V",
garbageValue = "124"
)
final void method138() {
this.field432 += ++this.field433;
@Export("generateMoreResults")
final void generateMoreResults() {
this.bb += ++this.cc;
for (int var1 = 0; var1 < 256; ++var1) {
int var2 = this.field430[var1];
int var2 = this.mm[var1];
if ((var1 & 2) == 0) {
if ((var1 & 1) == 0) {
this.field431 ^= this.field431 << 13;
this.aa ^= this.aa << 13;
} else {
this.field431 ^= this.field431 >>> 6;
this.aa ^= this.aa >>> 6;
}
} else if ((var1 & 1) == 0) {
this.field431 ^= this.field431 << 2;
this.aa ^= this.aa << 2;
} else {
this.field431 ^= this.field431 >>> 16;
this.aa ^= this.aa >>> 16;
}
this.field431 += this.field430[128 + var1 & 255];
this.aa += this.mm[128 + var1 & 255];
int var3;
this.field430[var1] = var3 = this.field430[(var2 & 1020) >> 2] + this.field432 + this.field431;
this.field429[var1] = this.field432 = this.field430[(var3 >> 8 & 1020) >> 2] + var2;
this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa;
this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2;
}
}
@@ -106,14 +115,14 @@ public final class IsaacCipher {
garbageValue = "579890110"
)
final void method139() {
int var1 = -1640531527;
int var2 = -1640531527;
int var3 = -1640531527;
int var4 = -1640531527;
int var5 = -1640531527;
int var6 = -1640531527;
int var7 = -1640531527;
int var8 = -1640531527;
int var1 = 0x9e3779b9;
int var2 = 0x9e3779b9;
int var3 = 0x9e3779b9;
int var4 = 0x9e3779b9;
int var5 = 0x9e3779b9;
int var6 = 0x9e3779b9;
int var7 = 0x9e3779b9;
int var8 = 0x9e3779b9;
int var9;
for (var9 = 0; var9 < 4; ++var9) {
@@ -144,14 +153,14 @@ public final class IsaacCipher {
}
for (var9 = 0; var9 < 256; var9 += 8) {
var8 += this.field429[var9];
var7 += this.field429[var9 + 1];
var6 += this.field429[var9 + 2];
var5 += this.field429[var9 + 3];
var4 += this.field429[var9 + 4];
var3 += this.field429[var9 + 5];
var2 += this.field429[var9 + 6];
var1 += this.field429[var9 + 7];
var8 += this.results[var9];
var7 += this.results[var9 + 1];
var6 += this.results[var9 + 2];
var5 += this.results[var9 + 3];
var4 += this.results[var9 + 4];
var3 += this.results[var9 + 5];
var2 += this.results[var9 + 6];
var1 += this.results[var9 + 7];
var8 ^= var7 << 11;
var5 += var8;
var7 += var6;
@@ -176,25 +185,25 @@ public final class IsaacCipher {
var1 ^= var8 >>> 9;
var6 += var1;
var8 += var7;
this.field430[var9] = var8;
this.field430[var9 + 1] = var7;
this.field430[var9 + 2] = var6;
this.field430[var9 + 3] = var5;
this.field430[var9 + 4] = var4;
this.field430[var9 + 5] = var3;
this.field430[var9 + 6] = var2;
this.field430[var9 + 7] = var1;
this.mm[var9] = var8;
this.mm[var9 + 1] = var7;
this.mm[var9 + 2] = var6;
this.mm[var9 + 3] = var5;
this.mm[var9 + 4] = var4;
this.mm[var9 + 5] = var3;
this.mm[var9 + 6] = var2;
this.mm[var9 + 7] = var1;
}
for (var9 = 0; var9 < 256; var9 += 8) {
var8 += this.field430[var9];
var7 += this.field430[var9 + 1];
var6 += this.field430[var9 + 2];
var5 += this.field430[var9 + 3];
var4 += this.field430[var9 + 4];
var3 += this.field430[var9 + 5];
var2 += this.field430[var9 + 6];
var1 += this.field430[var9 + 7];
var8 += this.mm[var9];
var7 += this.mm[var9 + 1];
var6 += this.mm[var9 + 2];
var5 += this.mm[var9 + 3];
var4 += this.mm[var9 + 4];
var3 += this.mm[var9 + 5];
var2 += this.mm[var9 + 6];
var1 += this.mm[var9 + 7];
var8 ^= var7 << 11;
var5 += var8;
var7 += var6;
@@ -219,18 +228,18 @@ public final class IsaacCipher {
var1 ^= var8 >>> 9;
var6 += var1;
var8 += var7;
this.field430[var9] = var8;
this.field430[var9 + 1] = var7;
this.field430[var9 + 2] = var6;
this.field430[var9 + 3] = var5;
this.field430[var9 + 4] = var4;
this.field430[var9 + 5] = var3;
this.field430[var9 + 6] = var2;
this.field430[var9 + 7] = var1;
this.mm[var9] = var8;
this.mm[var9 + 1] = var7;
this.mm[var9 + 2] = var6;
this.mm[var9 + 3] = var5;
this.mm[var9 + 4] = var4;
this.mm[var9 + 5] = var3;
this.mm[var9 + 6] = var2;
this.mm[var9 + 7] = var1;
}
this.method138();
this.field428 = 256;
this.generateMoreResults();
this.valuesRemaining = 256;
}
@ObfuscatedName("m")
@@ -238,7 +247,8 @@ public final class IsaacCipher {
signature = "(Lir;Lir;I)V",
garbageValue = "75867683"
)
public static void method4082(AbstractArchive var0, AbstractArchive var1) {
@Export("setNpcDefinitionArchives")
public static void setNpcDefinitionArchives(AbstractArchive var0, AbstractArchive var1) {
NPCDefinition.NpcDefinition_archive = var0;
NPCDefinition.NpcDefinition_modelArchive = var1;
}
@@ -22,7 +22,8 @@ public class ItemContainer extends Node {
@ObfuscatedSignature(
signature = "Lit;"
)
static Archive field434;
@Export("archive19")
static Archive archive19;
@ObfuscatedName("f")
@Export("ids")
int[] ids;
@@ -22,7 +22,8 @@ public class KitDefinition extends DualNode {
@ObfuscatedGetter(
intValue = 235389995
)
public static int field457;
@Export("KitDefinition_totalCount")
public static int KitDefinition_totalCount;
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "Ler;"
@@ -245,13 +246,13 @@ public class KitDefinition extends DualNode {
public static String method4866(Buffer var0) {
String var1;
try {
int var2 = var0.method48();
int var2 = var0.readUShortSmart();
if (var2 > 32767) {
var2 = 32767;
}
byte[] var3 = new byte[var2];
var0.index += class303.huffman.method128(var0.array, var0.index, var3, 0, var2);
var0.index += class303.huffman.decompress(var0.array, var0.index, var3, 0, var2);
String var4 = InterfaceParent.decodeStringCp1252(var3, 0, var2);
var1 = var4;
} catch (Exception var5) {
+2 -2
View File
@@ -205,8 +205,8 @@ public class Login {
if (ReflectionCheck.clientPreferences.roofsHidden) {
return SoundSystem.plane;
} else {
int var0 = class32.getTileHeight(WorldMapSection1.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane);
return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][GrandExchangeOfferNameComparator.cameraZ >> 7] & 4) != 0 ? SoundSystem.plane : 3;
int var0 = class32.getTileHeight(WorldMapSection2.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane);
return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection2.cameraX >> 7][GrandExchangeOfferNameComparator.cameraZ >> 7] & 4) != 0 ? SoundSystem.plane : 3;
}
}
@@ -38,7 +38,8 @@ public class LoginPacket implements ClientPacketMarker {
@ObfuscatedSignature(
signature = "[Lgl;"
)
static final LoginPacket[] field478;
@Export("LoginPacket_indexedValues")
static final LoginPacket[] LoginPacket_indexedValues;
@ObfuscatedName("u")
@ObfuscatedGetter(
intValue = 1743806243
@@ -77,7 +78,7 @@ public class LoginPacket implements ClientPacketMarker {
var4 = "_wip";
}
File var5 = new File(WorldMapSection1.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat");
File var5 = new File(WorldMapSection2.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat");
AccessFile var6;
if (!var2 && var5.exists()) {
try {
@@ -101,11 +102,11 @@ public class LoginPacket implements ClientPacketMarker {
field475 = new LoginPacket(16, -2);
field476 = new LoginPacket(18, -2);
field477 = new LoginPacket(27, 0);
field478 = new LoginPacket[32];
LoginPacket[] var0 = WorldMapIcon2.method300();
LoginPacket_indexedValues = new LoginPacket[32];
LoginPacket[] var0 = WorldMapIcon2.LoginPacket_values();
for (int var1 = 0; var1 < var0.length; ++var1) {
field478[var0[var1].id] = var0[var1];
LoginPacket_indexedValues[var0[var1].id] = var0[var1];
}
}
@@ -4,11 +4,13 @@ import java.net.URL;
import java.net.URLConnection;
import java.util.Random;
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;
@ObfuscatedName("bp")
@Implements("LoginScreenAnimation")
public class LoginScreenAnimation {
@ObfuscatedName("m")
@ObfuscatedSignature(
@@ -522,11 +524,11 @@ public class LoginScreenAnimation {
Buffer var9 = new Buffer(var4.index + var5.index + var8.index + 5);
var9.writeByte(2);
var9.writeByte(var4.index);
var9.method38(var4.array, 0, var4.index);
var9.writeBytes(var4.array, 0, var4.index);
var9.writeByte(var5.index);
var9.method38(var5.array, 0, var5.index);
var9.writeBytes(var5.array, 0, var5.index);
var9.writeShort(var8.index);
var9.method38(var8.array, 0, var8.index);
var9.writeBytes(var8.array, 0, var8.index);
byte[] var10 = var9.array;
int var11 = var10.length;
StringBuilder var12 = new StringBuilder();
@@ -82,7 +82,7 @@ public class MenuAction {
Widget var12 = Huffman.getWidget(var3);
if (var12 != null) {
class22.method295(var12);
WorldMapRectangle.method295(var12);
}
int var5;
@@ -120,7 +120,7 @@ public class MidiFileReader {
@ObfuscatedName("l")
@Export("readTrackLength")
void readTrackLength(int trackId) {
int var2 = this.buffer.method52();
int var2 = this.buffer.readVarInt();
int[] var3 = this.trackLengths;
var3[trackId] += var2;
}
@@ -148,7 +148,7 @@ public class MidiFileReader {
if (var3 != 240 && var3 != 247) {
return this.method167(trackId, var3);
} else {
int var4 = this.buffer.method52();
int var4 = this.buffer.readVarInt();
if (var3 == 247 && var4 > 0) {
int var5 = this.buffer.array[this.buffer.index] & 255;
if (var5 >= 241 && var5 <= 243 || var5 == 246 || var5 == 248 || var5 >= 250 && var5 <= 252 || var5 == 254) {
@@ -169,7 +169,7 @@ public class MidiFileReader {
int var3;
if (var2 == 255) {
int var8 = this.buffer.readUnsignedByte();
var3 = this.buffer.method52();
var3 = this.buffer.readVarInt();
Buffer var5;
if (var8 == 47) {
var5 = this.buffer;
+34 -33
View File
@@ -130,14 +130,15 @@ public class MilliClock extends Clock {
signature = "([Lbt;II[I[II)V",
garbageValue = "-1374398116"
)
static void method3400(World[] var0, int var1, int var2, int[] var3, int[] var4) {
if (var1 < var2) {
int var5 = var1 - 1;
int var6 = var2 + 1;
int var7 = (var2 + var1) / 2;
World var8 = var0[var7];
var0[var7] = var0[var1];
var0[var1] = var8;
@Export("sortWorlds")
static void sortWorlds(World[] worlds, int lowestUnsorted, int highestUnsorted, int[] sortOption1, int[] sortOption2) {
if (lowestUnsorted < highestUnsorted) {
int var5 = lowestUnsorted - 1;
int var6 = highestUnsorted + 1;
int var7 = (highestUnsorted + lowestUnsorted) / 2;
World var8 = worlds[var7];
worlds[var7] = worlds[lowestUnsorted];
worlds[lowestUnsorted] = var8;
while (var5 < var6) {
boolean var9 = true;
@@ -149,29 +150,29 @@ public class MilliClock extends Clock {
--var6;
for (var10 = 0; var10 < 4; ++var10) {
if (var3[var10] == 2) {
var11 = var0[var6].index;
if (sortOption1[var10] == 2) {
var11 = worlds[var6].index;
var12 = var8.index;
} else if (var3[var10] == 1) {
var11 = var0[var6].population;
} else if (sortOption1[var10] == 1) {
var11 = worlds[var6].population;
var12 = var8.population;
if (var11 == -1 && var4[var10] == 1) {
if (var11 == -1 && sortOption2[var10] == 1) {
var11 = 2001;
}
if (var12 == -1 && var4[var10] == 1) {
if (var12 == -1 && sortOption2[var10] == 1) {
var12 = 2001;
}
} else if (var3[var10] == 3) {
var11 = var0[var6].isMembersOnly() ? 1 : 0;
} else if (sortOption1[var10] == 3) {
var11 = worlds[var6].isMembersOnly() ? 1 : 0;
var12 = var8.isMembersOnly() ? 1 : 0;
} else {
var11 = var0[var6].id;
var11 = worlds[var6].id;
var12 = var8.id;
}
if (var12 != var11) {
if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) {
if ((sortOption2[var10] != 1 || var11 <= var12) && (sortOption2[var10] != 0 || var11 >= var12)) {
var9 = false;
}
break;
@@ -189,29 +190,29 @@ public class MilliClock extends Clock {
++var5;
for (var10 = 0; var10 < 4; ++var10) {
if (var3[var10] == 2) {
var11 = var0[var5].index;
if (sortOption1[var10] == 2) {
var11 = worlds[var5].index;
var12 = var8.index;
} else if (var3[var10] == 1) {
var11 = var0[var5].population;
} else if (sortOption1[var10] == 1) {
var11 = worlds[var5].population;
var12 = var8.population;
if (var11 == -1 && var4[var10] == 1) {
if (var11 == -1 && sortOption2[var10] == 1) {
var11 = 2001;
}
if (var12 == -1 && var4[var10] == 1) {
if (var12 == -1 && sortOption2[var10] == 1) {
var12 = 2001;
}
} else if (var3[var10] == 3) {
var11 = var0[var5].isMembersOnly() ? 1 : 0;
} else if (sortOption1[var10] == 3) {
var11 = worlds[var5].isMembersOnly() ? 1 : 0;
var12 = var8.isMembersOnly() ? 1 : 0;
} else {
var11 = var0[var5].id;
var11 = worlds[var5].id;
var12 = var8.id;
}
if (var11 != var12) {
if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) {
if ((sortOption2[var10] != 1 || var11 >= var12) && (sortOption2[var10] != 0 || var11 <= var12)) {
var9 = false;
}
break;
@@ -224,14 +225,14 @@ public class MilliClock extends Clock {
} while(var9);
if (var5 < var6) {
World var13 = var0[var5];
var0[var5] = var0[var6];
var0[var6] = var13;
World var13 = worlds[var5];
worlds[var5] = worlds[var6];
worlds[var6] = var13;
}
}
method3400(var0, var1, var6, var3, var4);
method3400(var0, var6 + 1, var2, var3, var4);
sortWorlds(worlds, lowestUnsorted, var6, sortOption1, sortOption2);
sortWorlds(worlds, var6 + 1, highestUnsorted, sortOption1, sortOption2);
}
}
+5 -5
View File
@@ -1529,19 +1529,19 @@ public class Model extends Entity {
@ObfuscatedName("cy")
@Export("draw")
void draw(int yaw, int cameraPitchSine, int cameraPitchCosine, int cameraYawSine, int cameraYawCosine, int x, int y, int var8, long tag) {
void draw(int yaw, int cameraPitchSine, int cameraPitchCosine, int cameraYawSine, int cameraYawCosine, int x, int y, int z, long tag) {
field529[0] = -1;
if (this.boundsType != 1) {
this.calculateBoundsCylinder();
}
this.calculateBoundingBox(yaw);
int var11 = cameraYawCosine * var8 - cameraYawSine * x >> 16;
int var11 = cameraYawCosine * z - cameraYawSine * x >> 16;
int var12 = cameraPitchSine * y + cameraPitchCosine * var11 >> 16;
int var13 = cameraPitchCosine * this.xzRadius >> 16;
int var14 = var12 + var13;
if (var14 > 50 && var12 < 3500) {
int var15 = var8 * cameraYawSine + cameraYawCosine * x >> 16;
int var15 = z * cameraYawSine + cameraYawCosine * x >> 16;
int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom;
if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) {
int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom;
@@ -1578,7 +1578,7 @@ public class Model extends Entity {
if (var30 && var29) {
boolean var35 = false;
if (field539) {
var35 = Decimator.method2491(this, x, y, var8);
var35 = Decimator.boundingBoxCheck(this, x, y, z);
} else {
var32 = var12 - var13;
if (var32 <= 50) {
@@ -1639,7 +1639,7 @@ public class Model extends Entity {
var37 += x;
var38 += y;
var39 += var8;
var39 += z;
var40 = var39 * cameraYawSine + cameraYawCosine * var37 >> 16;
var39 = cameraYawCosine * var39 - var37 * cameraYawSine >> 16;
var37 = var40;
+18 -18
View File
@@ -532,17 +532,17 @@ public class ModelData extends Entity {
var50 = var2.readUnsignedByte();
var51 = 0;
if ((var50 & 1) != 0) {
var51 = var3.method47();
var51 = var3.readShortSmart();
}
var52 = 0;
if ((var50 & 2) != 0) {
var52 = var4.method47();
var52 = var4.readShortSmart();
}
var53 = 0;
if ((var50 & 4) != 0) {
var53 = var5.method47();
var53 = var5.readShortSmart();
}
this.verticesX[var49] = var46 + var51;
@@ -602,9 +602,9 @@ public class ModelData extends Entity {
for (var53 = 0; var53 < var10; ++var53) {
var54 = var3.readUnsignedByte();
if (var54 == 1) {
var49 = var2.method47() + var52;
var50 = var2.method47() + var49;
var51 = var2.method47() + var50;
var49 = var2.readShortSmart() + var52;
var50 = var2.readShortSmart() + var49;
var51 = var2.readShortSmart() + var50;
var52 = var51;
this.indices1[var53] = var49;
this.indices2[var53] = var50;
@@ -613,7 +613,7 @@ public class ModelData extends Entity {
if (var54 == 2) {
var50 = var51;
var51 = var2.method47() + var52;
var51 = var2.readShortSmart() + var52;
var52 = var51;
this.indices1[var53] = var49;
this.indices2[var53] = var50;
@@ -622,7 +622,7 @@ public class ModelData extends Entity {
if (var54 == 3) {
var49 = var51;
var51 = var2.method47() + var52;
var51 = var2.readShortSmart() + var52;
var52 = var51;
this.indices1[var53] = var49;
this.indices2[var53] = var50;
@@ -633,7 +633,7 @@ public class ModelData extends Entity {
int var55 = var49;
var49 = var50;
var50 = var55;
var51 = var2.method47() + var52;
var51 = var2.readShortSmart() + var52;
var52 = var51;
this.indices1[var53] = var49;
this.indices2[var53] = var55;
@@ -790,17 +790,17 @@ public class ModelData extends Entity {
var39 = var4.readUnsignedByte();
var40 = 0;
if ((var39 & 1) != 0) {
var40 = var5.method47();
var40 = var5.readShortSmart();
}
var41 = 0;
if ((var39 & 2) != 0) {
var41 = var6.method47();
var41 = var6.readShortSmart();
}
var42 = 0;
if ((var39 & 4) != 0) {
var42 = var7.method47();
var42 = var7.readShortSmart();
}
this.verticesX[var38] = var35 + var40;
@@ -869,9 +869,9 @@ public class ModelData extends Entity {
for (var42 = 0; var42 < var10; ++var42) {
var43 = var5.readUnsignedByte();
if (var43 == 1) {
var38 = var4.method47() + var41;
var39 = var4.method47() + var38;
var40 = var4.method47() + var39;
var38 = var4.readShortSmart() + var41;
var39 = var4.readShortSmart() + var38;
var40 = var4.readShortSmart() + var39;
var41 = var40;
this.indices1[var42] = var38;
this.indices2[var42] = var39;
@@ -880,7 +880,7 @@ public class ModelData extends Entity {
if (var43 == 2) {
var39 = var40;
var40 = var4.method47() + var41;
var40 = var4.readShortSmart() + var41;
var41 = var40;
this.indices1[var42] = var38;
this.indices2[var42] = var39;
@@ -889,7 +889,7 @@ public class ModelData extends Entity {
if (var43 == 3) {
var38 = var40;
var40 = var4.method47() + var41;
var40 = var4.readShortSmart() + var41;
var41 = var40;
this.indices1[var42] = var38;
this.indices2[var42] = var39;
@@ -900,7 +900,7 @@ public class ModelData extends Entity {
var44 = var38;
var38 = var39;
var39 = var44;
var40 = var4.method47() + var41;
var40 = var4.readShortSmart() + var41;
var41 = var40;
this.indices1[var42] = var38;
this.indices2[var42] = var44;
@@ -141,8 +141,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
return !mouseEvent.isAltDown() && var2 != 2 ? (!mouseEvent.isMetaDown() && var2 != 3 ? 1 : 2) : 4;
}
@Export("mouseMoved")
@ObfuscatedName("mouseMoved")
public final synchronized void mouseMoved(MouseEvent var1) {
if (MouseHandler_instance != null) {
MouseHandler_idleCycles = 0;
@@ -153,8 +151,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
}
@Export("mousePressed")
@ObfuscatedName("mousePressed")
public final synchronized void mousePressed(MouseEvent var1) {
if (MouseHandler_instance != null) {
MouseHandler_idleCycles = 0;
@@ -173,8 +169,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
}
@Export("mouseReleased")
@ObfuscatedName("mouseReleased")
public final synchronized void mouseReleased(MouseEvent var1) {
if (MouseHandler_instance != null) {
MouseHandler_idleCycles = 0;
@@ -208,19 +202,13 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
}
@Export("mouseDragged")
@ObfuscatedName("mouseDragged")
public final synchronized void mouseDragged(MouseEvent var1) {
this.mouseMoved(var1);
}
@Export("focusGained")
@ObfuscatedName("focusGained")
public final void focusGained(FocusEvent var1) {
}
@Export("focusLost")
@ObfuscatedName("focusLost")
public final synchronized void focusLost(FocusEvent var1) {
if (MouseHandler_instance != null) {
MouseHandler_currentButton0 = 0;
@@ -228,8 +216,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
}
@Export("mouseEntered")
@ObfuscatedName("mouseEntered")
public final synchronized void mouseEntered(MouseEvent var1) {
this.mouseMoved(var1);
}
@@ -177,7 +177,7 @@ public class MusicPatch extends Node {
var21 = -1;
}
var23 = var2.method52();
var23 = var2.readVarInt();
}
this.field568[var24] = (short)(this.field568[var24] + ((var23 - 1 & 2) << 14));
@@ -122,7 +122,7 @@ public class MusicSample extends Node {
} while(var6 >= 255);
byte[] var7 = new byte[var5];
var2.method46(var7, 0, var5);
var2.readBytes(var7, 0, var5);
this.field620[var4] = var7;
}
@@ -82,7 +82,7 @@ public class MusicTrack extends Node {
var14 = var2 + var5 + var6 + var7 + var8 + var9 + var10 + var11 + var12;
for (var15 = 0; var15 < var14; ++var15) {
var1.method52();
var1.readVarInt();
}
var4 += var1.index - var13;
@@ -205,8 +205,8 @@ public class MusicTrack extends Node {
while (true) {
while (true) {
int var63 = var1.method52();
var51.method42(var63);
int var63 = var1.readVarInt();
var51.writeVarInt(var63);
int var64 = var1.array[var29++] & 255;
boolean var65 = var64 != var62;
var62 = var64 & 15;
@@ -217,7 +217,7 @@ public class MusicTrack extends Node {
var51.writeByte(47);
var51.writeByte(0);
var51.method39(var51.index - var61);
var51.writeLengthInt(var51.index - var61);
continue label222;
}
@@ -505,7 +505,7 @@ public class NPCDefinition extends DualNode {
public final NPCDefinition transform() {
int var1 = -1;
if (this.transformVarbit != -1) {
var1 = WorldMapSection2.getVarbit(this.transformVarbit);
var1 = WorldMapSection0.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) {
var1 = Varps.Varps_main[this.transformVarp];
}
@@ -531,7 +531,7 @@ public class NPCDefinition extends DualNode {
} else {
int var1 = -1;
if (this.transformVarbit != -1) {
var1 = WorldMapSection2.getVarbit(this.transformVarbit);
var1 = WorldMapSection0.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) {
var1 = Varps.Varps_main[this.transformVarp];
}
@@ -31,9 +31,9 @@ public class NetFileRequest extends DualNode {
static final void method4555(Widget[] var0, int var1) {
for (int var2 = 0; var2 < var0.length; ++var2) {
Widget var3 = var0[var2];
if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !PacketBufferNode.method3673(var3))) {
if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !PacketBufferNode.isComponentHidden(var3))) {
if (var3.type == 0) {
if (!var3.isIf3 && PacketBufferNode.method3673(var3) && var3 != Clock.mousedOverWidgetIf1) {
if (!var3.isIf3 && PacketBufferNode.isComponentHidden(var3) && var3 != Clock.mousedOverWidgetIf1) {
continue;
}
@@ -61,7 +61,7 @@ public class NetFileRequest extends DualNode {
if (var7 != -1) {
SequenceDefinition var6 = WorldMapAreaData.getSequenceDefinition(var7);
for (var3.modelFrameCycle += Client.field183; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class22.method295(var3)) {
for (var3.modelFrameCycle += Client.field183; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; WorldMapRectangle.method295(var3)) {
var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame];
++var3.modelFrame;
if (var3.modelFrame >= var6.frameIds.length) {
@@ -81,7 +81,7 @@ public class NetFileRequest extends DualNode {
var7 *= Client.field183;
var3.modelAngleX = var8 + var3.modelAngleX & 2047;
var3.modelAngleY = var7 + var3.modelAngleY & 2047;
class22.method295(var3);
WorldMapRectangle.method295(var3);
}
}
}
@@ -435,7 +435,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
var18 = var25;
} else if (var2 == 2) {
var18 = WorldMapSection2.method593(var0, var1, var3, var4);
var18 = WorldMapSection0.method593(var0, var1, var3, var4);
} else {
var18 = ArchiveDisk.method3585(var0, var1, var2, var3, var4);
}
@@ -440,11 +440,11 @@ public class ObjectDefinition extends DualNode {
} else if (var2 == 69) {
var1.readUnsignedByte();
} else if (var2 == 70) {
this.offsetX = var1.method44();
this.offsetX = var1.readShort();
} else if (var2 == 71) {
this.offsetHeight = var1.method44();
this.offsetHeight = var1.readShort();
} else if (var2 == 72) {
this.offsetY = var1.method44();
this.offsetY = var1.readShort();
} else if (var2 == 73) {
this.boolean2 = true;
} else if (var2 == 74) {
@@ -826,7 +826,7 @@ public class ObjectDefinition extends DualNode {
public final ObjectDefinition transform() {
int var1 = -1;
if (this.transformVarbit != -1) {
var1 = WorldMapSection2.getVarbit(this.transformVarbit);
var1 = WorldMapSection0.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) {
var1 = Varps.Varps_main[this.transformVarp];
}
+2 -1
View File
@@ -114,7 +114,8 @@ public final class Occluder {
signature = "(IB)Lia;",
garbageValue = "16"
)
public static VarbitDefinition method3255(int var0) {
@Export("getVarbitDefinition")
public static VarbitDefinition getVarbitDefinition(int var0) {
VarbitDefinition var1 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
@@ -19,8 +19,8 @@ public final class PacketBuffer extends Buffer {
@ObfuscatedSignature(
signature = "Lhn;"
)
@Export("isaacCipher0")
IsaacCipher isaacCipher0;
@Export("isaacCipher")
IsaacCipher isaacCipher;
@ObfuscatedName("d")
@ObfuscatedGetter(
intValue = -1048718919
@@ -39,7 +39,7 @@ public final class PacketBuffer extends Buffer {
)
@Export("newIsaacCipher")
public void newIsaacCipher(int[] array) {
this.isaacCipher0 = new IsaacCipher(array);
this.isaacCipher = new IsaacCipher(array);
}
@ObfuscatedName("ih")
@@ -49,7 +49,7 @@ public final class PacketBuffer extends Buffer {
)
@Export("setIsaacCipher")
public void setIsaacCipher(IsaacCipher isaacCipher) {
this.isaacCipher0 = isaacCipher;
this.isaacCipher = isaacCipher;
}
@ObfuscatedName("im")
@@ -59,7 +59,7 @@ public final class PacketBuffer extends Buffer {
)
@Export("writeByteIsaac")
public void writeByteIsaac(int var1) {
super.array[++super.index - 1] = (byte)(var1 + this.isaacCipher0.method136());
super.array[++super.index - 1] = (byte)(var1 + this.isaacCipher.nextInt());
}
@ObfuscatedName("ii")
@@ -69,7 +69,7 @@ public final class PacketBuffer extends Buffer {
)
@Export("readByteIsaac")
public int readByteIsaac() {
return super.array[++super.index - 1] - this.isaacCipher0.method136() & 255;
return super.array[++super.index - 1] - this.isaacCipher.nextInt() & 255;
}
@ObfuscatedName("ig")
@@ -78,7 +78,7 @@ public final class PacketBuffer extends Buffer {
garbageValue = "101"
)
public boolean method236() {
int var1 = super.array[super.index] - this.isaacCipher0.method137() & 255;
int var1 = super.array[super.index] - this.isaacCipher.method137() & 255;
return var1 >= 128;
}
@@ -89,8 +89,8 @@ public final class PacketBuffer extends Buffer {
)
@Export("readSmartByteShortIsaac")
public int readSmartByteShortIsaac() {
int var1 = super.array[++super.index - 1] - this.isaacCipher0.method136() & 255;
return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.index - 1] - this.isaacCipher0.method136() & 255);
int var1 = super.array[++super.index - 1] - this.isaacCipher.nextInt() & 255;
return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.index - 1] - this.isaacCipher.nextInt() & 255);
}
@ObfuscatedName("jb")
@@ -100,7 +100,7 @@ public final class PacketBuffer extends Buffer {
)
public void method237(byte[] var1, int var2, int var3) {
for (int var4 = 0; var4 < var3; ++var4) {
var1[var4 + var2] = (byte)(super.array[++super.index - 1] - this.isaacCipher0.method136());
var1[var4 + var2] = (byte)(super.array[++super.index - 1] - this.isaacCipher.nextInt());
}
}
@@ -175,7 +175,7 @@ public final class PacketBuffer extends Buffer {
garbageValue = "-1562700981"
)
@Export("requestNetFile")
static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) {
static void requestNetFile(Archive archive, int var1, int var2, int var3, byte var4, boolean priority) {
long var6 = (long)((var1 << 16) + var2);
NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6);
if (var8 == null) {
@@ -183,14 +183,14 @@ public final class PacketBuffer extends Buffer {
if (var8 == null) {
var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6);
if (var8 != null) {
if (var5) {
if (priority) {
var8.removeDual();
NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
--NetCache.NetCache_pendingWritesCount;
++NetCache.NetCache_pendingPriorityWritesCount;
}
} else {
if (!var5) {
if (!priority) {
var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6);
if (var8 != null) {
return;
@@ -198,10 +198,10 @@ public final class PacketBuffer extends Buffer {
}
var8 = new NetFileRequest();
var8.archive = var0;
var8.archive = archive;
var8.crc = var3;
var8.padding = var4;
if (var5) {
if (priority) {
NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
++NetCache.NetCache_pendingPriorityWritesCount;
} else {
@@ -57,8 +57,9 @@ public class PacketBufferNode extends Node {
signature = "(Lho;I)Z",
garbageValue = "-739353556"
)
static boolean method3673(Widget var0) {
return var0.isHidden;
@Export("isComponentHidden")
static boolean isComponentHidden(Widget component) {
return component.isHidden;
}
static {
@@ -128,7 +128,7 @@ public class PacketWriter {
break;
}
this.buffer.method38(var1.packetBuffer.array, 0, var1.field671);
this.buffer.writeBytes(var1.packetBuffer.array, 0, var1.field671);
this.field672 -= var1.field671;
var1.remove();
var1.packetBuffer.method36();
@@ -96,7 +96,7 @@ public final class PendingSpawn extends Node {
garbageValue = "1641191614"
)
public static void method1695(int var0, int var1) {
VarbitDefinition var2 = Occluder.method3255(var0);
VarbitDefinition var2 = Occluder.getVarbitDefinition(var0);
int var3 = var2.baseVar;
int var4 = var2.startBit;
int var5 = var2.endBit;
+2 -2
View File
@@ -287,7 +287,7 @@ public final class Player extends Actor {
this.appearance = new PlayerAppearance();
}
this.appearance.method256(var4, var9, var2 == 1, var3);
this.appearance.update(var4, var9, var2 == 1, var3);
}
@ObfuscatedName("f")
@@ -530,7 +530,7 @@ public final class Player extends Actor {
}
Client.isSpellSelected = false;
class22.method295(var0);
WorldMapRectangle.method295(var0);
}
}
@@ -10,7 +10,8 @@ public class PlayerAppearance {
@ObfuscatedName("g")
public static short[] field726;
@ObfuscatedName("d")
static final int[] field727;
@Export("equipmentIndices")
static final int[] equipmentIndices;
@ObfuscatedName("k")
@ObfuscatedSignature(
signature = "Ler;"
@@ -48,25 +49,26 @@ public class PlayerAppearance {
signature = "([I[IZII)V",
garbageValue = "727056871"
)
public void method256(int[] var1, int[] var2, boolean var3, int var4) {
if (var1 == null) {
var1 = new int[12];
@Export("update")
public void update(int[] equipment, int[] bodyColors, boolean isFemale, int npcTransformId) {
if (equipment == null) {
equipment = new int[12];
for (int var5 = 0; var5 < 7; ++var5) {
for (int var6 = 0; var6 < KitDefinition.field457; ++var6) {
KitDefinition var7 = WorldMapSection1.getKitDefinition(var6);
if (var7 != null && !var7.nonSelectable && var5 + (var3 ? 7 : 0) == var7.bodypartID) {
var1[field727[var5]] = var6 + 256;
for (int var6 = 0; var6 < KitDefinition.KitDefinition_totalCount; ++var6) {
KitDefinition var7 = WorldMapSection2.getKitDefinition(var6);
if (var7 != null && !var7.nonSelectable && var5 + (isFemale ? 7 : 0) == var7.bodypartID) {
equipment[equipmentIndices[var5]] = var6 + 256;
break;
}
}
}
}
this.equipment = var1;
this.bodyColors = var2;
this.isFemale = var3;
this.npcTransformId = var4;
this.equipment = equipment;
this.bodyColors = bodyColors;
this.isFemale = isFemale;
this.npcTransformId = npcTransformId;
this.setHash();
}
@@ -77,7 +79,7 @@ public class PlayerAppearance {
)
public void method257(int var1, boolean var2) {
if (var1 != 1 || !this.isFemale) {
int var3 = this.equipment[field727[var1]];
int var3 = this.equipment[equipmentIndices[var1]];
if (var3 != 0) {
var3 -= 256;
@@ -88,21 +90,21 @@ public class PlayerAppearance {
if (!var2) {
--var3;
if (var3 < 0) {
var3 = KitDefinition.field457 - 1;
var3 = KitDefinition.KitDefinition_totalCount - 1;
}
} else {
++var3;
if (var3 >= KitDefinition.field457) {
if (var3 >= KitDefinition.KitDefinition_totalCount) {
var3 = 0;
}
}
var4 = WorldMapSection1.getKitDefinition(var3);
var4 = WorldMapSection2.getKitDefinition(var3);
} while(var4 == null);
} while(var4.nonSelectable);
} while(var1 + (this.isFemale ? 7 : 0) != var4.bodypartID);
this.equipment[field727[var1]] = var3 + 256;
this.equipment[equipmentIndices[var1]] = var3 + 256;
this.setHash();
}
}
@@ -143,7 +145,7 @@ public class PlayerAppearance {
)
public void method259(boolean var1) {
if (this.isFemale != var1) {
this.method256((int[])null, this.bodyColors, var1, -1);
this.update((int[])null, this.bodyColors, var1, -1);
}
}
@@ -158,7 +160,7 @@ public class PlayerAppearance {
int var2;
for (var2 = 0; var2 < 7; ++var2) {
int var3 = this.equipment[field727[var2]];
int var3 = this.equipment[equipmentIndices[var2]];
if (var3 == 0) {
var1.writeByte(-1);
} else {
@@ -254,7 +256,7 @@ public class PlayerAppearance {
int var10;
for (int var11 = 0; var11 < 12; ++var11) {
var10 = var7[var11];
if (var10 >= 256 && var10 < 512 && !WorldMapSection1.getKitDefinition(var10 - 256).ready()) {
if (var10 >= 256 && var10 < 512 && !WorldMapSection2.getKitDefinition(var10 - 256).ready()) {
var9 = true;
}
@@ -282,7 +284,7 @@ public class PlayerAppearance {
var12 = var7[var13];
ModelData var14;
if (var12 >= 256 && var12 < 512) {
var14 = WorldMapSection1.getKitDefinition(var12 - 256).getModelData();
var14 = WorldMapSection2.getKitDefinition(var12 - 256).getModelData();
if (var14 != null) {
var17[var10++] = var14;
}
@@ -346,7 +348,7 @@ public class PlayerAppearance {
int var2;
for (int var3 = 0; var3 < 12; ++var3) {
var2 = this.equipment[var3];
if (var2 >= 256 && var2 < 512 && !WorldMapSection1.getKitDefinition(var2 - 256).method161()) {
if (var2 >= 256 && var2 < 512 && !WorldMapSection2.getKitDefinition(var2 - 256).method161()) {
var1 = true;
}
@@ -366,7 +368,7 @@ public class PlayerAppearance {
var4 = this.equipment[var5];
ModelData var6;
if (var4 >= 256 && var4 < 512) {
var6 = WorldMapSection1.getKitDefinition(var4 - 256).method162();
var6 = WorldMapSection2.getKitDefinition(var4 - 256).method162();
if (var6 != null) {
var7[var2++] = var6;
}
@@ -408,7 +410,7 @@ public class PlayerAppearance {
}
static {
field727 = new int[]{8, 11, 4, 6, 9, 7, 10};
equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10};
PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260);
}
}
@@ -228,19 +228,19 @@ public class Rasterizer2D extends DualNode {
@ObfuscatedName("dk")
@Export("Rasterizer2D_drawCircleAlpha")
public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) {
if (var4 != 0) {
if (var4 == 256) {
public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int opacity) {
if (opacity != 0) {
if (opacity == 256) {
drawCircle(var0, var1, var2, var3);
} else {
if (var2 < 0) {
var2 = -var2;
}
int var5 = 256 - var4;
int var6 = (var3 >> 16 & 255) * var4;
int var7 = (var3 >> 8 & 255) * var4;
int var8 = var4 * (var3 & 255);
int var5 = 256 - opacity;
int var6 = (var3 >> 16 & 255) * opacity;
int var7 = (var3 >> 8 & 255) * opacity;
int var8 = opacity * (var3 & 255);
int var9 = var1 - var2;
if (var9 < Rasterizer2D_yClipStart) {
var9 = Rasterizer2D_yClipStart;
@@ -411,40 +411,40 @@ public class Rasterizer2D extends DualNode {
}
@Export("drawGradient")
@Export("Rasterizer2D_fillRectangleGradient")
@ObfuscatedName("dw")
public static void drawGradient(int var0, int var1, int var2, int var3, int var4, int var5) {
if (var2 > 0 && var3 > 0) {
public static void Rasterizer2D_fillRectangleGradient(int x, int y, int width, int height, int rgbTop, int rgbBot) {
if (width > 0 && height > 0) {
int var6 = 0;
int var7 = 65536 / var3;
if (var0 < Rasterizer2D_xClipStart) {
var2 -= Rasterizer2D_xClipStart - var0;
var0 = Rasterizer2D_xClipStart;
int var7 = 65536 / height;
if (x < Rasterizer2D_xClipStart) {
width -= Rasterizer2D_xClipStart - x;
x = Rasterizer2D_xClipStart;
}
if (var1 < Rasterizer2D_yClipStart) {
var6 += (Rasterizer2D_yClipStart - var1) * var7;
var3 -= Rasterizer2D_yClipStart - var1;
var1 = Rasterizer2D_yClipStart;
if (y < Rasterizer2D_yClipStart) {
var6 += (Rasterizer2D_yClipStart - y) * var7;
height -= Rasterizer2D_yClipStart - y;
y = Rasterizer2D_yClipStart;
}
if (var0 + var2 > Rasterizer2D_xClipEnd) {
var2 = Rasterizer2D_xClipEnd - var0;
if (x + width > Rasterizer2D_xClipEnd) {
width = Rasterizer2D_xClipEnd - x;
}
if (var3 + var1 > Rasterizer2D_yClipEnd) {
var3 = Rasterizer2D_yClipEnd - var1;
if (height + y > Rasterizer2D_yClipEnd) {
height = Rasterizer2D_yClipEnd - y;
}
int var8 = Rasterizer2D_width - var2;
int var9 = var0 + Rasterizer2D_width * var1;
int var8 = Rasterizer2D_width - width;
int var9 = x + Rasterizer2D_width * y;
for (int var10 = -var3; var10 < 0; ++var10) {
for (int var10 = -height; var10 < 0; ++var10) {
int var11 = 65536 - var6 >> 8;
int var12 = var6 >> 8;
int var13 = (var12 * (var5 & 16711935) + var11 * (var4 & 16711935) & -16711936) + (var12 * (var5 & 65280) + var11 * (var4 & 65280) & 16711680) >>> 8;
int var13 = (var12 * (rgbBot & 16711935) + var11 * (rgbTop & 16711935) & -16711936) + (var12 * (rgbBot & 65280) + var11 * (rgbTop & 65280) & 16711680) >>> 8;
for (int var14 = -var2; var14 < 0; ++var14) {
for (int var14 = -width; var14 < 0; ++var14) {
Rasterizer2D_pixels[var9++] = var13;
}
@@ -456,46 +456,46 @@ public class Rasterizer2D extends DualNode {
}
@ObfuscatedName("dv")
@Export("drawGradientAlpha")
public static void drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
if (var2 > 0 && var3 > 0) {
@Export("Rasterizer2D_fillRectangleGradientAlpha")
public static void Rasterizer2D_fillRectangleGradientAlpha(int x, int y, int width, int height, int rgbTop, int rgbBot, int alphaTop, int alphaBot) {
if (width > 0 && height > 0) {
int var8 = 0;
int var9 = 65536 / var3;
if (var0 < Rasterizer2D_xClipStart) {
var2 -= Rasterizer2D_xClipStart - var0;
var0 = Rasterizer2D_xClipStart;
int var9 = 65536 / height;
if (x < Rasterizer2D_xClipStart) {
width -= Rasterizer2D_xClipStart - x;
x = Rasterizer2D_xClipStart;
}
if (var1 < Rasterizer2D_yClipStart) {
var8 += (Rasterizer2D_yClipStart - var1) * var9;
var3 -= Rasterizer2D_yClipStart - var1;
var1 = Rasterizer2D_yClipStart;
if (y < Rasterizer2D_yClipStart) {
var8 += (Rasterizer2D_yClipStart - y) * var9;
height -= Rasterizer2D_yClipStart - y;
y = Rasterizer2D_yClipStart;
}
if (var0 + var2 > Rasterizer2D_xClipEnd) {
var2 = Rasterizer2D_xClipEnd - var0;
if (x + width > Rasterizer2D_xClipEnd) {
width = Rasterizer2D_xClipEnd - x;
}
if (var3 + var1 > Rasterizer2D_yClipEnd) {
var3 = Rasterizer2D_yClipEnd - var1;
if (height + y > Rasterizer2D_yClipEnd) {
height = Rasterizer2D_yClipEnd - y;
}
int var10 = Rasterizer2D_width - var2;
int var11 = var0 + Rasterizer2D_width * var1;
int var10 = Rasterizer2D_width - width;
int var11 = x + Rasterizer2D_width * y;
for (int var12 = -var3; var12 < 0; ++var12) {
for (int var12 = -height; var12 < 0; ++var12) {
int var13 = 65536 - var8 >> 8;
int var14 = var8 >> 8;
int var15 = (var13 * var6 + var14 * var7 & 65280) >>> 8;
int var15 = (var13 * alphaTop + var14 * alphaBot & 65280) >>> 8;
if (var15 == 0) {
var11 += Rasterizer2D_width;
var8 += var9;
} else {
int var16 = (var14 * (var5 & 16711935) + var13 * (var4 & 16711935) & -16711936) + (var14 * (var5 & 65280) + var13 * (var4 & 65280) & 16711680) >>> 8;
int var16 = (var14 * (rgbBot & 16711935) + var13 * (rgbTop & 16711935) & -16711936) + (var14 * (rgbBot & 65280) + var13 * (rgbTop & 65280) & 16711680) >>> 8;
int var17 = 255 - var15;
int var18 = ((var16 & 16711935) * var15 >> 8 & 16711935) + (var15 * (var16 & 65280) >> 8 & 65280);
for (int var19 = -var2; var19 < 0; ++var19) {
for (int var19 = -width; var19 < 0; ++var19) {
int var20 = Rasterizer2D_pixels[var11];
if (var20 == 0) {
Rasterizer2D_pixels[var11++] = var18;
@@ -519,30 +519,30 @@ public class Rasterizer2D extends DualNode {
garbageValue = "1"
)
@Export("raster2d7")
public static void raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) {
if (var0 + var2 >= 0 && var3 + var1 >= 0 && var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) {
public static void raster2d7(int x, int y, int width, int height, int var4, int var5, byte[] var6, int var7) {
if (x + width >= 0 && height + y >= 0 && x < Rasterizer2D_width && y < Rasterizer2D_height) {
int var8 = 0;
int var9 = 0;
if (var0 < 0) {
var8 -= var0;
var2 += var0;
if (x < 0) {
var8 -= x;
width += x;
}
if (var1 < 0) {
var9 -= var1;
var3 += var1;
if (y < 0) {
var9 -= y;
height += y;
}
if (var0 + var2 > Rasterizer2D_width) {
var2 = Rasterizer2D_width - var0;
if (x + width > Rasterizer2D_width) {
width = Rasterizer2D_width - x;
}
if (var3 + var1 > Rasterizer2D_height) {
var3 = Rasterizer2D_height - var1;
if (height + y > Rasterizer2D_height) {
height = Rasterizer2D_height - y;
}
int var10 = var6.length / var7;
int var11 = Rasterizer2D_width - var2;
int var11 = Rasterizer2D_width - width;
int var12 = var4 >>> 24;
int var13 = var5 >>> 24;
int var14;
@@ -551,12 +551,12 @@ public class Rasterizer2D extends DualNode {
int var17;
int var18;
if (var12 == 255 && var13 == 255) {
var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width;
var14 = x + var8 + (var9 + y) * Rasterizer2D_width;
for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) {
for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) {
var17 = (var15 - var1) % var10;
var18 = (var16 - var0) % var7;
for (var15 = var9 + y; var15 < height + var9 + y; ++var15) {
for (var16 = x + var8; var16 < x + var8 + width; ++var16) {
var17 = (var15 - y) % var10;
var18 = (var16 - x) % var7;
if (var6[var18 + var17 * var7] != 0) {
Rasterizer2D_pixels[var14++] = var5;
} else {
@@ -567,12 +567,12 @@ public class Rasterizer2D extends DualNode {
var14 += var11;
}
} else {
var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width;
var14 = x + var8 + (var9 + y) * Rasterizer2D_width;
for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) {
for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) {
var17 = (var15 - var1) % var10;
var18 = (var16 - var0) % var7;
for (var15 = var9 + y; var15 < height + var9 + y; ++var15) {
for (var16 = x + var8; var16 < x + var8 + width; ++var16) {
var17 = (var15 - y) % var10;
var18 = (var16 - x) % var7;
int var19 = var4;
if (var6[var18 + var17 * var7] != 0) {
var19 = var5;
@@ -69,8 +69,8 @@ public class Rasterizer3D extends Rasterizer2D {
public static int[] Rasterizer3D_cosine;
@ObfuscatedName("m")
@Export("Rasterizer3D_method1")
public static final void Rasterizer3D_method1() {
@Export("Rasterizer3D_setClipFromRasterizer2D")
public static final void Rasterizer3D_setClipFromRasterizer2D() {
Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd);
}
@@ -1397,7 +1397,7 @@ public class Rasterizer3D extends Rasterizer2D {
int[] var19 = Rasterizer3D_textureLoader.load(var18);
int var20;
if (var19 == null) {
var20 = Rasterizer3D_textureLoader.vmethod324(var18);
var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18);
method3037(var0, var1, var2, var3, var4, var5, method3040(var20, var6), method3040(var20, var7), method3040(var20, var8));
} else {
Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18);
@@ -2440,7 +2440,7 @@ public class Rasterizer3D extends Rasterizer2D {
int[] var19 = Rasterizer3D_textureLoader.load(var18);
int var20;
if (var19 == null) {
var20 = Rasterizer3D_textureLoader.vmethod324(var18);
var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18);
method3037(var0, var1, var2, var3, var4, var5, method3040(var20, var6), method3040(var20, var7), method3040(var20, var8));
} else {
Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18);
@@ -11,17 +11,20 @@ public enum RectangleMode implements Enumerated {
@ObfuscatedSignature(
signature = "Llj;"
)
field757(0, 0),
@Export("SOLID")
SOLID(0, 0),
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "Llj;"
)
field758(1, 1),
@Export("GRADIENT_COLOR")
GRADIENT_COLOR(1, 1),
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "Llj;"
)
field759(2, 2);
@Export("GRADIENT_ALPHA")
GRADIENT_ALPHA(2, 2);
@ObfuscatedName("d")
@Export("musicTrackBoolean")
@@ -30,18 +33,18 @@ public enum RectangleMode implements Enumerated {
@ObfuscatedGetter(
intValue = -1391612747
)
@Export("id")
public final int id;
@Export("value")
public final int value;
@ObfuscatedName("o")
@ObfuscatedGetter(
intValue = -1204297807
)
@Export("id2")
final int id2;
@Export("id")
final int id;
private RectangleMode(int var3, int var4) {
this.id = var3;
this.id2 = var4;
this.value = var3;
this.id = var4;
}
@ObfuscatedName("f")
@@ -51,7 +54,7 @@ public enum RectangleMode implements Enumerated {
)
@Export("rsOrdinal")
public int rsOrdinal() {
return this.id2;
return this.id;
}
@ObfuscatedName("m")
@@ -59,9 +62,10 @@ public enum RectangleMode implements Enumerated {
signature = "(Lir;Lir;ZB)V",
garbageValue = "1"
)
public static void method6028(AbstractArchive var0, AbstractArchive var1, boolean var2) {
@Export("setObjectDefinitionArchives")
public static void setObjectDefinitionArchives(AbstractArchive var0, AbstractArchive var1, boolean isLowDetail) {
ObjectDefinition.ObjectDefinition_archive = var0;
ObjectDefinition.field640 = var1;
ObjectDefinition.ObjectDefinition_isLowDetail = var2;
ObjectDefinition.ObjectDefinition_isLowDetail = isLowDetail;
}
}
@@ -1,9 +1,11 @@
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;
@ObfuscatedName("fe")
@Implements("RouteStrategy")
public abstract class RouteStrategy {
@ObfuscatedName("l")
@ObfuscatedGetter(
+3 -3
View File
@@ -1848,7 +1848,7 @@ public class Scene {
Rasterizer3D.method3012(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture);
}
} else {
var30 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var1.texture);
var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture);
Rasterizer3D.method3037(var27, var29, var25, var26, var28, var24, method3108(var30, var1.neColor), method3108(var30, var1.nwColor), method3108(var30, var1.seColor));
}
}
@@ -1871,7 +1871,7 @@ public class Scene {
} else if (!Scene_isLowDetail) {
Rasterizer3D.method3012(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture);
} else {
var30 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var1.texture);
var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture);
Rasterizer3D.method3037(var23, var25, var29, var22, var24, var28, method3108(var30, var1.swColor), method3108(var30, var1.seColor), method3108(var30, var1.nwColor));
}
}
@@ -1950,7 +1950,7 @@ public class Scene {
Rasterizer3D.method3012(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field902[var10], TileModel.field902[var11], TileModel.field902[var12], TileModel.field903[var10], TileModel.field903[var11], TileModel.field903[var12], TileModel.field904[var10], TileModel.field904[var11], TileModel.field904[var12], var1.triangleTextureId[var9]);
}
} else {
int var19 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var1.triangleTextureId[var9]);
int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]);
Rasterizer3D.method3037(var16, var17, var18, var13, var14, var15, method3108(var19, var1.triangleColorA[var9]), method3108(var19, var1.triangleColorB[var9]), method3108(var19, var1.triangleColorC[var9]));
}
} else if (var1.triangleColorA[var9] != 12345678) {
@@ -196,7 +196,7 @@ public class ScriptEvent extends Node {
return 1;
} else if (var0 == ScriptOpcodes.INV_SIZE) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapDecorationType.method4523(var3).size;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapDecorationType.getInvDefinition(var3).size;
return 1;
} else if (var0 == ScriptOpcodes.STAT) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
@@ -59,9 +59,9 @@ public class SecureRandomCallable implements Callable {
Client.interfaceParents.put(var3, (long)var0);
DevicePcmPlayerProvider.method845(var1);
Widget var4 = Huffman.getWidget(var0);
class22.method295(var4);
WorldMapRectangle.method295(var4);
if (Client.field127 != null) {
class22.method295(Client.field127);
WorldMapRectangle.method295(Client.field127);
Client.field127 = null;
}
@@ -133,7 +133,7 @@ public class SecureRandomCallable implements Callable {
class214.menuWidth = var7;
AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22;
class39.revalidateWidgetScroll(Widget.interfaceComponents[var0 >> 16], var4, false);
WorldMapSection3.runWidgetOnLoadListener(var1);
WorldMapSection1.runWidgetOnLoadListener(var1);
if (Client.rootInterface != -1) {
GrandExchangeEvents.method74(Client.rootInterface, 1);
}
@@ -500,7 +500,7 @@ public class ServerPacket {
int var13 = 0;
while (true) {
int var14 = var10.method48();
int var14 = var10.readUShortSmart();
if (var14 == 0) {
break;
}
@@ -123,9 +123,9 @@ public class SoundCache {
)
@Export("getSoundEffect")
public RawSound getSoundEffect(int var1, int[] var2) {
if (this.soundEffectIndex.method5() == 1) {
if (this.soundEffectIndex.getGroupCount() == 1) {
return this.getSoundEffect0(0, var1, var2);
} else if (this.soundEffectIndex.method4(var1) == 1) {
} else if (this.soundEffectIndex.getGroupFileCount(var1) == 1) {
return this.getSoundEffect0(var1, 0, var2);
} else {
throw new RuntimeException();
@@ -139,9 +139,9 @@ public class SoundCache {
)
@Export("getMusicSample")
public RawSound getMusicSample(int var1, int[] var2) {
if (this.musicSampleIndex.method5() == 1) {
if (this.musicSampleIndex.getGroupCount() == 1) {
return this.getMusicSample0(0, var1, var2);
} else if (this.musicSampleIndex.method4(var1) == 1) {
} else if (this.musicSampleIndex.getGroupFileCount(var1) == 1) {
return this.getMusicSample0(var1, 0, var2);
} else {
throw new RuntimeException();
@@ -49,7 +49,8 @@ public class SoundEffect {
}
@ObfuscatedName("q")
public final int method303() {
@Export("calculateDelay")
public final int calculateDelay() {
int var1 = 9999999;
int var2;
+9 -7
View File
@@ -181,7 +181,8 @@ public final class Sprite extends Rasterizer2D {
}
@ObfuscatedName("l")
public void method307(int var1) {
@Export("outline")
public void outline(int color) {
int[] var2 = new int[this.subWidth * this.subHeight];
int var3 = 0;
@@ -190,13 +191,13 @@ public final class Sprite extends Rasterizer2D {
int var6 = this.pixels[var3];
if (var6 == 0) {
if (var5 > 0 && this.pixels[var3 - 1] != 0) {
var6 = var1;
var6 = color;
} else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) {
var6 = var1;
var6 = color;
} else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) {
var6 = var1;
var6 = color;
} else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) {
var6 = var1;
var6 = color;
}
}
@@ -208,13 +209,14 @@ public final class Sprite extends Rasterizer2D {
}
@ObfuscatedName("e")
public void method308(int var1) {
@Export("shadow")
public void shadow(int color) {
for (int var2 = this.subHeight - 1; var2 > 0; --var2) {
int var3 = var2 * this.subWidth;
for (int var4 = this.subWidth - 1; var4 > 0; --var4) {
if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) {
this.pixels[var4 + var3] = var1;
this.pixels[var4 + var3] = color;
}
}
}
+1 -1
View File
@@ -31,7 +31,7 @@ public class Strings {
throw new RuntimeException();
} else if (var2 == 0) {
byte[] var6 = new byte[var3];
var1.method46(var6, 0, var3);
var1.readBytes(var6, 0, var3);
return var6;
} else {
int var4 = var1.readInt();
@@ -134,40 +134,40 @@ public class StructDefinition extends DualNode {
var4.scrollY = 0;
}
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETCOLOUR) {
var4.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETFILL) {
var4.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETTRANS) {
var4.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETLINEWID) {
var4.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) {
var4.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SET2DANGLE) {
var4.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETTILING) {
var4.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETMODEL) {
var4.modelType = 1;
var4.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) {
RouteStrategy.Interpreter_intStackSize -= 6;
@@ -177,7 +177,7 @@ public class StructDefinition extends DualNode {
var4.modelAngleY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
var4.modelAngleZ = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4];
var4.modelZoom = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 5];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else {
int var5;
@@ -187,58 +187,58 @@ public class StructDefinition extends DualNode {
var4.sequenceId = var5;
var4.modelFrame = 0;
var4.modelFrameCycle = 0;
class22.method295(var4);
WorldMapRectangle.method295(var4);
}
return 1;
} else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) {
var4.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETTEXT) {
String var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
if (!var8.equals(var4.text)) {
var4.text = var8;
class22.method295(var4);
WorldMapRectangle.method295(var4);
}
return 1;
} else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) {
var4.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) {
RouteStrategy.Interpreter_intStackSize -= 3;
var4.textXAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4.textYAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var4.textLineHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) {
var4.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETOUTLINE) {
var4.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) {
var4.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETVFLIP) {
var4.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETHFLIP) {
var4.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) {
RouteStrategy.Interpreter_intStackSize -= 2;
var4.scrollWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
class22.method295(var4);
WorldMapRectangle.method295(var4);
if (var3 != -1 && var4.type == 0) {
class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false);
}
@@ -247,26 +247,26 @@ public class StructDefinition extends DualNode {
} else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) {
TilePaint.method3060(var4.id, var4.childIndex);
Client.field127 = var4;
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == 1122) {
var4.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) {
var4.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == 1124) {
var4.field960 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == 1125) {
var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
RectangleMode var7 = (RectangleMode)ScriptFrame.findEnumerated(DefaultsGroup.method5822(), var5);
if (var7 != null) {
var4.rectangleMode = var7;
class22.method295(var4);
WorldMapRectangle.method295(var4);
}
return 1;
+3 -3
View File
@@ -10,8 +10,8 @@ public class Texture extends Node {
@Export("Texture_animatedPixels")
static int[] Texture_animatedPixels;
@ObfuscatedName("o")
@Export("int1")
int int1;
@Export("averageRGB")
int averageRGB;
@ObfuscatedName("u")
boolean field893;
@ObfuscatedName("g")
@@ -41,7 +41,7 @@ public class Texture extends Node {
)
Texture(Buffer var1) {
this.isLoaded = false;
this.int1 = var1.readUnsignedShort();
this.averageRGB = var1.readUnsignedShort();
this.field893 = var1.readUnsignedByte() == 1;
int var2 = var1.readUnsignedByte();
if (var2 >= 1 && var2 <= 4) {
@@ -19,7 +19,8 @@ public interface TextureLoader {
signature = "(II)I",
garbageValue = "-1641984961"
)
int vmethod324(int var1);
@Export("getAverageTextureRGB")
int getAverageTextureRGB(int var1);
@ObfuscatedName("o")
@ObfuscatedSignature(
@@ -69,7 +69,7 @@ public class TextureProvider implements TextureLoader {
this.textureSize = var6;
int[] var7 = var1.method3(0);
int var8 = var7.length;
this.textures = new Texture[var1.method4(0)];
this.textures = new Texture[var1.getGroupFileCount(0)];
for (int var9 = 0; var9 < var8; ++var9) {
Buffer var10 = new Buffer(var1.takeFile(0, var7[var9]));
@@ -155,8 +155,9 @@ public class TextureProvider implements TextureLoader {
signature = "(II)I",
garbageValue = "-1641984961"
)
public int vmethod324(int var1) {
return this.textures[var1] != null ? this.textures[var1].int1 : 0;
@Export("getAverageTextureRGB")
public int getAverageTextureRGB(int var1) {
return this.textures[var1] != null ? this.textures[var1].averageRGB : 0;
}
@ObfuscatedName("o")
@@ -221,7 +222,7 @@ public class TextureProvider implements TextureLoader {
int var2 = var0.index;
byte[] var3 = class230.method4516(var1);
var0.writeSmartByteShort(var3.length);
var0.index += class303.huffman.method127(var3, 0, var3.length, var0.array, var0.index);
var0.index += class303.huffman.compress(var3, 0, var3.length, var0.array, var0.index);
return var0.index - var2;
}
@@ -276,7 +277,7 @@ public class TextureProvider implements TextureLoader {
while (true) {
int var13;
while (!var8) {
var13 = var4.method48();
var13 = var4.readUShortSmart();
if (var13 == 0) {
continue label56;
}
@@ -300,7 +301,7 @@ public class TextureProvider implements TextureLoader {
}
}
var13 = var4.method48();
var13 = var4.readUShortSmart();
if (var13 == 0) {
break;
}
@@ -82,7 +82,7 @@ public class UserComparator4 implements Comparator {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
if (var3 == 1 || var3 == 2) {
ReflectionCheck.clientPreferences.windowMode = var3;
WorldMapSection0.savePreferences();
WorldMapSection3.savePreferences();
}
return 1;
@@ -71,7 +71,7 @@ public class UserComparator7 extends AbstractUserComparator {
for (int var12 = 0; var12 < var7; ++var12) {
var11 = var0.readInt();
var10[var12] = new byte[var11];
var0.method46(var10[var12], 0, var11);
var0.readBytes(var10[var12], 0, var11);
}
}
+4 -4
View File
@@ -33,7 +33,7 @@ public class Varcs {
Varcs() {
this.unwrittenChanges = false;
int var1 = ObjectSound.archive2.method4(19);
int var1 = ObjectSound.archive2.getGroupFileCount(19);
this.map = new HashMap();
this.intsPersistence = new boolean[var1];
@@ -45,7 +45,7 @@ public class Varcs {
var2 = 0;
if (ObjectSound.archive2.method133(15)) {
var2 = ObjectSound.archive2.method4(15);
var2 = ObjectSound.archive2.getGroupFileCount(15);
}
this.strings = new String[var2];
@@ -145,7 +145,7 @@ public class Varcs {
)
@Export("getPreferencesFile")
AccessFile getPreferencesFile(boolean var1) {
return LoginPacket.getPreferencesFile("2", class22.studioGame.name, var1);
return LoginPacket.getPreferencesFile("2", WorldMapRectangle.studioGame.name, var1);
}
@ObfuscatedName("e")
@@ -365,7 +365,7 @@ public class Varcs {
garbageValue = "321265868"
)
public static void method2160(AbstractArchive var0) {
FloorOverlayDefinition.field663 = var0;
FloorOverlayDefinition.FloorOverlayDefinition_archive = var0;
}
@ObfuscatedName("q")
+2 -2
View File
@@ -39,10 +39,10 @@ public class Varps {
)
static void method4400(Buffer var0) {
if (Client.field172 != null) {
var0.method38(Client.field172, 0, Client.field172.length);
var0.writeBytes(Client.field172, 0, Client.field172.length);
} else {
byte[] var1 = AttackOption.method2032();
var0.method38(var1, 0, var1.length);
var0.writeBytes(var1, 0, var1.length);
}
}
@@ -61,8 +61,8 @@ public class VertexNormal {
ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0;
} else if (RouteStrategy.field760 != null) {
for (int var1 = 0; var1 < ByteArrayPool.field55.length; ++var1) {
if (var0.length == ByteArrayPool.field55[var1] && WorldMapSection2.field1082[var1] < RouteStrategy.field760[var1].length) {
RouteStrategy.field760[var1][WorldMapSection2.field1082[var1]++] = var0;
if (var0.length == ByteArrayPool.field55[var1] && WorldMapSection0.field1082[var1] < RouteStrategy.field760[var1].length) {
RouteStrategy.field760[var1][WorldMapSection0.field1082[var1]++] = var0;
return;
}
}
@@ -1,10 +1,12 @@
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;
@ObfuscatedName("ip")
public enum class249 implements Enumerated {
@Implements("VerticalAlignment")
public enum VerticalAlignment implements Enumerated {
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "Lip;"
@@ -25,7 +27,8 @@ public enum class249 implements Enumerated {
@ObfuscatedGetter(
intValue = 2070321655
)
public final int field3275;
@Export("value")
public final int value;
@ObfuscatedName("o")
@ObfuscatedGetter(
intValue = 1686539261
@@ -33,8 +36,8 @@ public enum class249 implements Enumerated {
@Export("id")
final int id;
private class249(int var3, int var4) {
this.field3275 = var3;
private VerticalAlignment(int var3, int var4) {
this.value = var3;
this.id = var4;
}
@@ -112,26 +112,26 @@ public class ViewportMouse {
if (var1 >= 300 && var1 <= 313) {
var2 = (var1 - 300) / 2;
var3 = var1 & 1;
Client.field119.method257(var2, var3 == 1);
Client.playerAppearance.method257(var2, var3 == 1);
}
if (var1 >= 314 && var1 <= 323) {
var2 = (var1 - 314) / 2;
var3 = var1 & 1;
Client.field119.method258(var2, var3 == 1);
Client.playerAppearance.method258(var2, var3 == 1);
}
if (var1 == 324) {
Client.field119.method259(false);
Client.playerAppearance.method259(false);
}
if (var1 == 325) {
Client.field119.method259(true);
Client.playerAppearance.method259(true);
}
if (var1 == 326) {
PacketBufferNode var4 = Interpreter.method1915(ClientPacket.field234, Client.packetWriter.isaacCipher);
Client.field119.method260(var4.packetBuffer);
Client.playerAppearance.method260(var4.packetBuffer);
Client.packetWriter.method241(var4);
return true;
} else {
@@ -88,7 +88,7 @@ public final class WallDecoration {
int var2 = -1;
for (int var3 = 0; var3 < var1; ++var3) {
var2 = var2 >>> 8 ^ Buffer.field45[(var2 ^ var0[var3]) & 255];
var2 = var2 >>> 8 ^ Buffer.crc32Table[(var2 ^ var0[var3]) & 255];
}
var2 = ~var2;
+15 -15
View File
@@ -724,7 +724,7 @@ public class Widget extends Node {
this.mouseOverColor = 0;
this.mouseOverColor2 = 0;
this.fill = false;
this.rectangleMode = RectangleMode.field757;
this.rectangleMode = RectangleMode.SOLID;
this.transparency = 0;
this.field960 = 0;
this.lineWid = 1;
@@ -801,8 +801,8 @@ public class Widget extends Node {
this.type = buffer.readUnsignedByte();
this.buttonType = buffer.readUnsignedByte();
this.contentType = buffer.readUnsignedShort();
this.rawX = buffer.method44();
this.rawY = buffer.method44();
this.rawX = buffer.readShort();
this.rawY = buffer.readShort();
this.rawWidth = buffer.readUnsignedShort();
this.rawHeight = buffer.readUnsignedShort();
this.transparency = buffer.readUnsignedByte();
@@ -893,8 +893,8 @@ public class Widget extends Node {
for (var8 = 0; var8 < 20; ++var8) {
int var9 = buffer.readUnsignedByte();
if (var9 == 1) {
this.inventoryXOffsets[var8] = buffer.method44();
this.inventoryYOffsets[var8] = buffer.method44();
this.inventoryXOffsets[var8] = buffer.readShort();
this.inventoryYOffsets[var8] = buffer.readShort();
this.inventorySprites[var8] = buffer.readInt();
} else {
this.inventorySprites[var8] = -1;
@@ -987,8 +987,8 @@ public class Widget extends Node {
this.textShadowed = buffer.readUnsignedByte() == 1;
this.color = buffer.readInt();
this.paddingX = buffer.method44();
this.paddingY = buffer.method44();
this.paddingX = buffer.readShort();
this.paddingY = buffer.readShort();
var4 = buffer.readUnsignedByte();
if (var4 == 1) {
this.clickMask |= 1073741824;
@@ -1058,11 +1058,11 @@ public class Widget extends Node {
this.isIf3 = true;
this.type = buffer.readUnsignedByte();
this.contentType = buffer.readUnsignedShort();
this.rawX = buffer.method44();
this.rawY = buffer.method44();
this.rawX = buffer.readShort();
this.rawY = buffer.readShort();
this.rawWidth = buffer.readUnsignedShort();
if (this.type == 9) {
this.rawHeight = buffer.method44();
this.rawHeight = buffer.readShort();
} else {
this.rawHeight = buffer.readUnsignedShort();
}
@@ -1103,8 +1103,8 @@ public class Widget extends Node {
this.modelId = -1;
}
this.modelOffsetX = buffer.method44();
this.modelOffsetY = buffer.method44();
this.modelOffsetX = buffer.readShort();
this.modelOffsetY = buffer.readShort();
this.modelAngleX = buffer.readUnsignedShort();
this.modelAngleY = buffer.readUnsignedShort();
this.modelAngleZ = buffer.readUnsignedShort();
@@ -1293,15 +1293,15 @@ public class Widget extends Node {
}
if (this.outline >= 1) {
var5.method307(1);
var5.outline(1);
}
if (this.outline >= 2) {
var5.method307(16777215);
var5.outline(16777215);
}
if (this.spriteShadow != 0) {
var5.method308(this.spriteShadow);
var5.shadow(this.spriteShadow);
}
widgetSpriteCache.put(var5, var3);
+3 -2
View File
@@ -17,7 +17,8 @@ public class World {
@ObfuscatedGetter(
intValue = 1143875805
)
static int field987;
@Export("worldListWorldCount")
static int worldListWorldCount;
@ObfuscatedName("l")
@Export("sortOption2")
static int[] sortOption2;
@@ -136,7 +137,7 @@ public class World {
static {
worldsCount = 0;
field987 = 0;
worldListWorldCount = 0;
sortOption2 = new int[]{1, 1, 1, 1};
sortOption1 = new int[]{0, 1, 2, 3};
}
@@ -126,21 +126,21 @@ public class WorldMapArea {
@Export("readWorldMapSection")
WorldMapSection readWorldMapSection(Buffer var1) {
int var2 = var1.readUnsignedByte();
WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.field1101, WorldMapSectionType.field1103, WorldMapSectionType.field1100, WorldMapSectionType.field1102};
WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE2};
WorldMapSectionType var4 = (WorldMapSectionType)ScriptFrame.findEnumerated(var3, var2);
Object var5 = null;
switch(var4.type) {
case 0:
var5 = new WorldMapSection2();
var5 = new WorldMapSection0();
break;
case 1:
var5 = new WorldMapSection3();
break;
case 2:
var5 = new WorldMapSection1();
break;
case 2:
var5 = new WorldMapSection2();
break;
case 3:
var5 = new WorldMapSection0();
var5 = new WorldMapSection3();
break;
default:
throw new IllegalStateException("");
@@ -207,14 +207,14 @@ public class WorldMapAreaData extends WorldMapArea {
--RouteStrategy.Interpreter_intStackSize;
var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1;
if (var5 >= 0 && var5 <= 9) {
WorldMapSection3.method345(var4, var5);
WorldMapSection1.method345(var4, var5);
return 1;
} else {
throw new RuntimeException();
}
} else if (var0 == 1355) {
var11 = 10;
WorldMapSection3.method345(var4, var11);
WorldMapSection1.method345(var4, var11);
return 1;
} else {
return 2;
@@ -61,7 +61,7 @@ public class WorldMapCacheName {
public static void method633(int[] var0, int[] var1) {
if (var0 != null && var1 != null) {
ByteArrayPool.field55 = var0;
WorldMapSection2.field1082 = new int[var0.length];
WorldMapSection0.field1082 = new int[var0.length];
RouteStrategy.field760 = new byte[var0.length][][];
for (int var2 = 0; var2 < ByteArrayPool.field55.length; ++var2) {
@@ -69,7 +69,7 @@ public class WorldMapCacheName {
}
} else {
ByteArrayPool.field55 = null;
WorldMapSection2.field1082 = null;
WorldMapSection0.field1082 = null;
RouteStrategy.field760 = ((byte[][][])null);
}
@@ -104,6 +104,6 @@ public class WorldMapDecoration {
ServerBuild.field788 = var0;
Client.field220 = var1;
FloorDecoration.selectedSpellFlags = var2;
class22.method295(var4);
WorldMapRectangle.method295(var4);
}
}

Some files were not shown because too many files have changed in this diff Show More