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

project: we are actually up to date now, thanks blue!

Browse Source
This commit is contained in:
TheRealNull
2021-01-04 06:58:20 -05:00
parent d0c8a8daec
commit b5bb349259
79 changed files with 668 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,19 +178,19 @@ public abstract class AbstractWorldMapIcon {
garbageValue = "5"
)
@Export("StructDefinition_getStructDefinition")
public static StructDefinition StructDefinition_getStructDefinition(int var0) {
StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); // L: 23
public static StructComposition StructDefinition_getStructDefinition(int var0) {
StructComposition var1 = (StructComposition) StructComposition.StructDefinition_cached.get((long)var0); // L: 23
if (var1 != null) { // L: 24
return var1;
} else {
byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); // L: 25
var1 = new StructDefinition(); // L: 26
byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 25
var1 = new StructComposition(); // L: 26
if (var2 != null) { // L: 27
var1.decode(new Buffer(var2));
}
var1.postDecode(); // L: 28
StructDefinition.StructDefinition_cached.put(var1, (long)var0); // L: 29
StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29
return var1; // L: 30
}
}

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

@@ -274,7 +274,7 @@ public final class Canvas extends java.awt.Canvas {
ObjectComposition.ObjectDefinition_modelsArchive = var4; // L: 1917
ObjectComposition.ObjectDefinition_isLowDetail = var17; // L: 1918
World.method1849(DynamicObject.archive2, BuddyRankComparator.archive7); // L: 1920
ParamDefinition.method4526(DynamicObject.archive2); // L: 1921
ParamComposition.method4526(DynamicObject.archive2); // L: 1921
Actor.method1821(DynamicObject.archive2, BuddyRankComparator.archive7, Client.isMembersWorld, class297.fontPlain11); // L: 1922
PcmPlayer.method2538(DynamicObject.archive2, SceneTilePaint.archive0, WorldMapSprite.archive1); // L: 1923
ModelData0.method3331(DynamicObject.archive2, BuddyRankComparator.archive7); // L: 1924
@@ -294,7 +294,7 @@ public final class Canvas extends java.awt.Canvas {
class195.Widget_loadedInterfaces = new boolean[class58.Widget_archive.getGroupCount()]; // L: 1941
Archive var11 = DynamicObject.archive2; // L: 1943
InvDefinition.InvDefinition_archive = var11; // L: 1945
StructDefinition.method4545(DynamicObject.archive2); // L: 1947
StructComposition.method4545(DynamicObject.archive2); // L: 1947
ModelData0.method3330(DynamicObject.archive2); // L: 1948
class13.method129(DynamicObject.archive2); // L: 1949
Varcs.varcs = new Varcs(); // L: 1950

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

@@ -109,19 +109,19 @@ public class ChatChannel {
garbageValue = "1207819240"
)
@Export("getParamDefinition")
public static ParamDefinition getParamDefinition(int var0) {
ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); // L: 25
public static ParamComposition getParamDefinition(int var0) {
ParamComposition var1 = (ParamComposition) ParamComposition.ParamDefinition_cached.get((long)var0); // L: 25
if (var1 != null) { // L: 26
return var1;
} else {
byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0); // L: 27
var1 = new ParamDefinition(); // L: 28
byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 27
var1 = new ParamComposition(); // L: 28
if (var2 != null) { // L: 29
var1.decode(new Buffer(var2));
}
var1.postDecode(); // L: 30
ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); // L: 31
ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 31
return var1; // L: 32
}
}

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

@@ -5098,9 +5098,9 @@ public final class Client extends GameShell implements Usernamed {
field707 = (field707 + 1) % 100; // L: 6209
String var34 = AbstractFont.escapeBrackets(ServerPacket.method3663(AttackOption.method2135(var3))); // L: 6210
if (var60.modIcon != -1) { // L: 6211
UserComparator10.addChatMessage(9, class25.method248(var60.modIcon) + var38, var34, ParamDefinition.base37DecodeLong(var22));
UserComparator10.addChatMessage(9, class25.method248(var60.modIcon) + var38, var34, ParamComposition.base37DecodeLong(var22));
} else {
UserComparator10.addChatMessage(9, var38, var34, ParamDefinition.base37DecodeLong(var22)); // L: 6212
UserComparator10.addChatMessage(9, var38, var34, ParamComposition.base37DecodeLong(var22)); // L: 6212
}
}

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

