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

More renaming

Browse Source
This commit is contained in:
Lucas
2019-07-07 08:53:22 +02:00
parent 7439136209
commit c92553f86f
54 changed files with 183 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,13 +23,13 @@ public abstract class AbstractWorldMapIcon {
signature = "Lhu;"
)
@Export("coord2")
public final TileLocation coord2;
public final Coord coord2;
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "Lhu;"
)
@Export("coord1")
public final TileLocation coord1;
public final Coord coord1;
@ObfuscatedName("e")
@ObfuscatedGetter(
intValue = -521086143
@@ -44,7 +44,7 @@ public abstract class AbstractWorldMapIcon {
@ObfuscatedSignature(
signature = "(Lhu;Lhu;)V"
)
AbstractWorldMapIcon(TileLocation var1, TileLocation var2) {
AbstractWorldMapIcon(Coord var1, Coord var2) {
this.coord1 = var1;
this.coord2 = var2;
}

2
runescape-client/src/main/java/Actor.java
View File

@@ -1306,7 +1306,7 @@ public abstract class Actor extends Entity {
if (var2 != 1007) {
if (var2 == 1008 || var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1012) {
class60.worldMap0.menuAction(var2, var3, new TileLocation(var0), new TileLocation(var1));
class60.worldMap0.menuAction(var2, var3, new Coord(var0), new Coord(var1));
}
break label415;
}

4
runescape-client/src/main/java/ArchiveDisk.java
View File

@@ -316,7 +316,7 @@ public final class ArchiveDisk
int var15 = var5 - var4.xInset;
int var16 = var6 - var4.yInset;
if (var3.vmethod3644(var2, var5, var6, var4)) {
WidgetGroupParent.field986 = var5;
InterfaceParent.field986 = var5;
UrlRequester.field929 = var6;
return true;
}
@@ -485,7 +485,7 @@ public final class ArchiveDisk
}
}
WidgetGroupParent.field986 = var5;
InterfaceParent.field986 = var5;
UrlRequester.field929 = var6;
return false;
}

4
runescape-client/src/main/java/Buffer.java
View File

@@ -388,7 +388,7 @@ public class Buffer extends Node {
}
int var2 = this.index - var1 - 1;
return var2 == 0 ? "" : WidgetGroupParent.decodeStringCp1252(this.array, var1, var2);
return var2 == 0 ? "" : InterfaceParent.decodeStringCp1252(this.array, var1, var2);
}
@ObfuscatedName("ak")
@@ -408,7 +408,7 @@ public class Buffer extends Node {
}
int var3 = this.index - var2 - 1;
return var3 == 0 ? "" : WidgetGroupParent.decodeStringCp1252(this.array, var2, var3);
return var3 == 0 ? "" : InterfaceParent.decodeStringCp1252(this.array, var2, var3);
}
}

52
runescape-client/src/main/java/Client.java
View File

