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

more RSClient refactoring

Browse Source
This commit is contained in:
Lucas
2019-07-08 17:46:35 +02:00
parent a32c667251
commit 112a2bcba7
87 changed files with 1384 additions and 1323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java
+4
View File
@@ -45,6 +45,10 @@ public class AnnotationCleaner
{ {
assertEquals(c + " implements " + implementingName + " but is called " + c.getClassName(), implementingName, c.getClassName()); 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()) for (Field f : c.getFields())
{ {
runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
+1 -1
View File
@@ -978,7 +978,7 @@ public interface RSClient extends RSGameShell, Client
@Import("Rasterizer2D_drawVerticalLine") @Import("Rasterizer2D_drawVerticalLine")
void rasterizerDrawVerticalLine(int x, int y, int h, int rgb); void rasterizerDrawVerticalLine(int x, int y, int h, int rgb);
@Import("drawGradient") @Import("Rasterizer2D_drawGradient")
void rasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom); void rasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom);
@Import("Rasterizer2D_fillRectangleAlpha") @Import("Rasterizer2D_fillRectangleAlpha")
runescape-client/src/main/java/AbstractWorldMapIcon.java
+13 -11
View File
@@ -34,12 +34,14 @@ public abstract class AbstractWorldMapIcon {
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -521086143 intValue = -521086143
) )
int field5; @Export("screenX")
int screenX;
@ObfuscatedName("x") @ObfuscatedName("x")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1065362217 intValue = -1065362217
) )
int field6; @Export("screenY")
int screenY;
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(Lhu;Lhu;)V" signature = "(Lhu;Lhu;)V"
@@ -109,38 +111,38 @@ public abstract class AbstractWorldMapIcon {
WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.getElement()); WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.getElement());
int var4 = this.vmethod397(); int var4 = this.vmethod397();
int var5 = this.vmethod398(); int var5 = this.vmethod398();
switch(var3.field3287.field3528) { switch(var3.horizontalAlignment.value) {
case 0: 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; break;
} }
return false; return false;
case 1: case 1:
if (var1 >= this.field5 && var1 < var4 + this.field5) { if (var1 >= this.screenX && var1 < var4 + this.screenX) {
break; break;
} }
return false; return false;
case 2: case 2:
if (var1 <= this.field5 - var4 || var1 > this.field5) { if (var1 <= this.screenX - var4 || var1 > this.screenX) {
return false; return false;
} }
} }
switch(var3.field3301.field3275) { switch(var3.verticalAlignment.value) {
case 0: case 0:
if (var2 <= this.field6 - var5 || var2 > this.field6) { if (var2 <= this.screenY - var5 || var2 > this.screenY) {
return false; return false;
} }
break; break;
case 1: 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; return false;
} }
break; break;
case 2: case 2:
if (var2 < this.field6 || var2 >= var5 + this.field6) { if (var2 < this.screenY || var2 >= var5 + this.screenY) {
return false; return false;
} }
} }
@@ -156,7 +158,7 @@ public abstract class AbstractWorldMapIcon {
) )
boolean method21(int var1, int var2) { boolean method21(int var1, int var2) {
WorldMapLabel var3 = this.getLabel(); 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") @ObfuscatedName("es")
runescape-client/src/main/java/Actor.java
+5 -5
View File
@@ -919,7 +919,7 @@ public abstract class Actor extends Entity {
var13 = class204.getWidgetChild(argument2, argument1); var13 = class204.getWidgetChild(argument2, argument1);
if (var13 != null) { if (var13 != null) {
Player.method1281(); 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.isItemSelected = 0;
Client.selectedSpellActionName = class198.method3745(var13); Client.selectedSpellActionName = class198.method3745(var13);
if (Client.selectedSpellActionName == null) { if (Client.selectedSpellActionName == null) {
@@ -967,7 +967,7 @@ public abstract class Actor extends Entity {
if (Client.field127 == null) { if (Client.field127 == null) {
TilePaint.method3060(argument2, argument1); TilePaint.method3060(argument2, argument1);
Client.field127 = class204.getWidgetChild(argument2, argument1); Client.field127 = class204.getWidgetChild(argument2, argument1);
class22.method295(Client.field127); WorldMapRectangle.method295(Client.field127);
} }
} else if (opcode == 31) { } else if (opcode == 31) {
var8 = Interpreter.method1915(ClientPacket.field285, Client.packetWriter.isaacCipher); var8 = Interpreter.method1915(ClientPacket.field285, Client.packetWriter.isaacCipher);
@@ -1045,7 +1045,7 @@ public abstract class Actor extends Entity {
HealthBarDefinition.selectedItemSlot = argument1; HealthBarDefinition.selectedItemSlot = argument1;
ServerPacket.selectedItemWidget = argument2; ServerPacket.selectedItemWidget = argument2;
MenuAction.selectedItemId = argument0; MenuAction.selectedItemId = argument0;
class22.method295(var13); WorldMapRectangle.method295(var13);
Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(argument0).name + BufferedFile.colorStartTag(16777215); Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(argument0).name + BufferedFile.colorStartTag(16777215);
if (Client.selectedItemName == null) { if (Client.selectedItemName == null) {
Client.selectedItemName = "null"; Client.selectedItemName = "null";
@@ -1327,7 +1327,7 @@ public abstract class Actor extends Entity {
if (Client.isItemSelected != 0) { if (Client.isItemSelected != 0) {
Client.isItemSelected = 0; Client.isItemSelected = 0;
class22.method295(Huffman.getWidget(ServerPacket.selectedItemWidget)); WorldMapRectangle.method295(Huffman.getWidget(ServerPacket.selectedItemWidget));
} }
if (Client.isSpellSelected) { if (Client.isSpellSelected) {
@@ -1335,7 +1335,7 @@ public abstract class Actor extends Entity {
} }
if (BoundaryObject.field40 != null && Client.field203 == 0) { if (BoundaryObject.field40 != null && Client.field203 == 0) {
class22.method295(BoundaryObject.field40); WorldMapRectangle.method295(BoundaryObject.field40);
} }
} }
runescape-client/src/main/java/ArchiveLoader.java
+9 -9
View File
@@ -92,7 +92,7 @@ public class ArchiveLoader {
boolean var11; boolean var11;
if (Login.worldSelectOpen) { if (Login.worldSelectOpen) {
if (class30.worldSelectBackSprites == null) { if (class30.worldSelectBackSprites == null) {
class30.worldSelectBackSprites = class2.method20(WorldMapSection3.archive8, "sl_back", ""); class30.worldSelectBackSprites = class2.method20(WorldMapSection1.archive8, "sl_back", "");
} }
Archive var12; Archive var12;
@@ -100,7 +100,7 @@ public class ArchiveLoader {
int var14; int var14;
IndexedSprite[] var15; IndexedSprite[] var15;
if (Frames.worldSelectFlagSprites == null) { if (Frames.worldSelectFlagSprites == null) {
var12 = WorldMapSection3.archive8; var12 = WorldMapSection1.archive8;
var14 = var12.getGroupId("sl_flags"); var14 = var12.getGroupId("sl_flags");
var13 = var12.getFileId(var14, ""); var13 = var12.getFileId(var14, "");
if (!SpriteMask.loadSprite(var12, var14, var13)) { if (!SpriteMask.loadSprite(var12, var14, var13)) {
@@ -113,7 +113,7 @@ public class ArchiveLoader {
} }
if (AttackOption.worldSelectArrows == null) { if (AttackOption.worldSelectArrows == null) {
var12 = WorldMapSection3.archive8; var12 = WorldMapSection1.archive8;
var14 = var12.getGroupId("sl_arrows"); var14 = var12.getGroupId("sl_arrows");
var13 = var12.getFileId(var14, ""); var13 = var12.getFileId(var14, "");
if (!SpriteMask.loadSprite(var12, var14, var13)) { if (!SpriteMask.loadSprite(var12, var14, var13)) {
@@ -126,7 +126,7 @@ public class ArchiveLoader {
} }
if (UrlRequest.worldSelectStars == null) { if (UrlRequest.worldSelectStars == null) {
var12 = WorldMapSection3.archive8; var12 = WorldMapSection1.archive8;
var14 = var12.getGroupId("sl_stars"); var14 = var12.getGroupId("sl_stars");
var13 = var12.getFileId(var14, ""); var13 = var12.getFileId(var14, "");
if (!SpriteMask.loadSprite(var12, var14, var13)) { if (!SpriteMask.loadSprite(var12, var14, var13)) {
@@ -139,16 +139,16 @@ public class ArchiveLoader {
} }
if (SecureRandomFuture.worldSelectLeftSprite == null) { if (SecureRandomFuture.worldSelectLeftSprite == null) {
SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "leftarrow", ""); SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection1.archive8, "leftarrow", "");
} }
if (NetSocket.worldSelectRightSprite == null) { 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.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0);
Rasterizer2D.drawGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); Rasterizer2D.Rasterizer2D_drawGradient(Login.xPadding, 0, 125, 23, 0xbd9839, 0x8b6608);
Rasterizer2D.drawGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); Rasterizer2D.Rasterizer2D_drawGradient(Login.xPadding + 125, 0, 640, 23, 0x4f4f4f, 0x292929);
var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1);
if (UrlRequest.worldSelectStars != null) { if (UrlRequest.worldSelectStars != null) {
UrlRequest.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); UrlRequest.worldSelectStars[1].drawAt(Login.xPadding + 140, 1);
@@ -700,7 +700,7 @@ public class ArchiveLoader {
var1.drawCentered("Click to switch", var39 / 2 + var10, var41 / 2 + var34 + 12, 16777215, 0); var1.drawCentered("Click to switch", var39 / 2 + var10, var41 / 2 + var34 + 12, 16777215, 0);
} }
} else { } else {
class277.field1144 = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "sl_button", ""); class277.field1144 = MenuAction.loadIndexedSpriteByName(WorldMapSection1.archive8, "sl_button", "");
} }
} }
} }
runescape-client/src/main/java/BoundaryObject.java
+1 -1
View File
@@ -81,7 +81,7 @@ public final class BoundaryObject {
static final void doCheat(String var0) { static final void doCheat(String var0) {
if (var0.equalsIgnoreCase("toggleroof")) { if (var0.equalsIgnoreCase("toggleroof")) {
ReflectionCheck.clientPreferences.roofsHidden = !ReflectionCheck.clientPreferences.roofsHidden; ReflectionCheck.clientPreferences.roofsHidden = !ReflectionCheck.clientPreferences.roofsHidden;
WorldMapSection0.savePreferences(); WorldMapSection3.savePreferences();
if (ReflectionCheck.clientPreferences.roofsHidden) { if (ReflectionCheck.clientPreferences.roofsHidden) {
WorldMapIcon1.addGameMessage(99, "", "Roofs are now all hidden"); WorldMapIcon1.addGameMessage(99, "", "Roofs are now all hidden");
} else { } else {
runescape-client/src/main/java/ByteArrayPool.java
+3 -3
View File
@@ -83,9 +83,9 @@ public class ByteArrayPool {
if (field55[var3] != var0) { if (field55[var3] != var0) {
if (var0 < field55[var3]) { if (var0 < field55[var3]) {
} }
} else if (WorldMapSection2.field1082[var3] > 0) { } else if (WorldMapSection0.field1082[var3] > 0) {
byte[] var4 = RouteStrategy.field760[var3][--WorldMapSection2.field1082[var3]]; byte[] var4 = RouteStrategy.field760[var3][--WorldMapSection0.field1082[var3]];
RouteStrategy.field760[var3][WorldMapSection2.field1082[var3]] = null; RouteStrategy.field760[var3][WorldMapSection0.field1082[var3]] = null;
return var4; return var4;
} }
} }
runescape-client/src/main/java/Bzip2Decompressor.java
+10 -10
View File
@@ -44,7 +44,7 @@ public final class Bzip2Decompressor {
int var2 = var0.field70; int var2 = var0.field70;
int var3 = var0.field78; int var3 = var0.field78;
int var4 = var0.field76; int var4 = var0.field76;
int[] var5 = WorldMapSection0.field1056; int[] var5 = WorldMapSection3.field1056;
int var6 = var0.field75; int var6 = var0.field75;
byte[] var7 = var0.field65; byte[] var7 = var0.field65;
int var8 = var0.field66; int var8 = var0.field66;
@@ -159,7 +159,7 @@ public final class Bzip2Decompressor {
var0.field70 = var2; var0.field70 = var2;
var0.field78 = var3; var0.field78 = var3;
var0.field76 = var4; var0.field76 = var4;
WorldMapSection0.field1056 = var5; WorldMapSection3.field1056 = var5;
var0.field75 = var6; var0.field75 = var6;
var0.field65 = var7; var0.field65 = var7;
var0.field66 = var8; var0.field66 = var8;
@@ -194,8 +194,8 @@ public final class Bzip2Decompressor {
int[] var21 = null; int[] var21 = null;
int[] var22 = null; int[] var22 = null;
var0.field73 = 1; var0.field73 = 1;
if (WorldMapSection0.field1056 == null) { if (WorldMapSection3.field1056 == null) {
WorldMapSection0.field1056 = new int[var0.field73 * 100000]; WorldMapSection3.field1056 = new int[var0.field73 * 100000];
} }
boolean var23 = true; boolean var23 = true;
@@ -434,7 +434,7 @@ public final class Bzip2Decompressor {
} }
var10003 = var0.field77[var0.field83[var24 & 255] & 255]++; 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; ++var39;
if (var41 == 0) { if (var41 == 0) {
++var53; ++var53;
@@ -493,7 +493,7 @@ public final class Bzip2Decompressor {
var46 = var0.field77; var46 = var0.field77;
for (var46[var24 & 255] += var48; var48 > 0; --var48) { for (var46[var24 & 255] += var48; var48 > 0; --var48) {
WorldMapSection0.field1056[var39] = var24 & 255; WorldMapSection3.field1056[var39] = var24 & 255;
++var39; ++var39;
} }
} }
@@ -513,16 +513,16 @@ public final class Bzip2Decompressor {
} }
for (var25 = 0; var25 < var39; ++var25) { for (var25 = 0; var25 < var39; ++var25) {
var24 = (byte)(WorldMapSection0.field1056[var25] & 255); var24 = (byte)(WorldMapSection3.field1056[var25] & 255);
var46 = WorldMapSection0.field1056; var46 = WorldMapSection3.field1056;
var48 = var0.field79[var24 & 255]; var48 = var0.field79[var24 & 255];
var46[var48] |= var25 << 8; var46[var48] |= var25 << 8;
++var0.field79[var24 & 255]; ++var0.field79[var24 & 255];
} }
var0.field75 = WorldMapSection0.field1056[var0.field74] >> 8; var0.field75 = WorldMapSection3.field1056[var0.field74] >> 8;
var0.field78 = 0; var0.field78 = 0;
var0.field75 = WorldMapSection0.field1056[var0.field75]; var0.field75 = WorldMapSection3.field1056[var0.field75];
var0.field76 = (byte)(var0.field75 & 255); var0.field76 = (byte)(var0.field75 & 255);
var0.field75 >>= 8; var0.field75 >>= 8;
++var0.field78; ++var0.field78;
runescape-client/src/main/java/class211.java → runescape-client/src/main/java/Calendar.java
+13 -9
View File
@@ -1,19 +1,23 @@
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.TimeZone; import java.util.TimeZone;
import net.runelite.mapping.Export; import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature; import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.ScriptOpcodes; import net.runelite.rs.ScriptOpcodes;
@ObfuscatedName("hg") @ObfuscatedName("hg")
public class class211 { @Implements("Calendar")
public class Calendar {
@ObfuscatedName("m") @ObfuscatedName("m")
static final String[][] field1124; @Export("MONTH_NAMES_ENGLISH_GERMAN")
static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
@ObfuscatedName("f") @ObfuscatedName("f")
static final String[] field1125; @Export("DAYS_OF_THE_WEEK")
static final String[] DAYS_OF_THE_WEEK;
@ObfuscatedName("q") @ObfuscatedName("q")
static Calendar field1126; @Export("Calendar_calendar")
static java.util.Calendar Calendar_calendar;
@ObfuscatedName("em") @ObfuscatedName("em")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Llg;" signature = "Llg;"
@@ -210,9 +214,9 @@ public class class211 {
} }
static { 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"}}; 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"}};
field1125 = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
Calendar.getInstance(TimeZone.getTimeZone("Europe/London")); java.util.Calendar.getInstance(TimeZone.getTimeZone("Europe/London"));
field1126 = Calendar.getInstance(TimeZone.getTimeZone("GMT")); Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
} }
} }
runescape-client/src/main/java/Canvas.java
+3 -3
View File
@@ -157,7 +157,7 @@ public final class Canvas extends java.awt.Canvas {
GrandExchangeOfferAgeComparator.field1111 = var10; GrandExchangeOfferAgeComparator.field1111 = var10;
} }
class22.method295(var5); WorldMapRectangle.method295(var5);
return 1; return 1;
} }
} }
@@ -167,12 +167,12 @@ public final class Canvas extends java.awt.Canvas {
var6 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; var6 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
var5 = Huffman.getWidget(var6.id); var5 = Huffman.getWidget(var6.id);
var5.children[var6.childIndex] = null; var5.children[var6.childIndex] = null;
class22.method295(var5); WorldMapRectangle.method295(var5);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_DELETEALL) { } else if (var0 == ScriptOpcodes.CC_DELETEALL) {
var6 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var6 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
var6.children = null; var6.children = null;
class22.method295(var6); WorldMapRectangle.method295(var6);
return 1; return 1;
} else if (var0 != ScriptOpcodes.CC_FIND) { } else if (var0 != ScriptOpcodes.CC_FIND) {
if (var0 == ScriptOpcodes.IF_FIND) { if (var0 == ScriptOpcodes.IF_FIND) {
runescape-client/src/main/java/Client.java
+105 -105
View File
@@ -1843,19 +1843,19 @@ public final class Client extends GameShell implements Usernamed {
if (var30 > 0) { if (var30 > 0) {
var43 = var30 - 1; var43 = var30 - 1;
var44 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var43); var44 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var43);
FloorOverlayDefinition var46; FloorOverlayDefinition var46;
if (var44 != null) { if (var44 != null) {
var46 = var44; var46 = var44;
} else { } else {
byte[] var47 = FloorOverlayDefinition.field663.takeFile(4, var43); byte[] var47 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var43);
var44 = new FloorOverlayDefinition(); var44 = new FloorOverlayDefinition();
if (var47 != null) { if (var47 != null) {
var44.decode(new Buffer(var47), var43); var44.decode(new Buffer(var47), var43);
} }
var44.postDecode(); var44.postDecode();
FloorOverlayDefinition.field664.put(var44, (long)var43); FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var44, (long)var43);
var46 = var44; var46 = var44;
} }
@@ -1881,18 +1881,18 @@ public final class Client extends GameShell implements Usernamed {
var42 = class32.field1157[var6][var12][var18] + 1; var42 = class32.field1157[var6][var12][var18] + 1;
byte var67 = class307.field1155[var6][var12][var18]; byte var67 = class307.field1155[var6][var12][var18];
int var68 = var30 - 1; int var68 = var30 - 1;
FloorOverlayDefinition var69 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var68); FloorOverlayDefinition var69 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var68);
if (var69 != null) { if (var69 != null) {
var44 = var69; var44 = var69;
} else { } else {
byte[] var48 = FloorOverlayDefinition.field663.takeFile(4, var68); byte[] var48 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var68);
var69 = new FloorOverlayDefinition(); var69 = new FloorOverlayDefinition();
if (var48 != null) { if (var48 != null) {
var69.decode(new Buffer(var48), var68); var69.decode(new Buffer(var48), var68);
} }
var69.postDecode(); var69.postDecode();
FloorOverlayDefinition.field664.put(var69, (long)var68); FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var69, (long)var68);
var44 = var69; var44 = var69;
} }
@@ -1902,7 +1902,7 @@ public final class Client extends GameShell implements Usernamed {
int var51; int var51;
int var52; int var52;
if (var70 >= 0) { if (var70 >= 0) {
var50 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var70); var50 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var70);
var49 = -1; var49 = -1;
} else if (var44.rgb == 16711935) { } else if (var44.rgb == 16711935) {
var49 = -2; var49 = -2;
@@ -2422,48 +2422,48 @@ public final class Client extends GameShell implements Usernamed {
PacketBuffer.field667 = var27; PacketBuffer.field667 = var27;
try { try {
class266.osName = System.getProperty("os.name"); HorizontalAlignment.osName = System.getProperty("os.name");
} catch (Exception var21) { } catch (Exception var21) {
class266.osName = "Unknown"; HorizontalAlignment.osName = "Unknown";
} }
WorldMapSection3.osNameLowerCase = class266.osName.toLowerCase(); WorldMapSection1.osNameLowerCase = HorizontalAlignment.osName.toLowerCase();
try { try {
WorldMapSection1.userHomeDirectory = System.getProperty("user.home"); WorldMapSection2.userHomeDirectory = System.getProperty("user.home");
if (WorldMapSection1.userHomeDirectory != null) { if (WorldMapSection2.userHomeDirectory != null) {
WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/"; WorldMapSection2.userHomeDirectory = WorldMapSection2.userHomeDirectory + "/";
} }
} catch (Exception var20) { } catch (Exception var20) {
} }
try { try {
if (WorldMapSection3.osNameLowerCase.startsWith("win")) { if (WorldMapSection1.osNameLowerCase.startsWith("win")) {
if (WorldMapSection1.userHomeDirectory == null) { if (WorldMapSection2.userHomeDirectory == null) {
WorldMapSection1.userHomeDirectory = System.getenv("USERPROFILE"); WorldMapSection2.userHomeDirectory = System.getenv("USERPROFILE");
} }
} else if (WorldMapSection1.userHomeDirectory == null) { } else if (WorldMapSection2.userHomeDirectory == null) {
WorldMapSection1.userHomeDirectory = System.getenv("HOME"); WorldMapSection2.userHomeDirectory = System.getenv("HOME");
} }
if (WorldMapSection1.userHomeDirectory != null) { if (WorldMapSection2.userHomeDirectory != null) {
WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/"; WorldMapSection2.userHomeDirectory = WorldMapSection2.userHomeDirectory + "/";
} }
} catch (Exception var19) { } catch (Exception var19) {
} }
if (WorldMapSection1.userHomeDirectory == null) { if (WorldMapSection2.userHomeDirectory == null) {
WorldMapSection1.userHomeDirectory = "~/"; 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}; Canvas.field94 = new String[]{".jagex_cache_" + PacketBuffer.field667, ".file_store_" + PacketBuffer.field667};
var6 = 0; var6 = 0;
label256: label256:
while (var6 < 4) { while (var6 < 4) {
String var28 = var6 == 0 ? "" : "" + var6; 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 var30 = null;
String var31 = null; String var31 = null;
boolean var32 = false; boolean var32 = false;
@@ -2529,8 +2529,8 @@ public final class Client extends GameShell implements Usernamed {
if (var30 == null && var6 == 0) { if (var30 == null && var6 == 0) {
label232: label232:
for (var3 = 0; var3 < Canvas.field94.length; ++var3) { for (var3 = 0; var3 < Canvas.field94.length; ++var3) {
for (int var34 = 0; var34 < WorldMapSection2.cacheDirectoryLocations.length; ++var34) { for (int var34 = 0; var34 < WorldMapSection0.cacheDirectoryLocations.length; ++var34) {
var36 = new File(WorldMapSection2.cacheDirectoryLocations[var34] + Canvas.field94[var3] + File.separatorChar + "oldschool" + File.separatorChar); 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)) { if (var36.exists() && DevicePcmPlayerProvider.method847(new File(var36, "test.dat"), true)) {
var30 = var36.toString(); var30 = var36.toString();
var32 = true; var32 = true;
@@ -2541,7 +2541,7 @@ public final class Client extends GameShell implements Usernamed {
} }
if (var30 == null) { 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; var32 = true;
} }
@@ -2691,8 +2691,8 @@ public final class Client extends GameShell implements Usernamed {
class21.field1123 = var5; class21.field1123 = var5;
break; break;
case 10: case 10:
class22.studioGame = (StudioGame)ScriptFrame.findEnumerated(ClientPacket.method3664(), Integer.parseInt(var5)); WorldMapRectangle.studioGame = (StudioGame)ScriptFrame.findEnumerated(ClientPacket.method3664(), Integer.parseInt(var5));
if (class22.studioGame == StudioGame.field892) { if (WorldMapRectangle.studioGame == StudioGame.field892) {
KeyHandler.loginType = LoginType.field479; KeyHandler.loginType = LoginType.field479;
} else { } else {
KeyHandler.loginType = LoginType.field487; KeyHandler.loginType = LoginType.field487;
@@ -2840,9 +2840,9 @@ public final class Client extends GameShell implements Usernamed {
int var21 = var17 == 0 ? 5 : 9; int var21 = var17 == 0 ? 5 : 9;
ModelData0.NetCache_currentResponse = var20; ModelData0.NetCache_currentResponse = var20;
class22.NetCache_responseArchiveBuffer = new Buffer(var13 + var21 + ModelData0.NetCache_currentResponse.padding); WorldMapRectangle.NetCache_responseArchiveBuffer = new Buffer(var13 + var21 + ModelData0.NetCache_currentResponse.padding);
class22.NetCache_responseArchiveBuffer.writeByte(var17); WorldMapRectangle.NetCache_responseArchiveBuffer.writeByte(var17);
class22.NetCache_responseArchiveBuffer.writeInt(var13); WorldMapRectangle.NetCache_responseArchiveBuffer.writeInt(var13);
NetCache.field630 = 8; NetCache.field630 = 8;
NetCache.NetCache_responseHeaderBuffer.index = 0; NetCache.NetCache_responseHeaderBuffer.index = 0;
} else if (NetCache.field630 == 0) { } else if (NetCache.field630 == 0) {
@@ -2854,31 +2854,31 @@ public final class Client extends GameShell implements Usernamed {
} }
} }
} else { } 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; var11 = 512 - NetCache.field630;
if (var11 > var10 - class22.NetCache_responseArchiveBuffer.index) { if (var11 > var10 - WorldMapRectangle.NetCache_responseArchiveBuffer.index) {
var11 = var10 - class22.NetCache_responseArchiveBuffer.index; var11 = var10 - WorldMapRectangle.NetCache_responseArchiveBuffer.index;
} }
if (var11 > var8) { if (var11 > var8) {
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) { if (NetCache.field631 != 0) {
for (var12 = 0; var12 < var11; ++var12) { for (var12 = 0; var12 < var11; ++var12) {
var14 = class22.NetCache_responseArchiveBuffer.array; var14 = WorldMapRectangle.NetCache_responseArchiveBuffer.array;
var15 = class22.NetCache_responseArchiveBuffer.index + var12; var15 = WorldMapRectangle.NetCache_responseArchiveBuffer.index + var12;
var14[var15] ^= NetCache.field631; var14[var15] ^= NetCache.field631;
} }
} }
var16 = class22.NetCache_responseArchiveBuffer; var16 = WorldMapRectangle.NetCache_responseArchiveBuffer;
var16.index += var11; var16.index += var11;
NetCache.field630 += var11; NetCache.field630 += var11;
if (var10 == class22.NetCache_responseArchiveBuffer.index) { if (var10 == WorldMapRectangle.NetCache_responseArchiveBuffer.index) {
if (16711935L == ModelData0.NetCache_currentResponse.key) { if (16711935L == ModelData0.NetCache_currentResponse.key) {
Players.NetCache_reference = class22.NetCache_responseArchiveBuffer; Players.NetCache_reference = WorldMapRectangle.NetCache_responseArchiveBuffer;
for (var12 = 0; var12 < 256; ++var12) { for (var12 = 0; var12 < 256; ++var12) {
Archive var25 = NetCache.NetCache_archives[var12]; Archive var25 = NetCache.NetCache_archives[var12];
@@ -2891,7 +2891,7 @@ public final class Client extends GameShell implements Usernamed {
} }
} else { } else {
NetCache.NetCache_crc.reset(); 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(); var12 = (int)NetCache.NetCache_crc.getValue();
if (var12 != ModelData0.NetCache_currentResponse.crc) { if (var12 != ModelData0.NetCache_currentResponse.crc) {
try { try {
@@ -2908,7 +2908,7 @@ public final class Client extends GameShell implements Usernamed {
NetCache.NetCache_crcMismatches = 0; NetCache.NetCache_crcMismatches = 0;
NetCache.NetCache_ioExceptions = 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(); ModelData0.NetCache_currentResponse.remove();
@@ -2920,7 +2920,7 @@ public final class Client extends GameShell implements Usernamed {
NetCache.field630 = 0; NetCache.field630 = 0;
ModelData0.NetCache_currentResponse = null; ModelData0.NetCache_currentResponse = null;
class22.NetCache_responseArchiveBuffer = null; WorldMapRectangle.NetCache_responseArchiveBuffer = null;
} else { } else {
if (NetCache.field630 != 512) { if (NetCache.field630 != 512) {
break; break;
@@ -3038,7 +3038,7 @@ public final class Client extends GameShell implements Usernamed {
UserComparator9.method3343(var2); UserComparator9.method3343(var2);
NetCache.NetCache_responseHeaderBuffer.index = 0; NetCache.NetCache_responseHeaderBuffer.index = 0;
ModelData0.NetCache_currentResponse = null; ModelData0.NetCache_currentResponse = null;
class22.NetCache_responseArchiveBuffer = null; WorldMapRectangle.NetCache_responseArchiveBuffer = null;
NetCache.field630 = 0; NetCache.field630 = 0;
while (true) { while (true) {
@@ -3343,16 +3343,16 @@ public final class Client extends GameShell implements Usernamed {
var8.packetBuffer.writeInt(SecureRandomFuture.archive5.hash); var8.packetBuffer.writeInt(SecureRandomFuture.archive5.hash);
var8.packetBuffer.writeInt(UserComparator3.archive6.hash); var8.packetBuffer.writeInt(UserComparator3.archive6.hash);
var8.packetBuffer.writeInt(class40.archive7.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(class238.archive9.hash);
var8.packetBuffer.writeInt(class16.archive10.hash); var8.packetBuffer.writeInt(class16.archive10.hash);
var8.packetBuffer.writeInt(Login.archive11.hash); var8.packetBuffer.writeInt(Login.archive11.hash);
var8.packetBuffer.writeInt(Formatting.archive12.hash); var8.packetBuffer.writeInt(Formatting.archive12.hash);
var8.packetBuffer.writeInt(ByteArrayPool.archive13.hash); var8.packetBuffer.writeInt(ByteArrayPool.archive13.hash);
var8.packetBuffer.writeInt(class2.archive14.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(0);
var8.packetBuffer.writeInt(class22.archive16.hash); var8.packetBuffer.writeInt(WorldMapRectangle.archive16.hash);
var8.packetBuffer.writeInt(WorldMapLabelSize.field1040.hash); var8.packetBuffer.writeInt(WorldMapLabelSize.field1040.hash);
var8.packetBuffer.writeInt(ItemContainer.field434.hash); var8.packetBuffer.writeInt(ItemContainer.field434.hash);
var8.packetBuffer.writeInt(AbstractByteArrayCopier.field0.hash); var8.packetBuffer.writeInt(AbstractByteArrayCopier.field0.hash);
@@ -3396,12 +3396,12 @@ public final class Client extends GameShell implements Usernamed {
} }
if (loginState == 7 && ((AbstractSocket)var1).available() > 0) { if (loginState == 7 && ((AbstractSocket)var1).available() > 0) {
WorldMapSection1.field1071 = ((AbstractSocket)var1).readUnsignedByte(); WorldMapSection2.field1071 = ((AbstractSocket)var1).readUnsignedByte();
loginState = 8; loginState = 8;
} }
if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection1.field1071) { if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection2.field1071) {
((AbstractSocket)var1).read(var2.array, 0, WorldMapSection1.field1071); ((AbstractSocket)var1).read(var2.array, 0, WorldMapSection2.field1071);
var2.index = 0; var2.index = 0;
loginState = 6; loginState = 6;
} }
@@ -3449,7 +3449,7 @@ public final class Client extends GameShell implements Usernamed {
ReflectionCheck.clientPreferences.rememberedUsername = null; ReflectionCheck.clientPreferences.rememberedUsername = null;
} }
WorldMapSection0.savePreferences(); WorldMapSection3.savePreferences();
staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); staffModLevel = ((AbstractSocket)var1).readUnsignedByte();
playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1;
localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte();
@@ -3484,7 +3484,7 @@ public final class Client extends GameShell implements Usernamed {
var2.index = 0; var2.index = 0;
((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length); ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length);
timer.method332(); timer.method332();
WorldMapSection1.method808(); WorldMapSection2.method808();
GrandExchangeOfferNameComparator.updatePlayer(var2); GrandExchangeOfferNameComparator.updatePlayer(var2);
GameObject.field359 = -1; GameObject.field359 = -1;
class50.loadRegions(false, var2); class50.loadRegions(false, var2);
@@ -3854,7 +3854,7 @@ public final class Client extends GameShell implements Usernamed {
class60.worldMap0.method360(); class60.worldMap0.method360();
} }
class266.method5120(); HorizontalAlignment.method5120();
Message.method1228(); Message.method1228();
if (gameState != 30) { if (gameState != 30) {
return; return;
@@ -3898,7 +3898,7 @@ public final class Client extends GameShell implements Usernamed {
if (BoundaryObject.field40 != null) { if (BoundaryObject.field40 != null) {
++field203; ++field203;
if (field203 >= 15) { if (field203 >= 15) {
class22.method295(BoundaryObject.field40); WorldMapRectangle.method295(BoundaryObject.field40);
BoundaryObject.field40 = null; BoundaryObject.field40 = null;
} }
} }
@@ -3974,7 +3974,7 @@ public final class Client extends GameShell implements Usernamed {
PacketBufferNode var27; PacketBufferNode var27;
if (DevicePcmPlayerProvider.dragInventoryWidget != null) { if (DevicePcmPlayerProvider.dragInventoryWidget != null) {
class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); WorldMapRectangle.method295(DevicePcmPlayerProvider.dragInventoryWidget);
++itemDragDuration; ++itemDragDuration;
if (MouseHandler.MouseHandler_currentButton == 0) { if (MouseHandler.MouseHandler_currentButton == 0) {
if (field207) { if (field207) {
@@ -4057,21 +4057,21 @@ public final class Client extends GameShell implements Usernamed {
if (var36 != Clock.mousedOverWidgetIf1) { if (var36 != Clock.mousedOverWidgetIf1) {
if (var36 != null) { if (var36 != null) {
class22.method295(var36); WorldMapRectangle.method295(var36);
} }
if (Clock.mousedOverWidgetIf1 != null) { if (Clock.mousedOverWidgetIf1 != null) {
class22.method295(Clock.mousedOverWidgetIf1); WorldMapRectangle.method295(Clock.mousedOverWidgetIf1);
} }
} }
if (var23 != AccessFile.field8 && field218 == field219) { if (var23 != AccessFile.field8 && field218 == field219) {
if (var23 != null) { if (var23 != null) {
class22.method295(var23); WorldMapRectangle.method295(var23);
} }
if (AccessFile.field8 != null) { if (AccessFile.field8 != null) {
class22.method295(AccessFile.field8); WorldMapRectangle.method295(AccessFile.field8);
} }
} }
@@ -4079,7 +4079,7 @@ public final class Client extends GameShell implements Usernamed {
if (field218 < field219) { if (field218 < field219) {
++field218; ++field218;
if (field219 == field218) { if (field219 == field218) {
class22.method295(AccessFile.field8); WorldMapRectangle.method295(AccessFile.field8);
} }
} }
} else if (field218 > 0) { } else if (field218 > 0) {
@@ -4091,17 +4091,17 @@ public final class Client extends GameShell implements Usernamed {
var4 = class3.field1146 * 128 + 64; var4 = class3.field1146 * 128 + 64;
var9 = MusicPatchPcmStream.field602 * 128 + 64; var9 = MusicPatchPcmStream.field602 * 128 + 64;
var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - AbstractWorldMapIcon.field4; var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - AbstractWorldMapIcon.field4;
if (WorldMapSection1.cameraX < var4) { if (WorldMapSection2.cameraX < var4) {
WorldMapSection1.cameraX = (var4 - WorldMapSection1.cameraX) * class30.field1148 / 1000 + WorldMapSection1.cameraX + ClientPacket.field221; WorldMapSection2.cameraX = (var4 - WorldMapSection2.cameraX) * class30.field1148 / 1000 + WorldMapSection2.cameraX + ClientPacket.field221;
if (WorldMapSection1.cameraX > var4) { if (WorldMapSection2.cameraX > var4) {
WorldMapSection1.cameraX = var4; WorldMapSection2.cameraX = var4;
} }
} }
if (WorldMapSection1.cameraX > var4) { if (WorldMapSection2.cameraX > var4) {
WorldMapSection1.cameraX -= class30.field1148 * (WorldMapSection1.cameraX - var4) / 1000 + ClientPacket.field221; WorldMapSection2.cameraX -= class30.field1148 * (WorldMapSection2.cameraX - var4) / 1000 + ClientPacket.field221;
if (WorldMapSection1.cameraX < var4) { if (WorldMapSection2.cameraX < var4) {
WorldMapSection1.cameraX = var4; WorldMapSection2.cameraX = var4;
} }
} }
@@ -4136,7 +4136,7 @@ public final class Client extends GameShell implements Usernamed {
var4 = GrandExchangeOffer.field376 * 128 + 64; var4 = GrandExchangeOffer.field376 * 128 + 64;
var9 = KeyHandler.field445 * 128 + 64; var9 = KeyHandler.field445 * 128 + 64;
var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - ArchiveDiskAction.field410; var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - ArchiveDiskAction.field410;
var11 = var4 - WorldMapSection1.cameraX; var11 = var4 - WorldMapSection2.cameraX;
var12 = var10 - GrandExchangeEvents.cameraY; var12 = var10 - GrandExchangeEvents.cameraY;
var13 = var9 - GrandExchangeOfferNameComparator.cameraZ; var13 = var9 - GrandExchangeOfferNameComparator.cameraZ;
var14 = (int)Math.sqrt((double)(var13 * var13 + var11 * var11)); var14 = (int)Math.sqrt((double)(var13 * var13 + var11 * var11));
@@ -4202,7 +4202,7 @@ public final class Client extends GameShell implements Usernamed {
} }
class196.varcs.tryWrite(); class196.varcs.tryWrite();
var4 = class22.method297(); var4 = WorldMapRectangle.method297();
var9 = KeyHandler.KeyHandler_idleCycles; var9 = KeyHandler.KeyHandler_idleCycles;
if (var4 > 15000 && var9 > 15000) { if (var4 > 15000 && var9 > 15000) {
field175 = 250; field175 = 250;
@@ -4585,9 +4585,9 @@ public final class Client extends GameShell implements Usernamed {
ClientPacket.field221 = var3.readUnsignedByte(); ClientPacket.field221 = var3.readUnsignedByte();
class30.field1148 = var3.readUnsignedByte(); class30.field1148 = var3.readUnsignedByte();
if (class30.field1148 >= 100) { if (class30.field1148 >= 100) {
WorldMapSection1.cameraX = class3.field1146 * 128 + 64; WorldMapSection2.cameraX = class3.field1146 * 128 + 64;
GrandExchangeOfferNameComparator.cameraZ = MusicPatchPcmStream.field602 * 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; var1.serverPacket0 = null;
@@ -4614,7 +4614,7 @@ public final class Client extends GameShell implements Usernamed {
if (ServerPacket.field806 == var1.serverPacket0) { if (ServerPacket.field806 == var1.serverPacket0) {
Canvas.field95 = var3.method59(); Canvas.field95 = var3.method59();
WorldMapSection3.field1089 = var3.readUnsignedByteNegate(); WorldMapSection1.field1089 = var3.readUnsignedByteNegate();
while (var3.index < var1.serverPacket0Length) { while (var3.index < var1.serverPacket0Length) {
var38 = var3.readUnsignedByte(); var38 = var3.readUnsignedByte();
@@ -4635,7 +4635,7 @@ public final class Client extends GameShell implements Usernamed {
var8.sequenceId = var38; var8.sequenceId = var38;
var8.modelFrame = 0; var8.modelFrame = 0;
var8.modelFrameCycle = 0; var8.modelFrameCycle = 0;
class22.method295(var8); WorldMapRectangle.method295(var8);
} }
var1.serverPacket0 = null; var1.serverPacket0 = null;
@@ -4648,7 +4648,7 @@ public final class Client extends GameShell implements Usernamed {
var9 = Huffman.getWidget(var38); var9 = Huffman.getWidget(var38);
var9.modelType = 3; var9.modelType = 3;
var9.modelId = Canvas.localPlayer.appearance.getChatHeadId(); var9.modelId = Canvas.localPlayer.appearance.getChatHeadId();
class22.method295(var9); WorldMapRectangle.method295(var9);
var1.serverPacket0 = null; var1.serverPacket0 = null;
return true; return true;
} }
@@ -4668,7 +4668,7 @@ public final class Client extends GameShell implements Usernamed {
var9.itemIds[var5] = 0; var9.itemIds[var5] = 0;
} }
class22.method295(var9); WorldMapRectangle.method295(var9);
var1.serverPacket0 = null; var1.serverPacket0 = null;
return true; return true;
} }
@@ -4716,7 +4716,7 @@ public final class Client extends GameShell implements Usernamed {
} }
if (var8 != null) { if (var8 != null) {
class22.method295(var8); WorldMapRectangle.method295(var8);
} }
GrandExchangeOfferAgeComparator.method159(); GrandExchangeOfferAgeComparator.method159();
@@ -4738,7 +4738,7 @@ public final class Client extends GameShell implements Usernamed {
} }
if (ServerPacket.field853 == var1.serverPacket0) { if (ServerPacket.field853 == var1.serverPacket0) {
WorldMapSection3.field1089 = var3.readUnsignedByteNegate(); WorldMapSection1.field1089 = var3.readUnsignedByteNegate();
Canvas.field95 = var3.method59(); Canvas.field95 = var3.method59();
var1.serverPacket0 = null; var1.serverPacket0 = null;
return true; return true;
@@ -4751,7 +4751,7 @@ public final class Client extends GameShell implements Usernamed {
var8 = Huffman.getWidget(var38); var8 = Huffman.getWidget(var38);
if (var14 != var8.isHidden) { if (var14 != var8.isHidden) {
var8.isHidden = var14; var8.isHidden = var14;
class22.method295(var8); WorldMapRectangle.method295(var8);
} }
var1.serverPacket0 = null; var1.serverPacket0 = null;
@@ -4798,7 +4798,7 @@ public final class Client extends GameShell implements Usernamed {
rootInterface = var38; rootInterface = var38;
this.method87(false); this.method87(false);
DevicePcmPlayerProvider.method845(var38); DevicePcmPlayerProvider.method845(var38);
WorldMapSection3.runWidgetOnLoadListener(rootInterface); WorldMapSection1.runWidgetOnLoadListener(rootInterface);
for (var6 = 0; var6 < 100; ++var6) { for (var6 = 0; var6 < 100; ++var6) {
field100[var6] = true; field100[var6] = true;
@@ -4827,7 +4827,7 @@ public final class Client extends GameShell implements Usernamed {
var15.modelAngleX = var38; var15.modelAngleX = var38;
var15.modelAngleY = var5; var15.modelAngleY = var5;
var15.modelZoom = var6; var15.modelZoom = var6;
class22.method295(var15); WorldMapRectangle.method295(var15);
} }
var1.serverPacket0 = null; var1.serverPacket0 = null;
@@ -4936,7 +4936,7 @@ public final class Client extends GameShell implements Usernamed {
var16.modelAngleX = var41.xan2d; var16.modelAngleX = var41.xan2d;
var16.modelAngleY = var41.yan2d; var16.modelAngleY = var41.yan2d;
var16.modelZoom = var41.zoom2d * 100 / var5; var16.modelZoom = var41.zoom2d * 100 / var5;
class22.method295(var16); WorldMapRectangle.method295(var16);
} else { } else {
var16.itemId = var6; var16.itemId = var6;
var16.itemQuantity = var5; var16.itemQuantity = var5;
@@ -4959,7 +4959,7 @@ public final class Client extends GameShell implements Usernamed {
var16.modelZoom = var16.modelZoom * 32 / var16.rawWidth; var16.modelZoom = var16.modelZoom * 32 / var16.rawWidth;
} }
class22.method295(var16); WorldMapRectangle.method295(var16);
} }
var1.serverPacket0 = null; var1.serverPacket0 = null;
@@ -5159,7 +5159,7 @@ public final class Client extends GameShell implements Usernamed {
} }
if (var8 != null) { if (var8 != null) {
class22.method295(var8); WorldMapRectangle.method295(var8);
} }
GrandExchangeOfferAgeComparator.method159(); GrandExchangeOfferAgeComparator.method159();
@@ -5187,7 +5187,7 @@ public final class Client extends GameShell implements Usernamed {
var16.rawY = var6; var16.rawY = var6;
var16.xAlignment = 0; var16.xAlignment = 0;
var16.yAlignment = 0; var16.yAlignment = 0;
class22.method295(var16); WorldMapRectangle.method295(var16);
this.alignWidget(var16); this.alignWidget(var16);
if (var16.type == 0) { if (var16.type == 0) {
class39.revalidateWidgetScroll(Widget.interfaceComponents[var38 >> 16], var16, false); class39.revalidateWidgetScroll(Widget.interfaceComponents[var38 >> 16], var16, false);
@@ -5205,7 +5205,7 @@ public final class Client extends GameShell implements Usernamed {
if (var8.modelType != 2 || var38 != var8.modelId) { if (var8.modelType != 2 || var38 != var8.modelId) {
var8.modelType = 2; var8.modelType = 2;
var8.modelId = var38; var8.modelId = var38;
class22.method295(var8); WorldMapRectangle.method295(var8);
} }
var1.serverPacket0 = null; var1.serverPacket0 = null;
@@ -5257,12 +5257,12 @@ public final class Client extends GameShell implements Usernamed {
var15 = Huffman.getWidget(var6); var15 = Huffman.getWidget(var6);
if (var15 != null) { if (var15 != null) {
class22.method295(var15); WorldMapRectangle.method295(var15);
} }
var15 = Huffman.getWidget(var38); var15 = Huffman.getWidget(var38);
if (var15 != null) { if (var15 != null) {
class22.method295(var15); WorldMapRectangle.method295(var15);
class39.revalidateWidgetScroll(Widget.interfaceComponents[var15.id >>> 16], var15, true); class39.revalidateWidgetScroll(Widget.interfaceComponents[var15.id >>> 16], var15, true);
} }
@@ -5284,7 +5284,7 @@ public final class Client extends GameShell implements Usernamed {
Widget var48 = Huffman.getWidget(var38); Widget var48 = Huffman.getWidget(var38);
if (var12 != var48.color) { if (var12 != var48.color) {
var48.color = var12; var48.color = var12;
class22.method295(var48); WorldMapRectangle.method295(var48);
} }
var1.serverPacket0 = null; var1.serverPacket0 = null;
@@ -5321,9 +5321,9 @@ public final class Client extends GameShell implements Usernamed {
if (ServerPacket.field814 == var1.serverPacket0) { if (ServerPacket.field814 == var1.serverPacket0) {
Canvas.field95 = var3.readUnsignedByteNegate(); 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) { for (var6 = Canvas.field95; var6 < Canvas.field95 + 8; ++var6) {
if (groundItems[SoundSystem.plane][var38][var6] != null) { if (groundItems[SoundSystem.plane][var38][var6] != null) {
groundItems[SoundSystem.plane][var38][var6] = null; groundItems[SoundSystem.plane][var38][var6] = null;
@@ -5333,7 +5333,7 @@ public final class Client extends GameShell implements Usernamed {
} }
for (PendingSpawn var46 = (PendingSpawn)pendingSpawns.last(); var46 != null; var46 = (PendingSpawn)pendingSpawns.previous()) { 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; var46.hitpoints = 0;
} }
} }
@@ -5349,7 +5349,7 @@ public final class Client extends GameShell implements Usernamed {
if (var8.modelType != 1 || var6 != var8.modelId) { if (var8.modelType != 1 || var6 != var8.modelId) {
var8.modelType = 1; var8.modelType = 1;
var8.modelId = var6; var8.modelId = var6;
class22.method295(var8); WorldMapRectangle.method295(var8);
} }
var1.serverPacket0 = null; var1.serverPacket0 = null;
@@ -5415,7 +5415,7 @@ public final class Client extends GameShell implements Usernamed {
var8 = Huffman.getWidget(var38); var8 = Huffman.getWidget(var38);
if (!var4.equals(var8.text)) { if (!var4.equals(var8.text)) {
var8.text = var4; var8.text = var4;
class22.method295(var8); WorldMapRectangle.method295(var8);
} }
var1.serverPacket0 = null; var1.serverPacket0 = null;
@@ -5450,7 +5450,7 @@ public final class Client extends GameShell implements Usernamed {
var38 = GrandExchangeOffer.field376 * 128 + 64; var38 = GrandExchangeOffer.field376 * 128 + 64;
var6 = KeyHandler.field445 * 128 + 64; var6 = KeyHandler.field445 * 128 + 64;
var5 = class32.getTileHeight(var38, var6, SoundSystem.plane) - ArchiveDiskAction.field410; var5 = class32.getTileHeight(var38, var6, SoundSystem.plane) - ArchiveDiskAction.field410;
var10 = var38 - WorldMapSection1.cameraX; var10 = var38 - WorldMapSection2.cameraX;
var11 = var5 - GrandExchangeEvents.cameraY; var11 = var5 - GrandExchangeEvents.cameraY;
var12 = var6 - GrandExchangeOfferNameComparator.cameraZ; var12 = var6 - GrandExchangeOfferNameComparator.cameraZ;
var13 = (int)Math.sqrt((double)(var12 * var12 + var10 * var10)); var13 = (int)Math.sqrt((double)(var12 * var12 + var10 * var10));
@@ -5484,7 +5484,7 @@ public final class Client extends GameShell implements Usernamed {
if (var6 != var8.scrollY) { if (var6 != var8.scrollY) {
var8.scrollY = var6; var8.scrollY = var6;
class22.method295(var8); WorldMapRectangle.method295(var8);
} }
} }
@@ -5598,7 +5598,7 @@ public final class Client extends GameShell implements Usernamed {
rootInterface = var6; rootInterface = var6;
this.method87(false); this.method87(false);
DevicePcmPlayerProvider.method845(rootInterface); DevicePcmPlayerProvider.method845(rootInterface);
WorldMapSection3.runWidgetOnLoadListener(rootInterface); WorldMapSection1.runWidgetOnLoadListener(rootInterface);
for (var10 = 0; var10 < 100; ++var10) { for (var10 = 0; var10 < 100; ++var10) {
field100[var10] = true; field100[var10] = true;
@@ -5713,7 +5713,7 @@ public final class Client extends GameShell implements Usernamed {
} }
if (field127 != null) { if (field127 != null) {
class22.method295(field127); WorldMapRectangle.method295(field127);
field127 = null; field127 = null;
} }
@@ -5936,7 +5936,7 @@ public final class Client extends GameShell implements Usernamed {
} }
if (var15 != -1) { if (var15 != -1) {
WorldMapSection0.method245(var15); WorldMapSection3.method245(var15);
} }
isMenuOpen = false; isMenuOpen = false;
@@ -5969,7 +5969,7 @@ public final class Client extends GameShell implements Usernamed {
} }
if ((var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) && menuOptionsCount > 0) { if ((var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) && menuOptionsCount > 0) {
WorldMapSection0.method245(var2); WorldMapSection3.method245(var2);
} }
if (var11 == 2 && menuOptionsCount > 0) { if (var11 == 2 && menuOptionsCount > 0) {
@@ -5989,7 +5989,7 @@ public final class Client extends GameShell implements Usernamed {
field207 = false; field207 = false;
itemDragDuration = 0; itemDragDuration = 0;
if (DevicePcmPlayerProvider.dragInventoryWidget != null) { if (DevicePcmPlayerProvider.dragInventoryWidget != null) {
class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); WorldMapRectangle.method295(DevicePcmPlayerProvider.dragInventoryWidget);
} }
DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var13); DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var13);
@@ -6005,7 +6005,7 @@ public final class Client extends GameShell implements Usernamed {
GrandExchangeOfferUnitPriceComparator.tempMenuAction.action = menuActions[var2]; GrandExchangeOfferUnitPriceComparator.tempMenuAction.action = menuActions[var2];
} }
class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); WorldMapRectangle.method295(DevicePcmPlayerProvider.dragInventoryWidget);
return; return;
} }
} }
@@ -6111,7 +6111,7 @@ public final class Client extends GameShell implements Usernamed {
var4 = var2.height; var4 = var2.height;
} }
WorldMapSection3.alignWidgetSize(component, var3, var4, false); WorldMapSection1.alignWidgetSize(component, var3, var4, false);
FloorOverlayDefinition.alignWidgetPosition(component, var3, var4); FloorOverlayDefinition.alignWidgetPosition(component, var3, var4);
} }
@@ -6121,7 +6121,7 @@ public final class Client extends GameShell implements Usernamed {
garbageValue = "715978124" garbageValue = "715978124"
) )
final void method88() { final void method88() {
class22.method295(clickedWidget); WorldMapRectangle.method295(clickedWidget);
++MouseRecorder.widgetDragDuration; ++MouseRecorder.widgetDragDuration;
if (field103 && field106) { if (field103 && field106) {
int var1 = MouseHandler.MouseHandler_x; int var1 = MouseHandler.MouseHandler_x;
runescape-client/src/main/java/DesktopPlatformInfoProvider.java
+3 -3
View File
@@ -15,11 +15,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
@Export("get") @Export("get")
public PlatformInfo get() { public PlatformInfo get() {
byte var1; byte var1;
if (WorldMapSection3.osNameLowerCase.startsWith("win")) { if (WorldMapSection1.osNameLowerCase.startsWith("win")) {
var1 = 1; var1 = 1;
} else if (WorldMapSection3.osNameLowerCase.startsWith("mac")) { } else if (WorldMapSection1.osNameLowerCase.startsWith("mac")) {
var1 = 2; var1 = 2;
} else if (WorldMapSection3.osNameLowerCase.startsWith("linux")) { } else if (WorldMapSection1.osNameLowerCase.startsWith("linux")) {
var1 = 3; var1 = 3;
} else { } else {
var1 = 4; var1 = 4;
runescape-client/src/main/java/DevicePcmPlayerProvider.java
+13 -13
View File
@@ -295,7 +295,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
} }
if (var10.contentType == 1339) { if (var10.contentType == 1339) {
class22.method296(var10, var12, var13, var11); WorldMapRectangle.method296(var10, var12, var13, var11);
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
continue; continue;
} }
@@ -370,7 +370,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
if (var36 != null) { if (var36 != null) {
var36.drawAt2(var21, var26); var36.drawAt2(var21, var26);
} else if (Widget.field957) { } else if (Widget.field957) {
class22.method295(var10); WorldMapRectangle.method295(var10);
} }
} }
} else { } else {
@@ -418,7 +418,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var47.scrollY -= var45; var47.scrollY -= var45;
Client.field206 += var45; Client.field206 += var45;
class22.method295(var47); WorldMapRectangle.method295(var47);
} }
if (var24 + var26 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var47.scrollY < var47.scrollHeight - var47.height) { 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; var47.scrollY += var45;
Client.field206 -= var45; Client.field206 -= var45;
class22.method295(var47); WorldMapRectangle.method295(var47);
} }
} }
} else if (var10 == BoundaryObject.field40 && var22 == Client.field204) { } else if (var10 == BoundaryObject.field40 && var22 == Client.field204) {
@@ -442,7 +442,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var42.drawAt2(var21, var26); var42.drawAt2(var21, var26);
} }
} else { } else {
class22.method295(var10); WorldMapRectangle.method295(var10);
} }
} }
} }
@@ -466,7 +466,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
if (var10.fill) { if (var10.fill) {
switch(var10.rectangleMode.id) { switch(var10.rectangleMode.id) {
case 1: case 1:
Rasterizer2D.drawGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); Rasterizer2D.Rasterizer2D_drawGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2);
break; break;
case 2: case 2:
Rasterizer2D.drawGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparency & 255), 255 - (var10.field960 & 255)); Rasterizer2D.drawGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparency & 255), 255 - (var10.field960 & 255));
@@ -489,7 +489,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var27 = var10.getFont(); var27 = var10.getFont();
if (var27 == null) { if (var27 == null) {
if (Widget.field957) { if (Widget.field957) {
class22.method295(var10); WorldMapRectangle.method295(var10);
} }
} else { } else {
String var38 = var10.text; String var38 = var10.text;
@@ -539,7 +539,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
if (var37 != null) { if (var37 != null) {
var37.drawAt2(var12, var13); var37.drawAt2(var12, var13);
} else if (Widget.field957) { } else if (Widget.field957) {
class22.method295(var10); WorldMapRectangle.method295(var10);
} }
} else { } else {
if (var10.itemId != -1) { if (var10.itemId != -1) {
@@ -550,7 +550,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
if (var37 == null) { if (var37 == null) {
if (Widget.field957) { if (Widget.field957) {
class22.method295(var10); WorldMapRectangle.method295(var10);
} }
} else { } else {
var19 = var37.width; var19 = var37.width;
@@ -608,7 +608,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var43.calculateBoundsCylinder(); var43.calculateBoundsCylinder();
var21 = var43.height / 2; var21 = var43.height / 2;
} else { } else {
class22.method295(var10); WorldMapRectangle.method295(var10);
} }
} }
} else if (var10.modelType == 5) { } else if (var10.modelType == 5) {
@@ -620,13 +620,13 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
} else if (var19 == -1) { } else if (var19 == -1) {
var43 = var10.getModel((SequenceDefinition)null, -1, var40, Canvas.localPlayer.appearance); var43 = var10.getModel((SequenceDefinition)null, -1, var40, Canvas.localPlayer.appearance);
if (var43 == null && Widget.field957) { if (var43 == null && Widget.field957) {
class22.method295(var10); WorldMapRectangle.method295(var10);
} }
} else { } else {
SequenceDefinition var44 = WorldMapAreaData.getSequenceDefinition(var19); SequenceDefinition var44 = WorldMapAreaData.getSequenceDefinition(var19);
var43 = var10.getModel(var44, var10.modelFrame, var40, Canvas.localPlayer.appearance); var43 = var10.getModel(var44, var10.modelFrame, var40, Canvas.localPlayer.appearance);
if (var43 == null && Widget.field957) { if (var43 == null && Widget.field957) {
class22.method295(var10); WorldMapRectangle.method295(var10);
} }
} }
@@ -652,7 +652,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var27 = var10.getFont(); var27 = var10.getFont();
if (var27 == null) { if (var27 == null) {
if (Widget.field957) { if (Widget.field957) {
class22.method295(var10); WorldMapRectangle.method295(var10);
} }
continue; continue;
} }
runescape-client/src/main/java/DynamicObject.java
+1 -1
View File
@@ -627,7 +627,7 @@ public class DynamicObject extends Entity {
Client.soundEffectCount = 0; Client.soundEffectCount = 0;
Client.isCameraLocked = false; Client.isCameraLocked = false;
WorldMapSection1.cameraX -= var5 << 7; WorldMapSection2.cameraX -= var5 << 7;
GrandExchangeOfferNameComparator.cameraZ -= var6 << 7; GrandExchangeOfferNameComparator.cameraZ -= var6 << 7;
MouseHandler.oculusOrbFocalPointX -= var5 << 7; MouseHandler.oculusOrbFocalPointX -= var5 << 7;
ScriptEvent.oculusOrbFocalPointY -= var6 << 7; ScriptEvent.oculusOrbFocalPointY -= var6 << 7;
runescape-client/src/main/java/FloorOverlayDefinition.java
+5 -3
View File
@@ -11,12 +11,14 @@ public class FloorOverlayDefinition extends DualNode {
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lir;" signature = "Lir;"
) )
public static AbstractArchive field663; @Export("FloorOverlayDefinition_archive")
public static AbstractArchive FloorOverlayDefinition_archive;
@ObfuscatedName("f") @ObfuscatedName("f")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Ler;" signature = "Ler;"
) )
public static EvictingDualNodeHashTable field664; @Export("FloorOverlayDefinition_cached")
public static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
@ObfuscatedName("q") @ObfuscatedName("q")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -111851793 intValue = -111851793
@@ -240,6 +242,6 @@ public class FloorOverlayDefinition extends DualNode {
} }
static { static {
field664 = new EvictingDualNodeHashTable(64); FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64);
} }
} }
runescape-client/src/main/java/FloorUnderlayDefinition.java
+2 -2
View File
@@ -176,8 +176,8 @@ public class FloorUnderlayDefinition extends DualNode {
signature = "(I)[Lip;", signature = "(I)[Lip;",
garbageValue = "618327716" garbageValue = "618327716"
) )
static class249[] method4839() { static VerticalAlignment[] method4839() {
return new class249[]{class249.field3277, class249.field3273, class249.field3274}; return new VerticalAlignment[]{VerticalAlignment.field3277, VerticalAlignment.field3273, VerticalAlignment.field3274};
} }
static { static {
runescape-client/src/main/java/FontName.java
+1 -1
View File
@@ -485,7 +485,7 @@ public class FontName {
SecureRandomFuture.archive5.method8(); SecureRandomFuture.archive5.method8();
UserComparator3.archive6.method8(); UserComparator3.archive6.method8();
class40.archive7.method8(); class40.archive7.method8();
WorldMapSection3.archive8.method8(); WorldMapSection1.archive8.method8();
class238.archive9.method8(); class238.archive9.method8();
class16.archive10.method8(); class16.archive10.method8();
Login.archive11.method8(); Login.archive11.method8();
runescape-client/src/main/java/FriendSystem.java
+1 -1
View File
@@ -202,7 +202,7 @@ public class FriendSystem {
var4 = "You can't add yourself to your own ignore list"; var4 = "You can't add yourself to your own ignore list";
WorldMapIcon1.addGameMessage(30, "", var4); WorldMapIcon1.addGameMessage(30, "", var4);
} else if (this.isIgnored(var2)) { } else if (this.isIgnored(var2)) {
class22.method294(var1); WorldMapRectangle.method294(var1);
} else { } else {
PacketBufferNode var5; PacketBufferNode var5;
if (this.isFriended(var2, false)) { if (this.isFriended(var2, false)) {
runescape-client/src/main/java/GameShell.java
+3 -3
View File
@@ -1037,14 +1037,14 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
if (gameState != 5 && gameState != 10) { if (gameState != 5 && gameState != 10) {
if (gameState == 20) { 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) { } else if (gameState == 11) {
class2.method27(class16.archive10, WorldMapSection3.archive8, false, 4); class2.method27(class16.archive10, WorldMapSection1.archive8, false, 4);
} else { } else {
class80.method2015(); class80.method2015();
} }
} else { } else {
class2.method27(class16.archive10, WorldMapSection3.archive8, true, 0); class2.method27(class16.archive10, WorldMapSection1.archive8, true, 0);
} }
Client.gameState = gameState; Client.gameState = gameState;
runescape-client/src/main/java/GrandExchangeEvent.java
+1 -1
View File
@@ -238,7 +238,7 @@ public class GrandExchangeEvent {
Interpreter.Interpreter_stringLocals = var30.stringLocals; Interpreter.Interpreter_stringLocals = var30.stringLocals;
} else if (var13 == ScriptOpcodes.GET_VARBIT) { } else if (var13 == ScriptOpcodes.GET_VARBIT) {
var11 = var6[var4]; 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) { } else if (var13 == ScriptOpcodes.SET_VARBIT) {
var11 = var6[var4]; var11 = var6[var4];
PendingSpawn.method1695(var11, Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); PendingSpawn.method1695(var11, Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
+1 -1
View File
@@ -145,7 +145,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
var4 = (int)var0.key; var4 = (int)var0.key;
Widget var5 = Huffman.getWidget(var4); Widget var5 = Huffman.getWidget(var4);
if (var5 != null) { if (var5 != null) {
class22.method295(var5); WorldMapRectangle.method295(var5);
} }
} }
} }
runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
+1 -1
View File
@@ -83,7 +83,7 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator {
var2 = Canvas.localPlayer.y >> 7; var2 = Canvas.localPlayer.y >> 7;
} }
int var3 = WorldMapSection1.cameraX >> 7; int var3 = WorldMapSection2.cameraX >> 7;
int var4 = GrandExchangeOfferNameComparator.cameraZ >> 7; int var4 = GrandExchangeOfferNameComparator.cameraZ >> 7;
if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) {
return SoundSystem.plane; return SoundSystem.plane;
runescape-client/src/main/java/HitSplatDefinition.java
+1 -1
View File
@@ -231,7 +231,7 @@ public class HitSplatDefinition extends DualNode {
public final HitSplatDefinition transform() { public final HitSplatDefinition transform() {
int var1 = -1; int var1 = -1;
if (this.transformVarbit != -1) { if (this.transformVarbit != -1) {
var1 = WorldMapSection2.getVarbit(this.transformVarbit); var1 = WorldMapSection0.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) { } else if (this.transformVarp != -1) {
var1 = Varps.Varps_main[this.transformVarp]; var1 = Varps.Varps_main[this.transformVarp];
} }
runescape-client/src/main/java/class266.java → runescape-client/src/main/java/HorizontalAlignment.java
+7 -4
View File
@@ -1,10 +1,12 @@
import net.runelite.mapping.Export; import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature; import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ju") @ObfuscatedName("ju")
public enum class266 implements Enumerated { @Implements("HorizontalAlignment")
public enum HorizontalAlignment implements Enumerated {
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lju;" signature = "Lju;"
@@ -28,7 +30,8 @@ public enum class266 implements Enumerated {
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -739868097 intValue = -739868097
) )
public final int field3528; @Export("value")
public final int value;
@ObfuscatedName("o") @ObfuscatedName("o")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1327532101 intValue = -1327532101
@@ -36,8 +39,8 @@ public enum class266 implements Enumerated {
@Export("id") @Export("id")
final int id; final int id;
private class266(int var3, int var4) { private HorizontalAlignment(int var3, int var4) {
this.field3528 = var3; this.value = var3;
this.id = var4; this.id = var4;
} }
runescape-client/src/main/java/Huffman.java
+41 -36
View File
@@ -16,18 +16,21 @@ public class Huffman {
@Export("canvasHeight") @Export("canvasHeight")
public static int canvasHeight; public static int canvasHeight;
@ObfuscatedName("m") @ObfuscatedName("m")
int[] field399; @Export("masks")
int[] masks;
@ObfuscatedName("f") @ObfuscatedName("f")
byte[] field400; @Export("bits")
byte[] bits;
@ObfuscatedName("q") @ObfuscatedName("q")
int[] field401; @Export("keys")
int[] keys;
public Huffman(byte[] var1) { public Huffman(byte[] var1) {
int var2 = var1.length; int var2 = var1.length;
this.field399 = new int[var2]; this.masks = new int[var2];
this.field400 = var1; this.bits = var1;
int[] var3 = new int[33]; int[] var3 = new int[33];
this.field401 = new int[8]; this.keys = new int[8];
int var4 = 0; int var4 = 0;
for (int var5 = 0; var5 < var2; ++var5) { for (int var5 = 0; var5 < var2; ++var5) {
@@ -35,7 +38,7 @@ public class Huffman {
if (var6 != 0) { if (var6 != 0) {
int var7 = 1 << 32 - var6; int var7 = 1 << 32 - var6;
int var8 = var3[var6]; int var8 = var3[var6];
this.field399[var5] = var8; this.masks[var5] = var8;
int var9; int var9;
int var10; int var10;
int var11; int var11;
@@ -74,29 +77,29 @@ public class Huffman {
for (var11 = 0; var11 < var6; ++var11) { for (var11 = 0; var11 < var6; ++var11) {
var12 = Integer.MIN_VALUE >>> var11; var12 = Integer.MIN_VALUE >>> var11;
if ((var8 & var12) != 0) { if ((var8 & var12) != 0) {
if (this.field401[var10] == 0) { if (this.keys[var10] == 0) {
this.field401[var10] = var4; this.keys[var10] = var4;
} }
var10 = this.field401[var10]; var10 = this.keys[var10];
} else { } else {
++var10; ++var10;
} }
if (var10 >= this.field401.length) { if (var10 >= this.keys.length) {
int[] var13 = new int[this.field401.length * 2]; int[] var13 = new int[this.keys.length * 2];
for (int var14 = 0; var14 < this.field401.length; ++var14) { for (int var14 = 0; var14 < this.keys.length; ++var14) {
var13[var14] = this.field401[var14]; var13[var14] = this.keys[var14];
} }
this.field401 = var13; this.keys = var13;
} }
var12 >>>= 1; var12 >>>= 1;
} }
this.field401[var10] = ~var5; this.keys[var10] = ~var5;
if (var10 >= var4) { if (var10 >= var4) {
var4 = var10 + 1; var4 = var10 + 1;
} }
@@ -110,14 +113,15 @@ public class Huffman {
signature = "([BII[BIB)I", signature = "([BII[BIB)I",
garbageValue = "64" 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 var6 = 0;
int var7 = var5 << 3; int var7 = var5 << 3;
for (var3 += var2; var2 < var3; ++var2) { for (var3 += var2; var2 < var3; ++var2) {
int var8 = var1[var2] & 255; int var8 = var1[var2] & 255;
int var9 = this.field399[var8]; int var9 = this.masks[var8];
byte var10 = this.field400[var8]; byte var10 = this.bits[var8];
if (var10 == 0) { if (var10 == 0) {
throw new RuntimeException(""); throw new RuntimeException("");
} }
@@ -160,7 +164,8 @@ public class Huffman {
signature = "([BI[BIII)I", signature = "([BI[BIII)I",
garbageValue = "-2094399899" 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) { if (var5 == 0) {
return 0; return 0;
} else { } else {
@@ -171,13 +176,13 @@ public class Huffman {
while (true) { while (true) {
byte var8 = var1[var7]; byte var8 = var1[var7];
if (var8 < 0) { if (var8 < 0) {
var6 = this.field401[var6]; var6 = this.keys[var6];
} else { } else {
++var6; ++var6;
} }
int var9; int var9;
if ((var9 = this.field401[var6]) < 0) { if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9); var3[var4++] = (byte)(~var9);
if (var4 >= var5) { if (var4 >= var5) {
break; break;
@@ -187,12 +192,12 @@ public class Huffman {
} }
if ((var8 & 64) != 0) { if ((var8 & 64) != 0) {
var6 = this.field401[var6]; var6 = this.keys[var6];
} else { } else {
++var6; ++var6;
} }
if ((var9 = this.field401[var6]) < 0) { if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9); var3[var4++] = (byte)(~var9);
if (var4 >= var5) { if (var4 >= var5) {
break; break;
@@ -202,12 +207,12 @@ public class Huffman {
} }
if ((var8 & 32) != 0) { if ((var8 & 32) != 0) {
var6 = this.field401[var6]; var6 = this.keys[var6];
} else { } else {
++var6; ++var6;
} }
if ((var9 = this.field401[var6]) < 0) { if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9); var3[var4++] = (byte)(~var9);
if (var4 >= var5) { if (var4 >= var5) {
break; break;
@@ -217,12 +222,12 @@ public class Huffman {
} }
if ((var8 & 16) != 0) { if ((var8 & 16) != 0) {
var6 = this.field401[var6]; var6 = this.keys[var6];
} else { } else {
++var6; ++var6;
} }
if ((var9 = this.field401[var6]) < 0) { if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9); var3[var4++] = (byte)(~var9);
if (var4 >= var5) { if (var4 >= var5) {
break; break;
@@ -232,12 +237,12 @@ public class Huffman {
} }
if ((var8 & 8) != 0) { if ((var8 & 8) != 0) {
var6 = this.field401[var6]; var6 = this.keys[var6];
} else { } else {
++var6; ++var6;
} }
if ((var9 = this.field401[var6]) < 0) { if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9); var3[var4++] = (byte)(~var9);
if (var4 >= var5) { if (var4 >= var5) {
break; break;
@@ -247,12 +252,12 @@ public class Huffman {
} }
if ((var8 & 4) != 0) { if ((var8 & 4) != 0) {
var6 = this.field401[var6]; var6 = this.keys[var6];
} else { } else {
++var6; ++var6;
} }
if ((var9 = this.field401[var6]) < 0) { if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9); var3[var4++] = (byte)(~var9);
if (var4 >= var5) { if (var4 >= var5) {
break; break;
@@ -262,12 +267,12 @@ public class Huffman {
} }
if ((var8 & 2) != 0) { if ((var8 & 2) != 0) {
var6 = this.field401[var6]; var6 = this.keys[var6];
} else { } else {
++var6; ++var6;
} }
if ((var9 = this.field401[var6]) < 0) { if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9); var3[var4++] = (byte)(~var9);
if (var4 >= var5) { if (var4 >= var5) {
break; break;
@@ -277,12 +282,12 @@ public class Huffman {
} }
if ((var8 & 1) != 0) { if ((var8 & 1) != 0) {
var6 = this.field401[var6]; var6 = this.keys[var6];
} else { } else {
++var6; ++var6;
} }
if ((var9 = this.field401[var6]) < 0) { if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9); var3[var4++] = (byte)(~var9);
if (var4 >= var5) { if (var4 >= var5) {
break; break;
runescape-client/src/main/java/Interpreter.java
+3 -3
View File
@@ -149,15 +149,15 @@ public class Interpreter {
) )
public static void method1976() { public static void method1976() {
try { try {
File var0 = new File(WorldMapSection1.userHomeDirectory, "random.dat"); File var0 = new File(WorldMapSection2.userHomeDirectory, "random.dat");
int var1; int var1;
if (var0.exists()) { if (var0.exists()) {
class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0);
} else { } else {
label34: label34:
for (int var2 = 0; var2 < Canvas.field94.length; ++var2) { for (int var2 = 0; var2 < Canvas.field94.length; ++var2) {
for (var1 = 0; var1 < WorldMapSection2.cacheDirectoryLocations.length; ++var1) { for (var1 = 0; var1 < WorldMapSection0.cacheDirectoryLocations.length; ++var1) {
File var3 = new File(WorldMapSection2.cacheDirectoryLocations[var1] + Canvas.field94[var2] + File.separatorChar + "random.dat"); File var3 = new File(WorldMapSection0.cacheDirectoryLocations[var1] + Canvas.field94[var2] + File.separatorChar + "random.dat");
if (var3.exists()) { if (var3.exists()) {
class168.randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); class168.randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0);
break label34; break label34;
runescape-client/src/main/java/KitDefinition.java
+1 -1
View File
@@ -251,7 +251,7 @@ public class KitDefinition extends DualNode {
} }
byte[] var3 = new byte[var2]; 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); String var4 = InterfaceParent.decodeStringCp1252(var3, 0, var2);
var1 = var4; var1 = var4;
} catch (Exception var5) { } catch (Exception var5) {
runescape-client/src/main/java/Login.java
+2 -2
View File
@@ -205,8 +205,8 @@ public class Login {
if (ReflectionCheck.clientPreferences.roofsHidden) { if (ReflectionCheck.clientPreferences.roofsHidden) {
return SoundSystem.plane; return SoundSystem.plane;
} else { } else {
int var0 = class32.getTileHeight(WorldMapSection1.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane); int var0 = class32.getTileHeight(WorldMapSection2.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; return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection2.cameraX >> 7][GrandExchangeOfferNameComparator.cameraZ >> 7] & 4) != 0 ? SoundSystem.plane : 3;
} }
} }
runescape-client/src/main/java/LoginPacket.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class LoginPacket implements ClientPacketMarker {
var4 = "_wip"; 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; AccessFile var6;
if (!var2 && var5.exists()) { if (!var2 && var5.exists()) {
try { try {
runescape-client/src/main/java/LoginScreenAnimation.java
+2
View File
@@ -4,11 +4,13 @@ import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.util.Random; import java.util.Random;
import net.runelite.mapping.Export; import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature; import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("bp") @ObfuscatedName("bp")
@Implements("LoginScreenAnimation")
public class LoginScreenAnimation { public class LoginScreenAnimation {
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
runescape-client/src/main/java/MenuAction.java
+1 -1
View File
@@ -82,7 +82,7 @@ public class MenuAction {
Widget var12 = Huffman.getWidget(var3); Widget var12 = Huffman.getWidget(var3);
if (var12 != null) { if (var12 != null) {
class22.method295(var12); WorldMapRectangle.method295(var12);
} }
int var5; int var5;
runescape-client/src/main/java/NPCDefinition.java
+2 -2
View File
@@ -505,7 +505,7 @@ public class NPCDefinition extends DualNode {
public final NPCDefinition transform() { public final NPCDefinition transform() {
int var1 = -1; int var1 = -1;
if (this.transformVarbit != -1) { if (this.transformVarbit != -1) {
var1 = WorldMapSection2.getVarbit(this.transformVarbit); var1 = WorldMapSection0.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) { } else if (this.transformVarp != -1) {
var1 = Varps.Varps_main[this.transformVarp]; var1 = Varps.Varps_main[this.transformVarp];
} }
@@ -531,7 +531,7 @@ public class NPCDefinition extends DualNode {
} else { } else {
int var1 = -1; int var1 = -1;
if (this.transformVarbit != -1) { if (this.transformVarbit != -1) {
var1 = WorldMapSection2.getVarbit(this.transformVarbit); var1 = WorldMapSection0.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) { } else if (this.transformVarp != -1) {
var1 = Varps.Varps_main[this.transformVarp]; var1 = Varps.Varps_main[this.transformVarp];
} }
runescape-client/src/main/java/NetFileRequest.java
+2 -2
View File
@@ -61,7 +61,7 @@ public class NetFileRequest extends DualNode {
if (var7 != -1) { if (var7 != -1) {
SequenceDefinition var6 = WorldMapAreaData.getSequenceDefinition(var7); 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.modelFrameCycle -= var6.frameLengths[var3.modelFrame];
++var3.modelFrame; ++var3.modelFrame;
if (var3.modelFrame >= var6.frameIds.length) { if (var3.modelFrame >= var6.frameIds.length) {
@@ -81,7 +81,7 @@ public class NetFileRequest extends DualNode {
var7 *= Client.field183; var7 *= Client.field183;
var3.modelAngleX = var8 + var3.modelAngleX & 2047; var3.modelAngleX = var8 + var3.modelAngleX & 2047;
var3.modelAngleY = var7 + var3.modelAngleY & 2047; var3.modelAngleY = var7 + var3.modelAngleY & 2047;
class22.method295(var3); WorldMapRectangle.method295(var3);
} }
} }
} }
runescape-client/src/main/java/NetSocket.java
+1 -1
View File
@@ -435,7 +435,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
var18 = var25; var18 = var25;
} else if (var2 == 2) { } else if (var2 == 2) {
var18 = WorldMapSection2.method593(var0, var1, var3, var4); var18 = WorldMapSection0.method593(var0, var1, var3, var4);
} else { } else {
var18 = ArchiveDisk.method3585(var0, var1, var2, var3, var4); var18 = ArchiveDisk.method3585(var0, var1, var2, var3, var4);
} }
runescape-client/src/main/java/ObjectDefinition.java
+1 -1
View File
@@ -826,7 +826,7 @@ public class ObjectDefinition extends DualNode {
public final ObjectDefinition transform() { public final ObjectDefinition transform() {
int var1 = -1; int var1 = -1;
if (this.transformVarbit != -1) { if (this.transformVarbit != -1) {
var1 = WorldMapSection2.getVarbit(this.transformVarbit); var1 = WorldMapSection0.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) { } else if (this.transformVarp != -1) {
var1 = Varps.Varps_main[this.transformVarp]; var1 = Varps.Varps_main[this.transformVarp];
} }
runescape-client/src/main/java/Occluder.java
+2 -1
View File
@@ -114,7 +114,8 @@ public final class Occluder {
signature = "(IB)Lia;", signature = "(IB)Lia;",
garbageValue = "16" 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); VarbitDefinition var1 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0);
if (var1 != null) { if (var1 != null) {
return var1; return var1;
runescape-client/src/main/java/PendingSpawn.java
+1 -1
View File
@@ -96,7 +96,7 @@ public final class PendingSpawn extends Node {
garbageValue = "1641191614" garbageValue = "1641191614"
) )
public static void method1695(int var0, int var1) { public static void method1695(int var0, int var1) {
VarbitDefinition var2 = Occluder.method3255(var0); VarbitDefinition var2 = Occluder.getVarbitDefinition(var0);
int var3 = var2.baseVar; int var3 = var2.baseVar;
int var4 = var2.startBit; int var4 = var2.startBit;
int var5 = var2.endBit; int var5 = var2.endBit;
runescape-client/src/main/java/Player.java
+1 -1
View File
@@ -530,7 +530,7 @@ public final class Player extends Actor {
} }
Client.isSpellSelected = false; Client.isSpellSelected = false;
class22.method295(var0); WorldMapRectangle.method295(var0);
} }
} }
runescape-client/src/main/java/PlayerAppearance.java
+6 -6
View File
@@ -54,7 +54,7 @@ public class PlayerAppearance {
for (int var5 = 0; var5 < 7; ++var5) { for (int var5 = 0; var5 < 7; ++var5) {
for (int var6 = 0; var6 < KitDefinition.field457; ++var6) { for (int var6 = 0; var6 < KitDefinition.field457; ++var6) {
KitDefinition var7 = WorldMapSection1.getKitDefinition(var6); KitDefinition var7 = WorldMapSection2.getKitDefinition(var6);
if (var7 != null && !var7.nonSelectable && var5 + (var3 ? 7 : 0) == var7.bodypartID) { if (var7 != null && !var7.nonSelectable && var5 + (var3 ? 7 : 0) == var7.bodypartID) {
var1[field727[var5]] = var6 + 256; var1[field727[var5]] = var6 + 256;
break; break;
@@ -97,7 +97,7 @@ public class PlayerAppearance {
} }
} }
var4 = WorldMapSection1.getKitDefinition(var3); var4 = WorldMapSection2.getKitDefinition(var3);
} while(var4 == null); } while(var4 == null);
} while(var4.nonSelectable); } while(var4.nonSelectable);
} while(var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); } while(var1 + (this.isFemale ? 7 : 0) != var4.bodypartID);
@@ -254,7 +254,7 @@ public class PlayerAppearance {
int var10; int var10;
for (int var11 = 0; var11 < 12; ++var11) { for (int var11 = 0; var11 < 12; ++var11) {
var10 = var7[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; var9 = true;
} }
@@ -282,7 +282,7 @@ public class PlayerAppearance {
var12 = var7[var13]; var12 = var7[var13];
ModelData var14; ModelData var14;
if (var12 >= 256 && var12 < 512) { if (var12 >= 256 && var12 < 512) {
var14 = WorldMapSection1.getKitDefinition(var12 - 256).getModelData(); var14 = WorldMapSection2.getKitDefinition(var12 - 256).getModelData();
if (var14 != null) { if (var14 != null) {
var17[var10++] = var14; var17[var10++] = var14;
} }
@@ -346,7 +346,7 @@ public class PlayerAppearance {
int var2; int var2;
for (int var3 = 0; var3 < 12; ++var3) { for (int var3 = 0; var3 < 12; ++var3) {
var2 = this.equipment[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; var1 = true;
} }
@@ -366,7 +366,7 @@ public class PlayerAppearance {
var4 = this.equipment[var5]; var4 = this.equipment[var5];
ModelData var6; ModelData var6;
if (var4 >= 256 && var4 < 512) { if (var4 >= 256 && var4 < 512) {
var6 = WorldMapSection1.getKitDefinition(var4 - 256).method162(); var6 = WorldMapSection2.getKitDefinition(var4 - 256).method162();
if (var6 != null) { if (var6 != null) {
var7[var2++] = var6; var7[var2++] = var6;
} }
runescape-client/src/main/java/Rasterizer2D.java
+70 -70
View File
@@ -228,19 +228,19 @@ public class Rasterizer2D extends DualNode {
@ObfuscatedName("dk") @ObfuscatedName("dk")
@Export("Rasterizer2D_drawCircleAlpha") @Export("Rasterizer2D_drawCircleAlpha")
public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int opacity) {
if (var4 != 0) { if (opacity != 0) {
if (var4 == 256) { if (opacity == 256) {
drawCircle(var0, var1, var2, var3); drawCircle(var0, var1, var2, var3);
} else { } else {
if (var2 < 0) { if (var2 < 0) {
var2 = -var2; var2 = -var2;
} }
int var5 = 256 - var4; int var5 = 256 - opacity;
int var6 = (var3 >> 16 & 255) * var4; int var6 = (var3 >> 16 & 255) * opacity;
int var7 = (var3 >> 8 & 255) * var4; int var7 = (var3 >> 8 & 255) * opacity;
int var8 = var4 * (var3 & 255); int var8 = opacity * (var3 & 255);
int var9 = var1 - var2; int var9 = var1 - var2;
if (var9 < Rasterizer2D_yClipStart) { if (var9 < Rasterizer2D_yClipStart) {
var9 = Rasterizer2D_yClipStart; var9 = Rasterizer2D_yClipStart;
@@ -411,40 +411,40 @@ public class Rasterizer2D extends DualNode {
} }
@Export("drawGradient") @Export("Rasterizer2D_drawGradient")
@ObfuscatedName("dw") @ObfuscatedName("dw")
public static void drawGradient(int var0, int var1, int var2, int var3, int var4, int var5) { public static void Rasterizer2D_drawGradient(int x, int y, int width, int height, int rgbTop, int rgbBot) {
if (var2 > 0 && var3 > 0) { if (width > 0 && height > 0) {
int var6 = 0; int var6 = 0;
int var7 = 65536 / var3; int var7 = 65536 / height;
if (var0 < Rasterizer2D_xClipStart) { if (x < Rasterizer2D_xClipStart) {
var2 -= Rasterizer2D_xClipStart - var0; width -= Rasterizer2D_xClipStart - x;
var0 = Rasterizer2D_xClipStart; x = Rasterizer2D_xClipStart;
} }
if (var1 < Rasterizer2D_yClipStart) { if (y < Rasterizer2D_yClipStart) {
var6 += (Rasterizer2D_yClipStart - var1) * var7; var6 += (Rasterizer2D_yClipStart - y) * var7;
var3 -= Rasterizer2D_yClipStart - var1; height -= Rasterizer2D_yClipStart - y;
var1 = Rasterizer2D_yClipStart; y = Rasterizer2D_yClipStart;
} }
if (var0 + var2 > Rasterizer2D_xClipEnd) { if (x + width > Rasterizer2D_xClipEnd) {
var2 = Rasterizer2D_xClipEnd - var0; width = Rasterizer2D_xClipEnd - x;
} }
if (var3 + var1 > Rasterizer2D_yClipEnd) { if (height + y > Rasterizer2D_yClipEnd) {
var3 = Rasterizer2D_yClipEnd - var1; height = Rasterizer2D_yClipEnd - y;
} }
int var8 = Rasterizer2D_width - var2; int var8 = Rasterizer2D_width - width;
int var9 = var0 + Rasterizer2D_width * var1; 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 var11 = 65536 - var6 >> 8;
int var12 = 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; Rasterizer2D_pixels[var9++] = var13;
} }
@@ -457,45 +457,45 @@ public class Rasterizer2D extends DualNode {
@ObfuscatedName("dv") @ObfuscatedName("dv")
@Export("drawGradientAlpha") @Export("drawGradientAlpha")
public static void drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { public static void drawGradientAlpha(int x, int y, int width, int height, int rgbTop, int rgbBot, int alphaTop, int alphaBot) {
if (var2 > 0 && var3 > 0) { if (width > 0 && height > 0) {
int var8 = 0; int var8 = 0;
int var9 = 65536 / var3; int var9 = 65536 / height;
if (var0 < Rasterizer2D_xClipStart) { if (x < Rasterizer2D_xClipStart) {
var2 -= Rasterizer2D_xClipStart - var0; width -= Rasterizer2D_xClipStart - x;
var0 = Rasterizer2D_xClipStart; x = Rasterizer2D_xClipStart;
} }
if (var1 < Rasterizer2D_yClipStart) { if (y < Rasterizer2D_yClipStart) {
var8 += (Rasterizer2D_yClipStart - var1) * var9; var8 += (Rasterizer2D_yClipStart - y) * var9;
var3 -= Rasterizer2D_yClipStart - var1; height -= Rasterizer2D_yClipStart - y;
var1 = Rasterizer2D_yClipStart; y = Rasterizer2D_yClipStart;
} }
if (var0 + var2 > Rasterizer2D_xClipEnd) { if (x + width > Rasterizer2D_xClipEnd) {
var2 = Rasterizer2D_xClipEnd - var0; width = Rasterizer2D_xClipEnd - x;
} }
if (var3 + var1 > Rasterizer2D_yClipEnd) { if (height + y > Rasterizer2D_yClipEnd) {
var3 = Rasterizer2D_yClipEnd - var1; height = Rasterizer2D_yClipEnd - y;
} }
int var10 = Rasterizer2D_width - var2; int var10 = Rasterizer2D_width - width;
int var11 = var0 + Rasterizer2D_width * var1; 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 var13 = 65536 - var8 >> 8;
int var14 = 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) { if (var15 == 0) {
var11 += Rasterizer2D_width; var11 += Rasterizer2D_width;
var8 += var9; var8 += var9;
} else { } 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 var17 = 255 - var15;
int var18 = ((var16 & 16711935) * var15 >> 8 & 16711935) + (var15 * (var16 & 65280) >> 8 & 65280); 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]; int var20 = Rasterizer2D_pixels[var11];
if (var20 == 0) { if (var20 == 0) {
Rasterizer2D_pixels[var11++] = var18; Rasterizer2D_pixels[var11++] = var18;
@@ -519,30 +519,30 @@ public class Rasterizer2D extends DualNode {
garbageValue = "1" garbageValue = "1"
) )
@Export("raster2d7") @Export("raster2d7")
public static void raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { public static void raster2d7(int x, int y, int width, int height, int var4, int var5, byte[] var6, int var7) {
if (var0 + var2 >= 0 && var3 + var1 >= 0 && var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { if (x + width >= 0 && height + y >= 0 && x < Rasterizer2D_width && y < Rasterizer2D_height) {
int var8 = 0; int var8 = 0;
int var9 = 0; int var9 = 0;
if (var0 < 0) { if (x < 0) {
var8 -= var0; var8 -= x;
var2 += var0; width += x;
} }
if (var1 < 0) { if (y < 0) {
var9 -= var1; var9 -= y;
var3 += var1; height += y;
} }
if (var0 + var2 > Rasterizer2D_width) { if (x + width > Rasterizer2D_width) {
var2 = Rasterizer2D_width - var0; width = Rasterizer2D_width - x;
} }
if (var3 + var1 > Rasterizer2D_height) { if (height + y > Rasterizer2D_height) {
var3 = Rasterizer2D_height - var1; height = Rasterizer2D_height - y;
} }
int var10 = var6.length / var7; int var10 = var6.length / var7;
int var11 = Rasterizer2D_width - var2; int var11 = Rasterizer2D_width - width;
int var12 = var4 >>> 24; int var12 = var4 >>> 24;
int var13 = var5 >>> 24; int var13 = var5 >>> 24;
int var14; int var14;
@@ -551,12 +551,12 @@ public class Rasterizer2D extends DualNode {
int var17; int var17;
int var18; int var18;
if (var12 == 255 && var13 == 255) { 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 (var15 = var9 + y; var15 < height + var9 + y; ++var15) {
for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { for (var16 = x + var8; var16 < x + var8 + width; ++var16) {
var17 = (var15 - var1) % var10; var17 = (var15 - y) % var10;
var18 = (var16 - var0) % var7; var18 = (var16 - x) % var7;
if (var6[var18 + var17 * var7] != 0) { if (var6[var18 + var17 * var7] != 0) {
Rasterizer2D_pixels[var14++] = var5; Rasterizer2D_pixels[var14++] = var5;
} else { } else {
@@ -567,12 +567,12 @@ public class Rasterizer2D extends DualNode {
var14 += var11; var14 += var11;
} }
} else { } 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 (var15 = var9 + y; var15 < height + var9 + y; ++var15) {
for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { for (var16 = x + var8; var16 < x + var8 + width; ++var16) {
var17 = (var15 - var1) % var10; var17 = (var15 - y) % var10;
var18 = (var16 - var0) % var7; var18 = (var16 - x) % var7;
int var19 = var4; int var19 = var4;
if (var6[var18 + var17 * var7] != 0) { if (var6[var18 + var17 * var7] != 0) {
var19 = var5; var19 = var5;
runescape-client/src/main/java/Rasterizer3D.java
+2 -2
View File
@@ -1397,7 +1397,7 @@ public class Rasterizer3D extends Rasterizer2D {
int[] var19 = Rasterizer3D_textureLoader.load(var18); int[] var19 = Rasterizer3D_textureLoader.load(var18);
int var20; int var20;
if (var19 == null) { 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)); method3037(var0, var1, var2, var3, var4, var5, method3040(var20, var6), method3040(var20, var7), method3040(var20, var8));
} else { } else {
Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18);
@@ -2440,7 +2440,7 @@ public class Rasterizer3D extends Rasterizer2D {
int[] var19 = Rasterizer3D_textureLoader.load(var18); int[] var19 = Rasterizer3D_textureLoader.load(var18);
int var20; int var20;
if (var19 == null) { 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)); method3037(var0, var1, var2, var3, var4, var5, method3040(var20, var6), method3040(var20, var7), method3040(var20, var8));
} else { } else {
Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18);
runescape-client/src/main/java/RouteStrategy.java
+2
View File
@@ -1,9 +1,11 @@
import net.runelite.mapping.Export; import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature; import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("fe") @ObfuscatedName("fe")
@Implements("RouteStrategy")
public abstract class RouteStrategy { public abstract class RouteStrategy {
@ObfuscatedName("l") @ObfuscatedName("l")
@ObfuscatedGetter( @ObfuscatedGetter(
runescape-client/src/main/java/Scene.java
+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); 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 { } 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)); 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) { } 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); 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 { } 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)); 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]); 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 { } 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])); 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) { } else if (var1.triangleColorA[var9] != 12345678) {
runescape-client/src/main/java/ScriptEvent.java
+1 -1
View File
@@ -196,7 +196,7 @@ public class ScriptEvent extends Node {
return 1; return 1;
} else if (var0 == ScriptOpcodes.INV_SIZE) { } else if (var0 == ScriptOpcodes.INV_SIZE) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; 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; return 1;
} else if (var0 == ScriptOpcodes.STAT) { } else if (var0 == ScriptOpcodes.STAT) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
runescape-client/src/main/java/SecureRandomCallable.java
+3 -3
View File
@@ -59,9 +59,9 @@ public class SecureRandomCallable implements Callable {
Client.interfaceParents.put(var3, (long)var0); Client.interfaceParents.put(var3, (long)var0);
DevicePcmPlayerProvider.method845(var1); DevicePcmPlayerProvider.method845(var1);
Widget var4 = Huffman.getWidget(var0); Widget var4 = Huffman.getWidget(var0);
class22.method295(var4); WorldMapRectangle.method295(var4);
if (Client.field127 != null) { if (Client.field127 != null) {
class22.method295(Client.field127); WorldMapRectangle.method295(Client.field127);
Client.field127 = null; Client.field127 = null;
} }
@@ -133,7 +133,7 @@ public class SecureRandomCallable implements Callable {
class214.menuWidth = var7; class214.menuWidth = var7;
AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22; AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22;
class39.revalidateWidgetScroll(Widget.interfaceComponents[var0 >> 16], var4, false); class39.revalidateWidgetScroll(Widget.interfaceComponents[var0 >> 16], var4, false);
WorldMapSection3.runWidgetOnLoadListener(var1); WorldMapSection1.runWidgetOnLoadListener(var1);
if (Client.rootInterface != -1) { if (Client.rootInterface != -1) {
GrandExchangeEvents.method74(Client.rootInterface, 1); GrandExchangeEvents.method74(Client.rootInterface, 1);
} }
runescape-client/src/main/java/SoundEffect.java
+2 -1
View File
@@ -49,7 +49,8 @@ public class SoundEffect {
} }
@ObfuscatedName("q") @ObfuscatedName("q")
public final int method303() { @Export("calculateDelay")
public final int calculateDelay() {
int var1 = 9999999; int var1 = 9999999;
int var2; int var2;
runescape-client/src/main/java/StructDefinition.java
+26 -26
View File
@@ -134,40 +134,40 @@ public class StructDefinition extends DualNode {
var4.scrollY = 0; var4.scrollY = 0;
} }
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) {
var4.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETFILL) { } else if (var0 == ScriptOpcodes.CC_SETFILL) {
var4.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; var4.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETTRANS) { } else if (var0 == ScriptOpcodes.CC_SETTRANS) {
var4.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETLINEWID) { } else if (var0 == ScriptOpcodes.CC_SETLINEWID) {
var4.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) {
var4.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) {
var4.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETTILING) { } else if (var0 == ScriptOpcodes.CC_SETTILING) {
var4.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; var4.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETMODEL) { } else if (var0 == ScriptOpcodes.CC_SETMODEL) {
var4.modelType = 1; var4.modelType = 1;
var4.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) {
RouteStrategy.Interpreter_intStackSize -= 6; RouteStrategy.Interpreter_intStackSize -= 6;
@@ -177,7 +177,7 @@ public class StructDefinition extends DualNode {
var4.modelAngleY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; var4.modelAngleY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
var4.modelAngleZ = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4]; var4.modelAngleZ = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4];
var4.modelZoom = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 5]; var4.modelZoom = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 5];
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else { } else {
int var5; int var5;
@@ -187,58 +187,58 @@ public class StructDefinition extends DualNode {
var4.sequenceId = var5; var4.sequenceId = var5;
var4.modelFrame = 0; var4.modelFrame = 0;
var4.modelFrameCycle = 0; var4.modelFrameCycle = 0;
class22.method295(var4); WorldMapRectangle.method295(var4);
} }
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) {
var4.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; var4.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETTEXT) { } else if (var0 == ScriptOpcodes.CC_SETTEXT) {
String var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; String var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
if (!var8.equals(var4.text)) { if (!var8.equals(var4.text)) {
var4.text = var8; var4.text = var8;
class22.method295(var4); WorldMapRectangle.method295(var4);
} }
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) {
var4.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) {
RouteStrategy.Interpreter_intStackSize -= 3; RouteStrategy.Interpreter_intStackSize -= 3;
var4.textXAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.textXAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4.textYAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var4.textYAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var4.textLineHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; var4.textLineHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) {
var4.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; var4.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) {
var4.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) {
var4.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETVFLIP) { } else if (var0 == ScriptOpcodes.CC_SETVFLIP) {
var4.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; var4.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETHFLIP) { } else if (var0 == ScriptOpcodes.CC_SETHFLIP) {
var4.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; var4.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) {
RouteStrategy.Interpreter_intStackSize -= 2; RouteStrategy.Interpreter_intStackSize -= 2;
var4.scrollWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.scrollWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var4.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
class22.method295(var4); WorldMapRectangle.method295(var4);
if (var3 != -1 && var4.type == 0) { if (var3 != -1 && var4.type == 0) {
class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false); class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false);
} }
@@ -247,26 +247,26 @@ public class StructDefinition extends DualNode {
} else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) {
TilePaint.method3060(var4.id, var4.childIndex); TilePaint.method3060(var4.id, var4.childIndex);
Client.field127 = var4; Client.field127 = var4;
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == 1122) { } else if (var0 == 1122) {
var4.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) {
var4.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == 1124) { } else if (var0 == 1124) {
var4.field960 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4.field960 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4); WorldMapRectangle.method295(var4);
return 1; return 1;
} else if (var0 == 1125) { } else if (var0 == 1125) {
var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
RectangleMode var7 = (RectangleMode)ScriptFrame.findEnumerated(DefaultsGroup.method5822(), var5); RectangleMode var7 = (RectangleMode)ScriptFrame.findEnumerated(DefaultsGroup.method5822(), var5);
if (var7 != null) { if (var7 != null) {
var4.rectangleMode = var7; var4.rectangleMode = var7;
class22.method295(var4); WorldMapRectangle.method295(var4);
} }
return 1; return 1;
runescape-client/src/main/java/Texture.java
+3 -3
View File
@@ -10,8 +10,8 @@ public class Texture extends Node {
@Export("Texture_animatedPixels") @Export("Texture_animatedPixels")
static int[] Texture_animatedPixels; static int[] Texture_animatedPixels;
@ObfuscatedName("o") @ObfuscatedName("o")
@Export("int1") @Export("averageRGB")
int int1; int averageRGB;
@ObfuscatedName("u") @ObfuscatedName("u")
boolean field893; boolean field893;
@ObfuscatedName("g") @ObfuscatedName("g")
@@ -41,7 +41,7 @@ public class Texture extends Node {
) )
Texture(Buffer var1) { Texture(Buffer var1) {
this.isLoaded = false; this.isLoaded = false;
this.int1 = var1.readUnsignedShort(); this.averageRGB = var1.readUnsignedShort();
this.field893 = var1.readUnsignedByte() == 1; this.field893 = var1.readUnsignedByte() == 1;
int var2 = var1.readUnsignedByte(); int var2 = var1.readUnsignedByte();
if (var2 >= 1 && var2 <= 4) { if (var2 >= 1 && var2 <= 4) {
runescape-client/src/main/java/TextureLoader.java
+2 -1
View File
@@ -19,7 +19,8 @@ public interface TextureLoader {
signature = "(II)I", signature = "(II)I",
garbageValue = "-1641984961" garbageValue = "-1641984961"
) )
int vmethod324(int var1); @Export("getAverageTextureRGB")
int getAverageTextureRGB(int var1);
@ObfuscatedName("o") @ObfuscatedName("o")
@ObfuscatedSignature( @ObfuscatedSignature(
runescape-client/src/main/java/TextureProvider.java
+4 -3
View File
@@ -155,8 +155,9 @@ public class TextureProvider implements TextureLoader {
signature = "(II)I", signature = "(II)I",
garbageValue = "-1641984961" garbageValue = "-1641984961"
) )
public int vmethod324(int var1) { @Export("getAverageTextureRGB")
return this.textures[var1] != null ? this.textures[var1].int1 : 0; public int getAverageTextureRGB(int var1) {
return this.textures[var1] != null ? this.textures[var1].averageRGB : 0;
} }
@ObfuscatedName("o") @ObfuscatedName("o")
@@ -221,7 +222,7 @@ public class TextureProvider implements TextureLoader {
int var2 = var0.index; int var2 = var0.index;
byte[] var3 = class230.method4516(var1); byte[] var3 = class230.method4516(var1);
var0.writeSmartByteShort(var3.length); 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; return var0.index - var2;
} }
runescape-client/src/main/java/UserComparator4.java
+1 -1
View File
@@ -82,7 +82,7 @@ public class UserComparator4 implements Comparator {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
if (var3 == 1 || var3 == 2) { if (var3 == 1 || var3 == 2) {
ReflectionCheck.clientPreferences.windowMode = var3; ReflectionCheck.clientPreferences.windowMode = var3;
WorldMapSection0.savePreferences(); WorldMapSection3.savePreferences();
} }
return 1; return 1;
runescape-client/src/main/java/Varcs.java
+2 -2
View File
@@ -145,7 +145,7 @@ public class Varcs {
) )
@Export("getPreferencesFile") @Export("getPreferencesFile")
AccessFile getPreferencesFile(boolean var1) { AccessFile getPreferencesFile(boolean var1) {
return LoginPacket.getPreferencesFile("2", class22.studioGame.name, var1); return LoginPacket.getPreferencesFile("2", WorldMapRectangle.studioGame.name, var1);
} }
@ObfuscatedName("e") @ObfuscatedName("e")
@@ -365,7 +365,7 @@ public class Varcs {
garbageValue = "321265868" garbageValue = "321265868"
) )
public static void method2160(AbstractArchive var0) { public static void method2160(AbstractArchive var0) {
FloorOverlayDefinition.field663 = var0; FloorOverlayDefinition.FloorOverlayDefinition_archive = var0;
} }
@ObfuscatedName("q") @ObfuscatedName("q")
runescape-client/src/main/java/VertexNormal.java
+2 -2
View File
@@ -61,8 +61,8 @@ public class VertexNormal {
ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0;
} else if (RouteStrategy.field760 != null) { } else if (RouteStrategy.field760 != null) {
for (int var1 = 0; var1 < ByteArrayPool.field55.length; ++var1) { for (int var1 = 0; var1 < ByteArrayPool.field55.length; ++var1) {
if (var0.length == ByteArrayPool.field55[var1] && WorldMapSection2.field1082[var1] < RouteStrategy.field760[var1].length) { if (var0.length == ByteArrayPool.field55[var1] && WorldMapSection0.field1082[var1] < RouteStrategy.field760[var1].length) {
RouteStrategy.field760[var1][WorldMapSection2.field1082[var1]++] = var0; RouteStrategy.field760[var1][WorldMapSection0.field1082[var1]++] = var0;
return; return;
} }
} }
runescape-client/src/main/java/class249.java → runescape-client/src/main/java/VerticalAlignment.java
+7 -4
View File
@@ -1,10 +1,12 @@
import net.runelite.mapping.Export; import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature; import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ip") @ObfuscatedName("ip")
public enum class249 implements Enumerated { @Implements("VerticalAlignment")
public enum VerticalAlignment implements Enumerated {
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lip;" signature = "Lip;"
@@ -25,7 +27,8 @@ public enum class249 implements Enumerated {
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 2070321655 intValue = 2070321655
) )
public final int field3275; @Export("value")
public final int value;
@ObfuscatedName("o") @ObfuscatedName("o")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 1686539261 intValue = 1686539261
@@ -33,8 +36,8 @@ public enum class249 implements Enumerated {
@Export("id") @Export("id")
final int id; final int id;
private class249(int var3, int var4) { private VerticalAlignment(int var3, int var4) {
this.field3275 = var3; this.value = var3;
this.id = var4; this.id = var4;
} }
runescape-client/src/main/java/WorldMapArea.java
+6 -6
View File
@@ -126,21 +126,21 @@ public class WorldMapArea {
@Export("readWorldMapSection") @Export("readWorldMapSection")
WorldMapSection readWorldMapSection(Buffer var1) { WorldMapSection readWorldMapSection(Buffer var1) {
int var2 = var1.readUnsignedByte(); 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); WorldMapSectionType var4 = (WorldMapSectionType)ScriptFrame.findEnumerated(var3, var2);
Object var5 = null; Object var5 = null;
switch(var4.type) { switch(var4.type) {
case 0: case 0:
var5 = new WorldMapSection2(); var5 = new WorldMapSection0();
break; break;
case 1: case 1:
var5 = new WorldMapSection3();
break;
case 2:
var5 = new WorldMapSection1(); var5 = new WorldMapSection1();
break; break;
case 2:
var5 = new WorldMapSection2();
break;
case 3: case 3:
var5 = new WorldMapSection0(); var5 = new WorldMapSection3();
break; break;
default: default:
throw new IllegalStateException(""); throw new IllegalStateException("");
runescape-client/src/main/java/WorldMapAreaData.java
+2 -2
View File
@@ -207,14 +207,14 @@ public class WorldMapAreaData extends WorldMapArea {
--RouteStrategy.Interpreter_intStackSize; --RouteStrategy.Interpreter_intStackSize;
var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1;
if (var5 >= 0 && var5 <= 9) { if (var5 >= 0 && var5 <= 9) {
WorldMapSection3.method345(var4, var5); WorldMapSection1.method345(var4, var5);
return 1; return 1;
} else { } else {
throw new RuntimeException(); throw new RuntimeException();
} }
} else if (var0 == 1355) { } else if (var0 == 1355) {
var11 = 10; var11 = 10;
WorldMapSection3.method345(var4, var11); WorldMapSection1.method345(var4, var11);
return 1; return 1;
} else { } else {
return 2; return 2;
runescape-client/src/main/java/WorldMapCacheName.java
+2 -2
View File
@@ -61,7 +61,7 @@ public class WorldMapCacheName {
public static void method633(int[] var0, int[] var1) { public static void method633(int[] var0, int[] var1) {
if (var0 != null && var1 != null) { if (var0 != null && var1 != null) {
ByteArrayPool.field55 = var0; ByteArrayPool.field55 = var0;
WorldMapSection2.field1082 = new int[var0.length]; WorldMapSection0.field1082 = new int[var0.length];
RouteStrategy.field760 = new byte[var0.length][][]; RouteStrategy.field760 = new byte[var0.length][][];
for (int var2 = 0; var2 < ByteArrayPool.field55.length; ++var2) { for (int var2 = 0; var2 < ByteArrayPool.field55.length; ++var2) {
@@ -69,7 +69,7 @@ public class WorldMapCacheName {
} }
} else { } else {
ByteArrayPool.field55 = null; ByteArrayPool.field55 = null;
WorldMapSection2.field1082 = null; WorldMapSection0.field1082 = null;
RouteStrategy.field760 = ((byte[][][])null); RouteStrategy.field760 = ((byte[][][])null);
} }
runescape-client/src/main/java/WorldMapDecoration.java
+1 -1
View File
@@ -104,6 +104,6 @@ public class WorldMapDecoration {
ServerBuild.field788 = var0; ServerBuild.field788 = var0;
Client.field220 = var1; Client.field220 = var1;
FloorDecoration.selectedSpellFlags = var2; FloorDecoration.selectedSpellFlags = var2;
class22.method295(var4); WorldMapRectangle.method295(var4);
} }
} }
runescape-client/src/main/java/WorldMapDecorationType.java
+3 -2
View File
@@ -160,12 +160,13 @@ public enum WorldMapDecorationType implements Enumerated {
signature = "(IB)Lib;", signature = "(IB)Lib;",
garbageValue = "1" garbageValue = "1"
) )
public static InvDefinition method4523(int var0) { @Export("getInvDefinition")
public static InvDefinition getInvDefinition(int var0) {
InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0);
if (var1 != null) { if (var1 != null) {
return var1; return var1;
} else { } else {
byte[] var2 = class4.field1158.takeFile(5, var0); byte[] var2 = class4.InvDefinition_archive.takeFile(5, var0);
var1 = new InvDefinition(); var1 = new InvDefinition();
if (var2 != null) { if (var2 != null) {
var1.decode(new Buffer(var2)); var1.decode(new Buffer(var2));
runescape-client/src/main/java/WorldMapElement.java
+14 -11
View File
@@ -23,8 +23,8 @@ public class WorldMapElement extends DualNode {
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lkz;" signature = "Lkz;"
) )
@Export("fonts") @Export("WorldMapElement_fonts")
static Fonts fonts; static Fonts WorldMapElement_fonts;
@ObfuscatedName("o") @ObfuscatedName("o")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1579051565 intValue = -1579051565
@@ -43,7 +43,8 @@ public class WorldMapElement extends DualNode {
@Export("sprite2") @Export("sprite2")
int sprite2; int sprite2;
@ObfuscatedName("l") @ObfuscatedName("l")
public String field1021; @Export("name")
public String name;
@ObfuscatedName("e") @ObfuscatedName("e")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -231067 intValue = -231067
@@ -87,12 +88,14 @@ public class WorldMapElement extends DualNode {
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lju;" signature = "Lju;"
) )
public class266 field3287; @Export("horizontalAlignment")
public HorizontalAlignment horizontalAlignment;
@ObfuscatedName("y") @ObfuscatedName("y")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lip;" signature = "Lip;"
) )
public class249 field3301; @Export("verticalAlignment")
public VerticalAlignment verticalAlignment;
@ObfuscatedName("h") @ObfuscatedName("h")
int[] field1028; int[] field1028;
@ObfuscatedName("b") @ObfuscatedName("b")
@@ -113,8 +116,8 @@ public class WorldMapElement extends DualNode {
this.field1025 = Integer.MAX_VALUE; this.field1025 = Integer.MAX_VALUE;
this.field1026 = Integer.MIN_VALUE; this.field1026 = Integer.MIN_VALUE;
this.field1027 = Integer.MIN_VALUE; this.field1027 = Integer.MIN_VALUE;
this.field3287 = class266.field3527; this.horizontalAlignment = HorizontalAlignment.field3527;
this.field3301 = class249.field3273; this.verticalAlignment = VerticalAlignment.field3273;
this.category = -1; this.category = -1;
this.field1020 = var1; this.field1020 = var1;
} }
@@ -148,7 +151,7 @@ public class WorldMapElement extends DualNode {
} else if (opcode == 2) { } else if (opcode == 2) {
this.sprite2 = buffer.method51(); this.sprite2 = buffer.method51();
} else if (opcode == 3) { } else if (opcode == 3) {
this.field1021 = buffer.readStringCp1252NullTerminated(); this.name = buffer.readStringCp1252NullTerminated();
} else if (opcode == 4) { } else if (opcode == 4) {
this.field1022 = buffer.readMedium(); this.field1022 = buffer.readMedium();
} else if (opcode == 5) { } else if (opcode == 5) {
@@ -214,10 +217,10 @@ public class WorldMapElement extends DualNode {
} else if (opcode == 28) { } else if (opcode == 28) {
buffer.readUnsignedByte(); buffer.readUnsignedByte();
} else if (opcode == 29) { } else if (opcode == 29) {
class266[] var6 = new class266[]{class266.field3527, class266.field3526, class266.field3529}; HorizontalAlignment[] var6 = new HorizontalAlignment[]{HorizontalAlignment.field3527, HorizontalAlignment.field3526, HorizontalAlignment.field3529};
this.field3287 = (class266)ScriptFrame.findEnumerated(var6, buffer.readUnsignedByte()); this.horizontalAlignment = (HorizontalAlignment)ScriptFrame.findEnumerated(var6, buffer.readUnsignedByte());
} else if (opcode == 30) { } else if (opcode == 30) {
this.field3301 = (class249)ScriptFrame.findEnumerated(FloorUnderlayDefinition.method4839(), buffer.readUnsignedByte()); this.verticalAlignment = (VerticalAlignment)ScriptFrame.findEnumerated(FloorUnderlayDefinition.method4839(), buffer.readUnsignedByte());
} }
} }
} }
runescape-client/src/main/java/WorldMapIcon1.java
+1 -1
View File
@@ -136,7 +136,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
} }
int[] var4 = Client.queuedSoundEffectDelays; int[] var4 = Client.queuedSoundEffectDelays;
var4[var0] += var11.method303(); var4[var0] += var11.calculateDelay();
Client.soundEffects[var0] = var11; Client.soundEffects[var0] = var11;
} }
runescape-client/src/main/java/WorldMapIcon2.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
) )
void method399() { void method399() {
this.element = class50.getObjectDefinition(this.field1034).transform().mapIconId; this.element = class50.getObjectDefinition(this.field1034).transform().mapIconId;
this.label = this.field1035.method420(ViewportMouse.getWorldMapElement(this.element)); this.label = this.field1035.createMapLabel(ViewportMouse.getWorldMapElement(this.element));
WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.getElement()); WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.getElement());
Sprite var2 = var1.getSprite(false); Sprite var2 = var1.getSprite(false);
if (var2 != null) { if (var2 != null) {
runescape-client/src/main/java/WorldMapLabel.java
+1 -1
View File
@@ -239,7 +239,7 @@ public class WorldMapLabel {
static final void worldToScreen(int var0, int var1, int var2) { static final void worldToScreen(int var0, int var1, int var2) {
if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) {
int var3 = class32.getTileHeight(var0, var1, SoundSystem.plane) - var2; int var3 = class32.getTileHeight(var0, var1, SoundSystem.plane) - var2;
var0 -= WorldMapSection1.cameraX; var0 -= WorldMapSection2.cameraX;
var3 -= GrandExchangeEvents.cameraY; var3 -= GrandExchangeEvents.cameraY;
var1 -= GrandExchangeOfferNameComparator.cameraZ; var1 -= GrandExchangeOfferNameComparator.cameraZ;
int var4 = Rasterizer3D.Rasterizer3D_sine[WorldMapIcon1.cameraPitch]; int var4 = Rasterizer3D.Rasterizer3D_sine[WorldMapIcon1.cameraPitch];
runescape-client/src/main/java/WorldMapLabelSize.java
+6 -4
View File
@@ -77,7 +77,8 @@ public class WorldMapLabelSize {
signature = "(I)[Ls;", signature = "(I)[Ls;",
garbageValue = "1579674051" garbageValue = "1579674051"
) )
static WorldMapLabelSize[] method192() { @Export("values")
static WorldMapLabelSize[] values() {
return new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_medium, WorldMapLabelSize_large}; return new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_medium, WorldMapLabelSize_large};
} }
@@ -86,8 +87,9 @@ public class WorldMapLabelSize {
signature = "(IB)Ls;", signature = "(IB)Ls;",
garbageValue = "-67" garbageValue = "-67"
) )
static WorldMapLabelSize method195(int var0) { @Export("valueOf")
WorldMapLabelSize[] var1 = method192(); static WorldMapLabelSize valueOf(int var0) {
WorldMapLabelSize[] var1 = values();
for (int var2 = 0; var2 < var1.length; ++var2) { for (int var2 = 0; var2 < var1.length; ++var2) {
WorldMapLabelSize var3 = var1[var2]; WorldMapLabelSize var3 = var1[var2];
@@ -115,7 +117,7 @@ public class WorldMapLabelSize {
} }
if (Client.field127 != null) { if (Client.field127 != null) {
class22.method295(Client.field127); WorldMapRectangle.method295(Client.field127);
Client.field127 = null; Client.field127 = null;
} }
runescape-client/src/main/java/WorldMapManager.java
+33 -33
View File
@@ -198,7 +198,7 @@ public final class WorldMapManager {
int var11 = Rasterizer2D.Rasterizer2D_height; int var11 = Rasterizer2D.Rasterizer2D_height;
int[] var12 = new int[4]; int[] var12 = new int[4];
Rasterizer2D.Rasterizer2D_getClipArray(var12); Rasterizer2D.Rasterizer2D_getClipArray(var12);
class22 var13 = this.method643(var1, var2, var3, var4); WorldMapRectangle var13 = this.method643(var1, var2, var3, var4);
float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1);
int var15 = (int)Math.ceil((double)var14); int var15 = (int)Math.ceil((double)var14);
this.field1050 = var15; this.field1050 = var15;
@@ -208,13 +208,13 @@ public final class WorldMapManager {
this.field1045.put(var15, var16); this.field1045.put(var15, var16);
} }
int var23 = var13.field166 + var13.field169 - 1; int var23 = var13.worldMapRegionX + var13.worldMapRegionWidth - 1;
int var17 = var13.field167 + var13.field164 - 1; int var17 = var13.worldMapRegionY + var13.worldMapRegionHeight - 1;
int var18; int var18;
int var19; int var19;
for (var18 = var13.field166; var18 <= var23; ++var18) { for (var18 = var13.worldMapRegionX; var18 <= var23; ++var18) {
for (var19 = var13.field167; var19 <= var17; ++var19) { for (var19 = var13.worldMapRegionY; var19 <= var17; ++var19) {
this.regions[var18][var19].method455(var15, (class40)this.field1045.get(var15), this.mapSceneSprites, this.field1046, this.field1047); this.regions[var18][var19].method455(var15, (class40)this.field1045.get(var15), this.mapSceneSprites, this.field1046, this.field1047);
} }
} }
@@ -225,8 +225,8 @@ public final class WorldMapManager {
var19 = this.surfaceOffsetX + var1; var19 = this.surfaceOffsetX + var1;
int var20 = var2 + this.surfaceOffsetY; int var20 = var2 + this.surfaceOffsetY;
for (int var21 = var13.field166; var21 < var13.field166 + var13.field169; ++var21) { for (int var21 = var13.worldMapRegionX; var21 < var13.worldMapRegionX + var13.worldMapRegionWidth; ++var21) {
for (int var22 = var13.field167; var22 < var13.field167 + var13.field164; ++var22) { for (int var22 = var13.worldMapRegionY; var22 < var13.worldMapRegionY + var13.worldMapRegionHeight; ++var22) {
this.regions[var21][var22].method404(var5 + var18 * (this.regions[var21][var22].x * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].y * 64 - var20 + 64) / 64, var18); this.regions[var21][var22].method404(var5 + var18 * (this.regions[var21][var22].x * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].y * 64 - var20 + 64) / 64, var18);
} }
} }
@@ -239,7 +239,7 @@ public final class WorldMapManager {
garbageValue = "-71" garbageValue = "-71"
) )
public final void method402(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { public final void method402(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) {
class22 var14 = this.method643(var1, var2, var3, var4); WorldMapRectangle var14 = this.method643(var1, var2, var3, var4);
float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1);
int var16 = (int)(var15 * 64.0F); int var16 = (int)(var15 * 64.0F);
int var17 = this.surfaceOffsetX + var1; int var17 = this.surfaceOffsetX + var1;
@@ -247,8 +247,8 @@ public final class WorldMapManager {
int var19; int var19;
int var20; int var20;
for (var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) { for (var19 = var14.worldMapRegionX; var19 < var14.worldMapRegionWidth + var14.worldMapRegionX; ++var19) {
for (var20 = var14.field167; var20 < var14.field164 + var14.field167; ++var20) { for (var20 = var14.worldMapRegionY; var20 < var14.worldMapRegionHeight + var14.worldMapRegionY; ++var20) {
if (var13) { if (var13) {
this.regions[var19][var20].method406(); this.regions[var19][var20].method406();
} }
@@ -258,8 +258,8 @@ public final class WorldMapManager {
} }
if (var10 != null && var11 > 0) { if (var10 != null && var11 > 0) {
for (var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) { for (var19 = var14.worldMapRegionX; var19 < var14.worldMapRegionWidth + var14.worldMapRegionX; ++var19) {
for (var20 = var14.field167; var20 < var14.field167 + var14.field164; ++var20) { for (var20 = var14.worldMapRegionY; var20 < var14.worldMapRegionY + var14.worldMapRegionHeight; ++var20) {
this.regions[var19][var20].method411(var10, var11, var12); this.regions[var19][var20].method411(var10, var11, var12);
} }
} }
@@ -318,14 +318,14 @@ public final class WorldMapManager {
if (!this.isLoaded0) { if (!this.isLoaded0) {
return var11; return var11;
} else { } else {
class22 var12 = this.method643(var1, var2, var3, var4); WorldMapRectangle var12 = this.method643(var1, var2, var3, var4);
float var13 = this.getPixelsPerTile(var7, var3 - var1); float var13 = this.getPixelsPerTile(var7, var3 - var1);
int var14 = (int)(var13 * 64.0F); int var14 = (int)(var13 * 64.0F);
int var15 = this.surfaceOffsetX + var1; int var15 = this.surfaceOffsetX + var1;
int var16 = var2 + this.surfaceOffsetY; int var16 = var2 + this.surfaceOffsetY;
for (int var17 = var12.field166; var17 < var12.field166 + var12.field169; ++var17) { for (int var17 = var12.worldMapRegionX; var17 < var12.worldMapRegionX + var12.worldMapRegionWidth; ++var17) {
for (int var18 = var12.field167; var18 < var12.field164 + var12.field167; ++var18) { for (int var18 = var12.worldMapRegionY; var18 < var12.worldMapRegionHeight + var12.worldMapRegionY; ++var18) {
List var19 = this.regions[var17][var18].method421(var5 + var14 * (this.regions[var17][var18].x * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].y * 64 - var16 + 64) / 64, var14, var9, var10); List var19 = this.regions[var17][var18].method421(var5 + var14 * (this.regions[var17][var18].x * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].y * 64 - var16 + 64) / 64, var14, var9, var10);
if (!var19.isEmpty()) { if (!var19.isEmpty()) {
var11.addAll(var19); var11.addAll(var19);
@@ -342,8 +342,8 @@ public final class WorldMapManager {
signature = "(IIIII)Lc;", signature = "(IIIII)Lc;",
garbageValue = "-1455088394" garbageValue = "-1455088394"
) )
class22 method643(int var1, int var2, int var3, int var4) { WorldMapRectangle method643(int var1, int var2, int var3, int var4) {
class22 var5 = new class22(this); WorldMapRectangle var5 = new WorldMapRectangle(this);
int var6 = this.surfaceOffsetX + var1; int var6 = this.surfaceOffsetX + var1;
int var7 = var2 + this.surfaceOffsetY; int var7 = var2 + this.surfaceOffsetY;
int var8 = var3 + this.surfaceOffsetX; int var8 = var3 + this.surfaceOffsetX;
@@ -352,30 +352,30 @@ public final class WorldMapManager {
int var11 = var7 / 64; int var11 = var7 / 64;
int var12 = var8 / 64; int var12 = var8 / 64;
int var13 = var9 / 64; int var13 = var9 / 64;
var5.field169 = var12 - var10 + 1; var5.worldMapRegionWidth = var12 - var10 + 1;
var5.field164 = var13 - var11 + 1; var5.worldMapRegionHeight = var13 - var11 + 1;
var5.field166 = var10 - this.mapAreaData.minX(); var5.worldMapRegionX = var10 - this.mapAreaData.minX();
var5.field167 = var11 - this.mapAreaData.minY(); var5.worldMapRegionY = var11 - this.mapAreaData.minY();
if (var5.field166 < 0) { if (var5.worldMapRegionX < 0) {
var5.field169 += var5.field166; var5.worldMapRegionWidth += var5.worldMapRegionX;
var5.field166 = 0; var5.worldMapRegionX = 0;
} }
if (var5.field166 > this.regions.length - var5.field169) { if (var5.worldMapRegionX > this.regions.length - var5.worldMapRegionWidth) {
var5.field169 = this.regions.length - var5.field166; var5.worldMapRegionWidth = this.regions.length - var5.worldMapRegionX;
} }
if (var5.field167 < 0) { if (var5.worldMapRegionY < 0) {
var5.field164 += var5.field167; var5.worldMapRegionHeight += var5.worldMapRegionY;
var5.field167 = 0; var5.worldMapRegionY = 0;
} }
if (var5.field167 > this.regions[0].length - var5.field164) { if (var5.worldMapRegionY > this.regions[0].length - var5.worldMapRegionHeight) {
var5.field164 = this.regions[0].length - var5.field167; var5.worldMapRegionHeight = this.regions[0].length - var5.worldMapRegionY;
} }
var5.field169 = Math.min(var5.field169, this.regions.length); var5.worldMapRegionWidth = Math.min(var5.worldMapRegionWidth, this.regions.length);
var5.field164 = Math.min(var5.field164, this.regions[0].length); var5.worldMapRegionHeight = Math.min(var5.worldMapRegionHeight, this.regions[0].length);
return var5; return var5;
} }
runescape-client/src/main/java/class22.java → runescape-client/src/main/java/WorldMapRectangle.java
+13 -6
View File
@@ -1,10 +1,13 @@
import net.runelite.mapping.Export; import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature; import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("c") @ObfuscatedName("c")
public final class class22 { @Implements("WorldMapRectangle")
public final class WorldMapRectangle
{
@ObfuscatedName("z") @ObfuscatedName("z")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lgr;" signature = "Lgr;"
@@ -27,22 +30,26 @@ public final class class22 {
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 1976624405 intValue = 1976624405
) )
int field169; @Export("worldMapRegionWidth")
int worldMapRegionWidth;
@ObfuscatedName("f") @ObfuscatedName("f")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -698663527 intValue = -698663527
) )
int field164; @Export("worldMapRegionHeight")
int worldMapRegionHeight;
@ObfuscatedName("q") @ObfuscatedName("q")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 1588021801 intValue = 1588021801
) )
int field166; @Export("worldMapRegionX")
int worldMapRegionX;
@ObfuscatedName("w") @ObfuscatedName("w")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 2138505015 intValue = 2138505015
) )
int field167; @Export("worldMapRegionY")
int worldMapRegionY;
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lal;" signature = "Lal;"
) )
@@ -51,7 +58,7 @@ public final class class22 {
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(Lal;)V" signature = "(Lal;)V"
) )
class22(WorldMapManager var1) { WorldMapRectangle(WorldMapManager var1) {
this.this$0 = var1; this.this$0 = var1;
} }
runescape-client/src/main/java/WorldMapRegion.java
+72 -67
View File
@@ -46,7 +46,8 @@ public class WorldMapRegion {
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 415972873 intValue = 415972873
) )
int field1054; @Export("pixelsPerTile")
int pixelsPerTile;
@ObfuscatedName("k") @ObfuscatedName("k")
@Export("iconsList") @Export("iconsList")
List iconsList; List iconsList;
@@ -73,9 +74,9 @@ public class WorldMapRegion {
garbageValue = "-87" garbageValue = "-87"
) )
void method404(int var1, int var2, int var3) { void method404(int var1, int var2, int var3) {
Sprite var4 = class13.method164(this.x, this.y, this.field1054); Sprite var4 = class13.method164(this.x, this.y, this.pixelsPerTile);
if (var4 != null) { if (var4 != null) {
if (var3 == this.field1054 * 64) { if (var3 == this.pixelsPerTile * 64) {
var4.drawAt(var1, var2); var4.drawAt(var1, var2);
} else { } else {
var4.method319(var1, var2, var3, var3); var4.method319(var1, var2, var3, var3);
@@ -126,7 +127,7 @@ public class WorldMapRegion {
label66: label66:
for (int var7 = var2; var7 < var2 + var4; ++var7) { for (int var7 = var2; var7 < var2 + var4; ++var7) {
for (int var8 = 0; var8 < var5.field156; ++var8) { for (int var8 = 0; var8 < var5.field156; ++var8) {
WorldMapDecoration[] var9 = var5.field144[var8][var6][var7]; WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7];
if (var9 != null && var9.length != 0) { if (var9 != null && var9.length != 0) {
WorldMapDecoration[] var10 = var9; WorldMapDecoration[] var10 = var9;
@@ -187,7 +188,7 @@ public class WorldMapRegion {
var10 = new WorldMapIcon2(var7, var6, var1.id, this); var10 = new WorldMapIcon2(var7, var6, var1.id, this);
} else { } else {
WorldMapElement var9 = ViewportMouse.getWorldMapElement(var1.mapIconId); WorldMapElement var9 = ViewportMouse.getWorldMapElement(var1.mapIconId);
var10 = new WorldMapIcon1(var7, var6, var9.field1020, this.method420(var9)); var10 = new WorldMapIcon1(var7, var6, var9.field1020, this.createMapLabel(var9));
} }
this.iconsMap.put(new Coord(0, var3, var4), var10); this.iconsMap.put(new Coord(0, var3, var4), var10);
@@ -290,7 +291,7 @@ public class WorldMapRegion {
garbageValue = "518389076" garbageValue = "518389076"
) )
void method455(int var1, class40 var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { void method455(int var1, class40 var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) {
this.field1054 = var1; this.pixelsPerTile = var1;
if ((this.field239 != null || !this.field1052.isEmpty()) && class13.method164(this.x, this.y, var1) == null) { if ((this.field239 != null || !this.field1052.isEmpty()) && class13.method164(this.x, this.y, var1) == null) {
boolean var6 = true; boolean var6 = true;
var6 &= this.method409(var4); var6 &= this.method409(var4);
@@ -305,7 +306,7 @@ public class WorldMapRegion {
if (var6) { if (var6) {
byte[] var8 = var5.takeFileFlat(var7); byte[] var8 = var5.takeFileFlat(var7);
class27 var9 = SecureRandomCallable.method1145(var8); class27 var9 = SecureRandomCallable.method1145(var8);
Sprite var10 = new Sprite(this.field1054 * 64, this.field1054 * 64); Sprite var10 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64);
var10.setRaster(); var10.setRaster();
if (this.field239 != null) { if (this.field239 != null) {
this.method546(var2, var3, var9); this.method546(var2, var3, var9);
@@ -315,7 +316,7 @@ public class WorldMapRegion {
int var11 = this.x; int var11 = this.x;
int var12 = this.y; int var12 = this.y;
int var13 = this.field1054; int var13 = this.pixelsPerTile;
field1051.put(var10, MouseHandler.method1083(var11, var12, var13), var10.pixels.length * 4); field1051.put(var10, MouseHandler.method1083(var11, var12, var13), var10.pixels.length * 4);
this.method408(); this.method408();
} }
@@ -333,8 +334,8 @@ public class WorldMapRegion {
var4 = new HashSet(); var4 = new HashSet();
} }
this.method412(var1, var2, var4, var3); this.drawNonLinkMapIcons(var1, var2, var4, var3);
this.method418(var1, var2, var4, var3); this.drawMapLinks(var1, var2, var4, var3);
} }
@ObfuscatedName("s") @ObfuscatedName("s")
@@ -351,7 +352,7 @@ public class WorldMapRegion {
int var6 = var5.getElement(); int var6 = var5.getElement();
if (var1.contains(var6)) { if (var1.contains(var6)) {
WorldMapElement var7 = ViewportMouse.getWorldMapElement(var6); WorldMapElement var7 = ViewportMouse.getWorldMapElement(var6);
this.method414(var7, var5.field5, var5.field6, var2, var3); this.method414(var7, var5.screenX, var5.screenY, var2, var3);
} }
} }
} }
@@ -437,26 +438,26 @@ public class WorldMapRegion {
int var6 = var3.field151[0][var1][var2] - 1; int var6 = var3.field151[0][var1][var2] - 1;
int var7 = var3.field145[0][var1][var2] - 1; int var7 = var3.field145[0][var1][var2] - 1;
if (var6 == -1 && var7 == -1) { if (var6 == -1 && var7 == -1) {
Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, this.field1053); Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.field1053);
} }
int var8 = 16711935; int var8 = 16711935;
int var9; int var9;
if (var7 != -1) { if (var7 != -1) {
int var10 = this.field1053; int var10 = this.field1053;
FloorOverlayDefinition var11 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var7); FloorOverlayDefinition var11 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var7);
FloorOverlayDefinition var12; FloorOverlayDefinition var12;
if (var11 != null) { if (var11 != null) {
var12 = var11; var12 = var11;
} else { } else {
byte[] var13 = FloorOverlayDefinition.field663.takeFile(4, var7); byte[] var13 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var7);
var11 = new FloorOverlayDefinition(); var11 = new FloorOverlayDefinition();
if (var13 != null) { if (var13 != null) {
var11.decode(new Buffer(var13), var7); var11.decode(new Buffer(var13), var7);
} }
var11.postDecode(); var11.postDecode();
FloorOverlayDefinition.field664.put(var11, (long)var7); FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var11, (long)var7);
var12 = var11; var12 = var11;
} }
@@ -467,7 +468,7 @@ public class WorldMapRegion {
} else { } else {
int var20; int var20;
if (var12.texture >= 0) { if (var12.texture >= 0) {
var20 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var12.texture), 96); var20 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var12.texture), 96);
var9 = Rasterizer3D.Rasterizer3D_colorPalette[var20] | -16777216; var9 = Rasterizer3D.Rasterizer3D_colorPalette[var20] | -16777216;
} else if (var12.rgb == 16711935) { } else if (var12.rgb == 16711935) {
var9 = var10; var9 = var10;
@@ -527,13 +528,13 @@ public class WorldMapRegion {
} }
if (var7 > -1 && var3.field154[0][var1][var2] == 0) { if (var7 > -1 && var3.field154[0][var1][var2] == 0) {
Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, var8); Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8);
} else { } else {
var9 = this.method541(var1, var2, var3, var5); var9 = this.method541(var1, var2, var3, var5);
if (var7 == -1) { if (var7 == -1) {
Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, var9); Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9);
} else { } else {
var4.method743(this.field1054 * var1, this.field1054 * (63 - var2), var9, var8, this.field1054, this.field1054, var3.field154[0][var1][var2], var3.field155[0][var1][var2]); var4.method743(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field154[0][var1][var2], var3.field155[0][var1][var2]);
} }
} }
@@ -549,19 +550,19 @@ public class WorldMapRegion {
int var6 = var3.field145[var5][var1][var2] - 1; int var6 = var3.field145[var5][var1][var2] - 1;
if (var6 > -1) { if (var6 > -1) {
int var7 = this.field1053; int var7 = this.field1053;
FloorOverlayDefinition var8 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var6); FloorOverlayDefinition var8 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var6);
FloorOverlayDefinition var9; FloorOverlayDefinition var9;
if (var8 != null) { if (var8 != null) {
var9 = var8; var9 = var8;
} else { } else {
byte[] var10 = FloorOverlayDefinition.field663.takeFile(4, var6); byte[] var10 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var6);
var8 = new FloorOverlayDefinition(); var8 = new FloorOverlayDefinition();
if (var10 != null) { if (var10 != null) {
var8.decode(new Buffer(var10), var6); var8.decode(new Buffer(var10), var6);
} }
var8.postDecode(); var8.postDecode();
FloorOverlayDefinition.field664.put(var8, (long)var6); FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var8, (long)var6);
var9 = var8; var9 = var8;
} }
@@ -573,7 +574,7 @@ public class WorldMapRegion {
} else { } else {
int var11; int var11;
if (var9.texture >= 0) { if (var9.texture >= 0) {
var11 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var9.texture), 96); var11 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96);
var18 = Rasterizer3D.Rasterizer3D_colorPalette[var11] | -16777216; var18 = Rasterizer3D.Rasterizer3D_colorPalette[var11] | -16777216;
} else if (var9.rgb == 16711935) { } else if (var9.rgb == 16711935) {
var18 = var7; var18 = var7;
@@ -630,9 +631,9 @@ public class WorldMapRegion {
} }
if (var3.field154[var5][var1][var2] == 0) { if (var3.field154[var5][var1][var2] == 0) {
Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, var18); Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var18);
} else { } else {
var4.method743(this.field1054 * var1, this.field1054 * (63 - var2), 0, var18, this.field1054, this.field1054, var3.field154[var5][var1][var2], var3.field155[var5][var1][var2]); var4.method743(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var18, this.pixelsPerTile, this.pixelsPerTile, var3.field154[var5][var1][var2], var3.field155[var5][var1][var2]);
} }
} }
} }
@@ -655,7 +656,7 @@ public class WorldMapRegion {
) )
void method464(int var1, int var2, class21 var3, IndexedSprite[] var4) { void method464(int var1, int var2, class21 var3, IndexedSprite[] var4) {
for (int var5 = 0; var5 < var3.field156; ++var5) { for (int var5 = 0; var5 < var3.field156; ++var5) {
WorldMapDecoration[] var6 = var3.field144[var5][var1][var2]; WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2];
if (var6 != null && var6.length != 0) { if (var6 != null && var6.length != 0) {
WorldMapDecoration[] var7 = var6; WorldMapDecoration[] var7 = var6;
@@ -665,9 +666,9 @@ public class WorldMapRegion {
ObjectDefinition var10 = class50.getObjectDefinition(var9.objectDefinitionId); ObjectDefinition var10 = class50.getObjectDefinition(var9.objectDefinitionId);
if (var10.mapSceneId != -1) { if (var10.mapSceneId != -1) {
if (var10.mapSceneId != 46 && var10.mapSceneId != 52) { if (var10.mapSceneId != 46 && var10.mapSceneId != 52) {
var4[var10.mapSceneId].method135(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054 * 2, this.field1054 * 2); var4[var10.mapSceneId].method135(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2);
} else { } else {
var4[var10.mapSceneId].method135(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054 * 2 + 1, this.field1054 * 2 + 1); var4[var10.mapSceneId].method135(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1);
} }
} }
} }
@@ -684,7 +685,7 @@ public class WorldMapRegion {
) )
void method465(int var1, int var2, class21 var3) { void method465(int var1, int var2, class21 var3) {
for (int var4 = 0; var4 < var3.field156; ++var4) { for (int var4 = 0; var4 < var3.field156; ++var4) {
WorldMapDecoration[] var5 = var3.field144[var4][var1][var2]; WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2];
if (var5 != null && var5.length != 0) { if (var5 != null && var5.length != 0) {
WorldMapDecoration[] var6 = var5; WorldMapDecoration[] var6 = var5;
@@ -706,19 +707,19 @@ public class WorldMapRegion {
if (var8.decoration == WorldMapDecorationType.field2804.id) { if (var8.decoration == WorldMapDecorationType.field2804.id) {
if (var8.rotation == 0) { if (var8.rotation == 0) {
Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2), 1, var12); Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12);
} }
if (var8.rotation == 1) { if (var8.rotation == 1) {
Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2), 1, var12); Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var12);
} }
if (var8.rotation == 2) { if (var8.rotation == 2) {
Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2) + this.field1054 - 1, 1, var12); Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12);
} }
if (var8.rotation == 3) { if (var8.rotation == 3) {
Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2) + this.field1054 - 1, 1, var12); Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12);
} }
} }
@@ -726,12 +727,12 @@ public class WorldMapRegion {
int var13 = var8.rotation % 2; int var13 = var8.rotation % 2;
int var14; int var14;
if (var13 == 0) { if (var13 == 0) {
for (var14 = 0; var14 < this.field1054; ++var14) { for (var14 = 0; var14 < this.pixelsPerTile; ++var14) {
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.field1054 * var1, (64 - var2) * this.field1054 - 1 - var14, 1, var12); Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12);
} }
} else { } else {
for (var14 = 0; var14 < this.field1054; ++var14) { for (var14 = 0; var14 < this.pixelsPerTile; ++var14) {
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.field1054 * var1, var14 + this.field1054 * (63 - var2), 1, var12); Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12);
} }
} }
} }
@@ -747,7 +748,8 @@ public class WorldMapRegion {
signature = "(IILjava/util/HashSet;IB)V", signature = "(IILjava/util/HashSet;IB)V",
garbageValue = "0" garbageValue = "0"
) )
void method412(int var1, int var2, HashSet var3, int var4) { @Export("drawNonLinkMapIcons")
void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) {
float var5 = (float)var4 / 64.0F; float var5 = (float)var4 / 64.0F;
float var6 = var5 / 2.0F; float var6 = var5 / 2.0F;
Iterator var7 = this.iconsMap.entrySet().iterator(); Iterator var7 = this.iconsMap.entrySet().iterator();
@@ -759,8 +761,8 @@ public class WorldMapRegion {
int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6);
AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue();
if (var12 != null && var12.method19()) { if (var12 != null && var12.method19()) {
var12.field5 = var10; var12.screenX = var10;
var12.field6 = var11; var12.screenY = var11;
WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.getElement()); WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.getElement());
if (!var3.contains(var13.method390())) { if (!var3.contains(var13.method390())) {
this.method415(var12, var10, var11, var5); this.method415(var12, var10, var11, var5);
@@ -783,7 +785,7 @@ public class WorldMapRegion {
if (var5.method19()) { if (var5.method19()) {
WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.getElement()); WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.getElement());
if (var6 != null && var1.contains(var6.method390())) { if (var6 != null && var1.contains(var6.method390())) {
this.method414(var6, var5.field5, var5.field6, var2, var3); this.method414(var6, var5.screenX, var5.screenY, var2, var3);
} }
} }
} }
@@ -795,13 +797,13 @@ public class WorldMapRegion {
signature = "(Lic;IIIIB)V", signature = "(Lic;IIIIB)V",
garbageValue = "92" garbageValue = "92"
) )
void method414(WorldMapElement var1, int var2, int var3, int var4, int var5) { void method414(WorldMapElement var1, int x, int y, int var4, int var5) {
Sprite var6 = var1.getSprite(false); Sprite var6 = var1.getSprite(false);
if (var6 != null) { if (var6 != null) {
var6.drawAt2(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); var6.drawAt2(x - var6.subWidth / 2, y - var6.subHeight / 2);
if (var4 % var5 < var5 / 2) { if (var4 % var5 < var5 / 2) {
Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); Rasterizer2D.Rasterizer2D_drawCircleAlpha(x, y, 15, 16776960, 128);
Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); Rasterizer2D.Rasterizer2D_drawCircleAlpha(x, y, 7, 16777215, 256);
} }
} }
@@ -826,8 +828,8 @@ public class WorldMapRegion {
void method416(WorldMapElement var1, int var2, int var3) { void method416(WorldMapElement var1, int var2, int var3) {
Sprite var4 = var1.getSprite(false); Sprite var4 = var1.getSprite(false);
if (var4 != null) { if (var4 != null) {
int var5 = this.method473(var4, var1.field3287); int var5 = this.method473(var4, var1.horizontalAlignment);
int var6 = this.method474(var4, var1.field3301); int var6 = this.method474(var4, var1.verticalAlignment);
var4.drawAt2(var5 + var2, var3 + var6); var4.drawAt2(var5 + var2, var3 + var6);
} }
@@ -852,7 +854,8 @@ public class WorldMapRegion {
signature = "(IILjava/util/HashSet;IB)V", signature = "(IILjava/util/HashSet;IB)V",
garbageValue = "-17" garbageValue = "-17"
) )
void method418(int var1, int var2, HashSet var3, int var4) { @Export("drawMapLinks")
void drawMapLinks(int var1, int var2, HashSet var3, int var4) {
float var5 = (float)var4 / 64.0F; float var5 = (float)var4 / 64.0F;
Iterator var6 = this.iconsList.iterator(); Iterator var6 = this.iconsList.iterator();
@@ -861,10 +864,10 @@ public class WorldMapRegion {
if (var7.method19()) { if (var7.method19()) {
int var8 = var7.coord2.x % 64; int var8 = var7.coord2.x % 64;
int var9 = var7.coord2.y % 64; int var9 = var7.coord2.y % 64;
var7.field5 = (int)((float)var8 * var5 + (float)var1); var7.screenX = (int)((float)var8 * var5 + (float)var1);
var7.field6 = (int)(var5 * (float)(63 - var9) + (float)var2); var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2);
if (!var3.contains(var7.getElement())) { if (!var3.contains(var7.getElement())) {
this.method415(var7, var7.field5, var7.field6, var5); this.method415(var7, var7.screenX, var7.screenY, var5);
} }
} }
} }
@@ -876,8 +879,8 @@ public class WorldMapRegion {
signature = "(Lln;Lju;I)I", signature = "(Lln;Lju;I)I",
garbageValue = "1945325707" garbageValue = "1945325707"
) )
int method473(Sprite var1, class266 var2) { int method473(Sprite var1, HorizontalAlignment var2) {
switch(var2.field3528) { switch(var2.value) {
case 0: case 0:
return -var1.subWidth / 2; return -var1.subWidth / 2;
case 2: case 2:
@@ -892,8 +895,8 @@ public class WorldMapRegion {
signature = "(Lln;Lip;I)I", signature = "(Lln;Lip;I)I",
garbageValue = "1788772278" garbageValue = "1788772278"
) )
int method474(Sprite var1, class249 var2) { int method474(Sprite var1, VerticalAlignment var2) {
switch(var2.field3275) { switch(var2.value) {
case 0: case 0:
return 0; return 0;
case 1: case 1:
@@ -910,7 +913,7 @@ public class WorldMapRegion {
) )
WorldMapLabel method419(int var1) { WorldMapLabel method419(int var1) {
WorldMapElement var2 = ViewportMouse.getWorldMapElement(var1); WorldMapElement var2 = ViewportMouse.getWorldMapElement(var1);
return this.method420(var2); return this.createMapLabel(var2);
} }
@ObfuscatedName("ab") @ObfuscatedName("ab")
@@ -918,9 +921,10 @@ public class WorldMapRegion {
signature = "(Lic;B)Laj;", signature = "(Lic;B)Laj;",
garbageValue = "59" garbageValue = "59"
) )
WorldMapLabel method420(WorldMapElement var1) { @Export("createMapLabel")
if (var1.field1021 != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { WorldMapLabel createMapLabel(WorldMapElement var1) {
WorldMapLabelSize var2 = WorldMapLabelSize.method195(var1.textSize); if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) {
WorldMapLabelSize var2 = WorldMapLabelSize.valueOf(var1.textSize);
if (var2 == null) { if (var2 == null) {
return null; return null;
} else { } else {
@@ -928,9 +932,9 @@ public class WorldMapRegion {
if (var3 == null) { if (var3 == null) {
return null; return null;
} else { } else {
int var4 = var3.lineCount(var1.field1021, 1000000); int var4 = var3.lineCount(var1.name, 1000000);
String[] var5 = new String[var4]; String[] var5 = new String[var4];
var3.breakLines(var1.field1021, (int[])null, var5); var3.breakLines(var1.name, (int[])null, var5);
int var6 = var5.length * var3.ascent / 2; int var6 = var5.length * var3.ascent / 2;
int var7 = 0; int var7 = 0;
String[] var8 = var5; String[] var8 = var5;
@@ -943,7 +947,7 @@ public class WorldMapRegion {
} }
} }
return new WorldMapLabel(var1.field1021, var7, var6, var2); return new WorldMapLabel(var1.name, var7, var6, var2);
} }
} }
} else { } else {
@@ -1009,19 +1013,19 @@ public class WorldMapRegion {
void method422(int var1, int var2, int var3, int var4) { void method422(int var1, int var2, int var3, int var4) {
var3 %= 4; var3 %= 4;
if (var3 == 0) { if (var3 == 0) {
Rasterizer2D.Rasterizer2D_drawVerticalLine(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, var4); Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
} }
if (var3 == 1) { if (var3 == 1) {
Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, var4); Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
} }
if (var3 == 2) { if (var3 == 2) {
Rasterizer2D.Rasterizer2D_drawVerticalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2), this.field1054, var4); Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
} }
if (var3 == 3) { if (var3 == 3) {
Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2) + this.field1054 - 1, this.field1054, var4); Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4);
} }
} }
@@ -1050,6 +1054,7 @@ public class WorldMapRegion {
signature = "(Lho;IIS)V", signature = "(Lho;IIS)V",
garbageValue = "597" garbageValue = "597"
) )
// Click minimap?
static final void method567(Widget var0, int var1, int var2) { static final void method567(Widget var0, int var1, int var2) {
if ((Client.minimapState == 0 || Client.minimapState == 3) && !Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { if ((Client.minimapState == 0 || Client.minimapState == 3) && !Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) {
SpriteMask var3 = var0.getSpriteMask(true); SpriteMask var3 = var0.getSpriteMask(true);
@@ -1102,7 +1107,7 @@ public class WorldMapRegion {
for (int var5 = 0; var5 < var0.length; ++var5) { for (int var5 = 0; var5 < var0.length; ++var5) {
Widget var6 = var0[var5]; Widget var6 = var0[var5];
if (var6 != null && var6.parentId == var1) { if (var6 != null && var6.parentId == var1) {
WorldMapSection3.alignWidgetSize(var6, var2, var3, var4); WorldMapSection1.alignWidgetSize(var6, var2, var3, var4);
FloorOverlayDefinition.alignWidgetPosition(var6, var2, var3); FloorOverlayDefinition.alignWidgetPosition(var6, var2, var3);
if (var6.scrollX > var6.scrollWidth - var6.width) { if (var6.scrollX > var6.scrollWidth - var6.width) {
var6.scrollX = var6.scrollWidth - var6.width; var6.scrollX = var6.scrollWidth - var6.width;
runescape-client/src/main/java/WorldMapSection0.java
+201 -166
View File
@@ -4,86 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature; import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("y") @ObfuscatedName("ah")
@Implements("WorldMapSection0") @Implements("WorldMapSection0")
public class WorldMapSection0 implements WorldMapSection { public class WorldMapSection0 implements WorldMapSection {
@ObfuscatedName("sn") @ObfuscatedName("l")
@ObfuscatedGetter( static int[] field1082;
intValue = -1946112139 @ObfuscatedName("j")
) @Export("cacheDirectoryLocations")
static int field1055; public static String[] cacheDirectoryLocations;
@ObfuscatedName("p")
static int[] field1056;
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -2011838881 intValue = -1561552223
) )
int field1057; @Export("minPlane")
int minPlane;
@ObfuscatedName("f") @ObfuscatedName("f")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 1299225715 intValue = -245382089
) )
int field1058; @Export("planes")
int planes;
@ObfuscatedName("q") @ObfuscatedName("q")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 82600709 intValue = -1024859679
) )
int field1059; @Export("xRegion")
int xRegion;
@ObfuscatedName("w") @ObfuscatedName("w")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -477370575 intValue = 40495485
) )
int field1060; @Export("yRegion")
int yRegion;
@ObfuscatedName("o") @ObfuscatedName("o")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -671345527 intValue = 982234927
) )
int field1061; int field1087;
@ObfuscatedName("u") @ObfuscatedName("u")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 529427495 intValue = -1272330125
) )
int field1062; int field1088;
@ObfuscatedName("g")
@ObfuscatedGetter(
intValue = -150870205
)
int field1063;
@ObfuscatedName("l")
@ObfuscatedGetter(
intValue = 1009718107
)
int field1064;
@ObfuscatedName("e")
@ObfuscatedGetter(
intValue = -1022177315
)
int field1065;
@ObfuscatedName("x")
@ObfuscatedGetter(
intValue = -1397517463
)
int field1066;
@ObfuscatedName("d")
@ObfuscatedGetter(
intValue = -799353317
)
int field1067;
@ObfuscatedName("k")
@ObfuscatedGetter(
intValue = -1388959491
)
int field1068;
@ObfuscatedName("n")
@ObfuscatedGetter(
intValue = -1657956317
)
int field1069;
@ObfuscatedName("i")
@ObfuscatedGetter(
intValue = 1345061881
)
int field1070;
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
@@ -91,21 +53,21 @@ public class WorldMapSection0 implements WorldMapSection {
garbageValue = "1384899025" garbageValue = "1384899025"
) )
@Export("expandBounds") @Export("expandBounds")
public void expandBounds(WorldMapArea var1) { public void expandBounds(WorldMapArea area) {
if (var1.minX0 > this.field1061) { if (area.minX0 > this.field1087) {
var1.minX0 = this.field1061; area.minX0 = this.field1087;
} }
if (var1.maxX0 < this.field1061) { if (area.maxX0 < this.field1087) {
var1.maxX0 = this.field1061; area.maxX0 = this.field1087;
} }
if (var1.minY0 > this.field1062) { if (area.minY0 > this.field1088) {
var1.minY0 = this.field1062; area.minY0 = this.field1088;
} }
if (var1.maxY0 < this.field1062) { if (area.maxY0 < this.field1088) {
var1.maxY0 = this.field1062; area.maxY0 = this.field1088;
} }
} }
@@ -116,8 +78,8 @@ public class WorldMapSection0 implements WorldMapSection {
garbageValue = "93" garbageValue = "93"
) )
@Export("containsCoord") @Export("containsCoord")
public boolean containsCoord(int var1, int var2, int var3) { public boolean containsCoord(int plane, int x, int y) {
return var1 >= this.field1057 && var1 < this.field1057 + this.field1058 ? var2 >= (this.field1059 << 6) + (this.field1063 << 3) && var2 <= (this.field1059 << 6) + (this.field1065 << 3) + 7 && var3 >= (this.field1060 << 6) + (this.field1064 << 3) && var3 <= (this.field1060 << 6) + (this.field1066 << 3) + 7 : false; return plane >= this.minPlane && plane < this.minPlane + this.planes ? x >> 6 == this.xRegion && y >> 6 == this.yRegion : false;
} }
@ObfuscatedName("q") @ObfuscatedName("q")
@@ -126,8 +88,8 @@ public class WorldMapSection0 implements WorldMapSection {
garbageValue = "4" garbageValue = "4"
) )
@Export("containsPosition") @Export("containsPosition")
public boolean containsPosition(int var1, int var2) { public boolean containsPosition(int x, int y) {
return var1 >= (this.field1061 << 6) + (this.field1067 << 3) && var1 <= (this.field1061 << 6) + (this.field1069 << 3) + 7 && var2 >= (this.field1062 << 6) + (this.field1068 << 3) && var2 <= (this.field1062 << 6) + (this.field1070 << 3) + 7; return x >> 6 == this.field1087 && y >> 6 == this.field1088;
} }
@ObfuscatedName("w") @ObfuscatedName("w")
@@ -136,11 +98,11 @@ public class WorldMapSection0 implements WorldMapSection {
garbageValue = "1545934424" garbageValue = "1545934424"
) )
@Export("position") @Export("position")
public int[] position(int var1, int var2, int var3) { public int[] position(int plane, int x, int y) {
if (!this.containsCoord(var1, var2, var3)) { if (!this.containsCoord(plane, x, y)) {
return null; return null;
} else { } else {
int[] var4 = new int[]{this.field1061 * 64 - this.field1059 * 64 + var2 + (this.field1067 * 8 - this.field1063 * 8), var3 + (this.field1062 * 64 - this.field1060 * 64) + (this.field1068 * 8 - this.field1064 * 8)}; int[] var4 = new int[]{this.field1087 * 64 - this.xRegion * 64 + x, y + (this.field1088 * 64 - this.yRegion * 64)};
return var4; return var4;
} }
} }
@@ -151,13 +113,13 @@ public class WorldMapSection0 implements WorldMapSection {
garbageValue = "-1916486802" garbageValue = "-1916486802"
) )
@Export("coord") @Export("coord")
public Coord coord(int var1, int var2) { public Coord coord(int x, int y) {
if (!this.containsPosition(var1, var2)) { if (!this.containsPosition(x, y)) {
return null; return null;
} else { } else {
int var3 = this.field1059 * 64 - this.field1061 * 64 + (this.field1063 * 8 - this.field1067 * 8) + var1; int var3 = this.xRegion * 64 - this.field1087 * 64 + x;
int var4 = this.field1060 * 64 - this.field1062 * 64 + var2 + (this.field1064 * 8 - this.field1068 * 8); int var4 = this.yRegion * 64 - this.field1088 * 64 + y;
return new Coord(this.field1057, var3, var4); return new Coord(this.minPlane, var3, var4);
} }
} }
@@ -167,116 +129,189 @@ public class WorldMapSection0 implements WorldMapSection {
garbageValue = "-113" garbageValue = "-113"
) )
@Export("read") @Export("read")
public void read(Buffer var1) { public void read(Buffer buffer) {
this.field1057 = var1.readUnsignedByte(); this.minPlane = buffer.readUnsignedByte();
this.field1058 = var1.readUnsignedByte(); this.planes = buffer.readUnsignedByte();
this.field1059 = var1.readUnsignedShort(); this.xRegion = buffer.readUnsignedShort();
this.field1063 = var1.readUnsignedByte(); this.yRegion = buffer.readUnsignedShort();
this.field1065 = var1.readUnsignedByte(); this.field1087 = buffer.readUnsignedShort();
this.field1060 = var1.readUnsignedShort(); this.field1088 = buffer.readUnsignedShort();
this.field1064 = var1.readUnsignedByte(); this.method425();
this.field1066 = var1.readUnsignedByte();
this.field1061 = var1.readUnsignedShort();
this.field1067 = var1.readUnsignedByte();
this.field1069 = var1.readUnsignedByte();
this.field1062 = var1.readUnsignedShort();
this.field1068 = var1.readUnsignedByte();
this.field1070 = var1.readUnsignedByte();
this.method423();
} }
@ObfuscatedName("g") @ObfuscatedName("g")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(I)V", signature = "(I)V",
garbageValue = "1967186894" garbageValue = "-1602858772"
) )
void method423() { void method425() {
} }
@ObfuscatedName("w") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(I)V", signature = "(II)I",
garbageValue = "-2102591569" garbageValue = "409746497"
) )
@Export("savePreferences") @Export("getVarbit")
static void savePreferences() { public static int getVarbit(int var0) {
AccessFile var0 = null; VarbitDefinition var1 = Occluder.getVarbitDefinition(var0);
int var2 = var1.baseVar;
try { int var3 = var1.startBit;
var0 = LoginPacket.getPreferencesFile("", class22.studioGame.name, true); int var4 = var1.endBit;
Buffer var1 = ReflectionCheck.clientPreferences.toBuffer(); int var5 = Varps.Varps_masks[var4 - var3];
var0.write(var1.array, 0, var1.index); return Varps.Varps_main[var2] >> var3 & var5;
} catch (Exception var3) {
} }
try { @ObfuscatedName("f")
if (var0 != null) {
var0.closeSync(true);
}
} catch (Exception var2) {
}
}
@ObfuscatedName("hz")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(II)V", signature = "(IILfe;Lfy;I)Z",
garbageValue = "1886145284" garbageValue = "-2025028346"
) )
static final void method245(int var0) { static final boolean method593(int var0, int var1, RouteStrategy var2, CollisionMap var3) {
if (var0 >= 0) { int var4 = var0;
int var1 = Client.menuArguments1[var0]; int var5 = var1;
int var2 = Client.menuArguments2[var0]; byte var6 = 64;
int var3 = Client.menuOpcodes[var0]; byte var7 = 64;
int var4 = Client.menuArguments0[var0]; int var8 = var0 - var6;
String var5 = Client.menuActions[var0]; int var9 = var1 - var7;
String var6 = Client.menuTargetNames[var0]; class178.directions[var6][var7] = 99;
Actor.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); class178.distances[var6][var7] = 0;
byte var10 = 0;
int var11 = 0;
class178.bufferX[var10] = var0;
int var12 = var10 + 1;
class178.bufferY[var10] = var1;
int[][] var13 = var3.flags;
while (var12 != var11) {
var4 = class178.bufferX[var11];
var5 = class178.bufferY[var11];
var11 = var11 + 1 & 4095;
int var14 = var4 - var8;
int var15 = var5 - var9;
int var16 = var4 - var3.xInset;
int var17 = var5 - var3.yInset;
if (var2.vmethod3644(2, var4, var5, var3)) {
InterfaceParent.field986 = var4;
UrlRequester.field929 = var5;
return true;
} }
int var18 = class178.distances[var14][var15] + 1;
if (var14 > 0 && class178.directions[var14 - 1][var15] == 0 && (var13[var16 - 1][var17] & 19136782) == 0 && (var13[var16 - 1][var17 + 1] & 19136824) == 0) {
class178.bufferX[var12] = var4 - 1;
class178.bufferY[var12] = var5;
var12 = var12 + 1 & 4095;
class178.directions[var14 - 1][var15] = 2;
class178.distances[var14 - 1][var15] = var18;
} }
@ObfuscatedName("io") if (var14 < 126 && class178.directions[var14 + 1][var15] == 0 && (var13[var16 + 2][var17] & 19136899) == 0 && (var13[var16 + 2][var17 + 1] & 19136992) == 0) {
class178.bufferX[var12] = var4 + 1;
class178.bufferY[var12] = var5;
var12 = var12 + 1 & 4095;
class178.directions[var14 + 1][var15] = 8;
class178.distances[var14 + 1][var15] = var18;
}
if (var15 > 0 && class178.directions[var14][var15 - 1] == 0 && (var13[var16][var17 - 1] & 19136782) == 0 && (var13[var16 + 1][var17 - 1] & 19136899) == 0) {
class178.bufferX[var12] = var4;
class178.bufferY[var12] = var5 - 1;
var12 = var12 + 1 & 4095;
class178.directions[var14][var15 - 1] = 1;
class178.distances[var14][var15 - 1] = var18;
}
if (var15 < 126 && class178.directions[var14][var15 + 1] == 0 && (var13[var16][var17 + 2] & 19136824) == 0 && (var13[var16 + 1][var17 + 2] & 19136992) == 0) {
class178.bufferX[var12] = var4;
class178.bufferY[var12] = var5 + 1;
var12 = var12 + 1 & 4095;
class178.directions[var14][var15 + 1] = 4;
class178.distances[var14][var15 + 1] = var18;
}
if (var14 > 0 && var15 > 0 && class178.directions[var14 - 1][var15 - 1] == 0 && (var13[var16 - 1][var17] & 19136830) == 0 && (var13[var16 - 1][var17 - 1] & 19136782) == 0 && (var13[var16][var17 - 1] & 19136911) == 0) {
class178.bufferX[var12] = var4 - 1;
class178.bufferY[var12] = var5 - 1;
var12 = var12 + 1 & 4095;
class178.directions[var14 - 1][var15 - 1] = 3;
class178.distances[var14 - 1][var15 - 1] = var18;
}
if (var14 < 126 && var15 > 0 && class178.directions[var14 + 1][var15 - 1] == 0 && (var13[var16 + 1][var17 - 1] & 19136911) == 0 && (var13[var16 + 2][var17 - 1] & 19136899) == 0 && (var13[var16 + 2][var17] & 19136995) == 0) {
class178.bufferX[var12] = var4 + 1;
class178.bufferY[var12] = var5 - 1;
var12 = var12 + 1 & 4095;
class178.directions[var14 + 1][var15 - 1] = 9;
class178.distances[var14 + 1][var15 - 1] = var18;
}
if (var14 > 0 && var15 < 126 && class178.directions[var14 - 1][var15 + 1] == 0 && (var13[var16 - 1][var17 + 1] & 19136830) == 0 && (var13[var16 - 1][var17 + 2] & 19136824) == 0 && (var13[var16][var17 + 2] & 19137016) == 0) {
class178.bufferX[var12] = var4 - 1;
class178.bufferY[var12] = var5 + 1;
var12 = var12 + 1 & 4095;
class178.directions[var14 - 1][var15 + 1] = 6;
class178.distances[var14 - 1][var15 + 1] = var18;
}
if (var14 < 126 && var15 < 126 && class178.directions[var14 + 1][var15 + 1] == 0 && (var13[var16 + 1][var17 + 2] & 19137016) == 0 && (var13[var16 + 2][var17 + 2] & 19136992) == 0 && (var13[var16 + 2][var17 + 1] & 19136995) == 0) {
class178.bufferX[var12] = var4 + 1;
class178.bufferY[var12] = var5 + 1;
var12 = var12 + 1 & 4095;
class178.directions[var14 + 1][var15 + 1] = 12;
class178.distances[var14 + 1][var15 + 1] = var18;
}
}
InterfaceParent.field986 = var4;
UrlRequester.field929 = var5;
return false;
}
@ObfuscatedName("hc")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(Lho;IIIIIII)V", signature = "(ILjava/lang/String;I)V",
garbageValue = "-1723792771" garbageValue = "-1850233906"
) )
static final void method246(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { static void method583(int var0, String var1) {
if (Client.field188) { int var2 = Players.Players_count;
Client.field189 = 32; int[] var3 = Players.Players_indices;
} else { boolean var4 = false;
Client.field189 = 0; Username var5 = new Username(var1, KeyHandler.loginType);
for (int var6 = 0; var6 < var2; ++var6) {
Player var7 = Client.players[var3[var6]];
if (var7 != null && var7 != Canvas.localPlayer && var7.username != null && var7.username.equals(var5)) {
PacketBufferNode var8;
if (var0 == 1) {
var8 = Interpreter.method1915(ClientPacket.field269, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeShort(var3[var6]);
var8.packetBuffer.method56(0);
Client.packetWriter.method241(var8);
} else if (var0 == 4) {
var8 = Interpreter.method1915(ClientPacket.field249, Client.packetWriter.isaacCipher);
var8.packetBuffer.method64(var3[var6]);
var8.packetBuffer.method56(0);
Client.packetWriter.method241(var8);
} else if (var0 == 6) {
var8 = Interpreter.method1915(ClientPacket.field315, Client.packetWriter.isaacCipher);
var8.packetBuffer.method63(var3[var6]);
var8.packetBuffer.method57(0);
Client.packetWriter.method241(var8);
} else if (var0 == 7) {
var8 = Interpreter.method1915(ClientPacket.field297, Client.packetWriter.isaacCipher);
var8.packetBuffer.method57(0);
var8.packetBuffer.writeShortLE(var3[var6]);
Client.packetWriter.method241(var8);
} }
Client.field188 = false; var4 = true;
int var7; break;
if (MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) {
if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) {
var0.scrollY -= 4;
class22.method295(var0);
} else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) {
var0.scrollY += 4;
class22.method295(var0);
} else if (var5 >= var1 - Client.field189 && var5 < Client.field189 + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) {
var7 = var3 * (var3 - 32) / var4;
if (var7 < 8) {
var7 = 8;
}
int var8 = var6 - var2 - 16 - var7 / 2;
int var9 = var3 - 32 - var7;
var0.scrollY = var8 * (var4 - var3) / var9;
class22.method295(var0);
Client.field188 = true;
} }
} }
if (Client.mouseWheelRotation != 0) { if (!var4) {
var7 = var0.width; WorldMapIcon1.addGameMessage(4, "", "Unable to find " + var1);
if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) {
var0.scrollY += Client.mouseWheelRotation * 45;
class22.method295(var0);
}
} }
} }
runescape-client/src/main/java/WorldMapSection1.java
+123 -183
View File
@@ -4,79 +4,73 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature; import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("as") @ObfuscatedName("p")
@Implements("WorldMapSection1") @Implements("WorldMapSection1")
public class WorldMapSection1 implements WorldMapSection { public class WorldMapSection1 implements WorldMapSection {
@ObfuscatedName("c") @ObfuscatedName("h")
@Export("userHomeDirectory") @Export("osNameLowerCase")
public static String userHomeDirectory; public static String osNameLowerCase;
@ObfuscatedName("du") @ObfuscatedName("dr")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lit;" signature = "Lit;"
) )
@Export("archive15") @Export("archive8")
static Archive archive15; static Archive archive8;
@ObfuscatedName("ey") @ObfuscatedName("go")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1516124929 intValue = -948290091
) )
static int field1071; static int field1089;
@ObfuscatedName("ha")
@ObfuscatedGetter(
intValue = 1052834531
)
@Export("cameraX")
static int cameraX;
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1971304641 intValue = 1389733201
) )
int field1072; int field1090;
@ObfuscatedName("f") @ObfuscatedName("f")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 1483447179 intValue = -1622972483
) )
int field1073; int field1091;
@ObfuscatedName("q") @ObfuscatedName("q")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1875803617 intValue = 702057599
) )
int field1074; int field1092;
@ObfuscatedName("w") @ObfuscatedName("w")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 284566685 intValue = -1068088609
) )
int field1075; int field1093;
@ObfuscatedName("o") @ObfuscatedName("o")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1513010233 intValue = 1257151629
) )
int field1076; int field1094;
@ObfuscatedName("u") @ObfuscatedName("u")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1383826035 intValue = -1351623663
) )
int field1077; int field1095;
@ObfuscatedName("g") @ObfuscatedName("g")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 1526007343 intValue = 1016557381
) )
int field1078; int field1096;
@ObfuscatedName("l") @ObfuscatedName("l")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -890169045 intValue = 884736611
) )
int field1079; int field1097;
@ObfuscatedName("e") @ObfuscatedName("e")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1797724181 intValue = 395786901
) )
int field1080; int field1098;
@ObfuscatedName("x") @ObfuscatedName("x")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 325777555 intValue = -627081155
) )
int field1081; int field1099;
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
@@ -84,21 +78,21 @@ public class WorldMapSection1 implements WorldMapSection {
garbageValue = "1384899025" garbageValue = "1384899025"
) )
@Export("expandBounds") @Export("expandBounds")
public void expandBounds(WorldMapArea var1) { public void expandBounds(WorldMapArea area) {
if (var1.minX0 > this.field1076) { if (area.minX0 > this.field1096) {
var1.minX0 = this.field1076; area.minX0 = this.field1096;
} }
if (var1.maxX0 < this.field1076) { if (area.maxX0 < this.field1098) {
var1.maxX0 = this.field1076; area.maxX0 = this.field1098;
} }
if (var1.minY0 > this.field1077) { if (area.minY0 > this.field1097) {
var1.minY0 = this.field1077; area.minY0 = this.field1097;
} }
if (var1.maxY0 < this.field1077) { if (area.maxY0 < this.field1099) {
var1.maxY0 = this.field1077; area.maxY0 = this.field1099;
} }
} }
@@ -109,8 +103,8 @@ public class WorldMapSection1 implements WorldMapSection {
garbageValue = "93" garbageValue = "93"
) )
@Export("containsCoord") @Export("containsCoord")
public boolean containsCoord(int var1, int var2, int var3) { public boolean containsCoord(int plane, int x, int y) {
return var1 >= this.field1072 && var1 < this.field1072 + this.field1073 ? var2 >= (this.field1074 << 6) + (this.field1078 << 3) && var2 <= (this.field1074 << 6) + (this.field1078 << 3) + 7 && var3 >= (this.field1075 << 6) + (this.field1079 << 3) && var3 <= (this.field1075 << 6) + (this.field1079 << 3) + 7 : false; return plane >= this.field1090 && plane < this.field1090 + this.field1091 ? x >> 6 >= this.field1092 && x >> 6 <= this.field1094 && y >> 6 >= this.field1093 && y >> 6 <= this.field1095 : false;
} }
@ObfuscatedName("q") @ObfuscatedName("q")
@@ -119,8 +113,8 @@ public class WorldMapSection1 implements WorldMapSection {
garbageValue = "4" garbageValue = "4"
) )
@Export("containsPosition") @Export("containsPosition")
public boolean containsPosition(int var1, int var2) { public boolean containsPosition(int x, int y) {
return var1 >= (this.field1076 << 6) + (this.field1080 << 3) && var1 <= (this.field1076 << 6) + (this.field1080 << 3) + 7 && var2 >= (this.field1077 << 6) + (this.field1081 << 3) && var2 <= (this.field1077 << 6) + (this.field1081 << 3) + 7; return x >> 6 >= this.field1096 && x >> 6 <= this.field1098 && y >> 6 >= this.field1097 && y >> 6 <= this.field1099;
} }
@ObfuscatedName("w") @ObfuscatedName("w")
@@ -129,11 +123,11 @@ public class WorldMapSection1 implements WorldMapSection {
garbageValue = "1545934424" garbageValue = "1545934424"
) )
@Export("position") @Export("position")
public int[] position(int var1, int var2, int var3) { public int[] position(int plane, int x, int y) {
if (!this.containsCoord(var1, var2, var3)) { if (!this.containsCoord(plane, x, y)) {
return null; return null;
} else { } else {
int[] var4 = new int[]{this.field1076 * 64 - this.field1074 * 64 + var2 + (this.field1080 * 8 - this.field1078 * 8), var3 + (this.field1077 * 64 - this.field1075 * 64) + (this.field1081 * 8 - this.field1079 * 8)}; int[] var4 = new int[]{this.field1096 * 64 - this.field1092 * 64 + x, y + (this.field1097 * 64 - this.field1093 * 64)};
return var4; return var4;
} }
} }
@@ -144,13 +138,13 @@ public class WorldMapSection1 implements WorldMapSection {
garbageValue = "-1916486802" garbageValue = "-1916486802"
) )
@Export("coord") @Export("coord")
public Coord coord(int var1, int var2) { public Coord coord(int x, int y) {
if (!this.containsPosition(var1, var2)) { if (!this.containsPosition(x, y)) {
return null; return null;
} else { } else {
int var3 = this.field1074 * 64 - this.field1076 * 64 + (this.field1078 * 8 - this.field1080 * 8) + var1; int var3 = this.field1092 * 64 - this.field1096 * 64 + x;
int var4 = this.field1075 * 64 - this.field1077 * 64 + var2 + (this.field1079 * 8 - this.field1081 * 8); int var4 = this.field1093 * 64 - this.field1097 * 64 + y;
return new Coord(this.field1072, var3, var4); return new Coord(this.field1090, var3, var4);
} }
} }
@@ -160,165 +154,111 @@ public class WorldMapSection1 implements WorldMapSection {
garbageValue = "-113" garbageValue = "-113"
) )
@Export("read") @Export("read")
public void read(Buffer var1) { public void read(Buffer buffer) {
this.field1072 = var1.readUnsignedByte(); this.field1090 = buffer.readUnsignedByte();
this.field1073 = var1.readUnsignedByte(); this.field1091 = buffer.readUnsignedByte();
this.field1074 = var1.readUnsignedShort(); this.field1092 = buffer.readUnsignedShort();
this.field1078 = var1.readUnsignedByte(); this.field1093 = buffer.readUnsignedShort();
this.field1075 = var1.readUnsignedShort(); this.field1094 = buffer.readUnsignedShort();
this.field1079 = var1.readUnsignedByte(); this.field1095 = buffer.readUnsignedShort();
this.field1076 = var1.readUnsignedShort(); this.field1096 = buffer.readUnsignedShort();
this.field1080 = var1.readUnsignedByte(); this.field1097 = buffer.readUnsignedShort();
this.field1077 = var1.readUnsignedShort(); this.field1098 = buffer.readUnsignedShort();
this.field1081 = var1.readUnsignedByte(); this.field1099 = buffer.readUnsignedShort();
this.method424(); this.method426();
} }
@ObfuscatedName("g") @ObfuscatedName("g")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(I)V", signature = "(B)V",
garbageValue = "2026323437" garbageValue = "-126"
) )
void method424() { void method426() {
} }
@ObfuscatedName("m") @ObfuscatedName("d")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(II)Lim;", signature = "(Lho;II)V",
garbageValue = "-205156540" garbageValue = "1115233428"
) )
@Export("getKitDefinition") static final void method345(Widget var0, int var1) {
public static KitDefinition getKitDefinition(int var0) { if (var0.field966 == null) {
KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); throw new RuntimeException();
if (var1 != null) {
return var1;
} else { } else {
byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); if (var0.field984 == null) {
var1 = new KitDefinition(); var0.field984 = new int[var0.field966.length];
if (var2 != null) {
var1.decode(new Buffer(var2));
} }
KitDefinition.KitDefinition_cached.put(var1, (long)var0); var0.field984[var1] = Integer.MAX_VALUE;
return var1;
} }
} }
@ObfuscatedName("fc") @ObfuscatedName("am")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(I)V", signature = "(IB)V",
garbageValue = "2142100332" garbageValue = "23"
) )
static void method808() { @Export("runWidgetOnLoadListener")
Client.mouseLastLastPressedTimeMillis = 1L; static void runWidgetOnLoadListener(int var0) {
Projectile.mouseRecorder.index = 0; if (var0 != -1 && GroundItemPile.loadInterface(var0)) {
class230.field1138 = true; Widget[] var1 = Widget.interfaceComponents[var0];
Client.field166 = true;
Client.field126 = -1L;
PendingSpawn.method1694();
Client.packetWriter.method239();
Client.packetWriter.packetBuffer.index = 0;
Client.packetWriter.serverPacket0 = null;
Client.packetWriter.field676 = null;
Client.packetWriter.field677 = null;
Client.packetWriter.field678 = null;
Client.packetWriter.serverPacket0Length = 0;
Client.packetWriter.field674 = 0;
Client.rebootTimer = 0;
Client.field175 = 0;
Client.hintArrowType = 0;
Client.menuOptionsCount = 0;
Client.isMenuOpen = false;
MouseHandler.MouseHandler_idleCycles = 0;
GroundItem.method2094();
Client.isItemSelected = 0;
Client.isSpellSelected = false;
Client.soundEffectCount = 0;
Client.camAngleY = 0;
Client.oculusOrbState = 0;
ClientParameter.field3645 = null;
Client.minimapState = 0;
Client.field125 = -1;
Client.destinationX = 0;
Client.destinationY = 0;
Client.playerAttackOption = AttackOption.AttackOption_hidden;
Client.npcAttackOption = AttackOption.AttackOption_hidden;
Client.npcCount = 0;
Players.Players_count = 0;
int var0; for (int var2 = 0; var2 < var1.length; ++var2) {
for (var0 = 0; var0 < 2048; ++var0) { Widget var3 = var1[var2];
Players.field733[var0] = null; if (var3.onLoad != null) {
Players.field732[var0] = 1; ScriptEvent var4 = new ScriptEvent();
} var4.widget = var3;
var4.args0 = var3.onLoad;
for (var0 = 0; var0 < 2048; ++var0) { GrandExchangeEvent.runScript0(var4, 5000000);
Client.players[var0] = null;
}
for (var0 = 0; var0 < 32768; ++var0) {
Client.npcs[var0] = null;
}
Client.combatTargetPlayerIndex = -1;
Client.projectiles.clear();
Client.graphicsObjects.clear();
for (var0 = 0; var0 < 4; ++var0) {
for (int var1 = 0; var1 < 104; ++var1) {
for (int var2 = 0; var2 < 104; ++var2) {
Client.groundItems[var0][var1][var2] = null;
} }
} }
} }
Client.pendingSpawns = new NodeDeque();
WorldMapArea.friendSystem.clear();
for (var0 = 0; var0 < VarpDefinition.field944; ++var0) {
VarpDefinition var3 = SecureRandomCallable.method1140(var0);
if (var3 != null) {
Varps.Varps_temp[var0] = 0;
Varps.Varps_main[var0] = 0;
}
} }
class196.varcs.clearTransient(); @ObfuscatedName("ic")
Client.followerIndex = -1; @ObfuscatedSignature(
if (Client.rootInterface != -1) { signature = "(Lho;IIZB)V",
AbstractByteArrayCopier.unloadInterface(Client.rootInterface); garbageValue = "-35"
)
@Export("alignWidgetSize")
static void alignWidgetSize(Widget component, int parentWidth, int parentHeight, boolean var3) {
int var4 = component.width;
int var5 = component.height;
if (component.widthAlignment == 0) {
component.width = component.rawWidth;
} else if (component.widthAlignment == 1) {
component.width = parentWidth - component.rawWidth;
} else if (component.widthAlignment == 2) {
component.width = component.rawWidth * parentWidth >> 14;
} }
for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) { if (component.heightAlignment == 0) {
MenuAction.closeInterface(var4, true); component.height = component.rawHeight;
} else if (component.heightAlignment == 1) {
component.height = parentHeight - component.rawHeight;
} else if (component.heightAlignment == 2) {
component.height = parentHeight * component.rawHeight >> 14;
} }
Client.rootInterface = -1; if (component.widthAlignment == 4) {
Client.interfaceParents = new NodeHashTable(8); component.width = component.height * component.field958 / component.field959;
Client.field127 = null;
Client.menuOptionsCount = 0;
Client.isMenuOpen = false;
Client.field119.method256((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1);
for (var0 = 0; var0 < 8; ++var0) {
Client.playerMenuActions[var0] = null;
Client.playerOptionsPriorities[var0] = false;
} }
SpriteMask.method4389(); if (component.heightAlignment == 4) {
Client.isLoading = true; component.height = component.width * component.field959 / component.field958;
for (var0 = 0; var0 < 100; ++var0) {
Client.field100[var0] = true;
} }
AbstractByteArrayCopier.method4024(); if (component.contentType == 1337) {
PacketWriter.clanChat = null; Client.viewportWidget = component;
}
for (var0 = 0; var0 < 8; ++var0) {
Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); if (var3 && component.onResize != null && (var4 != component.width || var5 != component.height)) {
ScriptEvent var6 = new ScriptEvent();
var6.widget = component;
var6.args0 = component.onResize;
Client.scriptEvents.addFirst(var6);
} }
FloorDecoration.grandExchangeEvents = null;
} }
} }
runescape-client/src/main/java/WorldMapSection2.java
+201 -191
View File
@@ -4,44 +4,79 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature; import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ah") @ObfuscatedName("as")
@Implements("WorldMapSection2") @Implements("WorldMapSection2")
public class WorldMapSection2 implements WorldMapSection { public class WorldMapSection2 implements WorldMapSection {
@ObfuscatedName("l") @ObfuscatedName("c")
static int[] field1082; @Export("userHomeDirectory")
@ObfuscatedName("j") public static String userHomeDirectory;
@Export("cacheDirectoryLocations") @ObfuscatedName("du")
public static String[] cacheDirectoryLocations; @ObfuscatedSignature(
signature = "Lit;"
)
@Export("archive15")
static Archive archive15;
@ObfuscatedName("ey")
@ObfuscatedGetter(
intValue = -1516124929
)
static int field1071;
@ObfuscatedName("ha")
@ObfuscatedGetter(
intValue = 1052834531
)
@Export("cameraX")
static int cameraX;
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1561552223 intValue = -1971304641
) )
int field1083; int field1072;
@ObfuscatedName("f") @ObfuscatedName("f")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -245382089 intValue = 1483447179
) )
int field1084; int field1073;
@ObfuscatedName("q") @ObfuscatedName("q")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1024859679 intValue = -1875803617
) )
int field1085; int field1074;
@ObfuscatedName("w") @ObfuscatedName("w")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 40495485 intValue = 284566685
) )
int field1086; int field1075;
@ObfuscatedName("o") @ObfuscatedName("o")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 982234927 intValue = -1513010233
) )
int field1087; int field1076;
@ObfuscatedName("u") @ObfuscatedName("u")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1272330125 intValue = -1383826035
) )
int field1088; int field1077;
@ObfuscatedName("g")
@ObfuscatedGetter(
intValue = 1526007343
)
int field1078;
@ObfuscatedName("l")
@ObfuscatedGetter(
intValue = -890169045
)
int field1079;
@ObfuscatedName("e")
@ObfuscatedGetter(
intValue = -1797724181
)
int field1080;
@ObfuscatedName("x")
@ObfuscatedGetter(
intValue = 325777555
)
int field1081;
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
@@ -49,21 +84,21 @@ public class WorldMapSection2 implements WorldMapSection {
garbageValue = "1384899025" garbageValue = "1384899025"
) )
@Export("expandBounds") @Export("expandBounds")
public void expandBounds(WorldMapArea var1) { public void expandBounds(WorldMapArea area) {
if (var1.minX0 > this.field1087) { if (area.minX0 > this.field1076) {
var1.minX0 = this.field1087; area.minX0 = this.field1076;
} }
if (var1.maxX0 < this.field1087) { if (area.maxX0 < this.field1076) {
var1.maxX0 = this.field1087; area.maxX0 = this.field1076;
} }
if (var1.minY0 > this.field1088) { if (area.minY0 > this.field1077) {
var1.minY0 = this.field1088; area.minY0 = this.field1077;
} }
if (var1.maxY0 < this.field1088) { if (area.maxY0 < this.field1077) {
var1.maxY0 = this.field1088; area.maxY0 = this.field1077;
} }
} }
@@ -74,8 +109,8 @@ public class WorldMapSection2 implements WorldMapSection {
garbageValue = "93" garbageValue = "93"
) )
@Export("containsCoord") @Export("containsCoord")
public boolean containsCoord(int var1, int var2, int var3) { public boolean containsCoord(int plane, int x, int y) {
return var1 >= this.field1083 && var1 < this.field1083 + this.field1084 ? var2 >> 6 == this.field1085 && var3 >> 6 == this.field1086 : false; return plane >= this.field1072 && plane < this.field1072 + this.field1073 ? x >= (this.field1074 << 6) + (this.field1078 << 3) && x <= (this.field1074 << 6) + (this.field1078 << 3) + 7 && y >= (this.field1075 << 6) + (this.field1079 << 3) && y <= (this.field1075 << 6) + (this.field1079 << 3) + 7 : false;
} }
@ObfuscatedName("q") @ObfuscatedName("q")
@@ -84,8 +119,8 @@ public class WorldMapSection2 implements WorldMapSection {
garbageValue = "4" garbageValue = "4"
) )
@Export("containsPosition") @Export("containsPosition")
public boolean containsPosition(int var1, int var2) { public boolean containsPosition(int x, int y) {
return var1 >> 6 == this.field1087 && var2 >> 6 == this.field1088; return x >= (this.field1076 << 6) + (this.field1080 << 3) && x <= (this.field1076 << 6) + (this.field1080 << 3) + 7 && y >= (this.field1077 << 6) + (this.field1081 << 3) && y <= (this.field1077 << 6) + (this.field1081 << 3) + 7;
} }
@ObfuscatedName("w") @ObfuscatedName("w")
@@ -94,11 +129,11 @@ public class WorldMapSection2 implements WorldMapSection {
garbageValue = "1545934424" garbageValue = "1545934424"
) )
@Export("position") @Export("position")
public int[] position(int var1, int var2, int var3) { public int[] position(int plane, int x, int y) {
if (!this.containsCoord(var1, var2, var3)) { if (!this.containsCoord(plane, x, y)) {
return null; return null;
} else { } else {
int[] var4 = new int[]{this.field1087 * 64 - this.field1085 * 64 + var2, var3 + (this.field1088 * 64 - this.field1086 * 64)}; int[] var4 = new int[]{this.field1076 * 64 - this.field1074 * 64 + x + (this.field1080 * 8 - this.field1078 * 8), y + (this.field1077 * 64 - this.field1075 * 64) + (this.field1081 * 8 - this.field1079 * 8)};
return var4; return var4;
} }
} }
@@ -109,13 +144,13 @@ public class WorldMapSection2 implements WorldMapSection {
garbageValue = "-1916486802" garbageValue = "-1916486802"
) )
@Export("coord") @Export("coord")
public Coord coord(int var1, int var2) { public Coord coord(int x, int y) {
if (!this.containsPosition(var1, var2)) { if (!this.containsPosition(x, y)) {
return null; return null;
} else { } else {
int var3 = this.field1085 * 64 - this.field1087 * 64 + var1; int var3 = this.field1074 * 64 - this.field1076 * 64 + (this.field1078 * 8 - this.field1080 * 8) + x;
int var4 = this.field1086 * 64 - this.field1088 * 64 + var2; int var4 = this.field1075 * 64 - this.field1077 * 64 + y + (this.field1079 * 8 - this.field1081 * 8);
return new Coord(this.field1083, var3, var4); return new Coord(this.field1072, var3, var4);
} }
} }
@@ -125,190 +160,165 @@ public class WorldMapSection2 implements WorldMapSection {
garbageValue = "-113" garbageValue = "-113"
) )
@Export("read") @Export("read")
public void read(Buffer var1) { public void read(Buffer buffer) {
this.field1083 = var1.readUnsignedByte(); this.field1072 = buffer.readUnsignedByte();
this.field1084 = var1.readUnsignedByte(); this.field1073 = buffer.readUnsignedByte();
this.field1085 = var1.readUnsignedShort(); this.field1074 = buffer.readUnsignedShort();
this.field1086 = var1.readUnsignedShort(); this.field1078 = buffer.readUnsignedByte();
this.field1087 = var1.readUnsignedShort(); this.field1075 = buffer.readUnsignedShort();
this.field1088 = var1.readUnsignedShort(); this.field1079 = buffer.readUnsignedByte();
this.method425(); this.field1076 = buffer.readUnsignedShort();
this.field1080 = buffer.readUnsignedByte();
this.field1077 = buffer.readUnsignedShort();
this.field1081 = buffer.readUnsignedByte();
this.method424();
} }
@ObfuscatedName("g") @ObfuscatedName("g")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(I)V", signature = "(I)V",
garbageValue = "-1602858772" garbageValue = "2026323437"
) )
void method425() { void method424() {
} }
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(II)I", signature = "(II)Lim;",
garbageValue = "409746497" garbageValue = "-205156540"
) )
@Export("getVarbit") @Export("getKitDefinition")
public static int getVarbit(int var0) { public static KitDefinition getKitDefinition(int var0) {
VarbitDefinition var1 = Occluder.method3255(var0); KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0);
int var2 = var1.baseVar; if (var1 != null) {
int var3 = var1.startBit; return var1;
int var4 = var1.endBit; } else {
int var5 = Varps.Varps_masks[var4 - var3]; byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0);
return Varps.Varps_main[var2] >> var3 & var5; var1 = new KitDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
} }
@ObfuscatedName("f") KitDefinition.KitDefinition_cached.put(var1, (long)var0);
return var1;
}
}
@ObfuscatedName("fc")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(IILfe;Lfy;I)Z", signature = "(I)V",
garbageValue = "-2025028346" garbageValue = "2142100332"
) )
static final boolean method593(int var0, int var1, RouteStrategy var2, CollisionMap var3) { static void method808() {
int var4 = var0; Client.mouseLastLastPressedTimeMillis = 1L;
int var5 = var1; Projectile.mouseRecorder.index = 0;
byte var6 = 64; class230.field1138 = true;
byte var7 = 64; Client.field166 = true;
int var8 = var0 - var6; Client.field126 = -1L;
int var9 = var1 - var7; PendingSpawn.method1694();
class178.directions[var6][var7] = 99; Client.packetWriter.method239();
class178.distances[var6][var7] = 0; Client.packetWriter.packetBuffer.index = 0;
byte var10 = 0; Client.packetWriter.serverPacket0 = null;
int var11 = 0; Client.packetWriter.field676 = null;
class178.bufferX[var10] = var0; Client.packetWriter.field677 = null;
int var12 = var10 + 1; Client.packetWriter.field678 = null;
class178.bufferY[var10] = var1; Client.packetWriter.serverPacket0Length = 0;
int[][] var13 = var3.flags; Client.packetWriter.field674 = 0;
Client.rebootTimer = 0;
Client.field175 = 0;
Client.hintArrowType = 0;
Client.menuOptionsCount = 0;
Client.isMenuOpen = false;
MouseHandler.MouseHandler_idleCycles = 0;
GroundItem.method2094();
Client.isItemSelected = 0;
Client.isSpellSelected = false;
Client.soundEffectCount = 0;
Client.camAngleY = 0;
Client.oculusOrbState = 0;
ClientParameter.field3645 = null;
Client.minimapState = 0;
Client.field125 = -1;
Client.destinationX = 0;
Client.destinationY = 0;
Client.playerAttackOption = AttackOption.AttackOption_hidden;
Client.npcAttackOption = AttackOption.AttackOption_hidden;
Client.npcCount = 0;
Players.Players_count = 0;
while (var12 != var11) { int var0;
var4 = class178.bufferX[var11]; for (var0 = 0; var0 < 2048; ++var0) {
var5 = class178.bufferY[var11]; Players.field733[var0] = null;
var11 = var11 + 1 & 4095; Players.field732[var0] = 1;
int var14 = var4 - var8;
int var15 = var5 - var9;
int var16 = var4 - var3.xInset;
int var17 = var5 - var3.yInset;
if (var2.vmethod3644(2, var4, var5, var3)) {
InterfaceParent.field986 = var4;
UrlRequester.field929 = var5;
return true;
} }
int var18 = class178.distances[var14][var15] + 1; for (var0 = 0; var0 < 2048; ++var0) {
if (var14 > 0 && class178.directions[var14 - 1][var15] == 0 && (var13[var16 - 1][var17] & 19136782) == 0 && (var13[var16 - 1][var17 + 1] & 19136824) == 0) { Client.players[var0] = null;
class178.bufferX[var12] = var4 - 1;
class178.bufferY[var12] = var5;
var12 = var12 + 1 & 4095;
class178.directions[var14 - 1][var15] = 2;
class178.distances[var14 - 1][var15] = var18;
} }
if (var14 < 126 && class178.directions[var14 + 1][var15] == 0 && (var13[var16 + 2][var17] & 19136899) == 0 && (var13[var16 + 2][var17 + 1] & 19136992) == 0) { for (var0 = 0; var0 < 32768; ++var0) {
class178.bufferX[var12] = var4 + 1; Client.npcs[var0] = null;
class178.bufferY[var12] = var5;
var12 = var12 + 1 & 4095;
class178.directions[var14 + 1][var15] = 8;
class178.distances[var14 + 1][var15] = var18;
} }
if (var15 > 0 && class178.directions[var14][var15 - 1] == 0 && (var13[var16][var17 - 1] & 19136782) == 0 && (var13[var16 + 1][var17 - 1] & 19136899) == 0) { Client.combatTargetPlayerIndex = -1;
class178.bufferX[var12] = var4; Client.projectiles.clear();
class178.bufferY[var12] = var5 - 1; Client.graphicsObjects.clear();
var12 = var12 + 1 & 4095;
class178.directions[var14][var15 - 1] = 1;
class178.distances[var14][var15 - 1] = var18;
}
if (var15 < 126 && class178.directions[var14][var15 + 1] == 0 && (var13[var16][var17 + 2] & 19136824) == 0 && (var13[var16 + 1][var17 + 2] & 19136992) == 0) { for (var0 = 0; var0 < 4; ++var0) {
class178.bufferX[var12] = var4; for (int var1 = 0; var1 < 104; ++var1) {
class178.bufferY[var12] = var5 + 1; for (int var2 = 0; var2 < 104; ++var2) {
var12 = var12 + 1 & 4095; Client.groundItems[var0][var1][var2] = null;
class178.directions[var14][var15 + 1] = 4;
class178.distances[var14][var15 + 1] = var18;
} }
if (var14 > 0 && var15 > 0 && class178.directions[var14 - 1][var15 - 1] == 0 && (var13[var16 - 1][var17] & 19136830) == 0 && (var13[var16 - 1][var17 - 1] & 19136782) == 0 && (var13[var16][var17 - 1] & 19136911) == 0) {
class178.bufferX[var12] = var4 - 1;
class178.bufferY[var12] = var5 - 1;
var12 = var12 + 1 & 4095;
class178.directions[var14 - 1][var15 - 1] = 3;
class178.distances[var14 - 1][var15 - 1] = var18;
}
if (var14 < 126 && var15 > 0 && class178.directions[var14 + 1][var15 - 1] == 0 && (var13[var16 + 1][var17 - 1] & 19136911) == 0 && (var13[var16 + 2][var17 - 1] & 19136899) == 0 && (var13[var16 + 2][var17] & 19136995) == 0) {
class178.bufferX[var12] = var4 + 1;
class178.bufferY[var12] = var5 - 1;
var12 = var12 + 1 & 4095;
class178.directions[var14 + 1][var15 - 1] = 9;
class178.distances[var14 + 1][var15 - 1] = var18;
}
if (var14 > 0 && var15 < 126 && class178.directions[var14 - 1][var15 + 1] == 0 && (var13[var16 - 1][var17 + 1] & 19136830) == 0 && (var13[var16 - 1][var17 + 2] & 19136824) == 0 && (var13[var16][var17 + 2] & 19137016) == 0) {
class178.bufferX[var12] = var4 - 1;
class178.bufferY[var12] = var5 + 1;
var12 = var12 + 1 & 4095;
class178.directions[var14 - 1][var15 + 1] = 6;
class178.distances[var14 - 1][var15 + 1] = var18;
}
if (var14 < 126 && var15 < 126 && class178.directions[var14 + 1][var15 + 1] == 0 && (var13[var16 + 1][var17 + 2] & 19137016) == 0 && (var13[var16 + 2][var17 + 2] & 19136992) == 0 && (var13[var16 + 2][var17 + 1] & 19136995) == 0) {
class178.bufferX[var12] = var4 + 1;
class178.bufferY[var12] = var5 + 1;
var12 = var12 + 1 & 4095;
class178.directions[var14 + 1][var15 + 1] = 12;
class178.distances[var14 + 1][var15 + 1] = var18;
} }
} }
InterfaceParent.field986 = var4; Client.pendingSpawns = new NodeDeque();
UrlRequester.field929 = var5; WorldMapArea.friendSystem.clear();
return false;
}
@ObfuscatedName("hc") for (var0 = 0; var0 < VarpDefinition.field944; ++var0) {
@ObfuscatedSignature( VarpDefinition var3 = SecureRandomCallable.method1140(var0);
signature = "(ILjava/lang/String;I)V", if (var3 != null) {
garbageValue = "-1850233906" Varps.Varps_temp[var0] = 0;
) Varps.Varps_main[var0] = 0;
static void method583(int var0, String var1) {
int var2 = Players.Players_count;
int[] var3 = Players.Players_indices;
boolean var4 = false;
Username var5 = new Username(var1, KeyHandler.loginType);
for (int var6 = 0; var6 < var2; ++var6) {
Player var7 = Client.players[var3[var6]];
if (var7 != null && var7 != Canvas.localPlayer && var7.username != null && var7.username.equals(var5)) {
PacketBufferNode var8;
if (var0 == 1) {
var8 = Interpreter.method1915(ClientPacket.field269, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeShort(var3[var6]);
var8.packetBuffer.method56(0);
Client.packetWriter.method241(var8);
} else if (var0 == 4) {
var8 = Interpreter.method1915(ClientPacket.field249, Client.packetWriter.isaacCipher);
var8.packetBuffer.method64(var3[var6]);
var8.packetBuffer.method56(0);
Client.packetWriter.method241(var8);
} else if (var0 == 6) {
var8 = Interpreter.method1915(ClientPacket.field315, Client.packetWriter.isaacCipher);
var8.packetBuffer.method63(var3[var6]);
var8.packetBuffer.method57(0);
Client.packetWriter.method241(var8);
} else if (var0 == 7) {
var8 = Interpreter.method1915(ClientPacket.field297, Client.packetWriter.isaacCipher);
var8.packetBuffer.method57(0);
var8.packetBuffer.writeShortLE(var3[var6]);
Client.packetWriter.method241(var8);
}
var4 = true;
break;
} }
} }
if (!var4) { class196.varcs.clearTransient();
WorldMapIcon1.addGameMessage(4, "", "Unable to find " + var1); Client.followerIndex = -1;
if (Client.rootInterface != -1) {
AbstractByteArrayCopier.unloadInterface(Client.rootInterface);
} }
for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) {
MenuAction.closeInterface(var4, true);
}
Client.rootInterface = -1;
Client.interfaceParents = new NodeHashTable(8);
Client.field127 = null;
Client.menuOptionsCount = 0;
Client.isMenuOpen = false;
Client.field119.method256((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1);
for (var0 = 0; var0 < 8; ++var0) {
Client.playerMenuActions[var0] = null;
Client.playerOptionsPriorities[var0] = false;
}
SpriteMask.method4389();
Client.isLoading = true;
for (var0 = 0; var0 < 100; ++var0) {
Client.field100[var0] = true;
}
AbstractByteArrayCopier.method4024();
PacketWriter.clanChat = null;
for (var0 = 0; var0 < 8; ++var0) {
Client.grandExchangeOffers[var0] = new GrandExchangeOffer();
}
FloorDecoration.grandExchangeEvents = null;
} }
} }
runescape-client/src/main/java/WorldMapSection3.java
+161 -142
View File
@@ -4,73 +4,86 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature; import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("p") @ObfuscatedName("y")
@Implements("WorldMapSection3") @Implements("WorldMapSection3")
public class WorldMapSection3 implements WorldMapSection { public class WorldMapSection3 implements WorldMapSection {
@ObfuscatedName("h") @ObfuscatedName("sn")
@Export("osNameLowerCase")
public static String osNameLowerCase;
@ObfuscatedName("dr")
@ObfuscatedSignature(
signature = "Lit;"
)
@Export("archive8")
static Archive archive8;
@ObfuscatedName("go")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -948290091 intValue = -1946112139
) )
static int field1089; static int field1055;
@ObfuscatedName("p")
static int[] field1056;
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 1389733201 intValue = -2011838881
) )
int field1090; int field1057;
@ObfuscatedName("f") @ObfuscatedName("f")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1622972483 intValue = 1299225715
) )
int field1091; int field1058;
@ObfuscatedName("q") @ObfuscatedName("q")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 702057599 intValue = 82600709
) )
int field1092; int field1059;
@ObfuscatedName("w") @ObfuscatedName("w")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1068088609 intValue = -477370575
) )
int field1093; int field1060;
@ObfuscatedName("o") @ObfuscatedName("o")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 1257151629 intValue = -671345527
) )
int field1094; int field1061;
@ObfuscatedName("u") @ObfuscatedName("u")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1351623663 intValue = 529427495
) )
int field1095; int field1062;
@ObfuscatedName("g") @ObfuscatedName("g")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 1016557381 intValue = -150870205
) )
int field1096; int field1063;
@ObfuscatedName("l") @ObfuscatedName("l")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 884736611 intValue = 1009718107
) )
int field1097; int field1064;
@ObfuscatedName("e") @ObfuscatedName("e")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 395786901 intValue = -1022177315
) )
int field1098; int field1065;
@ObfuscatedName("x") @ObfuscatedName("x")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -627081155 intValue = -1397517463
) )
int field1099; int field1066;
@ObfuscatedName("d")
@ObfuscatedGetter(
intValue = -799353317
)
int field1067;
@ObfuscatedName("k")
@ObfuscatedGetter(
intValue = -1388959491
)
int field1068;
@ObfuscatedName("n")
@ObfuscatedGetter(
intValue = -1657956317
)
int field1069;
@ObfuscatedName("i")
@ObfuscatedGetter(
intValue = 1345061881
)
int field1070;
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
@@ -78,21 +91,21 @@ public class WorldMapSection3 implements WorldMapSection {
garbageValue = "1384899025" garbageValue = "1384899025"
) )
@Export("expandBounds") @Export("expandBounds")
public void expandBounds(WorldMapArea var1) { public void expandBounds(WorldMapArea area) {
if (var1.minX0 > this.field1096) { if (area.minX0 > this.field1061) {
var1.minX0 = this.field1096; area.minX0 = this.field1061;
} }
if (var1.maxX0 < this.field1098) { if (area.maxX0 < this.field1061) {
var1.maxX0 = this.field1098; area.maxX0 = this.field1061;
} }
if (var1.minY0 > this.field1097) { if (area.minY0 > this.field1062) {
var1.minY0 = this.field1097; area.minY0 = this.field1062;
} }
if (var1.maxY0 < this.field1099) { if (area.maxY0 < this.field1062) {
var1.maxY0 = this.field1099; area.maxY0 = this.field1062;
} }
} }
@@ -103,8 +116,8 @@ public class WorldMapSection3 implements WorldMapSection {
garbageValue = "93" garbageValue = "93"
) )
@Export("containsCoord") @Export("containsCoord")
public boolean containsCoord(int var1, int var2, int var3) { public boolean containsCoord(int plane, int x, int y) {
return var1 >= this.field1090 && var1 < this.field1090 + this.field1091 ? var2 >> 6 >= this.field1092 && var2 >> 6 <= this.field1094 && var3 >> 6 >= this.field1093 && var3 >> 6 <= this.field1095 : false; return plane >= this.field1057 && plane < this.field1057 + this.field1058 ? x >= (this.field1059 << 6) + (this.field1063 << 3) && x <= (this.field1059 << 6) + (this.field1065 << 3) + 7 && y >= (this.field1060 << 6) + (this.field1064 << 3) && y <= (this.field1060 << 6) + (this.field1066 << 3) + 7 : false;
} }
@ObfuscatedName("q") @ObfuscatedName("q")
@@ -113,8 +126,8 @@ public class WorldMapSection3 implements WorldMapSection {
garbageValue = "4" garbageValue = "4"
) )
@Export("containsPosition") @Export("containsPosition")
public boolean containsPosition(int var1, int var2) { public boolean containsPosition(int x, int y) {
return var1 >> 6 >= this.field1096 && var1 >> 6 <= this.field1098 && var2 >> 6 >= this.field1097 && var2 >> 6 <= this.field1099; return x >= (this.field1061 << 6) + (this.field1067 << 3) && x <= (this.field1061 << 6) + (this.field1069 << 3) + 7 && y >= (this.field1062 << 6) + (this.field1068 << 3) && y <= (this.field1062 << 6) + (this.field1070 << 3) + 7;
} }
@ObfuscatedName("w") @ObfuscatedName("w")
@@ -123,11 +136,11 @@ public class WorldMapSection3 implements WorldMapSection {
garbageValue = "1545934424" garbageValue = "1545934424"
) )
@Export("position") @Export("position")
public int[] position(int var1, int var2, int var3) { public int[] position(int plane, int x, int y) {
if (!this.containsCoord(var1, var2, var3)) { if (!this.containsCoord(plane, x, y)) {
return null; return null;
} else { } else {
int[] var4 = new int[]{this.field1096 * 64 - this.field1092 * 64 + var2, var3 + (this.field1097 * 64 - this.field1093 * 64)}; int[] var4 = new int[]{this.field1061 * 64 - this.field1059 * 64 + x + (this.field1067 * 8 - this.field1063 * 8), y + (this.field1062 * 64 - this.field1060 * 64) + (this.field1068 * 8 - this.field1064 * 8)};
return var4; return var4;
} }
} }
@@ -138,13 +151,13 @@ public class WorldMapSection3 implements WorldMapSection {
garbageValue = "-1916486802" garbageValue = "-1916486802"
) )
@Export("coord") @Export("coord")
public Coord coord(int var1, int var2) { public Coord coord(int x, int y) {
if (!this.containsPosition(var1, var2)) { if (!this.containsPosition(x, y)) {
return null; return null;
} else { } else {
int var3 = this.field1092 * 64 - this.field1096 * 64 + var1; int var3 = this.field1059 * 64 - this.field1061 * 64 + (this.field1063 * 8 - this.field1067 * 8) + x;
int var4 = this.field1093 * 64 - this.field1097 * 64 + var2; int var4 = this.field1060 * 64 - this.field1062 * 64 + y + (this.field1064 * 8 - this.field1068 * 8);
return new Coord(this.field1090, var3, var4); return new Coord(this.field1057, var3, var4);
} }
} }
@@ -154,111 +167,117 @@ public class WorldMapSection3 implements WorldMapSection {
garbageValue = "-113" garbageValue = "-113"
) )
@Export("read") @Export("read")
public void read(Buffer var1) { public void read(Buffer buffer) {
this.field1090 = var1.readUnsignedByte(); this.field1057 = buffer.readUnsignedByte();
this.field1091 = var1.readUnsignedByte(); this.field1058 = buffer.readUnsignedByte();
this.field1092 = var1.readUnsignedShort(); this.field1059 = buffer.readUnsignedShort();
this.field1093 = var1.readUnsignedShort(); this.field1063 = buffer.readUnsignedByte();
this.field1094 = var1.readUnsignedShort(); this.field1065 = buffer.readUnsignedByte();
this.field1095 = var1.readUnsignedShort(); this.field1060 = buffer.readUnsignedShort();
this.field1096 = var1.readUnsignedShort(); this.field1064 = buffer.readUnsignedByte();
this.field1097 = var1.readUnsignedShort(); this.field1066 = buffer.readUnsignedByte();
this.field1098 = var1.readUnsignedShort(); this.field1061 = buffer.readUnsignedShort();
this.field1099 = var1.readUnsignedShort(); this.field1067 = buffer.readUnsignedByte();
this.method426(); this.field1069 = buffer.readUnsignedByte();
this.field1062 = buffer.readUnsignedShort();
this.field1068 = buffer.readUnsignedByte();
this.field1070 = buffer.readUnsignedByte();
this.method423();
} }
@ObfuscatedName("g") @ObfuscatedName("g")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(B)V", signature = "(I)V",
garbageValue = "-126" garbageValue = "1967186894"
) )
void method426() { void method423() {
} }
@ObfuscatedName("d") @ObfuscatedName("w")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(Lho;II)V", signature = "(I)V",
garbageValue = "1115233428" garbageValue = "-2102591569"
) )
static final void method345(Widget var0, int var1) { @Export("savePreferences")
if (var0.field966 == null) { static void savePreferences() {
throw new RuntimeException(); AccessFile var0 = null;
try {
var0 = LoginPacket.getPreferencesFile("", WorldMapRectangle.studioGame.name, true);
Buffer var1 = ReflectionCheck.clientPreferences.toBuffer();
var0.write(var1.array, 0, var1.index);
} catch (Exception var3) {
}
try {
if (var0 != null) {
var0.closeSync(true);
}
} catch (Exception var2) {
}
}
@ObfuscatedName("hz")
@ObfuscatedSignature(
signature = "(II)V",
garbageValue = "1886145284"
)
static final void method245(int var0) {
if (var0 >= 0) {
int var1 = Client.menuArguments1[var0];
int var2 = Client.menuArguments2[var0];
int var3 = Client.menuOpcodes[var0];
int var4 = Client.menuArguments0[var0];
String var5 = Client.menuActions[var0];
String var6 = Client.menuTargetNames[var0];
Actor.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
}
}
@ObfuscatedName("io")
@ObfuscatedSignature(
signature = "(Lho;IIIIIII)V",
garbageValue = "-1723792771"
)
static final void method246(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) {
if (Client.field188) {
Client.field189 = 32;
} else { } else {
if (var0.field984 == null) { Client.field189 = 0;
var0.field984 = new int[var0.field966.length];
} }
var0.field984[var1] = Integer.MAX_VALUE; Client.field188 = false;
int var7;
if (MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) {
if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) {
var0.scrollY -= 4;
WorldMapRectangle.method295(var0);
} else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) {
var0.scrollY += 4;
WorldMapRectangle.method295(var0);
} else if (var5 >= var1 - Client.field189 && var5 < Client.field189 + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) {
var7 = var3 * (var3 - 32) / var4;
if (var7 < 8) {
var7 = 8;
}
int var8 = var6 - var2 - 16 - var7 / 2;
int var9 = var3 - 32 - var7;
var0.scrollY = var8 * (var4 - var3) / var9;
WorldMapRectangle.method295(var0);
Client.field188 = true;
} }
} }
@ObfuscatedName("am") if (Client.mouseWheelRotation != 0) {
@ObfuscatedSignature( var7 = var0.width;
signature = "(IB)V", if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) {
garbageValue = "23" var0.scrollY += Client.mouseWheelRotation * 45;
) WorldMapRectangle.method295(var0);
@Export("runWidgetOnLoadListener")
static void runWidgetOnLoadListener(int var0) {
if (var0 != -1 && GroundItemPile.loadInterface(var0)) {
Widget[] var1 = Widget.interfaceComponents[var0];
for (int var2 = 0; var2 < var1.length; ++var2) {
Widget var3 = var1[var2];
if (var3.onLoad != null) {
ScriptEvent var4 = new ScriptEvent();
var4.widget = var3;
var4.args0 = var3.onLoad;
GrandExchangeEvent.runScript0(var4, 5000000);
}
} }
} }
} }
@ObfuscatedName("ic")
@ObfuscatedSignature(
signature = "(Lho;IIZB)V",
garbageValue = "-35"
)
@Export("alignWidgetSize")
static void alignWidgetSize(Widget component, int parentWidth, int parentHeight, boolean var3) {
int var4 = component.width;
int var5 = component.height;
if (component.widthAlignment == 0) {
component.width = component.rawWidth;
} else if (component.widthAlignment == 1) {
component.width = parentWidth - component.rawWidth;
} else if (component.widthAlignment == 2) {
component.width = component.rawWidth * parentWidth >> 14;
}
if (component.heightAlignment == 0) {
component.height = component.rawHeight;
} else if (component.heightAlignment == 1) {
component.height = parentHeight - component.rawHeight;
} else if (component.heightAlignment == 2) {
component.height = parentHeight * component.rawHeight >> 14;
}
if (component.widthAlignment == 4) {
component.width = component.height * component.field958 / component.field959;
}
if (component.heightAlignment == 4) {
component.height = component.width * component.field959 / component.field958;
}
if (component.contentType == 1337) {
Client.viewportWidget = component;
}
if (var3 && component.onResize != null && (var4 != component.width || var5 != component.height)) {
ScriptEvent var6 = new ScriptEvent();
var6.widget = component;
var6.args0 = component.onResize;
Client.scriptEvents.addFirst(var6);
}
}
} }
runescape-client/src/main/java/WorldMapSectionType.java
+17 -13
View File
@@ -13,22 +13,26 @@ public enum WorldMapSectionType implements Enumerated {
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lh;" signature = "Lh;"
) )
field1100(1, (byte)0), @Export("WORLDMAPSECTIONTYPE0")
WORLDMAPSECTIONTYPE0(1, (byte)0),
@ObfuscatedName("f") @ObfuscatedName("f")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lh;" signature = "Lh;"
) )
field1101(0, (byte)1), @Export("WORLDMAPSECTIONTYPE1")
WORLDMAPSECTIONTYPE1(0, (byte)1),
@ObfuscatedName("q") @ObfuscatedName("q")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lh;" signature = "Lh;"
) )
field1102(3, (byte)2), @Export("WORLDMAPSECTIONTYPE2")
WORLDMAPSECTIONTYPE2(3, (byte)2),
@ObfuscatedName("w") @ObfuscatedName("w")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lh;" signature = "Lh;"
) )
field1103(2, (byte)3); @Export("WORLDMAPSECTIONTYPE3")
WORLDMAPSECTIONTYPE3(2, (byte)3);
@ObfuscatedName("e") @ObfuscatedName("e")
@ObfuscatedSignature( @ObfuscatedSignature(
@@ -71,15 +75,15 @@ public enum WorldMapSectionType implements Enumerated {
@ObfuscatedName("m") @ObfuscatedName("m")
public static String method252(long var0) { public static String method252(long var0) {
class211.field1126.setTime(new Date(var0)); Calendar.Calendar_calendar.setTime(new Date(var0));
int var2 = class211.field1126.get(7); int var2 = Calendar.Calendar_calendar.get(7);
int var3 = class211.field1126.get(5); int var3 = Calendar.Calendar_calendar.get(5);
int var4 = class211.field1126.get(2); int var4 = Calendar.Calendar_calendar.get(2);
int var5 = class211.field1126.get(1); int var5 = Calendar.Calendar_calendar.get(1);
int var6 = class211.field1126.get(11); int var6 = Calendar.Calendar_calendar.get(11);
int var7 = class211.field1126.get(12); int var7 = Calendar.Calendar_calendar.get(12);
int var8 = class211.field1126.get(13); int var8 = Calendar.Calendar_calendar.get(13);
return class211.field1125[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + class211.field1124[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT";
} }
@ObfuscatedName("w") @ObfuscatedName("w")
runescape-client/src/main/java/class1.java
+5 -5
View File
@@ -93,7 +93,7 @@ final class class1 implements class0 {
var4.rawY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var4.rawY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var4.xAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; var4.xAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
var4.yAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; var4.yAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
class22.method295(var4); WorldMapRectangle.method295(var4);
TextureProvider.client.alignWidget(var4); TextureProvider.client.alignWidget(var4);
if (var3 != -1 && var4.type == 0) { if (var3 != -1 && var4.type == 0) {
class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false); class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false);
@@ -106,7 +106,7 @@ final class class1 implements class0 {
var4.rawHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var4.rawHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var4.widthAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; var4.widthAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
var4.heightAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; var4.heightAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
class22.method295(var4); WorldMapRectangle.method295(var4);
TextureProvider.client.alignWidget(var4); TextureProvider.client.alignWidget(var4);
if (var3 != -1 && var4.type == 0) { if (var3 != -1 && var4.type == 0) {
class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false); class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false);
@@ -117,7 +117,7 @@ final class class1 implements class0 {
boolean var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; boolean var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
if (var5 != var4.isHidden) { if (var5 != var4.isHidden) {
var4.isHidden = var5; var4.isHidden = var5;
class22.method295(var4); WorldMapRectangle.method295(var4);
} }
return 1; return 1;
@@ -228,7 +228,7 @@ final class class1 implements class0 {
String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class50.method900(var7, var4 == 1); class50.method900(var7, var4 == 1);
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection0.field1055; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection3.field1055;
return 1; return 1;
} else if (var0 != ScriptOpcodes.OC_FINDNEXT) { } else if (var0 != ScriptOpcodes.OC_FINDNEXT) {
if (var0 == ScriptOpcodes.OC_FINDRESET) { if (var0 == ScriptOpcodes.OC_FINDRESET) {
@@ -238,7 +238,7 @@ final class class1 implements class0 {
return 2; return 2;
} }
} else { } else {
if (AttackOption.field30 != null && WorldMapDecorationType.field1139 < WorldMapSection0.field1055) { if (AttackOption.field30 != null && WorldMapDecorationType.field1139 < WorldMapSection3.field1055) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.field30[++WorldMapDecorationType.field1139 - 1] & '\uffff'; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.field30[++WorldMapDecorationType.field1139 - 1] & '\uffff';
} else { } else {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
runescape-client/src/main/java/class15.java
+2 -2
View File
@@ -62,7 +62,7 @@ public class class15 extends class21 {
super.field145 = new short[super.field156][64][64]; super.field145 = new short[super.field156][64][64];
super.field154 = new byte[super.field156][64][64]; super.field154 = new byte[super.field156][64][64];
super.field155 = new byte[super.field156][64][64]; super.field155 = new byte[super.field156][64][64];
super.field144 = new WorldMapDecoration[super.field156][64][64][]; super.decorations = new WorldMapDecoration[super.field156][64][64][];
int var2 = var1.readUnsignedByte(); int var2 = var1.readUnsignedByte();
if (var2 != class30.field246.field248) { if (var2 != class30.field246.field248) {
throw new IllegalStateException(""); throw new IllegalStateException("");
@@ -123,7 +123,7 @@ public class class15 extends class21 {
static int method182(int var0, Script var1, boolean var2) { static int method182(int var0, Script var1, boolean var2) {
Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { if (var0 == ScriptOpcodes.IF_GETTARGETMASK) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3)); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Calendar.method4107(class1.getWidgetClickMask(var3));
return 1; return 1;
} else if (var0 != ScriptOpcodes.IF_GETOP) { } else if (var0 != ScriptOpcodes.IF_GETOP) {
if (var0 == ScriptOpcodes.IF_GETOPBASE) { if (var0 == ScriptOpcodes.IF_GETOPBASE) {
runescape-client/src/main/java/class16.java
+12 -12
View File
@@ -64,7 +64,7 @@ public class class16 {
static int method188(int var0, Script var1, boolean var2) { static int method188(int var0, Script var1, boolean var2) {
Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { if (var0 == ScriptOpcodes.CC_GETTARGETMASK) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3)); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Calendar.method4107(class1.getWidgetClickMask(var3));
return 1; return 1;
} else if (var0 != ScriptOpcodes.CC_GETOP) { } else if (var0 != ScriptOpcodes.CC_GETOP) {
if (var0 == ScriptOpcodes.CC_GETOPBASE) { if (var0 == ScriptOpcodes.CC_GETOPBASE) {
@@ -122,7 +122,7 @@ public class class16 {
var9 = var1.method65(); var9 = var1.method65();
var10 = var1.method61(); var10 = var1.method61();
var11 = var1.readUnsignedByteNegate(); var11 = var1.readUnsignedByteNegate();
int var15 = (var11 >> 4 & 7) + WorldMapSection3.field1089; int var15 = (var11 >> 4 & 7) + WorldMapSection1.field1089;
int var16 = (var11 & 7) + Canvas.field95; int var16 = (var11 & 7) + Canvas.field95;
Player var17; Player var17;
if (var9 == Client.localPlayerIndex) { if (var9 == Client.localPlayerIndex) {
@@ -185,7 +185,7 @@ public class class16 {
int var32; int var32;
if (class190.field2349 == var0) { if (class190.field2349 == var0) {
var31 = var1.method58(); var31 = var1.method58();
var2 = (var31 >> 4 & 7) + WorldMapSection3.field1089; var2 = (var31 >> 4 & 7) + WorldMapSection1.field1089;
var32 = (var31 & 7) + Canvas.field95; var32 = (var31 & 7) + Canvas.field95;
var3 = var1.method59(); var3 = var1.method59();
var4 = var3 >> 2; var4 = var3 >> 2;
@@ -198,7 +198,7 @@ public class class16 {
} else { } else {
if (class190.field2345 == var0) { if (class190.field2345 == var0) {
var31 = var1.readUnsignedByte(); var31 = var1.readUnsignedByte();
var2 = (var31 >> 4 & 7) + WorldMapSection3.field1089; var2 = (var31 >> 4 & 7) + WorldMapSection1.field1089;
var32 = (var31 & 7) + Canvas.field95; var32 = (var31 & 7) + Canvas.field95;
var3 = var1.method59(); var3 = var1.method59();
var4 = var1.method58(); var4 = var1.method58();
@@ -223,7 +223,7 @@ public class class16 {
var2 = var1.method58(); var2 = var1.method58();
var32 = var1.method66(); var32 = var1.method66();
var3 = var1.readUnsignedByte(); var3 = var1.readUnsignedByte();
var4 = (var3 >> 4 & 7) + WorldMapSection3.field1089; var4 = (var3 >> 4 & 7) + WorldMapSection1.field1089;
var5 = (var3 & 7) + Canvas.field95; var5 = (var3 & 7) + Canvas.field95;
if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) {
var4 = var4 * 128 + 64; var4 = var4 * 128 + 64;
@@ -239,7 +239,7 @@ public class class16 {
var32 = var31 & 3; var32 = var31 & 3;
var3 = Client.field182[var2]; var3 = Client.field182[var2];
var4 = var1.readUnsignedByteNegate(); var4 = var1.readUnsignedByteNegate();
var5 = (var4 >> 4 & 7) + WorldMapSection3.field1089; var5 = (var4 >> 4 & 7) + WorldMapSection1.field1089;
var6 = (var4 & 7) + Canvas.field95; var6 = (var4 & 7) + Canvas.field95;
var7 = var1.readUnsignedShort(); var7 = var1.readUnsignedShort();
if (var5 >= 0 && var6 >= 0 && var5 < 103 && var6 < 103) { if (var5 >= 0 && var6 >= 0 && var5 < 103 && var6 < 103) {
@@ -298,7 +298,7 @@ public class class16 {
NodeDeque var40; NodeDeque var40;
if (class190.field2347 == var0) { if (class190.field2347 == var0) {
var31 = var1.method58(); var31 = var1.method58();
var2 = (var31 >> 4 & 7) + WorldMapSection3.field1089; var2 = (var31 >> 4 & 7) + WorldMapSection1.field1089;
var32 = (var31 & 7) + Canvas.field95; var32 = (var31 & 7) + Canvas.field95;
var3 = var1.method67(); var3 = var1.method67();
if (var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) { if (var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) {
@@ -324,7 +324,7 @@ public class class16 {
var32 = var31 & 3; var32 = var31 & 3;
var3 = Client.field182[var2]; var3 = Client.field182[var2];
var4 = var1.method59(); var4 = var1.method59();
var5 = (var4 >> 4 & 7) + WorldMapSection3.field1089; var5 = (var4 >> 4 & 7) + WorldMapSection1.field1089;
var6 = (var4 & 7) + Canvas.field95; var6 = (var4 & 7) + Canvas.field95;
if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
class258.method4898(SoundSystem.plane, var5, var6, var3, -1, var2, var32, 0, -1); class258.method4898(SoundSystem.plane, var5, var6, var3, -1, var2, var32, 0, -1);
@@ -339,7 +339,7 @@ public class class16 {
var6 = var1.method59(); var6 = var1.method59();
var7 = var1.method65(); var7 = var1.method65();
var8 = var1.method58(); var8 = var1.method58();
var35 = (var8 >> 4 & 7) + WorldMapSection3.field1089; var35 = (var8 >> 4 & 7) + WorldMapSection1.field1089;
var9 = (var8 & 7) + Canvas.field95; var9 = (var8 & 7) + Canvas.field95;
var10 = var1.method60(); var10 = var1.method60();
byte var41 = var1.method61(); byte var41 = var1.method61();
@@ -359,7 +359,7 @@ public class class16 {
var31 = var1.method66(); var31 = var1.method66();
var2 = var1.method67(); var2 = var1.method67();
var32 = var1.method58(); var32 = var1.method58();
var3 = (var32 >> 4 & 7) + WorldMapSection3.field1089; var3 = (var32 >> 4 & 7) + WorldMapSection1.field1089;
var4 = (var32 & 7) + Canvas.field95; var4 = (var32 & 7) + Canvas.field95;
if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) {
var38 = new GroundItem(); var38 = new GroundItem();
@@ -378,7 +378,7 @@ public class class16 {
var2 = var1.method67(); var2 = var1.method67();
var32 = var1.method65(); var32 = var1.method65();
var3 = var1.method58(); var3 = var1.method58();
var4 = (var3 >> 4 & 7) + WorldMapSection3.field1089; var4 = (var3 >> 4 & 7) + WorldMapSection1.field1089;
var5 = (var3 & 7) + Canvas.field95; var5 = (var3 & 7) + Canvas.field95;
if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) {
var40 = Client.groundItems[SoundSystem.plane][var4][var5]; var40 = Client.groundItems[SoundSystem.plane][var4][var5];
@@ -526,7 +526,7 @@ public class class16 {
if (var6 == 14) { if (var6 == 14) {
var9 = var2[var4++]; var9 = var2[var4++];
var7 = WorldMapSection2.getVarbit(var9); var7 = WorldMapSection0.getVarbit(var9);
} }
if (var6 == 15) { if (var6 == 15) {
runescape-client/src/main/java/class171.java
+57 -57
View File
@@ -99,26 +99,26 @@ public class class171 {
Login.Login_loadingPercent = 10; Login.Login_loadingPercent = 10;
Client.titleLoadingStage = 30; Client.titleLoadingStage = 30;
} else if (Client.titleLoadingStage == 30) { } else if (Client.titleLoadingStage == 30) {
AbstractArchive.archive0 = class22.newArchive(0, false, true, true); AbstractArchive.archive0 = WorldMapRectangle.newArchive(0, false, true, true);
Skeleton.archive1 = class22.newArchive(1, false, true, true); Skeleton.archive1 = WorldMapRectangle.newArchive(1, false, true, true);
ObjectSound.archive2 = class22.newArchive(2, true, false, true); ObjectSound.archive2 = WorldMapRectangle.newArchive(2, true, false, true);
WorldMapIcon1.archive3 = class22.newArchive(3, false, true, true); WorldMapIcon1.archive3 = WorldMapRectangle.newArchive(3, false, true, true);
WorldMapDecoration.archive4 = class22.newArchive(4, false, true, true); WorldMapDecoration.archive4 = WorldMapRectangle.newArchive(4, false, true, true);
SecureRandomFuture.archive5 = class22.newArchive(5, true, true, true); SecureRandomFuture.archive5 = WorldMapRectangle.newArchive(5, true, true, true);
UserComparator3.archive6 = class22.newArchive(6, true, true, true); UserComparator3.archive6 = WorldMapRectangle.newArchive(6, true, true, true);
class40.archive7 = class22.newArchive(7, false, true, true); class40.archive7 = WorldMapRectangle.newArchive(7, false, true, true);
WorldMapSection3.archive8 = class22.newArchive(8, false, true, true); WorldMapSection1.archive8 = WorldMapRectangle.newArchive(8, false, true, true);
class238.archive9 = class22.newArchive(9, false, true, true); class238.archive9 = WorldMapRectangle.newArchive(9, false, true, true);
class16.archive10 = class22.newArchive(10, false, true, true); class16.archive10 = WorldMapRectangle.newArchive(10, false, true, true);
Login.archive11 = class22.newArchive(11, false, true, true); Login.archive11 = WorldMapRectangle.newArchive(11, false, true, true);
Formatting.archive12 = class22.newArchive(12, false, true, true); Formatting.archive12 = WorldMapRectangle.newArchive(12, false, true, true);
ByteArrayPool.archive13 = class22.newArchive(13, true, false, true); ByteArrayPool.archive13 = WorldMapRectangle.newArchive(13, true, false, true);
class2.archive14 = class22.newArchive(14, false, true, true); class2.archive14 = WorldMapRectangle.newArchive(14, false, true, true);
WorldMapSection1.archive15 = class22.newArchive(15, false, true, true); WorldMapSection2.archive15 = WorldMapRectangle.newArchive(15, false, true, true);
class22.archive16 = class22.newArchive(17, true, true, true); WorldMapRectangle.archive16 = WorldMapRectangle.newArchive(17, true, true, true);
WorldMapLabelSize.field1040 = class22.newArchive(18, false, true, true); WorldMapLabelSize.field1040 = WorldMapRectangle.newArchive(18, false, true, true);
ItemContainer.field434 = class22.newArchive(19, false, true, true); ItemContainer.field434 = WorldMapRectangle.newArchive(19, false, true, true);
AbstractByteArrayCopier.field0 = class22.newArchive(20, false, true, true); AbstractByteArrayCopier.field0 = WorldMapRectangle.newArchive(20, false, true, true);
Login.Login_loadingText = "Connecting to update server"; Login.Login_loadingText = "Connecting to update server";
Login.Login_loadingPercent = 20; Login.Login_loadingPercent = 20;
Client.titleLoadingStage = 40; Client.titleLoadingStage = 40;
@@ -132,18 +132,18 @@ public class class171 {
var0 += SecureRandomFuture.archive5.percentage() * 4 / 100; var0 += SecureRandomFuture.archive5.percentage() * 4 / 100;
var0 += UserComparator3.archive6.percentage() * 2 / 100; var0 += UserComparator3.archive6.percentage() * 2 / 100;
var0 += class40.archive7.percentage() * 56 / 100; var0 += class40.archive7.percentage() * 56 / 100;
var0 += WorldMapSection3.archive8.percentage() * 2 / 100; var0 += WorldMapSection1.archive8.percentage() * 2 / 100;
var0 += class238.archive9.percentage() * 2 / 100; var0 += class238.archive9.percentage() * 2 / 100;
var0 += class16.archive10.percentage() * 2 / 100; var0 += class16.archive10.percentage() * 2 / 100;
var0 += Login.archive11.percentage() * 2 / 100; var0 += Login.archive11.percentage() * 2 / 100;
var0 += Formatting.archive12.percentage() * 2 / 100; var0 += Formatting.archive12.percentage() * 2 / 100;
var0 += ByteArrayPool.archive13.percentage() * 2 / 100; var0 += ByteArrayPool.archive13.percentage() * 2 / 100;
var0 += class2.archive14.percentage() * 2 / 100; var0 += class2.archive14.percentage() * 2 / 100;
var0 += WorldMapSection1.archive15.percentage() * 2 / 100; var0 += WorldMapSection2.archive15.percentage() * 2 / 100;
var0 += ItemContainer.field434.percentage() / 100; var0 += ItemContainer.field434.percentage() / 100;
var0 += WorldMapLabelSize.field1040.percentage() / 100; var0 += WorldMapLabelSize.field1040.percentage() / 100;
var0 += AbstractByteArrayCopier.field0.percentage() / 100; var0 += AbstractByteArrayCopier.field0.percentage() / 100;
var0 += class22.archive16.method130() && class22.archive16.method2() ? 1 : 0; var0 += WorldMapRectangle.archive16.method130() && WorldMapRectangle.archive16.method2() ? 1 : 0;
if (var0 != 100) { if (var0 != 100) {
if (var0 != 0) { if (var0 != 0) {
Login.Login_loadingText = "Checking for updates - " + var0 + "%"; Login.Login_loadingText = "Checking for updates - " + var0 + "%";
@@ -157,15 +157,15 @@ public class class171 {
AbstractWorldMapIcon.method625(SecureRandomFuture.archive5, "Maps"); AbstractWorldMapIcon.method625(SecureRandomFuture.archive5, "Maps");
AbstractWorldMapIcon.method625(UserComparator3.archive6, "Music Tracks"); AbstractWorldMapIcon.method625(UserComparator3.archive6, "Music Tracks");
AbstractWorldMapIcon.method625(class40.archive7, "Models"); AbstractWorldMapIcon.method625(class40.archive7, "Models");
AbstractWorldMapIcon.method625(WorldMapSection3.archive8, "Sprites"); AbstractWorldMapIcon.method625(WorldMapSection1.archive8, "Sprites");
AbstractWorldMapIcon.method625(Login.archive11, "Music Jingles"); AbstractWorldMapIcon.method625(Login.archive11, "Music Jingles");
AbstractWorldMapIcon.method625(class2.archive14, "Music Samples"); AbstractWorldMapIcon.method625(class2.archive14, "Music Samples");
AbstractWorldMapIcon.method625(WorldMapSection1.archive15, "Music Patches"); AbstractWorldMapIcon.method625(WorldMapSection2.archive15, "Music Patches");
AbstractWorldMapIcon.method625(ItemContainer.field434, "World Map"); AbstractWorldMapIcon.method625(ItemContainer.field434, "World Map");
AbstractWorldMapIcon.method625(WorldMapLabelSize.field1040, "World Map Geography"); AbstractWorldMapIcon.method625(WorldMapLabelSize.field1040, "World Map Geography");
AbstractWorldMapIcon.method625(AbstractByteArrayCopier.field0, "World Map Ground"); AbstractWorldMapIcon.method625(AbstractByteArrayCopier.field0, "World Map Ground");
class211.spriteIds = new GraphicsDefaults(); Calendar.spriteIds = new GraphicsDefaults();
class211.spriteIds.decode(class22.archive16); Calendar.spriteIds.decode(WorldMapRectangle.archive16);
Login.Login_loadingText = "Loaded update list"; Login.Login_loadingText = "Loaded update list";
Login.Login_loadingPercent = 30; Login.Login_loadingPercent = 30;
Client.titleLoadingStage = 45; Client.titleLoadingStage = 45;
@@ -176,7 +176,7 @@ public class class171 {
var28.method174(9, 128); var28.method174(9, 128);
WorldMapCacheName.pcmPlayer0 = Players.newPcmPlayer(GameShell.taskHandler, 0, 22050); WorldMapCacheName.pcmPlayer0 = Players.newPcmPlayer(GameShell.taskHandler, 0, 22050);
WorldMapCacheName.pcmPlayer0.setStream(var28); WorldMapCacheName.pcmPlayer0.setStream(var28);
NetSocket.method3537(WorldMapSection1.archive15, class2.archive14, WorldMapDecoration.archive4, var28); NetSocket.method3537(WorldMapSection2.archive15, class2.archive14, WorldMapDecoration.archive4, var28);
AbstractArchive.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048); AbstractArchive.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048);
TaskHandler.pcmStreamMixer = new PcmStreamMixer(); TaskHandler.pcmStreamMixer = new PcmStreamMixer();
AbstractArchive.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer); AbstractArchive.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer);
@@ -184,13 +184,13 @@ public class class171 {
Login.Login_loadingText = "Prepared sound engine"; Login.Login_loadingText = "Prepared sound engine";
Login.Login_loadingPercent = 35; Login.Login_loadingPercent = 35;
Client.titleLoadingStage = 50; Client.titleLoadingStage = 50;
WorldMapElement.fonts = new Fonts(WorldMapSection3.archive8, ByteArrayPool.archive13); WorldMapElement.WorldMapElement_fonts = new Fonts(WorldMapSection1.archive8, ByteArrayPool.archive13);
} else { } else {
int var29; int var29;
if (Client.titleLoadingStage == 50) { if (Client.titleLoadingStage == 50) {
FontName[] var2 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13}; FontName[] var2 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
var29 = var2.length; var29 = var2.length;
Fonts var3 = WorldMapElement.fonts; Fonts var3 = WorldMapElement.WorldMapElement_fonts;
FontName[] var4 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13}; FontName[] var4 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
Client.fontsMap = var3.createMap(var4); Client.fontsMap = var3.createMap(var4);
if (Client.fontsMap.size() < var29) { if (Client.fontsMap.size() < var29) {
@@ -206,7 +206,7 @@ public class class171 {
Client.titleLoadingStage = 60; Client.titleLoadingStage = 60;
} }
} else if (Client.titleLoadingStage == 60) { } else if (Client.titleLoadingStage == 60) {
var0 = FloorDecoration.method2853(class16.archive10, WorldMapSection3.archive8); var0 = FloorDecoration.method2853(class16.archive10, WorldMapSection1.archive8);
var29 = class3.method36(); var29 = class3.method36();
if (var0 < var29) { if (var0 < var29) {
Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var29 + "%"; Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var29 + "%";
@@ -260,7 +260,7 @@ public class class171 {
VarpDefinition.field944 = VarpDefinition.field943.method4(16); VarpDefinition.field944 = VarpDefinition.field943.method4(16);
Archive var15 = WorldMapIcon1.archive3; Archive var15 = WorldMapIcon1.archive3;
Archive var16 = class40.archive7; Archive var16 = class40.archive7;
Archive var17 = WorldMapSection3.archive8; Archive var17 = WorldMapSection1.archive8;
Archive var18 = ByteArrayPool.archive13; Archive var18 = ByteArrayPool.archive13;
Widget.Widget_archive = var15; Widget.Widget_archive = var15;
BufferedSource.field54 = var16; BufferedSource.field54 = var16;
@@ -269,20 +269,20 @@ public class class171 {
Widget.interfaceComponents = new Widget[Widget.Widget_archive.method5()][]; Widget.interfaceComponents = new Widget[Widget.Widget_archive.method5()][];
Widget.loadedInterfaces = new boolean[Widget.Widget_archive.method5()]; Widget.loadedInterfaces = new boolean[Widget.Widget_archive.method5()];
Archive var19 = ObjectSound.archive2; Archive var19 = ObjectSound.archive2;
class4.field1158 = var19; class4.InvDefinition_archive = var19;
Archive var20 = ObjectSound.archive2; Archive var20 = ObjectSound.archive2;
EnumDefinition.EnumDefinition_archive = var20; EnumDefinition.EnumDefinition_archive = var20;
Frames.method3241(ObjectSound.archive2); Frames.method3241(ObjectSound.archive2);
Archive var21 = ObjectSound.archive2; Archive var21 = ObjectSound.archive2;
ParamDefinition.ParamDefinition_archive = var21; ParamDefinition.ParamDefinition_archive = var21;
class196.varcs = new Varcs(); class196.varcs = new Varcs();
class60.method1172(ObjectSound.archive2, WorldMapSection3.archive8, ByteArrayPool.archive13); class60.method1172(ObjectSound.archive2, WorldMapSection1.archive8, ByteArrayPool.archive13);
Archive var22 = ObjectSound.archive2; Archive var22 = ObjectSound.archive2;
Archive var23 = WorldMapSection3.archive8; Archive var23 = WorldMapSection1.archive8;
HealthBarDefinition.field379 = var22; HealthBarDefinition.field379 = var22;
HealthBarDefinition.field380 = var23; HealthBarDefinition.field380 = var23;
Archive var24 = ObjectSound.archive2; Archive var24 = ObjectSound.archive2;
Archive var25 = WorldMapSection3.archive8; Archive var25 = WorldMapSection1.archive8;
WorldMapElement.WorldMapElement_archive = var25; WorldMapElement.WorldMapElement_archive = var25;
if (var24.method2()) { if (var24.method2()) {
UserComparator4.WorldMapElement_count = var24.method4(35); UserComparator4.WorldMapElement_count = var24.method4(35);
@@ -305,13 +305,13 @@ public class class171 {
} else if (Client.titleLoadingStage == 80) { } else if (Client.titleLoadingStage == 80) {
var0 = 0; var0 = 0;
if (GrandExchangeOfferUnitPriceComparator.compass == null) { if (GrandExchangeOfferUnitPriceComparator.compass == null) {
GrandExchangeOfferUnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field878, 0); GrandExchangeOfferUnitPriceComparator.compass = class322.readSprite(WorldMapSection1.archive8, Calendar.spriteIds.field878, 0);
} else { } else {
++var0; ++var0;
} }
if (FaceNormal.field345 == null) { if (FaceNormal.field345 == null) {
FaceNormal.field345 = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field879, 0); FaceNormal.field345 = class322.readSprite(WorldMapSection1.archive8, Calendar.spriteIds.field879, 0);
} else { } else {
++var0; ++var0;
} }
@@ -319,8 +319,8 @@ public class class171 {
IndexedSprite[] var32; IndexedSprite[] var32;
int var34; int var34;
if (class192.mapSceneSprites == null) { if (class192.mapSceneSprites == null) {
var30 = WorldMapSection3.archive8; var30 = WorldMapSection1.archive8;
var34 = class211.spriteIds.mapScenes; var34 = Calendar.spriteIds.mapScenes;
if (!SpriteMask.loadSprite(var30, var34, 0)) { if (!SpriteMask.loadSprite(var30, var34, 0)) {
var32 = null; var32 = null;
} else { } else {
@@ -334,8 +334,8 @@ public class class171 {
Sprite[] var35; Sprite[] var35;
if (class15.headIconPkSprites == null) { if (class15.headIconPkSprites == null) {
var30 = WorldMapSection3.archive8; var30 = WorldMapSection1.archive8;
var34 = class211.spriteIds.headIconsPk; var34 = Calendar.spriteIds.headIconsPk;
if (!SpriteMask.loadSprite(var30, var34, 0)) { if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null; var35 = null;
} else { } else {
@@ -348,8 +348,8 @@ public class class171 {
} }
if (ClientPreferences.headIconPrayerSprites == null) { if (ClientPreferences.headIconPrayerSprites == null) {
var30 = WorldMapSection3.archive8; var30 = WorldMapSection1.archive8;
var34 = class211.spriteIds.headIconsPrayer; var34 = Calendar.spriteIds.headIconsPrayer;
if (!SpriteMask.loadSprite(var30, var34, 0)) { if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null; var35 = null;
} else { } else {
@@ -362,8 +362,8 @@ public class class171 {
} }
if (Player.headIconHintSprites == null) { if (Player.headIconHintSprites == null) {
var30 = WorldMapSection3.archive8; var30 = WorldMapSection1.archive8;
var34 = class211.spriteIds.headIconsHint; var34 = Calendar.spriteIds.headIconsHint;
if (!SpriteMask.loadSprite(var30, var34, 0)) { if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null; var35 = null;
} else { } else {
@@ -376,8 +376,8 @@ public class class171 {
} }
if (class16.mapMarkerSprites == null) { if (class16.mapMarkerSprites == null) {
var30 = WorldMapSection3.archive8; var30 = WorldMapSection1.archive8;
var34 = class211.spriteIds.mapMarkers; var34 = Calendar.spriteIds.mapMarkers;
if (!SpriteMask.loadSprite(var30, var34, 0)) { if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null; var35 = null;
} else { } else {
@@ -390,8 +390,8 @@ public class class171 {
} }
if (KeyHandler.crossSprites == null) { if (KeyHandler.crossSprites == null) {
var30 = WorldMapSection3.archive8; var30 = WorldMapSection1.archive8;
var34 = class211.spriteIds.crosses; var34 = Calendar.spriteIds.crosses;
if (!SpriteMask.loadSprite(var30, var34, 0)) { if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null; var35 = null;
} else { } else {
@@ -404,8 +404,8 @@ public class class171 {
} }
if (class39.mapDotSprites == null) { if (class39.mapDotSprites == null) {
var30 = WorldMapSection3.archive8; var30 = WorldMapSection1.archive8;
var34 = class211.spriteIds.mapDots; var34 = Calendar.spriteIds.mapDots;
if (!SpriteMask.loadSprite(var30, var34, 0)) { if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null; var35 = null;
} else { } else {
@@ -418,8 +418,8 @@ public class class171 {
} }
if (class32.scrollBarSprites == null) { if (class32.scrollBarSprites == null) {
var30 = WorldMapSection3.archive8; var30 = WorldMapSection1.archive8;
var34 = class211.spriteIds.scrollBars; var34 = Calendar.spriteIds.scrollBars;
if (!SpriteMask.loadSprite(var30, var34, 0)) { if (!SpriteMask.loadSprite(var30, var34, 0)) {
var32 = null; var32 = null;
} else { } else {
@@ -432,8 +432,8 @@ public class class171 {
} }
if (WorldMapSectionType.modIconSprites == null) { if (WorldMapSectionType.modIconSprites == null) {
var30 = WorldMapSection3.archive8; var30 = WorldMapSection1.archive8;
var34 = class211.spriteIds.modIcons; var34 = Calendar.spriteIds.modIcons;
if (!SpriteMask.loadSprite(var30, var34, 0)) { if (!SpriteMask.loadSprite(var30, var34, 0)) {
var32 = null; var32 = null;
} else { } else {
@@ -465,7 +465,7 @@ public class class171 {
Login.Login_loadingText = "Loading textures - 0%"; Login.Login_loadingText = "Loading textures - 0%";
Login.Login_loadingPercent = 90; Login.Login_loadingPercent = 90;
} else { } else {
SecureRandomFuture.textureProvider = new TextureProvider(class238.archive9, WorldMapSection3.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); SecureRandomFuture.textureProvider = new TextureProvider(class238.archive9, WorldMapSection1.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128);
Rasterizer3D.Rasterizer3D_setTextureLoader(SecureRandomFuture.textureProvider); Rasterizer3D.Rasterizer3D_setTextureLoader(SecureRandomFuture.textureProvider);
Rasterizer3D.Rasterizer3D_setBrightness(0.8D); Rasterizer3D.Rasterizer3D_setBrightness(0.8D);
Client.titleLoadingStage = 100; Client.titleLoadingStage = 100;
runescape-client/src/main/java/class196.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class class196 {
garbageValue = "125" garbageValue = "125"
) )
static int method3736(int var0, Script var1, boolean var2) { static int method3736(int var0, Script var1, boolean var2) {
return var0 < 1000 ? Canvas.method861(var0, var1, var2) : (var0 < 1100 ? class1.method8(var0, var1, var2) : (var0 < 1200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 1300 ? class32.method576(var0, var1, var2) : (var0 < 1400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 1500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 1600 ? WorldMapSectionType.method253(var0, var1, var2) : (var0 < 1700 ? ScriptEvent.method1185(var0, var1, var2) : (var0 < 1800 ? Formatting.method2023(var0, var1, var2) : (var0 < 1900 ? class16.method188(var0, var1, var2) : (var0 < 2000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 2100 ? class1.method8(var0, var1, var2) : (var0 < 2200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 2300 ? class32.method576(var0, var1, var2) : (var0 < 2400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 2500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 2600 ? ViewportMouse.method2983(var0, var1, var2) : (var0 < 2700 ? GrandExchangeEvents.method75(var0, var1, var2) : (var0 < 2800 ? GrandExchangeOfferNameComparator.method146(var0, var1, var2) : (var0 < 2900 ? class15.method182(var0, var1, var2) : (var0 < 3000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 3200 ? class4.method54(var0, var1, var2) : (var0 < 3300 ? GrandExchangeOfferWorldComparator.method68(var0, var1, var2) : (var0 < 3400 ? ScriptEvent.method1187(var0, var1, var2) : (var0 < 3500 ? Formatting.method2022(var0, var1, var2) : (var0 < 3700 ? FontName.method5639(var0, var1, var2) : (var0 < 4000 ? class248.method4741(var0, var1, var2) : (var0 < 4100 ? TextureProvider.method2752(var0, var1, var2) : (var0 < 4200 ? class211.method4103(var0, var1, var2) : (var0 < 4300 ? class1.method16(var0, var1, var2) : (var0 < 5100 ? DynamicObject.method2223(var0, var1, var2) : (var0 < 5400 ? UserComparator4.method3335(var0, var1, var2) : (var0 < 5600 ? GrandExchangeOfferOwnWorldComparator.method1285(var0, var1, var2) : (var0 < 5700 ? Decimator.method2492(var0, var1, var2) : (var0 < 6300 ? class229.method4513(var0, var1, var2) : (var0 < 6600 ? class31.method573(var0, var1, var2) : (var0 < 6700 ? class54.method1093(var0, var1, var2) : 2)))))))))))))))))))))))))))))))))))); return var0 < 1000 ? Canvas.method861(var0, var1, var2) : (var0 < 1100 ? class1.method8(var0, var1, var2) : (var0 < 1200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 1300 ? class32.method576(var0, var1, var2) : (var0 < 1400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 1500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 1600 ? WorldMapSectionType.method253(var0, var1, var2) : (var0 < 1700 ? ScriptEvent.method1185(var0, var1, var2) : (var0 < 1800 ? Formatting.method2023(var0, var1, var2) : (var0 < 1900 ? class16.method188(var0, var1, var2) : (var0 < 2000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 2100 ? class1.method8(var0, var1, var2) : (var0 < 2200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 2300 ? class32.method576(var0, var1, var2) : (var0 < 2400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 2500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 2600 ? ViewportMouse.method2983(var0, var1, var2) : (var0 < 2700 ? GrandExchangeEvents.method75(var0, var1, var2) : (var0 < 2800 ? GrandExchangeOfferNameComparator.method146(var0, var1, var2) : (var0 < 2900 ? class15.method182(var0, var1, var2) : (var0 < 3000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 3200 ? class4.method54(var0, var1, var2) : (var0 < 3300 ? GrandExchangeOfferWorldComparator.method68(var0, var1, var2) : (var0 < 3400 ? ScriptEvent.method1187(var0, var1, var2) : (var0 < 3500 ? Formatting.method2022(var0, var1, var2) : (var0 < 3700 ? FontName.method5639(var0, var1, var2) : (var0 < 4000 ? class248.method4741(var0, var1, var2) : (var0 < 4100 ? TextureProvider.method2752(var0, var1, var2) : (var0 < 4200 ? Calendar.method4103(var0, var1, var2) : (var0 < 4300 ? class1.method16(var0, var1, var2) : (var0 < 5100 ? DynamicObject.method2223(var0, var1, var2) : (var0 < 5400 ? UserComparator4.method3335(var0, var1, var2) : (var0 < 5600 ? GrandExchangeOfferOwnWorldComparator.method1285(var0, var1, var2) : (var0 < 5700 ? Decimator.method2492(var0, var1, var2) : (var0 < 6300 ? class229.method4513(var0, var1, var2) : (var0 < 6600 ? class31.method573(var0, var1, var2) : (var0 < 6700 ? class54.method1093(var0, var1, var2) : 2))))))))))))))))))))))))))))))))))));
} }
@ObfuscatedName("u") @ObfuscatedName("u")
runescape-client/src/main/java/class198.java
+1 -1
View File
@@ -9,6 +9,6 @@ public class class198 {
garbageValue = "1713547686" garbageValue = "1713547686"
) )
static String method3745(Widget var0) { static String method3745(Widget var0) {
return class211.method4107(class1.getWidgetClickMask(var0)) == 0 ? null : (var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null); return Calendar.method4107(class1.getWidgetClickMask(var0)) == 0 ? null : (var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null);
} }
} }
runescape-client/src/main/java/class21.java
+7 -5
View File
@@ -1,4 +1,5 @@
import java.util.LinkedList; import java.util.LinkedList;
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature; import net.runelite.mapping.ObfuscatedSignature;
@@ -59,7 +60,8 @@ public abstract class class21 {
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "[[[[Lv;" signature = "[[[[Lv;"
) )
WorldMapDecoration[][][][] field144; @Export("decorations")
WorldMapDecoration[][][][] decorations;
@ObfuscatedName("i") @ObfuscatedName("i")
boolean field157; boolean field157;
@ObfuscatedName("a") @ObfuscatedName("a")
@@ -112,11 +114,11 @@ public abstract class class21 {
garbageValue = "-2111523326" garbageValue = "-2111523326"
) )
void method282() { void method282() {
this.field151 = (short[][][])((short[][][])null); this.field151 = ((short[][][])null);
this.field145 = (short[][][])((short[][][])null); this.field145 = ((short[][][])null);
this.field154 = ((byte[][][])null); this.field154 = ((byte[][][])null);
this.field155 = ((byte[][][])null); this.field155 = ((byte[][][])null);
this.field144 = (WorldMapDecoration[][][][])((WorldMapDecoration[][][][])null); this.decorations = ((WorldMapDecoration[][][][])null);
this.field157 = false; this.field157 = false;
this.field153 = false; this.field153 = false;
} }
@@ -183,7 +185,7 @@ public abstract class class21 {
for (var8 = 0; var8 < var5; ++var8) { for (var8 = 0; var8 < var5; ++var8) {
var9 = var3.readUnsignedByte(); var9 = var3.readUnsignedByte();
if (var9 != 0) { if (var9 != 0) {
WorldMapDecoration[] var14 = this.field144[var8][var1][var2] = new WorldMapDecoration[var9]; WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9];
for (var10 = 0; var10 < var9; ++var10) { for (var10 = 0; var10 < var9; ++var10) {
int var12 = var3.method51(); int var12 = var3.method51();
runescape-client/src/main/java/class238.java
+2 -2
View File
@@ -226,7 +226,7 @@ public final class class238 {
class171.method3494(var22 + 1, var9.id, var9.childIndex, var9.itemId, ""); class171.method3494(var22 + 1, var9.id, var9.childIndex, var9.itemId, "");
} else if (var22 == 10) { } else if (var22 == 10) {
Player.method1281(); Player.method1281();
WorldMapDecoration.method350(var9.id, var9.childIndex, class211.method4107(class1.getWidgetClickMask(var9)), var9.itemId); WorldMapDecoration.method350(var9.id, var9.childIndex, Calendar.method4107(class1.getWidgetClickMask(var9)), var9.itemId);
Client.selectedSpellActionName = class198.method3745(var9); Client.selectedSpellActionName = class198.method3745(var9);
if (Client.selectedSpellActionName == null) { if (Client.selectedSpellActionName == null) {
Client.selectedSpellActionName = "null"; Client.selectedSpellActionName = "null";
@@ -557,7 +557,7 @@ public final class class238 {
} }
if (var9.scrollHeight > var9.height) { if (var9.scrollHeight > var9.height) {
WorldMapSection0.method246(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); WorldMapSection3.method246(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y);
} }
} }
runescape-client/src/main/java/class306.java
+1 -1
View File
@@ -58,7 +58,7 @@ public final class class306 {
ClientPreferences var1 = new ClientPreferences(); ClientPreferences var1 = new ClientPreferences();
try { try {
var0 = LoginPacket.getPreferencesFile("", class22.studioGame.name, false); var0 = LoginPacket.getPreferencesFile("", WorldMapRectangle.studioGame.name, false);
byte[] var2 = new byte[(int)var0.length()]; byte[] var2 = new byte[(int)var0.length()];
int var3; int var3;
runescape-client/src/main/java/class32.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class class32 {
var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
} }
class22.method295(var3); WorldMapRectangle.method295(var3);
if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) {
if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { if (var0 == ScriptOpcodes.CC_SETNPCHEAD) {
var3.modelType = 2; var3.modelType = 2;
runescape-client/src/main/java/class39.java
+1 -1
View File
@@ -68,7 +68,7 @@ public class class39 extends class21 {
super.field145 = new short[super.field156][64][64]; super.field145 = new short[super.field156][64][64];
super.field154 = new byte[super.field156][64][64]; super.field154 = new byte[super.field156][64][64];
super.field155 = new byte[super.field156][64][64]; super.field155 = new byte[super.field156][64][64];
super.field144 = new WorldMapDecoration[super.field156][64][64][]; super.decorations = new WorldMapDecoration[super.field156][64][64][];
int var2 = var1.readUnsignedByte(); int var2 = var1.readUnsignedByte();
if (var2 != class30.field247.field248) { if (var2 != class30.field247.field248) {
throw new IllegalStateException(""); throw new IllegalStateException("");
runescape-client/src/main/java/class4.java
+9 -7
View File
@@ -1,3 +1,4 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature; import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.ScriptOpcodes; import net.runelite.rs.ScriptOpcodes;
@@ -8,7 +9,8 @@ final class class4 implements class0 {
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lir;" signature = "Lir;"
) )
public static AbstractArchive field1158; @Export("InvDefinition_archive")
public static AbstractArchive InvDefinition_archive;
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
@@ -52,7 +54,7 @@ final class class4 implements class0 {
garbageValue = "-843046456" garbageValue = "-843046456"
) )
public static void method55() { public static void method55() {
FloorOverlayDefinition.field664.clear(); FloorOverlayDefinition.FloorOverlayDefinition_cached.clear();
} }
@ObfuscatedName("v") @ObfuscatedName("v")
@@ -110,7 +112,7 @@ final class class4 implements class0 {
if (var0 == ScriptOpcodes.OPPLAYER) { if (var0 == ScriptOpcodes.OPPLAYER) {
var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
var6 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var6 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
WorldMapSection2.method583(var7, var6); WorldMapSection0.method583(var7, var6);
return 1; return 1;
} else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) {
RouteStrategy.Interpreter_intStackSize -= 3; RouteStrategy.Interpreter_intStackSize -= 3;
@@ -135,7 +137,7 @@ final class class4 implements class0 {
return 1; return 1;
} else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) {
ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
WorldMapSection0.savePreferences(); WorldMapSection3.savePreferences();
return 1; return 1;
} else { } else {
boolean var8; boolean var8;
@@ -268,7 +270,7 @@ final class class4 implements class0 {
} else if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { } else if (var0 == ScriptOpcodes.SETHIDEUSERNAME) {
var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
ReflectionCheck.clientPreferences.hideUsername = var8; ReflectionCheck.clientPreferences.hideUsername = var8;
WorldMapSection0.savePreferences(); WorldMapSection3.savePreferences();
return 1; return 1;
} else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername ? 1 : 0; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername ? 1 : 0;
@@ -278,7 +280,7 @@ final class class4 implements class0 {
Client.Login_isUsernameRemembered = var8; Client.Login_isUsernameRemembered = var8;
if (!var8) { if (!var8) {
ReflectionCheck.clientPreferences.rememberedUsername = ""; ReflectionCheck.clientPreferences.rememberedUsername = "";
WorldMapSection0.savePreferences(); WorldMapSection3.savePreferences();
} }
return 1; return 1;
@@ -291,7 +293,7 @@ final class class4 implements class0 {
var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
if (var8 == ReflectionCheck.clientPreferences.titleMusicDisabled) { if (var8 == ReflectionCheck.clientPreferences.titleMusicDisabled) {
ReflectionCheck.clientPreferences.titleMusicDisabled = !var8; ReflectionCheck.clientPreferences.titleMusicDisabled = !var8;
WorldMapSection0.savePreferences(); WorldMapSection3.savePreferences();
} }
return 1; return 1;
runescape-client/src/main/java/class40.java
+7 -7
View File
@@ -31,11 +31,11 @@ public class class40 {
signature = "(IIIIIIIIB)V", signature = "(IIIIIIIIB)V",
garbageValue = "125" garbageValue = "125"
) )
void method743(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { void method743(int x, int y, int var3, int var4, int width, int height, int var7, int var8) {
if (var7 != 0 && this.field326 != 0 && this.field329 != null) { if (var7 != 0 && this.field326 != 0 && this.field329 != null) {
var8 = this.method744(var8, var7); var8 = this.method744(var8, var7);
var7 = this.method774(var7); var7 = this.method774(var7);
Rasterizer2D.raster2d7(var1, var2, var5, var6, var3, var4, this.field329[var7 - 1][var8], this.field326); Rasterizer2D.raster2d7(x, y, width, height, var3, var4, this.field329[var7 - 1][var8], this.field326);
} }
} }
@@ -755,7 +755,7 @@ public class class40 {
var11 = var19; var11 = var19;
} }
WorldMapSection1.cameraX = var6 - var11; WorldMapSection2.cameraX = var6 - var11;
GrandExchangeEvents.cameraY = var14 - var12; GrandExchangeEvents.cameraY = var14 - var12;
GrandExchangeOfferNameComparator.cameraZ = var15 - var16; GrandExchangeOfferNameComparator.cameraZ = var15 - var16;
WorldMapIcon1.cameraPitch = var4; WorldMapIcon1.cameraPitch = var4;
@@ -779,7 +779,7 @@ public class class40 {
var4 = Login.method2061(); var4 = Login.method2061();
} }
var13 = WorldMapSection1.cameraX; var13 = WorldMapSection2.cameraX;
var6 = GrandExchangeEvents.cameraY; var6 = GrandExchangeEvents.cameraY;
var14 = GrandExchangeOfferNameComparator.cameraZ; var14 = GrandExchangeOfferNameComparator.cameraZ;
var15 = WorldMapIcon1.cameraPitch; var15 = WorldMapIcon1.cameraPitch;
@@ -789,7 +789,7 @@ public class class40 {
if (Client.field139[var24]) { if (Client.field139[var24]) {
var9 = (int)(Math.random() * (double)(Client.field141[var24] * 2 + 1) - (double)Client.field141[var24] + Math.sin((double)Client.field144[var24] * ((double)Client.field143[var24] / 100.0D)) * (double)Client.field142[var24]); var9 = (int)(Math.random() * (double)(Client.field141[var24] * 2 + 1) - (double)Client.field141[var24] + Math.sin((double)Client.field144[var24] * ((double)Client.field143[var24] / 100.0D)) * (double)Client.field142[var24]);
if (var24 == 0) { if (var24 == 0) {
WorldMapSection1.cameraX += var9; WorldMapSection2.cameraX += var9;
} }
if (var24 == 1) { if (var24 == 1) {
@@ -842,7 +842,7 @@ public class class40 {
class13.playPcmPlayers(); class13.playPcmPlayers();
var10 = Rasterizer3D.Rasterizer3D_zoom; var10 = Rasterizer3D.Rasterizer3D_zoom;
Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom;
class65.scene.draw(WorldMapSection1.cameraX, GrandExchangeEvents.cameraY, GrandExchangeOfferNameComparator.cameraZ, WorldMapIcon1.cameraPitch, MusicPatchNode.cameraYaw, var4); class65.scene.draw(WorldMapSection2.cameraX, GrandExchangeEvents.cameraY, GrandExchangeOfferNameComparator.cameraZ, WorldMapIcon1.cameraPitch, MusicPatchNode.cameraYaw, var4);
Rasterizer3D.Rasterizer3D_zoom = var10; Rasterizer3D.Rasterizer3D_zoom = var10;
class13.playPcmPlayers(); class13.playPcmPlayers();
class65.scene.clearTempGameObjects(); class65.scene.clearTempGameObjects();
@@ -864,7 +864,7 @@ public class class40 {
Client.field208 = 0; Client.field208 = 0;
} }
WorldMapSection1.cameraX = var13; WorldMapSection2.cameraX = var13;
GrandExchangeEvents.cameraY = var6; GrandExchangeEvents.cameraY = var6;
GrandExchangeOfferNameComparator.cameraZ = var14; GrandExchangeOfferNameComparator.cameraZ = var14;
WorldMapIcon1.cameraPitch = var15; WorldMapIcon1.cameraPitch = var15;
runescape-client/src/main/java/class50.java
+4 -4
View File
@@ -213,7 +213,7 @@ public class class50 {
ItemDefinition var5 = Skills.getItemDefinition(var4); ItemDefinition var5 = Skills.getItemDefinition(var4);
if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) {
if (var3 >= 250) { if (var3 >= 250) {
WorldMapSection0.field1055 = -1; WorldMapSection3.field1055 = -1;
AttackOption.field30 = null; AttackOption.field30 = null;
return; return;
} }
@@ -234,10 +234,10 @@ public class class50 {
AttackOption.field30 = var2; AttackOption.field30 = var2;
WorldMapDecorationType.field1139 = 0; WorldMapDecorationType.field1139 = 0;
WorldMapSection0.field1055 = var3; WorldMapSection3.field1055 = var3;
String[] var8 = new String[WorldMapSection0.field1055]; String[] var8 = new String[WorldMapSection3.field1055];
for (int var9 = 0; var9 < WorldMapSection0.field1055; ++var9) { for (int var9 = 0; var9 < WorldMapSection3.field1055; ++var9) {
var8[var9] = Skills.getItemDefinition(var2[var9]).name; var8[var9] = Skills.getItemDefinition(var2[var9]).name;
} }
runescape-client/src/main/java/class54.java
+6 -6
View File
@@ -18,7 +18,7 @@ public final class class54 {
) )
static int method1086(int var0, int var1) { static int method1086(int var0, int var1) {
long var2 = (long)((var0 << 16) + var1); long var2 = (long)((var0 << 16) + var1);
return ModelData0.NetCache_currentResponse != null && var2 == ModelData0.NetCache_currentResponse.key ? class22.NetCache_responseArchiveBuffer.index * 99 / (class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding) + 1 : 0; return ModelData0.NetCache_currentResponse != null && var2 == ModelData0.NetCache_currentResponse.key ? WorldMapRectangle.NetCache_responseArchiveBuffer.index * 99 / (WorldMapRectangle.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding) + 1 : 0;
} }
@ObfuscatedName("q") @ObfuscatedName("q")
@@ -41,7 +41,7 @@ public final class class54 {
if (!Login.worldSelectOpen) { if (!Login.worldSelectOpen) {
if ((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { if ((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) {
ReflectionCheck.clientPreferences.titleMusicDisabled = !ReflectionCheck.clientPreferences.titleMusicDisabled; ReflectionCheck.clientPreferences.titleMusicDisabled = !ReflectionCheck.clientPreferences.titleMusicDisabled;
WorldMapSection0.savePreferences(); WorldMapSection3.savePreferences();
if (!ReflectionCheck.clientPreferences.titleMusicDisabled) { if (!ReflectionCheck.clientPreferences.titleMusicDisabled) {
class204.method4011(UserComparator3.archive6, "scape main", "", 255, false); class204.method4011(UserComparator3.archive6, "scape main", "", 255, false);
} else { } else {
@@ -224,7 +224,7 @@ public final class class54 {
Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered;
if (!Client.Login_isUsernameRemembered && ReflectionCheck.clientPreferences.rememberedUsername != null) { if (!Client.Login_isUsernameRemembered && ReflectionCheck.clientPreferences.rememberedUsername != null) {
ReflectionCheck.clientPreferences.rememberedUsername = null; ReflectionCheck.clientPreferences.rememberedUsername = null;
WorldMapSection0.savePreferences(); WorldMapSection3.savePreferences();
} }
} }
@@ -239,7 +239,7 @@ public final class class54 {
class196.method3740(); class196.method3740();
} }
WorldMapSection0.savePreferences(); WorldMapSection3.savePreferences();
} }
while (true) { while (true) {
@@ -927,10 +927,10 @@ public final class class54 {
if (var0 == ScriptOpcodes.MEC_TEXT) { if (var0 == ScriptOpcodes.MEC_TEXT) {
var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
var12 = ViewportMouse.getWorldMapElement(var3); var12 = ViewportMouse.getWorldMapElement(var3);
if (var12.field1021 == null) { if (var12.name == null) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
} else { } else {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12.field1021; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12.name;
} }
return 1; return 1;