@@ -93,7 +93,7 @@ public class DynamicObject extends Renderable
this.x = var5; // L: 24
this.y = var6; // L: 25
if (var7 != -1) { // L: 26
this.sequenceDefinition = ParamDefinition.SequenceDefinition_get(var7); // L: 27
this.sequenceDefinition = ParamComposition.SequenceDefinition_get(var7); // L: 27
this.frame = 0; // L: 28
this.cycleStart = Client.cycle - 1; // L: 29
if (this.sequenceDefinition.field3548 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30

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

@@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jx")
@Implements("EnumDefinition")
@Implements("EnumComposition")
public class EnumComposition extends DualNode {
@ObfuscatedName("rk")
@ObfuscatedGetter(

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

@@ -596,7 +596,7 @@ public class FontName {
CollisionMap.invalidateWidget(var10);
}
} else {
SequenceDefinition var47 = ParamDefinition.SequenceDefinition_get(var20); // L: 9272
SequenceDefinition var47 = ParamComposition.SequenceDefinition_get(var20); // L: 9272
var41 = var10.getModel(var47, var10.modelFrame, var36, PlayerComposition.localPlayer.appearance); // L: 9273
if (var41 == null && Widget.field2603) { // L: 9274
CollisionMap.invalidateWidget(var10);

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

@@ -96,7 +96,7 @@ public class Frames extends DualNode {
if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1145
int var4;
if (var0 == 1928) { // L: 1162
var6 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 1163
var6 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 1163
var4 = Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]; // L: 1164
if (var4 >= 1 && var4 <= 10) { // L: 1165
class3.widgetDefaultMenuAction(var4, var6.id, var6.childIndex, var6.itemId, ""); // L: 1168
@@ -124,7 +124,7 @@ public class Frames extends DualNode {
if (var0 >= 2000) { // L: 1150
var6 = CollisionMap.getWidget(Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]); // L: 1151
} else {
var6 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 1153
var6 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 1153
}
if (var6.onResize == null) { // L: 1154

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

@@ -75,7 +75,7 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator {
garbageValue = "-613147121"
)
static int method200(int var0, Script var1, boolean var2) {
Widget var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 1041
Widget var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 1041
if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1042
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1043
return 1; // L: 1044

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

@@ -81,7 +81,7 @@ public final class GraphicsObject extends Renderable
int var8 = TileItem.SpotAnimationDefinition_get(this.id).sequence; // L: 27
if (var8 != -1) { // L: 28
this.isFinished = false; // L: 29
this.sequenceDefinition = ParamDefinition.SequenceDefinition_get(var8); // L: 30
this.sequenceDefinition = ParamComposition.SequenceDefinition_get(var8); // L: 30
} else {
this.isFinished = true; // L: 32
}

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

@@ -148,7 +148,7 @@ public enum HorizontalAlignment implements Enumerated {
return 1; // L: 3442
} else {
int var4;
ParamDefinition var5;
ParamComposition var5;
if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3444
VarcInt.Interpreter_intStackSize -= 2; // L: 3445
var3 = Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize]; // L: 3446

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

@@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jq")
@Implements("ItemDefinition")
@Implements("ItemComposition")
public class ItemComposition extends DualNode {
@ObfuscatedName("p")
@Export("ItemDefinition_inMembersWorld")

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

@@ -63,7 +63,7 @@ public class Messages {
garbageValue = "-729014462"
)
static int method2283(int var0, Script var1, boolean var2) {
Widget var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 1012
Widget var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 1012
if (var0 == ScriptOpcodes.CC_GETX) { // L: 1013
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = var3.x; // L: 1014
return 1; // L: 1015

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

@@ -131,7 +131,7 @@ public enum ModeWhere implements Enumerated {
var0 -= 1000; // L: 948
var3 = CollisionMap.getWidget(Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]); // L: 949
} else {
var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 951
var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 951
}
String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 952

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

@@ -71,7 +71,7 @@ public final class NPC extends Actor {
--var4; // L: 35
}
if (super.sequence != -1 && ParamDefinition.SequenceDefinition_get(super.sequence).field3555 == 1) { // L: 37
if (super.sequence != -1 && ParamComposition.SequenceDefinition_get(super.sequence).field3555 == 1) { // L: 37
super.sequence = -1;
}
@@ -96,7 +96,7 @@ public final class NPC extends Actor {
garbageValue = "-169739231"
)
final void method2106(int var1, int var2, boolean var3) {
if (super.sequence != -1 && ParamDefinition.SequenceDefinition_get(super.sequence).field3555 == 1) { // L: 50
if (super.sequence != -1 && ParamComposition.SequenceDefinition_get(super.sequence).field3555 == 1) { // L: 50
super.sequence = -1;
}
@@ -140,8 +140,8 @@ public final class NPC extends Actor {
if (this.definition == null) { // L: 77
return null;
} else {
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ParamDefinition.SequenceDefinition_get(super.sequence) : null; // L: 78
SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? ParamDefinition.SequenceDefinition_get(super.movementSequence) : null; // L: 79
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ParamComposition.SequenceDefinition_get(super.sequence) : null; // L: 78
SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? ParamComposition.SequenceDefinition_get(super.movementSequence) : null; // L: 79
Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 80
if (var3 == null) {
return null;

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

@@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jd")
@Implements("NPCDefinition")
@Implements("NPCComposition")
public class NPCComposition extends DualNode {
@ObfuscatedName("h")
@ObfuscatedSignature(

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

@@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jm")
@Implements("ObjectDefinition")
@Implements("ObjectComposition")
public class ObjectComposition extends DualNode {
@ObfuscatedName("h")
@Export("ObjectDefinition_isLowDetail")

8
runescape-client/src/main/java/ParamDefinition.java → runescape-client/src/main/java/ParamComposition.java
View File

@@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jl")
@Implements("ParamDefinition")
public class ParamDefinition extends DualNode {
@Implements("ParamComposition")
public class ParamComposition extends DualNode {
@ObfuscatedName("h")
@ObfuscatedSignature(
descriptor = "Lib;"
@@ -39,7 +39,7 @@ public class ParamDefinition extends DualNode {
ParamDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12
}
ParamDefinition() {
ParamComposition() {
this.autoDisable = true; // L: 16
} // L: 18
@@ -120,7 +120,7 @@ public class ParamDefinition extends DualNode {
garbageValue = "1899658312"
)
public static void method4526(AbstractArchive var0) {
StructDefinition.StructDefinition_archive = var0; // L: 19
StructComposition.StructDefinition_archive = var0; // L: 19
} // L: 20
@ObfuscatedName("v")

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

@@ -384,8 +384,8 @@ public final class Player extends Actor {
if (this.appearance == null) { // L: 149
return null;
} else {
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ParamDefinition.SequenceDefinition_get(super.sequence) : null; // L: 150
SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : ParamDefinition.SequenceDefinition_get(super.movementSequence); // L: 151
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ParamComposition.SequenceDefinition_get(super.sequence) : null; // L: 150
SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : ParamComposition.SequenceDefinition_get(super.movementSequence); // L: 151
Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 152
if (var3 == null) { // L: 153
return null;
@@ -451,7 +451,7 @@ public final class Player extends Actor {
garbageValue = "1635620178"
)
final void method1313(int var1, int var2, byte var3) {
if (super.sequence != -1 && ParamDefinition.SequenceDefinition_get(super.sequence).field3555 == 1) { // L: 199
if (super.sequence != -1 && ParamComposition.SequenceDefinition_get(super.sequence).field3555 == 1) { // L: 199
super.sequence = -1;
}

3
runescape-client/src/main/java/PlayerComposition.java
View File

@@ -37,7 +37,8 @@ public class PlayerComposition
@ObfuscatedSignature(
descriptor = "Lhe;"
)
static Widget field2561;
@Export("scriptDotWidget")
static Widget scriptDotWidget;
@ObfuscatedName("kn")
@ObfuscatedSignature(
descriptor = "Lbq;"

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

@@ -150,7 +150,7 @@ public final class Projectile extends Renderable
this.isMoving = false; // L: 47
int var12 = TileItem.SpotAnimationDefinition_get(this.id).sequence; // L: 48
if (var12 != -1) { // L: 49
this.sequenceDefinition = ParamDefinition.SequenceDefinition_get(var12);
this.sequenceDefinition = ParamComposition.SequenceDefinition_get(var12);
} else {
this.sequenceDefinition = null; // L: 50
}

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

@@ -74,7 +74,7 @@ public final class SceneTilePaint
var0.isWalking = false; // L: 4080
SequenceDefinition var1;
if (var0.movementSequence != -1) { // L: 4081
var1 = ParamDefinition.SequenceDefinition_get(var0.movementSequence); // L: 4082
var1 = ParamComposition.SequenceDefinition_get(var0.movementSequence); // L: 4082
if (var1 != null && var1.frameIds != null) { // L: 4083
++var0.movementFrameCycle; // L: 4084
if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 4085
@@ -100,7 +100,7 @@ public final class SceneTilePaint
int var3 = TileItem.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4100
if (var3 != -1) { // L: 4101
SequenceDefinition var2 = ParamDefinition.SequenceDefinition_get(var3); // L: 4102
SequenceDefinition var2 = ParamComposition.SequenceDefinition_get(var3); // L: 4102
if (var2 != null && var2.frameIds != null) { // L: 4103
++var0.spotAnimationFrameCycle; // L: 4104
if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { // L: 4105
@@ -121,7 +121,7 @@ public final class SceneTilePaint
}
if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4118
var1 = ParamDefinition.SequenceDefinition_get(var0.sequence); // L: 4119
var1 = ParamComposition.SequenceDefinition_get(var0.sequence); // L: 4119
if (var1.field3560 == 1 && var0.field996 > 0 && var0.field984 <= Client.cycle && var0.field973 < Client.cycle) { // L: 4120 4121
var0.sequenceDelay = 1; // L: 4122
return; // L: 4123
@@ -129,7 +129,7 @@ public final class SceneTilePaint
}
if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4127
var1 = ParamDefinition.SequenceDefinition_get(var0.sequence); // L: 4128
var1 = ParamComposition.SequenceDefinition_get(var0.sequence); // L: 4128
if (var1 != null && var1.frameIds != null) { // L: 4129
++var0.sequenceFrameCycle; // L: 4130
if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 4131

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

@@ -50,7 +50,7 @@ public class ScriptFrame {
var4 = CollisionMap.getWidget(Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]); // L: 778
var3 = false; // L: 779
} else {
var4 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 781
var4 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 781
}
int var11;

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

@@ -63,7 +63,7 @@ public class SecureRandomCallable implements Callable {
boolean var3 = false; // L: 110
for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 111
ParamDefinition var5 = ChatChannel.getParamDefinition((int)var4.key); // L: 112
ParamComposition var5 = ChatChannel.getParamDefinition((int)var4.key); // L: 112
if (var5.autoDisable) { // L: 113
var4.remove();
} else {

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

@@ -135,7 +135,7 @@ public class Skeleton extends Node {
}
if (var5 != -1) { // L: 10614
SequenceDefinition var6 = ParamDefinition.SequenceDefinition_get(var5); // L: 10615
SequenceDefinition var6 = ParamComposition.SequenceDefinition_get(var5); // L: 10615
for (var3.modelFrameCycle += Client.field850; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; CollisionMap.invalidateWidget(var3)) { // L: 10616 10617 10624
var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 10618

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

@@ -203,7 +203,7 @@ public class SpotAnimationDefinition extends DualNode {
Model var5;
if (this.sequence != -1 && var1 != -1) { // L: 103
var5 = ParamDefinition.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1);
var5 = ParamComposition.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1);
} else {
var5 = var2.toSharedSpotAnimationModel(true); // L: 104
}

6
runescape-client/src/main/java/StructDefinition.java → runescape-client/src/main/java/StructComposition.java
View File

@@ -4,8 +4,8 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jb")
@Implements("StructDefinition")
public class StructDefinition extends DualNode {
@Implements("StructComposition")
public class StructComposition extends DualNode {
@ObfuscatedName("h")
@ObfuscatedSignature(
descriptor = "Lib;"
@@ -29,7 +29,7 @@ public class StructDefinition extends DualNode {
StructDefinition_cached = new EvictingDualNodeHashTable(64); // L: 13
}
StructDefinition() {
StructComposition() {
} // L: 16
@ObfuscatedName("x")

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

@@ -81,7 +81,7 @@ public enum StudioGame implements Enumerated {
garbageValue = "1020902177"
)
public static void method4185() {
ParamDefinition.ParamDefinition_cached.clear(); // L: 72
ParamComposition.ParamDefinition_cached.clear(); // L: 72
} // L: 73
@ObfuscatedName("ak")

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

@@ -166,7 +166,7 @@ public final class Tiles {
@Export("performPlayerAnimation")
static void performPlayerAnimation(Player var0, int var1, int var2) {
if (var0.sequence == var1 && var1 != -1) { // L: 4151
int var3 = ParamDefinition.SequenceDefinition_get(var1).field3548; // L: 4152
int var3 = ParamComposition.SequenceDefinition_get(var1).field3548; // L: 4152
if (var3 == 1) { // L: 4153
var0.sequenceFrame = 0; // L: 4154
var0.sequenceFrameCycle = 0; // L: 4155
@@ -177,7 +177,7 @@ public final class Tiles {
if (var3 == 2) { // L: 4159
var0.field974 = 0; // L: 4160
}
} else if (var1 == -1 || var0.sequence == -1 || ParamDefinition.SequenceDefinition_get(var1).field3557 >= ParamDefinition.SequenceDefinition_get(var0.sequence).field3557) { // L: 4163
} else if (var1 == -1 || var0.sequence == -1 || ParamComposition.SequenceDefinition_get(var1).field3557 >= ParamComposition.SequenceDefinition_get(var0.sequence).field3557) { // L: 4163
var0.sequence = var1; // L: 4164
var0.sequenceFrame = 0; // L: 4165
var0.sequenceFrameCycle = 0; // L: 4166

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

@@ -64,7 +64,7 @@ public class UserComparator9 extends AbstractUserComparator {
var0 -= 1000; // L: 735
var3 = CollisionMap.getWidget(Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]); // L: 736
} else {
var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 738
var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 738
}
CollisionMap.invalidateWidget(var3); // L: 739

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

@@ -461,7 +461,7 @@ public class WorldMapData_0 extends AbstractWorldMapData {
var7 = var1.readUnsignedByte(); // L: 7166
if (var6 == var15.sequence && var6 != -1) { // L: 7167
var8 = ParamDefinition.SequenceDefinition_get(var6).field3548; // L: 7168
var8 = ParamComposition.SequenceDefinition_get(var6).field3548; // L: 7168
if (var8 == 1) { // L: 7169
var15.sequenceFrame = 0; // L: 7170
var15.sequenceFrameCycle = 0; // L: 7171
@@ -472,7 +472,7 @@ public class WorldMapData_0 extends AbstractWorldMapData {
if (var8 == 2) { // L: 7175
var15.field974 = 0; // L: 7176
}
} else if (var6 == -1 || var15.sequence == -1 || ParamDefinition.SequenceDefinition_get(var6).field3557 >= ParamDefinition.SequenceDefinition_get(var15.sequence).field3557) { // L: 7179
} else if (var6 == -1 || var15.sequence == -1 || ParamComposition.SequenceDefinition_get(var6).field3557 >= ParamComposition.SequenceDefinition_get(var15.sequence).field3557) { // L: 7179
var15.sequence = var6; // L: 7180
var15.sequenceFrame = 0; // L: 7181
var15.sequenceFrameCycle = 0; // L: 7182

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

@@ -188,7 +188,7 @@ public class WorldMapData_1 extends AbstractWorldMapData {
var4 = Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]; // L: 553
var3 = CollisionMap.getWidget(var4); // L: 554
} else {
var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 556
var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 556
}
if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 557

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

@@ -119,7 +119,7 @@ public class WorldMapID {
VarcInt.Interpreter_intStackSize -= 2; // L: 1387
var10 = Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize]; // L: 1388
var16 = Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize + 1]; // L: 1389
Widget var13 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 1390
Widget var13 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 1390
class13.clickWidget(var13, var10, var16); // L: 1391
return 1; // L: 1392
} else if (var0 == ScriptOpcodes.MOUSECAM) {
@@ -256,7 +256,7 @@ public class WorldMapID {
return 1; // L: 1534
} else if (var0 == 3140) {
Client.field810 = 3; // L: 1537
Client.field811 = var2 ? PlayerComposition.field2561.id * -437932207 * 653064625 : VarcInt.scriptActiveWidget.id * -437932207 * 653064625; // L: 1538
Client.field811 = var2 ? PlayerComposition.scriptDotWidget.id * -437932207 * 653064625 : VarcInt.scriptActiveWidget.id * -437932207 * 653064625; // L: 1538
return 1; // L: 1539
} else {
boolean var11;
@@ -528,7 +528,7 @@ public class WorldMapID {
if (var0.field984 >= Client.cycle) { // L: 3878
WorldMapManager.method672(var0);
} else if (var0.field973 >= Client.cycle) { // L: 3879
if (var0.field973 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > ParamDefinition.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3880
if (var0.field973 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > ParamComposition.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3880
var2 = var0.field973 - var0.field984; // L: 3881
var3 = Client.cycle - var0.field984; // L: 3882
var4 = var0.field941 * 64 + var0.field981 * 128; // L: 3883

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

@@ -57,7 +57,7 @@ public final class WorldMapRectangle {
garbageValue = "470419605"
)
static int method331(int var0, Script var1, boolean var2) {
Widget var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 1124
Widget var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 1124
if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1125
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = ServerPacket.Widget_unpackTargetMask(FaceNormal.getWidgetFlags(var3)); // L: 1126
return 1; // L: 1127
@@ -126,7 +126,7 @@ public final class WorldMapRectangle {
WorldMapID.method601(); // L: 2883
HealthBarDefinition.method4509(); // L: 2884
VarcInt.method4426(); // L: 2885
StructDefinition.StructDefinition_cached.clear(); // L: 2887
StructComposition.StructDefinition_cached.clear(); // L: 2887
StudioGame.method4185(); // L: 2889
WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 2891
PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 2894

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

@@ -13,7 +13,7 @@ public final class class13 {
garbageValue = "2"
)
public static void method129(AbstractArchive var0) {
ParamDefinition.ParamDefinition_archive = var0; // L: 21
ParamComposition.ParamDefinition_archive = var0; // L: 21
} // L: 22
@ObfuscatedName("x")

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

@@ -56,7 +56,7 @@ public class class200 {
var3 = Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]; // L: 503
var4 = CollisionMap.getWidget(var3); // L: 504
} else {
var4 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 506
var4 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 506
}
if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 507

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

@@ -157,7 +157,7 @@ public class class231 {
var12.isIf3 = true; // L: 452
var6.children[var11] = var12; // L: 453
if (var2) { // L: 454
PlayerComposition.field2561 = var12;
PlayerComposition.scriptDotWidget = var12;
} else {
VarcInt.scriptActiveWidget = var12; // L: 455
}
@@ -169,7 +169,7 @@ public class class231 {
} else {
Widget var3;
if (var0 == ScriptOpcodes.CC_DELETE) { // L: 459
var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 460
var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 460
Widget var10 = CollisionMap.getWidget(var3.id); // L: 461
var10.children[var3.childIndex] = null; // L: 462
CollisionMap.invalidateWidget(var10); // L: 463
@@ -185,7 +185,7 @@ public class class231 {
if (var3 != null) { // L: 487
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = 1; // L: 488
if (var2) { // L: 489
PlayerComposition.field2561 = var3;
PlayerComposition.scriptDotWidget = var3;
} else {
VarcInt.scriptActiveWidget = var3; // L: 490
}
@@ -205,7 +205,7 @@ public class class231 {
if (var5 != null && var4 != -1) { // L: 477
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = 1; // L: 478
if (var2) { // L: 479
PlayerComposition.field2561 = var5;
PlayerComposition.scriptDotWidget = var5;
} else {
VarcInt.scriptActiveWidget = var5; // L: 480
}

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

@@ -41,7 +41,7 @@ public class class238 {
garbageValue = "1585982662"
)
public static String method4166(CharSequence var0) {
String var1 = ParamDefinition.base37DecodeLong(Renderable.method3340(var0)); // L: 75
String var1 = ParamComposition.base37DecodeLong(Renderable.method3340(var0)); // L: 75
if (var1 == null) { // L: 76
var1 = "";
}

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

@@ -10,7 +10,7 @@ public class class277 {
garbageValue = "-1829984749"
)
static int method5005(int var0, Script var1, boolean var2) {
Widget var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 1106
Widget var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 1106
if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1107
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = var3.itemId; // L: 1108
return 1; // L: 1109

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

@@ -213,7 +213,7 @@ public class class51 implements WorldMapSection {
var0.field963 = 0; // L: 3987
} else {
if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3990
SequenceDefinition var1 = ParamDefinition.SequenceDefinition_get(var0.sequence); // L: 3991
SequenceDefinition var1 = ParamComposition.SequenceDefinition_get(var0.sequence); // L: 3991
if (var0.field996 > 0 && var1.field3560 == 0) { // L: 3992
++var0.field963; // L: 3993
return; // L: 3994