@@ -103,8 +103,8 @@ public final class Client extends GameShell implements Usernamed {
@ObfuscatedSignature(
signature = "Lld;"
)
@Export("widgetGroupParents")
static NodeHashTable widgetGroupParents;
@Export("interfaceParents")
static NodeHashTable interfaceParents;
@ObfuscatedName("oy")
@Export("rootWidgetXs")
static int[] rootWidgetXs;
@@ -1732,7 +1732,7 @@ public final class Client extends GameShell implements Usernamed {
for (var13 = 0; var13 < 104; ++var13) {
var14 = var12 + 5;
int var10002;
UnderlayDefinition var29;
FloorUnderlayDefinition var29;
if (var14 >= 0 && var14 < 104) {
var15 = Tiles.field908[var6][var14][var13] & 255;
if (var15 > 0) {
@@ -1830,7 +1830,7 @@ public final class Client extends GameShell implements Usernamed {
var39 = WorldMapAreaData.method712(var40, var41, var42);
}
OverlayDefinition var43;
FloorOverlayDefinition var43;
if (var6 > 0) {
boolean var44 = true;
if (var28 == 0 && class32.field1157[var6][var12][var18] != 0) {
@@ -1839,19 +1839,19 @@ public final class Client extends GameShell implements Usernamed {
if (var65 > 0) {
var42 = var65 - 1;
var43 = (OverlayDefinition)OverlayDefinition.field664.get((long)var42);
OverlayDefinition var45;
var43 = (FloorOverlayDefinition) FloorOverlayDefinition.field664.get((long)var42);
FloorOverlayDefinition var45;
if (var43 != null) {
var45 = var43;
} else {
byte[] var46 = OverlayDefinition.field663.takeFile(4, var42);
var43 = new OverlayDefinition();
byte[] var46 = FloorOverlayDefinition.field663.takeFile(4, var42);
var43 = new FloorOverlayDefinition();
if (var46 != null) {
var43.decode(new Buffer(var46), var42);
}
var43.init();
OverlayDefinition.field664.put(var43, (long)var42);
var43.postDecode();
FloorOverlayDefinition.field664.put(var43, (long)var42);
var45 = var43;
}
@@ -1877,18 +1877,18 @@ public final class Client extends GameShell implements Usernamed {
var41 = class32.field1157[var6][var12][var18] + 1;
byte var66 = class307.field1155[var6][var12][var18];
int var67 = var65 - 1;
OverlayDefinition var68 = (OverlayDefinition)OverlayDefinition.field664.get((long)var67);
FloorOverlayDefinition var68 = (FloorOverlayDefinition) FloorOverlayDefinition.field664.get((long)var67);
if (var68 != null) {
var43 = var68;
} else {
byte[] var47 = OverlayDefinition.field663.takeFile(4, var67);
var68 = new OverlayDefinition();
byte[] var47 = FloorOverlayDefinition.field663.takeFile(4, var67);
var68 = new FloorOverlayDefinition();
if (var47 != null) {
var68.decode(new Buffer(var47), var67);
}
var68.init();
OverlayDefinition.field664.put(var68, (long)var67);
var68.postDecode();
FloorOverlayDefinition.field664.put(var68, (long)var67);
var43 = var68;
}
@@ -5226,19 +5226,19 @@ public final class Client extends GameShell implements Usernamed {
return true;
}
WidgetGroupParent var22;
InterfaceParent var22;
if (ServerPacket.field871 == var1.serverPacket0) {
var37 = var3.readInt();
var6 = var3.readInt();
WidgetGroupParent var48 = (WidgetGroupParent)widgetGroupParents.get((long)var6);
var22 = (WidgetGroupParent)widgetGroupParents.get((long)var37);
InterfaceParent var48 = (InterfaceParent)interfaceParents.get((long)var6);
var22 = (InterfaceParent)interfaceParents.get((long)var37);
if (var22 != null) {
MenuAction.closeWidgetGroup(var22, var48 == null || var48.group != var22.group);
}
if (var48 != null) {
var48.remove();
widgetGroupParents.put(var48, (long)var37);
interfaceParents.put(var48, (long)var37);
}
var15 = Huffman.getWidget(var6);
@@ -5574,7 +5574,7 @@ public final class Client extends GameShell implements Usernamed {
return true;
}
WidgetGroupParent var50;
InterfaceParent var50;
if (ServerPacket.field845 == var1.serverPacket0) {
var37 = var3.index + var1.serverPacket0Length;
var6 = var3.readUnsignedShort();
@@ -5594,7 +5594,7 @@ public final class Client extends GameShell implements Usernamed {
var10 = var3.readInt();
var11 = var3.readUnsignedShort();
var12 = var3.readUnsignedByte();
var50 = (WidgetGroupParent)widgetGroupParents.get((long)var10);
var50 = (InterfaceParent)interfaceParents.get((long)var10);
if (var50 != null && var11 != var50.group) {
MenuAction.closeWidgetGroup(var50, true);
var50 = null;
@@ -5605,7 +5605,7 @@ public final class Client extends GameShell implements Usernamed {
}
}
for (var22 = (WidgetGroupParent)widgetGroupParents.first(); var22 != null; var22 = (WidgetGroupParent)widgetGroupParents.next()) {
for (var22 = (InterfaceParent)interfaceParents.first(); var22 != null; var22 = (InterfaceParent)interfaceParents.next()) {
if (var22.keep) {
var22.keep = false;
} else {
@@ -5692,7 +5692,7 @@ public final class Client extends GameShell implements Usernamed {
if (ServerPacket.field798 == var1.serverPacket0) {
var37 = var3.readInt();
var50 = (WidgetGroupParent)widgetGroupParents.get((long)var37);
var50 = (InterfaceParent)interfaceParents.get((long)var37);
if (var50 != null) {
MenuAction.closeWidgetGroup(var50, true);
}
@@ -5753,7 +5753,7 @@ public final class Client extends GameShell implements Usernamed {
var37 = var3.method58();
var6 = var3.method72();
var5 = var3.method67();
var22 = (WidgetGroupParent)widgetGroupParents.get((long)var6);
var22 = (InterfaceParent)interfaceParents.get((long)var6);
if (var22 != null) {
MenuAction.closeWidgetGroup(var22, var5 != var22.group);
}
@@ -6093,7 +6093,7 @@ public final class Client extends GameShell implements Usernamed {
}
WorldMapSection3.alignWidgetSize(var1, var3, var4, false);
OverlayDefinition.alignWidgetPosition(var1, var3, var4);
FloorOverlayDefinition.alignWidgetPosition(var1, var3, var4);
}
@ObfuscatedName("jh")
@@ -6402,7 +6402,7 @@ public final class Client extends GameShell implements Usernamed {
selectedSpellActionName = null;
selectedSpellName = null;
rootWidgetGroup = -1;
widgetGroupParents = new NodeHashTable(8);
interfaceParents = new NodeHashTable(8);
field151 = 0;
field153 = -1;
chatEffects = 0;

15
runescape-client/src/main/java/TileLocation.java → runescape-client/src/main/java/Coord.java
View File

@@ -5,8 +5,9 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("hu")
@Implements("TileLocation")
public class TileLocation {
@Implements("Coord")
public class Coord
{
@ObfuscatedName("m")
@ObfuscatedGetter(
intValue = 503621925
@@ -29,19 +30,19 @@ public class TileLocation {
@ObfuscatedSignature(
signature = "(Lhu;)V"
)
public TileLocation(TileLocation var1) {
public Coord(Coord var1) {
this.plane = var1.plane;
this.x = var1.x;
this.y = var1.y;
}
public TileLocation(int var1, int var2, int var3) {
public Coord(int var1, int var2, int var3) {
this.plane = var1;
this.x = var2;
this.y = var3;
}
public TileLocation(int var1) {
public Coord(int var1) {
if (var1 == -1) {
this.plane = -1;
} else {
@@ -68,7 +69,7 @@ public class TileLocation {
garbageValue = "-1"
)
@Export("equals0")
boolean equals0(TileLocation var1) {
boolean equals0(Coord var1) {
return this.plane != var1.plane ? false : (this.x != var1.x ? false : this.y == var1.y);
}
@@ -84,7 +85,7 @@ public class TileLocation {
@ObfuscatedName("equals")
public boolean method326(Object var1) {
return this == var1 ? true : (!(var1 instanceof TileLocation) ? false : this.equals0((TileLocation)var1));
return this == var1 ? true : (!(var1 instanceof Coord) ? false : this.equals0((Coord)var1));
}
@ObfuscatedName("hashCode")

2
runescape-client/src/main/java/DevicePcmPlayerProvider.java
View File

@@ -333,7 +333,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
drawWidgetGroup(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
}
WidgetGroupParent var23 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var10.id);
InterfaceParent var23 = (InterfaceParent)Client.interfaceParents.get((long)var10.id);
if (var23 != null) {
Interpreter.drawWidgets(var23.group, var15, var16, var17, var18, var12, var13, var11);
}

2
runescape-client/src/main/java/DynamicObject.java
View File

@@ -442,7 +442,7 @@ public class DynamicObject extends Entity {
return 1;
} else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) {
var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WidgetGroupParent.method1174(var5);
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = InterfaceParent.method1174(var5);
return 1;
} else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) {
var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];

4
runescape-client/src/main/java/FaceNormal.java
View File

@@ -42,12 +42,12 @@ public class FaceNormal {
)
static Script method3236(int var0, int var1, int var2) {
int var3 = UnitPriceComparator.method125(var1, var0);
Script var4 = WidgetGroupParent.method1175(var3, var0);
Script var4 = InterfaceParent.method1175(var3, var0);
if (var4 != null) {
return var4;
} else {
var3 = PacketBuffer.method4081(var2, var0);
var4 = WidgetGroupParent.method1175(var3, var0);
var4 = InterfaceParent.method1175(var3, var0);
return var4 != null ? var4 : null;
}
}

10
runescape-client/src/main/java/OverlayDefinition.java → runescape-client/src/main/java/FloorOverlayDefinition.java
View File

@@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jf")
@Implements("OverlayDefinition")
public class OverlayDefinition extends DualNode {
@Implements("FloorOverlayDefinition")
public class FloorOverlayDefinition extends DualNode {
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "Lir;"
@@ -74,7 +74,7 @@ public class OverlayDefinition extends DualNode {
@Export("lightness2")
public int lightness2;
public OverlayDefinition() {
public FloorOverlayDefinition() {
this.rgb = 0;
this.texture = -1;
this.field665 = true;
@@ -86,8 +86,8 @@ public class OverlayDefinition extends DualNode {
signature = "(I)V",
garbageValue = "867788548"
)
@Export("init")
public void init() {
@Export("postDecode")
public void postDecode() {
if (this.rgb2 != -1) {
this.setHsl(this.rgb2);
this.hue2 = this.hue;

10
runescape-client/src/main/java/UnderlayDefinition.java → runescape-client/src/main/java/FloorUnderlayDefinition.java
View File

@@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ih")
@Implements("UnderlayDefinition")
public class UnderlayDefinition extends DualNode {
@Implements("FloorUnderlayDefinition")
public class FloorUnderlayDefinition extends DualNode {
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "Lir;"
@@ -50,7 +50,7 @@ public class UnderlayDefinition extends DualNode {
@Export("hueMultiplier")
public int hueMultiplier;
UnderlayDefinition() {
FloorUnderlayDefinition() {
this.rgb = 0;
}
@@ -59,8 +59,8 @@ public class UnderlayDefinition extends DualNode {
signature = "(I)V",
garbageValue = "-782326269"
)
@Export("init")
void init() {
@Export("postDecode")
void postDecode() {
this.setHsl(this.rgb);
}

2
runescape-client/src/main/java/Fonts.java
View File

@@ -64,7 +64,7 @@ public class Fonts {
String var8 = var5.field349;
int var9 = var6.getGroupId(var8);
int var10 = var6.getFileId(var9, "");
Font var11 = SpriteIds.method5823(var6, var7, var9, var10);
Font var11 = GraphicsDefaults.method5823(var6, var7, var9, var10);
if (var11 != null) {
this.map.put(var5, var11);
var2.put(var5, var11);

11
runescape-client/src/main/java/SpriteIds.java → runescape-client/src/main/java/GraphicsDefaults.java
View File

@@ -5,8 +5,9 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("lg")
@Implements("SpriteIds")
public class SpriteIds {
@Implements("GraphicsDefaults")
public class GraphicsDefaults
{
@ObfuscatedName("m")
@ObfuscatedGetter(
intValue = 1673796151
@@ -72,7 +73,7 @@ public class SpriteIds {
@Export("modIcons")
public int modIcons;
public SpriteIds() {
public GraphicsDefaults() {
this.field878 = -1;
this.field879 = -1;
this.mapScenes = -1;
@@ -91,8 +92,8 @@ public class SpriteIds {
signature = "(Lir;I)V",
garbageValue = "1764356022"
)
@Export("read")
public void read(AbstractArchive var1) {
@Export("decode")
public void decode(AbstractArchive var1) {
byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3810.group);
Buffer var3 = new Buffer(var2);

2
runescape-client/src/main/java/HitSplatDefinition.java
View File

@@ -371,7 +371,7 @@ public class HitSplatDefinition extends DualNode {
if (var1 != null) {
return var1;
} else {
var1 = SpriteIds.method5823(field383, field384, this.fontId, 0);
var1 = GraphicsDefaults.method5823(field383, field384, this.fontId, 0);
if (var1 != null) {
HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId);
}

6
runescape-client/src/main/java/WidgetGroupParent.java → runescape-client/src/main/java/InterfaceParent.java
View File

@@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("bx")
@Implements("WidgetGroupParent")
public class WidgetGroupParent extends Node {
@Implements("InterfaceParent")
public class InterfaceParent extends Node {
@ObfuscatedName("px")
@ObfuscatedSignature(
signature = "Lln;"
@@ -34,7 +34,7 @@ public class WidgetGroupParent extends Node {
@Export("keep")
boolean keep;
WidgetGroupParent() {
InterfaceParent() {
this.keep = false;
}

2
runescape-client/src/main/java/KitDefinition.java
View File

@@ -252,7 +252,7 @@ public class KitDefinition extends DualNode {
byte[] var3 = new byte[var2];
var0.index += class303.huffman.method128(var0.array, var0.index, var3, 0, var2);
String var4 = WidgetGroupParent.decodeStringCp1252(var3, 0, var2);
String var4 = InterfaceParent.decodeStringCp1252(var3, 0, var2);
var1 = var4;
} catch (Exception var5) {
var1 = "Cabbage";

2
runescape-client/src/main/java/MenuAction.java
View File

@@ -66,7 +66,7 @@ public class MenuAction {
garbageValue = "1537219807"
)
@Export("closeWidgetGroup")
static final void closeWidgetGroup(WidgetGroupParent var0, boolean var1) {
static final void closeWidgetGroup(InterfaceParent var0, boolean var1) {
int var2 = var0.group;
int var3 = (int)var0.key;
var0.remove();

4
runescape-client/src/main/java/Message.java
View File

@@ -376,7 +376,7 @@ public class Message extends DualNode {
if (SoundSystem.plane != Client.field125) {
Client.field125 = SoundSystem.plane;
int var0 = SoundSystem.plane;
int[] var1 = WidgetGroupParent.sceneMinimapSprite.pixels;
int[] var1 = InterfaceParent.sceneMinimapSprite.pixels;
int var2 = var1.length;
int var3;
@@ -404,7 +404,7 @@ public class Message extends DualNode {
var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10);
var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16;
WidgetGroupParent.sceneMinimapSprite.setRaster();
InterfaceParent.sceneMinimapSprite.setRaster();
int var6;
for (var5 = 1; var5 < 103; ++var5) {

6
runescape-client/src/main/java/MouseRecorder.java
View File

@@ -96,7 +96,7 @@ public class MouseRecorder implements Runnable {
var10 = var4;
}
int[] var20 = WidgetGroupParent.sceneMinimapSprite.pixels;
int[] var20 = InterfaceParent.sceneMinimapSprite.pixels;
var12 = var1 * 4 + (103 - var2) * 2048 + 24624;
var11 = HitSplatDefinition.method4972(var5);
ObjectDefinition var15 = class50.getObjectDefinition(var11);
@@ -198,7 +198,7 @@ public class MouseRecorder implements Runnable {
var22 = 15597568;
}
int[] var26 = WidgetGroupParent.sceneMinimapSprite.pixels;
int[] var26 = InterfaceParent.sceneMinimapSprite.pixels;
var17 = var1 * 4 + (103 - var2) * 2048 + 24624;
if (var8 != 0 && var8 != 2) {
var26[var17] = var22;
@@ -275,7 +275,7 @@ public class MouseRecorder implements Runnable {
int var5 = Client.minimapOrientation & 2047;
int var6 = Canvas.localPlayer.x / 32 + 48;
int var7 = 464 - Canvas.localPlayer.y / 32;
WidgetGroupParent.sceneMinimapSprite.method315(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths);
InterfaceParent.sceneMinimapSprite.method315(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths);
int var8;
int var9;

2
runescape-client/src/main/java/NetFileRequest.java
View File

@@ -42,7 +42,7 @@ public class NetFileRequest extends DualNode {
method4555(var3.children, var3.id);
}
WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id);
InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id);
if (var4 != null) {
ClientPreferences.method1809(var4.group);
}

6
runescape-client/src/main/java/NetSocket.java
View File

@@ -357,7 +357,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
var15 = var9 - var4.xInset;
var16 = var10 - var4.yInset;
if (var3.vmethod3644(1, var9, var10, var4)) {
WidgetGroupParent.field986 = var9;
InterfaceParent.field986 = var9;
UrlRequester.field929 = var10;
var25 = true;
break label226;
@@ -429,7 +429,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
}
}
WidgetGroupParent.field986 = var9;
InterfaceParent.field986 = var9;
UrlRequester.field929 = var10;
var25 = false;
}
@@ -443,7 +443,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
var8 = var0 - 64;
var9 = var1 - 64;
var10 = WidgetGroupParent.field986;
var10 = InterfaceParent.field986;
var19 = UrlRequester.field929;
if (!var18) {
var20 = Integer.MAX_VALUE;

6
runescape-client/src/main/java/SecureRandomCallable.java
View File

@@ -52,11 +52,11 @@ public class SecureRandomCallable implements Callable {
signature = "(IIII)Lbx;",
garbageValue = "329127611"
)
static final WidgetGroupParent method1143(int var0, int var1, int var2) {
WidgetGroupParent var3 = new WidgetGroupParent();
static final InterfaceParent method1143(int var0, int var1, int var2) {
InterfaceParent var3 = new InterfaceParent();
var3.group = var1;
var3.type = var2;
Client.widgetGroupParents.put(var3, (long)var0);
Client.interfaceParents.put(var3, (long)var0);
DevicePcmPlayerProvider.method845(var1);
Widget var4 = Huffman.getWidget(var0);
class22.method295(var4);

12
runescape-client/src/main/java/StudioGame.java
View File

@@ -68,19 +68,19 @@ public enum StudioGame implements Enumerated {
signature = "(II)Lih;",
garbageValue = "-2058685786"
)
public static UnderlayDefinition method4550(int var0) {
UnderlayDefinition var1 = (UnderlayDefinition)UnderlayDefinition.UnderlayDefinition_cached.get((long)var0);
public static FloorUnderlayDefinition method4550(int var0) {
FloorUnderlayDefinition var1 = (FloorUnderlayDefinition) FloorUnderlayDefinition.UnderlayDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
} else {
byte[] var2 = UnderlayDefinition.UnderlayDefinition_archive.takeFile(1, var0);
var1 = new UnderlayDefinition();
byte[] var2 = FloorUnderlayDefinition.UnderlayDefinition_archive.takeFile(1, var0);
var1 = new FloorUnderlayDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2), var0);
}
var1.init();
UnderlayDefinition.UnderlayDefinition_cached.put(var1, (long)var0);
var1.postDecode();
FloorUnderlayDefinition.UnderlayDefinition_cached.put(var1, (long)var0);
return var1;
}
}

2
runescape-client/src/main/java/Tile.java
View File

@@ -146,7 +146,7 @@ public final class Tile extends Node {
garbageValue = "-1899580455"
)
public static void method2867() {
UnderlayDefinition.UnderlayDefinition_cached.clear();
FloorUnderlayDefinition.UnderlayDefinition_cached.clear();
}
@ObfuscatedName("is")

4
runescape-client/src/main/java/TotalQuantityComparator.java
View File

@@ -109,12 +109,12 @@ final class TotalQuantityComparator implements Comparator {
signature = "(ILhu;ZI)V",
garbageValue = "466862614"
)
static void method96(int var0, TileLocation var1, boolean var2) {
static void method96(int var0, Coord var1, boolean var2) {
WorldMapArea var3 = BufferedFile.worldMap().getMapArea(var0);
int var4 = Canvas.localPlayer.plane;
int var5 = (Canvas.localPlayer.x >> 7) + class50.baseX;
int var6 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
TileLocation var7 = new TileLocation(var4, var5, var6);
Coord var7 = new Coord(var4, var5, var6);
BufferedFile.worldMap().method367(var3, var7, var1, var2);
}

2
runescape-client/src/main/java/Varcs.java
View File

@@ -357,7 +357,7 @@ public class Varcs {
garbageValue = "321265868"
)
public static void method2160(AbstractArchive var0) {
OverlayDefinition.field663 = var0;
FloorOverlayDefinition.field663 = var0;
}
@ObfuscatedName("q")

2
runescape-client/src/main/java/Varps.java
View File

@@ -29,7 +29,7 @@ public class Varps {
garbageValue = "2111080001"
)
public static void method4393(AbstractArchive var0) {
UnderlayDefinition.UnderlayDefinition_archive = var0;
FloorUnderlayDefinition.UnderlayDefinition_archive = var0;
}
@ObfuscatedName("ki")

2
runescape-client/src/main/java/Widget.java
View File

@@ -1318,7 +1318,7 @@ public class Widget extends Node {
if (var1 != null) {
return var1;
} else {
var1 = SpriteIds.method5823(field955, class27.field1143, this.fontId, 0);
var1 = GraphicsDefaults.method5823(field955, class27.field1143, this.fontId, 0);
if (var1 != null) {
Widget_cachedFonts.put(var1, (long)this.fontId);
} else {

10
runescape-client/src/main/java/WorldMap.java
View File

@@ -242,7 +242,7 @@ public class WorldMap {
signature = "Lhu;"
)
@Export("mouseCoord")
TileLocation mouseCoord;
Coord mouseCoord;
@ObfuscatedName("bc")
@Export("showCoord")
public boolean showCoord;
@@ -675,7 +675,7 @@ public class WorldMap {
signature = "(Lag;Lhu;Lhu;ZI)V",
garbageValue = "-1430939646"
)
public void method367(WorldMapArea var1, TileLocation var2, TileLocation var3, boolean var4) {
public void method367(WorldMapArea var1, Coord var2, Coord var3, boolean var4) {
if (var1 != null) {
if (this.currentMapArea == null || var1 != this.currentMapArea) {
this.initializeWorldMap(var1);
@@ -1013,7 +1013,7 @@ public class WorldMap {
signature = "(I)Lhu;",
garbageValue = "-2005824064"
)
public TileLocation method376() {
public Coord method376() {
return this.currentMapArea == null ? null : this.currentMapArea.coord(this.method374(), this.method375());
}
@@ -1263,7 +1263,7 @@ public class WorldMap {
signature = "(ILhu;I)Lhu;",
garbageValue = "333454230"
)
public TileLocation method385(int var1, TileLocation var2) {
public Coord method385(int var1, Coord var2) {
if (!this.cacheLoader.getIsLoaded()) {
return null;
} else if (!this.worldMapManager.isLoaded()) {
@@ -1306,7 +1306,7 @@ public class WorldMap {
garbageValue = "94"
)
@Export("menuAction")
public void menuAction(int var1, int var2, TileLocation var3, TileLocation var4) {
public void menuAction(int var1, int var2, Coord var3, Coord var4) {
ScriptEvent var5 = new ScriptEvent();
WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4);
var5.setArgs(new Object[]{var6});

10
runescape-client/src/main/java/WorldMapArea.java
View File

@@ -49,7 +49,7 @@ public class WorldMapArea {
signature = "Lhu;"
)
@Export("origin0")
TileLocation origin0;
Coord origin0;
@ObfuscatedName("g")
@ObfuscatedGetter(
intValue = 1238532539
@@ -103,7 +103,7 @@ public class WorldMapArea {
this.id0 = var2;
this.archiveName0 = var1.readStringCp1252NullTerminated();
this.name0 = var1.readStringCp1252NullTerminated();
this.origin0 = new TileLocation(var1.readInt());
this.origin0 = new Coord(var1.readInt());
this.field1015 = var1.readInt();
var1.readUnsignedByte();
this.isMain0 = var1.readUnsignedByte() == 1;
@@ -223,7 +223,7 @@ public class WorldMapArea {
garbageValue = "1509069978"
)
@Export("coord")
public TileLocation coord(int var1, int var2) {
public Coord coord(int var1, int var2) {
Iterator var3 = this.sections.iterator();
while (var3.hasNext()) {
@@ -387,8 +387,8 @@ public class WorldMapArea {
garbageValue = "-1411761003"
)
@Export("origin")
public TileLocation origin() {
return new TileLocation(this.origin0);
public Coord origin() {
return new Coord(this.origin0);
}
@ObfuscatedName("m")

4
runescape-client/src/main/java/WorldMapAreaData.java
View File

@@ -69,10 +69,10 @@ public class WorldMapAreaData extends WorldMapArea {
for (int var4 = 0; var4 < var3; ++var4) {
int var5 = var1.method51();
TileLocation var6 = new TileLocation(var1.readInt());
Coord var6 = new Coord(var1.readInt());
boolean var7 = var1.readUnsignedByte() == 1;
if (var2 || !var7) {
this.field1018.add(new WorldMapIcon1((TileLocation)null, var6, var5, (WorldMapLabel)null));
this.field1018.add(new WorldMapIcon1((Coord)null, var6, var5, (WorldMapLabel)null));
}
}

2
runescape-client/src/main/java/WorldMapElement.java
View File

@@ -216,7 +216,7 @@ public class WorldMapElement extends DualNode {
class266[] var6 = new class266[]{class266.field3527, class266.field3526, class266.field3529};
this.field3287 = (class266)ScriptFrame.findEnumerated(var6, var1.readUnsignedByte());
} else if (var2 == 30) {
this.field3301 = (class249)ScriptFrame.findEnumerated(UnderlayDefinition.method4839(), var1.readUnsignedByte());
this.field3301 = (class249)ScriptFrame.findEnumerated(FloorUnderlayDefinition.method4839(), var1.readUnsignedByte());
}
}
}

6
runescape-client/src/main/java/WorldMapEvent.java
View File

@@ -24,18 +24,18 @@ public class WorldMapEvent {
signature = "Lhu;"
)
@Export("coord1")
public TileLocation coord1;
public Coord coord1;
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "Lhu;"
)
@Export("coord2")
public TileLocation coord2;
public Coord coord2;
@ObfuscatedSignature(
signature = "(ILhu;Lhu;)V"
)
public WorldMapEvent(int var1, TileLocation var2, TileLocation var3) {
public WorldMapEvent(int var1, Coord var2, Coord var3) {
this.mapElement = var1;
this.coord1 = var2;
this.coord2 = var3;

2
runescape-client/src/main/java/WorldMapIcon1.java
View File

@@ -53,7 +53,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
@ObfuscatedSignature(
signature = "(Lhu;Lhu;ILaj;)V"
)
WorldMapIcon1(TileLocation var1, TileLocation var2, int var3, WorldMapLabel var4) {
WorldMapIcon1(Coord var1, Coord var2, int var3, WorldMapLabel var4) {
super(var1, var2);
this.field1031 = var3;
this.label0 = var4;

2
runescape-client/src/main/java/WorldMapIcon2.java
View File

@@ -44,7 +44,7 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
@ObfuscatedSignature(
signature = "(Lhu;Lhu;ILav;)V"
)
WorldMapIcon2(TileLocation var1, TileLocation var2, int var3, WorldMapRegion var4) {
WorldMapIcon2(Coord var1, Coord var2, int var3, WorldMapRegion var4) {
super(var1, var2);
this.field1034 = var3;
this.field1035 = var4;

2
runescape-client/src/main/java/WorldMapLabelSize.java
View File

@@ -108,7 +108,7 @@ public class WorldMapLabelSize {
PacketBufferNode var0 = Interpreter.method1915(ClientPacket.field242, Client.packetWriter.isaacCipher);
Client.packetWriter.method241(var0);
for (WidgetGroupParent var1 = (WidgetGroupParent)Client.widgetGroupParents.first(); var1 != null; var1 = (WidgetGroupParent)Client.widgetGroupParents.next()) {
for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) {
if (var1.type == 0 || var1.type == 3) {
MenuAction.closeWidgetGroup(var1, true);
}

38
runescape-client/src/main/java/WorldMapRegion.java
View File

@@ -173,13 +173,13 @@ public class WorldMapRegion {
garbageValue = "-896662600"
)
void method479(ObjectDefinition var1, int var2, int var3, int var4, class21 var5) {
TileLocation var6 = new TileLocation(var2, var3 + this.x * 64, this.y * 64 + var4);
TileLocation var7 = null;
Coord var6 = new Coord(var2, var3 + this.x * 64, this.y * 64 + var4);
Coord var7 = null;
if (this.field239 != null) {
var7 = new TileLocation(this.field239.field148 + var2, var3 + this.field239.field149 * 64, var4 + this.field239.field146 * 64);
var7 = new Coord(this.field239.field148 + var2, var3 + this.field239.field149 * 64, var4 + this.field239.field146 * 64);
} else {
class39 var8 = (class39)var5;
var7 = new TileLocation(var2 + var8.field148, var3 + var8.field149 * 64 + var8.method717() * 8, var4 + var8.field146 * 64 + var8.method718() * 8);
var7 = new Coord(var2 + var8.field148, var3 + var8.field149 * 64 + var8.method717() * 8, var4 + var8.field146 * 64 + var8.method718() * 8);
}
Object var10;
@@ -190,7 +190,7 @@ public class WorldMapRegion {
var10 = new WorldMapIcon1(var7, var6, var9.field1020, this.method420(var9));
}
this.iconsMap.put(new TileLocation(0, var3, var4), var10);
this.iconsMap.put(new Coord(0, var3, var4), var10);
}
@ObfuscatedName("e")
@@ -444,19 +444,19 @@ public class WorldMapRegion {
int var9;
if (var7 != -1) {
int var10 = this.field1053;
OverlayDefinition var11 = (OverlayDefinition)OverlayDefinition.field664.get((long)var7);
OverlayDefinition var12;
FloorOverlayDefinition var11 = (FloorOverlayDefinition) FloorOverlayDefinition.field664.get((long)var7);
FloorOverlayDefinition var12;
if (var11 != null) {
var12 = var11;
} else {
byte[] var13 = OverlayDefinition.field663.takeFile(4, var7);
var11 = new OverlayDefinition();
byte[] var13 = FloorOverlayDefinition.field663.takeFile(4, var7);
var11 = new FloorOverlayDefinition();
if (var13 != null) {
var11.decode(new Buffer(var13), var7);
}
var11.init();
OverlayDefinition.field664.put(var11, (long)var7);
var11.postDecode();
FloorOverlayDefinition.field664.put(var11, (long)var7);
var12 = var11;
}
@@ -549,19 +549,19 @@ public class WorldMapRegion {
int var6 = var3.field145[var5][var1][var2] - 1;
if (var6 > -1) {
int var7 = this.field1053;
OverlayDefinition var8 = (OverlayDefinition)OverlayDefinition.field664.get((long)var6);
OverlayDefinition var9;
FloorOverlayDefinition var8 = (FloorOverlayDefinition) FloorOverlayDefinition.field664.get((long)var6);
FloorOverlayDefinition var9;
if (var8 != null) {
var9 = var8;
} else {
byte[] var10 = OverlayDefinition.field663.takeFile(4, var6);
var8 = new OverlayDefinition();
byte[] var10 = FloorOverlayDefinition.field663.takeFile(4, var6);
var8 = new FloorOverlayDefinition();
if (var10 != null) {
var8.decode(new Buffer(var10), var6);
}
var8.init();
OverlayDefinition.field664.put(var8, (long)var6);
var8.postDecode();
FloorOverlayDefinition.field664.put(var8, (long)var6);
var9 = var8;
}
@@ -754,7 +754,7 @@ public class WorldMapRegion {
while (var7.hasNext()) {
Entry var8 = (Entry)var7.next();
TileLocation var9 = (TileLocation)var8.getKey();
Coord var9 = (Coord)var8.getKey();
int var10 = (int)((float)var1 + var5 * (float)var9.x - var6);
int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6);
AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue();
@@ -1102,7 +1102,7 @@ public class WorldMapRegion {
Widget var6 = var0[var5];
if (var6 != null && var6.parentId == var1) {
WorldMapSection3.alignWidgetSize(var6, var2, var3, var4);
OverlayDefinition.alignWidgetPosition(var6, var2, var3);
FloorOverlayDefinition.alignWidgetPosition(var6, var2, var3);
if (var6.scrollX > var6.scrollWidth - var6.width) {
var6.scrollX = var6.scrollWidth - var6.width;
}

2
runescape-client/src/main/java/WorldMapSection.java
View File

@@ -44,7 +44,7 @@ public interface WorldMapSection {
garbageValue = "-1916486802"
)
@Export("coord")
TileLocation coord(int var1, int var2);
Coord coord(int var1, int var2);
@ObfuscatedName("u")
@ObfuscatedSignature(

4
runescape-client/src/main/java/WorldMapSection0.java
View File

@@ -151,13 +151,13 @@ public class WorldMapSection0 implements WorldMapSection {
garbageValue = "-1916486802"
)
@Export("coord")
public TileLocation coord(int var1, int var2) {
public Coord coord(int var1, int var2) {
if (!this.containsPosition(var1, var2)) {
return null;
} else {
int var3 = this.field1059 * 64 - this.field1061 * 64 + (this.field1063 * 8 - this.field1067 * 8) + var1;
int var4 = this.field1060 * 64 - this.field1062 * 64 + var2 + (this.field1064 * 8 - this.field1068 * 8);
return new TileLocation(this.field1057, var3, var4);
return new Coord(this.field1057, var3, var4);
}
}

8
runescape-client/src/main/java/WorldMapSection1.java
View File

@@ -144,13 +144,13 @@ public class WorldMapSection1 implements WorldMapSection {
garbageValue = "-1916486802"
)
@Export("coord")
public TileLocation coord(int var1, int var2) {
public Coord coord(int var1, int var2) {
if (!this.containsPosition(var1, var2)) {
return null;
} else {
int var3 = this.field1074 * 64 - this.field1076 * 64 + (this.field1078 * 8 - this.field1080 * 8) + var1;
int var4 = this.field1075 * 64 - this.field1077 * 64 + var2 + (this.field1079 * 8 - this.field1081 * 8);
return new TileLocation(this.field1072, var3, var4);
return new Coord(this.field1072, var3, var4);
}
}
@@ -289,12 +289,12 @@ public class WorldMapSection1 implements WorldMapSection {
AbstractByteArrayCopier.unloadWidgetGroup(Client.rootWidgetGroup);
}
for (WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.first(); var4 != null; var4 = (WidgetGroupParent)Client.widgetGroupParents.next()) {
for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) {
MenuAction.closeWidgetGroup(var4, true);
}
Client.rootWidgetGroup = -1;
Client.widgetGroupParents = new NodeHashTable(8);
Client.interfaceParents = new NodeHashTable(8);
Client.field127 = null;
Client.menuOptionsCount = 0;
Client.isMenuOpen = false;

8
runescape-client/src/main/java/WorldMapSection2.java
View File

@@ -109,13 +109,13 @@ public class WorldMapSection2 implements WorldMapSection {
garbageValue = "-1916486802"
)
@Export("coord")
public TileLocation coord(int var1, int var2) {
public Coord coord(int var1, int var2) {
if (!this.containsPosition(var1, var2)) {
return null;
} else {
int var3 = this.field1085 * 64 - this.field1087 * 64 + var1;
int var4 = this.field1086 * 64 - this.field1088 * 64 + var2;
return new TileLocation(this.field1083, var3, var4);
return new Coord(this.field1083, var3, var4);
}
}
@@ -188,7 +188,7 @@ public class WorldMapSection2 implements WorldMapSection {
int var17 = var4 - var3.xInset;
int var18 = var5 - var3.yInset;
if (var2.vmethod3644(2, var4, var5, var3)) {
WidgetGroupParent.field986 = var4;
InterfaceParent.field986 = var4;
UrlRequester.field929 = var5;
return true;
}
@@ -259,7 +259,7 @@ public class WorldMapSection2 implements WorldMapSection {
}
}
WidgetGroupParent.field986 = var4;
InterfaceParent.field986 = var4;
UrlRequester.field929 = var5;
return false;
}

4
runescape-client/src/main/java/WorldMapSection3.java
View File

@@ -138,13 +138,13 @@ public class WorldMapSection3 implements WorldMapSection {
garbageValue = "-1916486802"
)
@Export("coord")
public TileLocation coord(int var1, int var2) {
public Coord coord(int var1, int var2) {
if (!this.containsPosition(var1, var2)) {
return null;
} else {
int var3 = this.field1092 * 64 - this.field1096 * 64 + var1;
int var4 = this.field1093 * 64 - this.field1097 * 64 + var2;
return new TileLocation(this.field1090, var3, var4);
return new Coord(this.field1090, var3, var4);
}
}

2
runescape-client/src/main/java/class11.java
View File

@@ -210,7 +210,7 @@ final class class11 implements Comparator {
return 1;
} else if (var0 == ScriptOpcodes.IF_HASSUB) {
int var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
WidgetGroupParent var5 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var4);
InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var4);
if (var5 != null) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
} else {

2
runescape-client/src/main/java/class12.java
View File

@@ -123,7 +123,7 @@ final class class12 implements Comparator {
garbageValue = "1731524026"
)
static void method159() {
for (WidgetGroupParent var0 = (WidgetGroupParent)Client.widgetGroupParents.first(); var0 != null; var0 = (WidgetGroupParent)Client.widgetGroupParents.next()) {
for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) {
int var1 = var0.group;
if (GroundItemPile.loadWidgetGroup(var1)) {
boolean var2 = true;

28
runescape-client/src/main/java/class171.java
View File

@@ -90,7 +90,7 @@ public class class171 {
Client.collisionMaps[var0] = new CollisionMap(104, 104);
}
WidgetGroupParent.sceneMinimapSprite = new Sprite(512, 512);
InterfaceParent.sceneMinimapSprite = new Sprite(512, 512);
Login.Login_loadingText = "Starting game engine...";
Login.Login_loadingPercent = 5;
Client.titleLoadingStage = 20;
@@ -164,8 +164,8 @@ public class class171 {
AbstractWorldMapIcon.method625(ItemContainer.field434, "World Map");
AbstractWorldMapIcon.method625(WorldMapLabelSize.field1040, "World Map Geography");
AbstractWorldMapIcon.method625(AbstractByteArrayCopier.field0, "World Map Ground");
class211.spriteIds = new SpriteIds();
class211.spriteIds.read(class22.archive16);
class211.graphicsDefaults = new GraphicsDefaults();
class211.graphicsDefaults.decode(class22.archive16);
Login.Login_loadingText = "Loaded update list";
Login.Login_loadingPercent = 30;
Client.titleLoadingStage = 45;
@@ -305,13 +305,13 @@ public class class171 {
} else if (Client.titleLoadingStage == 80) {
var0 = 0;
if (UnitPriceComparator.compass == null) {
UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field878, 0);
UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.graphicsDefaults.field878, 0);
} else {
++var0;
}
if (FaceNormal.field345 == null) {
FaceNormal.field345 = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field879, 0);
FaceNormal.field345 = class322.readSprite(WorldMapSection3.archive8, class211.graphicsDefaults.field879, 0);
} else {
++var0;
}
@@ -320,7 +320,7 @@ public class class171 {
int var34;
if (class192.mapSceneSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.mapScenes;
var34 = class211.graphicsDefaults.mapScenes;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var32 = null;
} else {
@@ -335,7 +335,7 @@ public class class171 {
Sprite[] var35;
if (class15.headIconPkSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.headIconsPk;
var34 = class211.graphicsDefaults.headIconsPk;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -349,7 +349,7 @@ public class class171 {
if (ClientPreferences.headIconPrayerSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.headIconsPrayer;
var34 = class211.graphicsDefaults.headIconsPrayer;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -363,7 +363,7 @@ public class class171 {
if (Player.headIconHintSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.headIconsHint;
var34 = class211.graphicsDefaults.headIconsHint;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -377,7 +377,7 @@ public class class171 {
if (class16.mapMarkerSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.mapMarkers;
var34 = class211.graphicsDefaults.mapMarkers;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -391,7 +391,7 @@ public class class171 {
if (KeyHandler.crossSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.crosses;
var34 = class211.graphicsDefaults.crosses;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -405,7 +405,7 @@ public class class171 {
if (class39.mapDotSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.mapDots;
var34 = class211.graphicsDefaults.mapDots;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -419,7 +419,7 @@ public class class171 {
if (class32.scrollBarSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.scrollBars;
var34 = class211.graphicsDefaults.scrollBars;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var32 = null;
} else {
@@ -433,7 +433,7 @@ public class class171 {
if (WorldMapSectionType.modIconSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.modIcons;
var34 = class211.graphicsDefaults.modIcons;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var32 = null;
} else {

4
runescape-client/src/main/java/class211.java
View File

@@ -18,8 +18,8 @@ public class class211 {
@ObfuscatedSignature(
signature = "Llg;"
)
@Export("spriteIds")
static SpriteIds spriteIds;
@Export("graphicsDefaults")
static GraphicsDefaults graphicsDefaults;
@ObfuscatedName("m")
@ObfuscatedSignature(

2
runescape-client/src/main/java/class238.java
View File

@@ -566,7 +566,7 @@ public final class class238 {
updateWidgetGroup(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
}
WidgetGroupParent var33 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var9.id);
InterfaceParent var33 = (InterfaceParent)Client.interfaceParents.get((long)var9.id);
if (var33 != null) {
if (var33.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) {
for (var32 = (ScriptEvent)Client.scriptEvents.last(); var32 != null; var32 = (ScriptEvent)Client.scriptEvents.previous()) {

2
runescape-client/src/main/java/class30.java
View File

@@ -84,7 +84,7 @@ public class class30 {
method570(var3.children, var1);
}
WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id);
InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id);
if (var4 != null) {
GrandExchangeEvents.method74(var4.group, var1);
}

2
runescape-client/src/main/java/class39.java
View File

@@ -810,7 +810,7 @@ public class class39 extends class21 {
WorldMapRegion.notRevalidateWidgetScroll(var1.children, var1.id, var3, var4, var2);
}
WidgetGroupParent var5 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var1.id);
InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id);
if (var5 != null) {
int var6 = var5.group;
if (GroundItemPile.loadWidgetGroup(var6)) {

2
runescape-client/src/main/java/class4.java
View File

@@ -52,7 +52,7 @@ final class class4 implements class0 {
garbageValue = "-843046456"
)
public static void method55() {
OverlayDefinition.field664.clear();
FloorOverlayDefinition.field664.clear();
}
@ObfuscatedName("v")

28
runescape-client/src/main/java/class54.java
View File

@@ -665,21 +665,21 @@ public final class class54 {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCacheLoaded() ? 1 : 0;
return 1;
} else {
TileLocation var5;
Coord var5;
if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) {
var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
BufferedFile.worldMap().setWorldMapPositionTarget(var5.x, var5.y);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) {
var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
BufferedFile.worldMap().method371(var5.x, var5.y);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) {
var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
BufferedFile.worldMap().method372(var5.plane, var5.x, var5.y);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) {
var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
BufferedFile.worldMap().method373(var5.plane, var5.x, var5.y);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) {
@@ -751,7 +751,7 @@ public final class class54 {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().currentMapAreaId();
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) {
var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
var6 = BufferedFile.worldMap().getCurrentMapArea();
if (var6 == null) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
@@ -770,9 +770,9 @@ public final class class54 {
return 1;
}
} else {
TileLocation var7;
Coord var7;
if (var0 == 6618) {
var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
var6 = BufferedFile.worldMap().getCurrentMapArea();
if (var6 == null) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
@@ -789,23 +789,23 @@ public final class class54 {
return 1;
}
} else {
TileLocation var8;
Coord var8;
if (var0 == 6619) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
TotalQuantityComparator.method96(var3, var8, false);
return 1;
} else if (var0 == 6620) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
TotalQuantityComparator.method96(var3, var8, true);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
var4 = BufferedFile.worldMap().getMapArea(var3);
if (var4 == null) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -819,7 +819,7 @@ public final class class54 {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method378();
return 1;
} else if (var0 == 6623) {
var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
var6 = BufferedFile.worldMap().mapAreaAtCoord(var5.plane, var5.x, var5.y);
if (var6 == null) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
@@ -889,7 +889,7 @@ public final class class54 {
} else if (var0 == 6638) {
RouteStrategy.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
var7 = BufferedFile.worldMap().method385(var3, var8);
if (var7 == null) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;

2
runescape-client/src/main/java/class65.java
View File

@@ -33,7 +33,7 @@ public class class65 extends RouteStrategy {
)
static final void method1232(Actor var0, int var1) {
if (var0.field19 > Client.cycle) {
SpriteIds.method5828(var0);
GraphicsDefaults.method5828(var0);
} else {
int var2;
int var3;