Started identifying CS2 opcodes

This commit is contained in:
Pazaz 2022-05-11 04:59:13 -04:00
parent b57d5a0031
commit 3531b1c57c
27 changed files with 422 additions and 346 deletions

View file

@ -13,9 +13,9 @@ public class ClientProt {
if (local8 == null) {
return;
}
if (local8.anObjectArray29 != null) {
if (local8.onOptionClick != null) {
@Pc(19) HookRequest local19 = new HookRequest();
local19.arguments = local8.anObjectArray29;
local19.arguments = local8.onOptionClick;
local19.source = local8;
local19.opBase = arg0;
local19.op = arg2;
@ -483,29 +483,29 @@ public class ClientProt {
}
@Pc(109) int local109 = local41 - Static20.anInt660;
@Pc(114) int local114 = local30 - Static124.anInt3075;
@Pc(122) int local122 = local30 + Static4.aClass13_1.anInt489 - Static81.anInt2225;
@Pc(122) int local122 = local30 + Static4.aClass13_1.scrollX - Static81.anInt2225;
@Pc(130) int local130 = Static4.aClass13_1.scrollY + local41 - Static228.anInt5103;
@Pc(133) int local133 = Static105.aClass13_14.anInt472;
if (Static213.anInt4851 > Static105.aClass13_14.anInt447 && (local133 < local114 || -local133 > local114 || local109 > local133 || local109 < -local133)) {
@Pc(133) int local133 = Static105.aClass13_14.dragDeadzone;
if (Static213.anInt4851 > Static105.aClass13_14.dragDeadtime && (local133 < local114 || -local133 > local114 || local109 > local133 || local109 < -local133)) {
Static138.aBoolean172 = true;
}
@Pc(176) HookRequest local176;
if (Static105.aClass13_14.anObjectArray26 != null && Static138.aBoolean172) {
if (Static105.aClass13_14.onDragStart != null && Static138.aBoolean172) {
local176 = new HookRequest();
local176.source = Static105.aClass13_14;
local176.arguments = Static105.aClass13_14.anObjectArray26;
local176.arguments = Static105.aClass13_14.onDragStart;
local176.mouseX = local122;
local176.mouseY = local130;
ScriptRunner.run(local176);
}
if (Mouse.pressedButton == 0) {
if (Static138.aBoolean172) {
if (Static105.aClass13_14.anObjectArray16 != null) {
if (Static105.aClass13_14.onDragRelease != null) {
local176 = new HookRequest();
local176.mouseY = local130;
local176.target = Static56.aClass13_12;
local176.mouseX = local122;
local176.arguments = Static105.aClass13_14.anObjectArray16;
local176.arguments = Static105.aClass13_14.onDragRelease;
local176.source = Static105.aClass13_14;
ScriptRunner.run(local176);
}

View file

@ -30,7 +30,7 @@ public final class Component {
public Object[] onClickRepeat;
@OriginalMember(owner = "client!be", name = "p", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray6;
public Object[] onDrag;
@OriginalMember(owner = "client!be", name = "q", descriptor = "[Lclient!na;")
public JagString[] ops;
@ -45,16 +45,16 @@ public final class Component {
public int[] inventoryTriggers;
@OriginalMember(owner = "client!be", name = "v", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray8;
public Object[] onWidgetsOpenClose;
@OriginalMember(owner = "client!be", name = "x", descriptor = "Z")
public boolean aBoolean21;
public boolean vFlip;
@OriginalMember(owner = "client!be", name = "z", descriptor = "[Ljava/lang/Object;")
public Object[] onHold;
@OriginalMember(owner = "client!be", name = "E", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray10;
public Object[] onScroll;
@OriginalMember(owner = "client!be", name = "G", descriptor = "[I")
public int[] varcstrTriggers;
@ -66,16 +66,16 @@ public final class Component {
public int[] anIntArray36;
@OriginalMember(owner = "client!be", name = "X", descriptor = "Z")
public boolean aBoolean26;
public boolean hFlip;
@OriginalMember(owner = "client!be", name = "Z", descriptor = "I")
public int modelId;
@OriginalMember(owner = "client!be", name = "bb", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray11;
public Object[] onUse;
@OriginalMember(owner = "client!be", name = "fb", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray12;
public Object[] onDialogAbort;
@OriginalMember(owner = "client!be", name = "gb", descriptor = "[I")
public int[] anIntArray37;
@ -84,7 +84,7 @@ public final class Component {
public int[] varcTriggers;
@OriginalMember(owner = "client!be", name = "qb", descriptor = "[Ljava/lang/Object;")
public Object[] onCamFinished;
public Object[] onMinimapUnlock;
@OriginalMember(owner = "client!be", name = "tb", descriptor = "[Ljava/lang/Object;")
public Object[] onKey;
@ -93,13 +93,13 @@ public final class Component {
public Object[] onVarcstrTransmit;
@OriginalMember(owner = "client!be", name = "Db", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray16;
public Object[] onDragRelease;
@OriginalMember(owner = "client!be", name = "Fb", descriptor = "[B")
public byte[] aByteArray7;
@OriginalMember(owner = "client!be", name = "Jb", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray17;
public Object[] onResize;
@OriginalMember(owner = "client!be", name = "Nb", descriptor = "[Ljava/lang/Object;")
public Object[] onRelease;
@ -114,7 +114,7 @@ public final class Component {
public int[] objTypes;
@OriginalMember(owner = "client!be", name = "fc", descriptor = "[Ljava/lang/Object;")
public Object[] onChatTransmit;
public Object[] onMsg;
@OriginalMember(owner = "client!be", name = "lc", descriptor = "[Lclient!be;")
public Component[] createdComponents;
@ -153,7 +153,7 @@ public final class Component {
public int[] anIntArray45;
@OriginalMember(owner = "client!be", name = "Xc", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray26;
public Object[] onDragStart;
@OriginalMember(owner = "client!be", name = "ad", descriptor = "[[I")
public int[][] anIntArrayArray4;
@ -165,7 +165,7 @@ public final class Component {
public int[] anIntArray47;
@OriginalMember(owner = "client!be", name = "gd", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray27;
public Object[] onUseWith;
@OriginalMember(owner = "client!be", name = "kd", descriptor = "[I")
public int[] anIntArray48;
@ -177,7 +177,7 @@ public final class Component {
public Object[] onClanTransmit;
@OriginalMember(owner = "client!be", name = "rd", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray29;
public Object[] onOptionClick;
@OriginalMember(owner = "client!be", name = "sd", descriptor = "[Ljava/lang/Object;")
public Object[] onMiscTransmit;
@ -186,7 +186,7 @@ public final class Component {
public int[] objCounts;
@OriginalMember(owner = "client!be", name = "H", descriptor = "Z")
public boolean aBoolean23 = false;
public boolean spriteTiling = false;
@OriginalMember(owner = "client!be", name = "f", descriptor = "I")
public int aspectHeight = 1;
@ -207,7 +207,7 @@ public final class Component {
public int y = 0;
@OriginalMember(owner = "client!be", name = "nb", descriptor = "I")
public int anInt472 = 0;
public int dragDeadzone = 0;
@OriginalMember(owner = "client!be", name = "W", descriptor = "I")
public int anInt462 = -1;
@ -222,19 +222,19 @@ public final class Component {
public int anInt481 = 0;
@OriginalMember(owner = "client!be", name = "A", descriptor = "Z")
public boolean aBoolean22 = false;
public boolean modelOrtho = false;
@OriginalMember(owner = "client!be", name = "zb", descriptor = "Z")
public boolean aBoolean30 = false;
@OriginalMember(owner = "client!be", name = "y", descriptor = "I")
public int anInt447 = 0;
public int dragDeadtime = 0;
@OriginalMember(owner = "client!be", name = "hb", descriptor = "I")
public int scrollY = 0;
@OriginalMember(owner = "client!be", name = "xb", descriptor = "I")
public int anInt477 = -1;
public int spriteId = -1;
@OriginalMember(owner = "client!be", name = "eb", descriptor = "I")
public int anInt467 = 0;
@ -243,7 +243,7 @@ public final class Component {
public boolean hidden = false;
@OriginalMember(owner = "client!be", name = "Zb", descriptor = "I")
public int anInt490 = 1;
public int lineWidth = 1;
@OriginalMember(owner = "client!be", name = "Mb", descriptor = "I")
public int anInt484 = -1;
@ -276,13 +276,13 @@ public final class Component {
public byte dynamicHeightValue = 0;
@OriginalMember(owner = "client!be", name = "bc", descriptor = "I")
public int anInt491 = 0;
public int scrollMaxV = 0;
@OriginalMember(owner = "client!be", name = "Y", descriptor = "Z")
public boolean aBoolean27 = false;
public boolean dragRenderBehavior = false;
@OriginalMember(owner = "client!be", name = "ob", descriptor = "Z")
public boolean aBoolean28 = false;
public boolean textAntiMacro = false;
@OriginalMember(owner = "client!be", name = "cb", descriptor = "I")
public int anInt465 = -1;
@ -312,7 +312,7 @@ public final class Component {
public int width = 0;
@OriginalMember(owner = "client!be", name = "Wb", descriptor = "I")
public int anInt489 = 0;
public int scrollX = 0;
@OriginalMember(owner = "client!be", name = "sb", descriptor = "Z")
public boolean noClickThrough = false;
@ -336,7 +336,7 @@ public final class Component {
public int modelZOffset = 0;
@OriginalMember(owner = "client!be", name = "Dc", descriptor = "Lclient!na;")
public JagString opBase = Static176.aClass100_800;
public JagString optionBase = Static176.aClass100_800;
@OriginalMember(owner = "client!be", name = "Lc", descriptor = "I")
public int updatedVarcsReaderIndex = 0;
@ -351,19 +351,19 @@ public final class Component {
public int lastTransmitTimer = -1;
@OriginalMember(owner = "client!be", name = "c", descriptor = "Z")
public boolean aBoolean18 = false;
public boolean hasAlpha = false;
@OriginalMember(owner = "client!be", name = "F", descriptor = "I")
public int anInt451 = 0;
@OriginalMember(owner = "client!be", name = "wb", descriptor = "I")
public int anInt476 = 0;
public int alpha = 0;
@OriginalMember(owner = "client!be", name = "hc", descriptor = "I")
public int modelXOffset = 0;
@OriginalMember(owner = "client!be", name = "Ub", descriptor = "Lclient!na;")
public JagString aClass100_86 = Static176.aClass100_800;
public JagString targetVerb = Static176.aClass100_800;
@OriginalMember(owner = "client!be", name = "Lb", descriptor = "I")
public int modelRotationSpeed = 0;
@ -372,7 +372,7 @@ public final class Component {
public JagString aClass100_82 = Static176.aClass100_800;
@OriginalMember(owner = "client!be", name = "Pc", descriptor = "I")
public int objSelected = 0;
public int outlineThickness = 0;
@OriginalMember(owner = "client!be", name = "oc", descriptor = "I")
public int anInt498 = -1;
@ -402,10 +402,10 @@ public final class Component {
public int anInt500 = 0;
@OriginalMember(owner = "client!be", name = "uc", descriptor = "I")
public int anInt502 = -1;
public int font = -1;
@OriginalMember(owner = "client!be", name = "Pb", descriptor = "I")
public int anInt486 = 0;
public int scrollMaxH = 0;
@OriginalMember(owner = "client!be", name = "ec", descriptor = "I")
public int updatedInventoriesReaderIndex = 0;
@ -414,7 +414,7 @@ public final class Component {
public short aShort11 = 0;
@OriginalMember(owner = "client!be", name = "ed", descriptor = "I")
public int anInt521 = 0;
public int angle2d = 0;
@OriginalMember(owner = "client!be", name = "id", descriptor = "I")
public int modelSeqId = -1;
@ -435,7 +435,7 @@ public final class Component {
public int anInt453 = 0;
@OriginalMember(owner = "client!be", name = "Oc", descriptor = "I")
public int objShadow = 0;
public int shadowColor = 0;
@OriginalMember(owner = "client!be", name = "fd", descriptor = "Lclient!be;")
public Component aClass13_5 = null;
@ -518,7 +518,7 @@ public final class Component {
if (this.anIntArray37 != null) {
return true;
}
@Pc(18) SoftwareIndexedSprite local18 = Static164.loadSoftwareIndexedSprite(this.anInt477, InterfaceList.aClass153_12);
@Pc(18) SoftwareIndexedSprite local18 = Static164.loadSoftwareIndexedSprite(this.spriteId, InterfaceList.aClass153_12);
if (local18 == null) {
return false;
}
@ -575,7 +575,7 @@ public final class Component {
this.dynamicHeightValue = 0;
this.yMode = 0;
this.xMode = 0;
this.anInt476 = arg0.g1();
this.alpha = arg0.g1();
this.layer = arg0.g2();
if (this.layer == 65535) {
this.layer = -1;
@ -614,7 +614,7 @@ public final class Component {
}
}
if (this.type == 0) {
this.anInt491 = arg0.g2();
this.scrollMaxV = arg0.g2();
this.hidden = arg0.g1() == 1;
}
if (this.type == 1) {
@ -675,11 +675,11 @@ public final class Component {
this.anInt460 = arg0.g1();
this.anInt478 = arg0.g1();
this.anInt467 = arg0.g1();
this.anInt502 = arg0.g2();
if (this.anInt502 == 65535) {
this.anInt502 = -1;
this.font = arg0.g2();
if (this.font == 65535) {
this.font = -1;
}
this.aBoolean28 = arg0.g1() == 1;
this.textAntiMacro = arg0.g1() == 1;
}
if (this.type == 4) {
this.text = arg0.gjstr();
@ -694,7 +694,7 @@ public final class Component {
this.anInt475 = arg0.g4();
}
if (this.type == 5) {
this.anInt477 = arg0.g4();
this.spriteId = arg0.g4();
this.anInt519 = arg0.g4();
}
if (this.type == 6) {
@ -726,11 +726,11 @@ public final class Component {
this.objCounts = new int[this.baseHeight * this.baseWidth];
this.objTypes = new int[this.baseWidth * this.baseHeight];
this.anInt460 = arg0.g1();
this.anInt502 = arg0.g2();
if (this.anInt502 == 65535) {
this.anInt502 = -1;
this.font = arg0.g2();
if (this.font == 65535) {
this.font = -1;
}
this.aBoolean28 = arg0.g1() == 1;
this.textAntiMacro = arg0.g1() == 1;
this.color = arg0.g4();
this.anInt512 = arg0.g2s();
this.anInt516 = arg0.g2s();
@ -751,7 +751,7 @@ public final class Component {
this.text = arg0.gjstr();
}
if (this.anInt530 == 2 || this.type == 2) {
this.aClass100_86 = arg0.gjstr();
this.targetVerb = arg0.gjstr();
this.aClass100_85 = arg0.gjstr();
local175 = arg0.g2() & 0x3F;
local164 |= local175 << 11;
@ -942,18 +942,18 @@ public final class Component {
if (arg0) {
local12 = this.anInt519;
} else {
local12 = this.anInt477;
local12 = this.spriteId;
}
if (local12 == -1) {
return null;
}
@Pc(66) long local66 = ((this.aBoolean21 ? 1L : 0L) << 38) + ((this.aBoolean18 ? 1L : 0L) << 35) + (long) local12 + ((long) this.objSelected << 36) + ((this.aBoolean26 ? 1L : 0L) << 39) + ((long) this.objShadow << 40);
@Pc(66) long local66 = ((this.vFlip ? 1L : 0L) << 38) + ((this.hasAlpha ? 1L : 0L) << 35) + (long) local12 + ((long) this.outlineThickness << 36) + ((this.hFlip ? 1L : 0L) << 39) + ((long) this.shadowColor << 40);
@Pc(72) Sprite local72 = (Sprite) sprites.get(local66);
if (local72 != null) {
return local72;
}
@Pc(85) SoftwareSprite local85;
if (this.aBoolean18) {
if (this.hasAlpha) {
local85 = SoftwareSprite.loadSoftwareAlphaSprite(InterfaceList.aClass153_12, local12);
} else {
local85 = SpriteLoader.loadSoftwareSprite(0, InterfaceList.aClass153_12, local12);
@ -962,23 +962,23 @@ public final class Component {
Static211.aBoolean72 = true;
return null;
}
if (this.aBoolean21) {
if (this.vFlip) {
local85.method309();
}
if (this.aBoolean26) {
if (this.hFlip) {
local85.method299();
}
if (this.objSelected > 0) {
local85.method298(this.objSelected);
if (this.outlineThickness > 0) {
local85.method298(this.outlineThickness);
}
if (this.objSelected >= 1) {
if (this.outlineThickness >= 1) {
local85.drawOutline(1);
}
if (this.objSelected >= 2) {
if (this.outlineThickness >= 2) {
local85.drawOutline(16777215);
}
if (this.objShadow != 0) {
local85.drawShadow(this.objShadow);
if (this.shadowColor != 0) {
local85.drawShadow(this.shadowColor);
}
if (!GlRenderer.enabled) {
local72 = local85;
@ -1017,22 +1017,22 @@ public final class Component {
}
this.hidden = buffer.g1() == 1;
if (this.type == 0) {
this.anInt486 = buffer.g2();
this.anInt491 = buffer.g2();
this.scrollMaxH = buffer.g2();
this.scrollMaxV = buffer.g2();
this.noClickThrough = buffer.g1() == 1;
}
@Pc(175) int local175;
if (this.type == 5) {
this.anInt477 = buffer.g4();
this.anInt521 = buffer.g2();
this.spriteId = buffer.g4();
this.angle2d = buffer.g2();
local175 = buffer.g1();
this.aBoolean18 = (local175 & 0x2) != 0;
this.aBoolean23 = (local175 & 0x1) != 0;
this.anInt476 = buffer.g1();
this.objSelected = buffer.g1();
this.objShadow = buffer.g4();
this.aBoolean21 = buffer.g1() == 1;
this.aBoolean26 = buffer.g1() == 1;
this.hasAlpha = (local175 & 0x2) != 0;
this.spriteTiling = (local175 & 0x1) != 0;
this.alpha = buffer.g1();
this.outlineThickness = buffer.g1();
this.shadowColor = buffer.g4();
this.vFlip = buffer.g1() == 1;
this.hFlip = buffer.g1() == 1;
}
if (this.type == 6) {
this.modelType = 1;
@ -1050,7 +1050,7 @@ public final class Component {
if (this.modelSeqId == 65535) {
this.modelSeqId = -1;
}
this.aBoolean22 = buffer.g1() == 1;
this.modelOrtho = buffer.g1() == 1;
this.aShort11 = (short) buffer.g2();
this.aShort10 = (short) buffer.g2();
this.aBoolean34 = buffer.g1() == 1;
@ -1062,24 +1062,24 @@ public final class Component {
}
}
if (this.type == 4) {
this.anInt502 = buffer.g2();
if (this.anInt502 == 65535) {
this.anInt502 = -1;
this.font = buffer.g2();
if (this.font == 65535) {
this.font = -1;
}
this.text = buffer.gjstr();
this.anInt467 = buffer.g1();
this.anInt460 = buffer.g1();
this.anInt478 = buffer.g1();
this.aBoolean28 = buffer.g1() == 1;
this.textAntiMacro = buffer.g1() == 1;
this.color = buffer.g4();
}
if (this.type == 3) {
this.color = buffer.g4();
this.aBoolean30 = buffer.g1() == 1;
this.anInt476 = buffer.g1();
this.alpha = buffer.g1();
}
if (this.type == 9) {
this.anInt490 = buffer.g1();
this.lineWidth = buffer.g1();
this.color = buffer.g4();
this.aBoolean20 = buffer.g1() == 1;
}
@ -1104,7 +1104,7 @@ public final class Component {
local471 = buffer.g1();
}
}
this.opBase = buffer.gjstr();
this.optionBase = buffer.gjstr();
local497 = buffer.g1();
@Pc(557) int local557 = local497 & 0xF;
@Pc(567) int local567;
@ -1127,11 +1127,11 @@ public final class Component {
local567 = buffer.g1();
this.anIntArray39[local567] = buffer.g2();
}
this.anInt472 = buffer.g1();
this.anInt447 = buffer.g1();
this.aBoolean27 = buffer.g1() == 1;
this.dragDeadzone = buffer.g1();
this.dragDeadtime = buffer.g1();
this.dragRenderBehavior = buffer.g1() == 1;
local567 = -1;
this.aClass100_86 = buffer.gjstr();
this.targetVerb = buffer.gjstr();
if (Static199.method3594(local175) != 0) {
local567 = buffer.g2();
this.anInt499 = buffer.g2();
@ -1150,21 +1150,21 @@ public final class Component {
this.anObjectArray3 = this.method485(buffer);
this.onMouseOver = this.method485(buffer);
this.onMouseLeave = this.method485(buffer);
this.anObjectArray27 = this.method485(buffer);
this.anObjectArray11 = this.method485(buffer);
this.onUseWith = this.method485(buffer);
this.onUse = this.method485(buffer);
this.onVarpTransmit = this.method485(buffer);
this.onInvTransmit = this.method485(buffer);
this.onStatTransmit = this.method485(buffer);
this.onTimer = this.method485(buffer);
this.anObjectArray29 = this.method485(buffer);
this.onOptionClick = this.method485(buffer);
this.onMouseRepeat = this.method485(buffer);
this.onClickRepeat = this.method485(buffer);
this.anObjectArray6 = this.method485(buffer);
this.onDrag = this.method485(buffer);
this.onRelease = this.method485(buffer);
this.onHold = this.method485(buffer);
this.anObjectArray26 = this.method485(buffer);
this.anObjectArray16 = this.method485(buffer);
this.anObjectArray10 = this.method485(buffer);
this.onDragStart = this.method485(buffer);
this.onDragRelease = this.method485(buffer);
this.onScroll = this.method485(buffer);
this.onVarcTransmit = this.method485(buffer);
this.onVarcstrTransmit = this.method485(buffer);
this.varpTriggers = this.method486(buffer);
@ -1177,19 +1177,19 @@ public final class Component {
@OriginalMember(owner = "client!be", name = "a", descriptor = "([Lclient!ok;I)Lclient!rk;")
public final Font method491(@OriginalArg(0) IndexedSprite[] arg0) {
Static211.aBoolean72 = false;
if (this.anInt502 == -1) {
if (this.font == -1) {
return null;
}
@Pc(21) Font local21 = (Font) fonts.get((long) this.anInt502);
@Pc(21) Font local21 = (Font) fonts.get((long) this.font);
if (local21 != null) {
return local21;
}
local21 = Static127.method2462(this.anInt502, InterfaceList.aClass153_12, InterfaceList.aClass153_64);
local21 = Static127.method2462(this.font, InterfaceList.aClass153_12, InterfaceList.aClass153_64);
if (local21 == null) {
Static211.aBoolean72 = true;
} else {
local21.setNameIcons(arg0, null);
fonts.put(local21, (long) this.anInt502);
fonts.put(local21, (long) this.font);
}
return local21;
}

View file

@ -46,4 +46,37 @@ public class Find {
}
Static202.method3656(local113, results);
}
@OriginalMember(owner = "client!me", name = "a", descriptor = "(ZLclient!na;I)V")
public static void search(@OriginalArg(0) boolean arg0, @OriginalArg(1) JagString arg1) {
@Pc(8) short[] local8 = new short[16];
@Pc(12) JagString local12 = arg1.toLowerCase();
@Pc(14) int local14 = 0;
for (@Pc(16) int local16 = 0; local16 < ObjTypeList.anInt3245; local16++) {
@Pc(27) ObjType local27 = ObjTypeList.get(local16);
if ((!arg0 || local27.stockMarket) && local27.certificateTemplate == -1 && local27.lentTemplate == -1 && local27.dummyItem == 0 && local27.name.toLowerCase().indexOf(local12) != -1) {
if (local14 >= 250) {
results = null;
index = -1;
return;
}
if (local14 >= local8.length) {
@Pc(83) short[] local83 = new short[local8.length * 2];
for (@Pc(85) int local85 = 0; local85 < local14; local85++) {
local83[local85] = local8[local85];
}
local8 = local83;
}
local8[local14++] = (short) local16;
}
}
results = local8;
size = 0;
index = local14;
@Pc(117) JagString[] local117 = new JagString[index];
for (@Pc(119) int local119 = 0; local119 < index; local119++) {
local117[local119] = ObjTypeList.get(local8[local119]).name;
}
Static202.method3656(local117, results);
}
}

View file

@ -323,7 +323,7 @@ public abstract class Font extends SecondaryNode {
protected abstract void renderGlyphTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6);
@OriginalMember(owner = "client!rk", name = "b", descriptor = "(Lclient!na;I)I")
public final int method2856(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
public final int getMaxLineWidth(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
@Pc(10) int local10 = this.splitParagraph(arg0, new int[] { arg1 }, lines);
@Pc(12) int local12 = 0;
for (@Pc(14) int local14 = 0; local14 < local10; local14++) {

View file

@ -182,7 +182,7 @@ public class InterfaceList {
@OriginalMember(owner = "client!qj", name = "a", descriptor = "(Lclient!be;BI)Lclient!na;")
public static JagString getOp(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1) {
if (!getServerActiveProperties(arg0).method503(arg1) && arg0.anObjectArray29 == null) {
if (!getServerActiveProperties(arg0).method503(arg1) && arg0.onOptionClick == null) {
return null;
} else if (arg0.ops == null || arg0.ops.length <= arg1 || arg0.ops[arg1] == null || arg0.ops[arg1].trim().length() == 0) {
return Static121.aBoolean154 ? JagString.concatenate(new JagString[] { Static207.aClass100_903, JagString.parseInt(arg1) }) : null;

View file

@ -3,7 +3,6 @@ package rt4;
import java.applet.Applet;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
@ -429,7 +428,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "b", descriptor = "(BLclient!na;)I")
public final int method3126(@OriginalArg(1) JagString arg0) {
public final int compare(@OriginalArg(1) JagString arg0) {
@Pc(12) int local12 = 0;
@Pc(14) int local14 = 0;
@Pc(17) int local17 = arg0.length;
@ -489,7 +488,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(ZI)Lclient!na;")
public final JagString method3128(@OriginalArg(1) int arg0) {
public final JagString concatChar(@OriginalArg(1) int arg0) {
if (arg0 <= 0 || arg0 > 255) {
throw new IllegalArgumentException("invalid char");
}

View file

@ -251,7 +251,7 @@ public class MiniMap {
local156 = Fonts.b12Full;
}
local231 = local164 * local181 + local189 * local146 >> 16;
local239 = local156.method2856(Static235.mapElementList.aClass100Array153[local117], 100);
local239 = local156.getMaxLineWidth(Static235.mapElementList.aClass100Array153[local117], 100);
@Pc(245) int local245 = local231 - local239 / 2;
if (local245 >= -arg3.width && local245 <= arg3.width && local200 >= -arg3.height && local200 <= arg3.height) {
local271 = 16777215;

View file

@ -228,24 +228,24 @@ public class MiniMenu {
for (local171 = 9; local171 >= 5; local171--) {
@Pc(765) JagString local765 = InterfaceList.getOp(component, local171);
if (local765 != null) {
add(getOpCursor(local171, component), (long) (local171 + 1), component.opBase, component.createdComponentId, (short) 1003, local765, component.id);
add(getOpCursor(local171, component), (long) (local171 + 1), component.optionBase, component.createdComponentId, (short) 1003, local765, component.id);
}
}
local47 = Static97.getTargetVerb(component);
if (local47 != null) {
add(-1, 0L, component.opBase, component.createdComponentId, (short) 32, local47, component.id);
add(-1, 0L, component.optionBase, component.createdComponentId, (short) 32, local47, component.id);
}
for (local173 = 4; local173 >= 0; local173--) {
@Pc(828) JagString local828 = InterfaceList.getOp(component, local173);
if (local828 != null) {
add(getOpCursor(local173, component), (long) (local173 + 1), component.opBase, component.createdComponentId, (short) 9, local828, component.id);
add(getOpCursor(local173, component), (long) (local173 + 1), component.optionBase, component.createdComponentId, (short) 9, local828, component.id);
}
}
if (InterfaceList.getServerActiveProperties(component).method506()) {
add(-1, 0L, JagString.EMPTY, component.createdComponentId, (short) 41, LocalizedText.CONTINUE, component.id);
}
} else if (InterfaceList.getServerActiveProperties(component).method508() && (anInt4999 & 0x20) != 0) {
add(Static246.anInt5393, 0L, JagString.concatenate(new JagString[] { aClass100_466, aClass100_408, component.opBase}), component.createdComponentId, (short) 12, aClass100_545, component.id);
add(Static246.anInt5393, 0L, JagString.concatenate(new JagString[] { aClass100_466, aClass100_408, component.optionBase}), component.createdComponentId, (short) 12, aClass100_545, component.id);
}
}
@ -646,7 +646,7 @@ public class MiniMenu {
aClass100_545 = Static250.aClass100_1042;
}
if (local693.usingScripts) {
aClass100_466 = JagString.concatenate(new JagString[] { local693.opBase, COLOR_WHITE});
aClass100_466 = JagString.concatenate(new JagString[] { local693.optionBase, COLOR_WHITE});
} else {
aClass100_466 = JagString.concatenate(new JagString[] {COLOR_GREEN, local693.aClass100_85, COLOR_WHITE});
}
@ -1434,7 +1434,7 @@ public class MiniMenu {
@OriginalMember(owner = "client!aj", name = "a", descriptor = "(BILclient!be;)I")
public static int getOpCursor(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) {
if (!InterfaceList.getServerActiveProperties(arg1).method503(arg0) && arg1.anObjectArray29 == null) {
if (!InterfaceList.getServerActiveProperties(arg1).method503(arg0) && arg1.onOptionClick == null) {
return -1;
} else if (arg1.anIntArray39 == null || arg0 >= arg1.anIntArray39.length) {
return -1;

View file

@ -2607,8 +2607,8 @@ public class Protocol {
component = InterfaceList.getComponent(i);
x = change.intArg1;
if (component != null && component.type == 0) {
if (x > component.anInt491 - component.height) {
x = component.anInt491 - component.height;
if (x > component.scrollMaxV - component.height) {
x = component.scrollMaxV - component.height;
}
if (x < 0) {
x = 0;

View file

@ -40,6 +40,83 @@ public final class ScriptRunner {
@OriginalMember(owner = "client!og", name = "g", descriptor = "[Lclient!na;")
public static JagString[] stringLocals;
public class Cs2Opcodes {
// Component setters
public static final int setPosition = 1000;
public static final int setSize = 1001;
public static final int setHidden = 1003;
public static final int setAspect = 1004;
public static final int setNoClickThrough = 1005;
// Component properties
public static final int getX = 1500;
public static final int getY = 1501;
public static final int getWidth = 1502;
public static final int getHeight = 1503;
public static final int getHidden = 1504;
public static final int getLayer = 1505;
// Bit utilities
public static final int addPercent = 4007;
public static final int flagBit = 4008;
public static final int unflagBit = 4009;
public static final int isBitFlagged = 4010;
public static final int mod = 4011;
public static final int pow = 4012;
public static final int root = 4013;
public static final int bitAnd = 4014;
public static final int bitOr = 4015;
public static final int min = 4016;
public static final int max = 4017;
public static final int multiplyDivide = 4018;
// String utilities
public static final int concatInt = 4100;
public static final int concatString = 4101;
public static final int concatSignedInt = 4102;
public static final int toLowerStr = 4103;
public static final int timeToStr = 4104;
public static final int strForGender = 4105;
public static final int parseInt = 4106;
public static final int compare = 4107;
public static final int getLineCount = 4108;
public static final int getMaxLineWidth = 4109;
public static final int chooseString = 4110;
public static final int escape = 4111;
public static final int concatChar = 4112;
public static final int isValidChar = 4113;
public static final int isAlphaNumeric = 4114;
public static final int isLetter = 4115;
public static final int isDigit = 4116;
public static final int length = 4117;
public static final int substr = 4118;
public static final int removeTags = 4119;
public static final int indexOfChar = 4120;
public static final int indexOfStr = 4121;
public static final int toLower = 4122;
public static final int toUpper = 4123;
public static final int formatNumber = 4124;
// Objs
public static final int itemIsStackable = 4207;
public static final int itemAttribute = 4208;
public static final int searchItem = 4210;
// Privacy
public static final int getPublicChatSetting = 5000;
public static final int setChatSettings = 5001;
public static final int getPrivateChatSetting = 5005;
// Ads
public static final int canShowVideoAd = 6405;
public static final int isShowingVideoAd = 6406;
// Worlds
public static final int getFirstWorldData = 6501;
public static final int getNextWorldData = 6502;
public static final int setWorldHost = 6503;
}
@OriginalMember(owner = "client!h", name = "a", descriptor = "(BILclient!jl;)V")
public static void run(@OriginalArg(1) int maxCycles, @OriginalArg(2) HookRequest request) {
@Pc(4) Object[] local4 = request.arguments;
@ -502,16 +579,16 @@ public final class ScriptRunner {
}
if (opcode == 1100) {
isp -= 2;
component.anInt489 = intStack[isp];
if (component.anInt489 > component.anInt486 - component.width) {
component.anInt489 = component.anInt486 - component.width;
component.scrollX = intStack[isp];
if (component.scrollX > component.scrollMaxH - component.width) {
component.scrollX = component.scrollMaxH - component.width;
}
if (component.anInt489 < 0) {
component.anInt489 = 0;
if (component.scrollX < 0) {
component.scrollX = 0;
}
component.scrollY = intStack[isp + 1];
if (component.scrollY > component.anInt491 - component.height) {
component.scrollY = component.anInt491 - component.height;
if (component.scrollY > component.scrollMaxV - component.height) {
component.scrollY = component.scrollMaxV - component.height;
}
if (component.scrollY < 0) {
component.scrollY = 0;
@ -539,31 +616,31 @@ public final class ScriptRunner {
}
if (opcode == 1103) {
isp--;
component.anInt476 = intStack[isp];
component.alpha = intStack[isp];
InterfaceList.redraw(component);
continue;
}
if (opcode == 1104) {
isp--;
component.anInt490 = intStack[isp];
component.lineWidth = intStack[isp];
InterfaceList.redraw(component);
continue;
}
if (opcode == 1105) {
isp--;
component.anInt477 = intStack[isp];
component.spriteId = intStack[isp];
InterfaceList.redraw(component);
continue;
}
if (opcode == 1106) {
isp--;
component.anInt521 = intStack[isp];
component.angle2d = intStack[isp];
InterfaceList.redraw(component);
continue;
}
if (opcode == 1107) {
isp--;
component.aBoolean23 = intStack[isp] == 1;
component.spriteTiling = intStack[isp] == 1;
InterfaceList.redraw(component);
continue;
}
@ -609,7 +686,7 @@ public final class ScriptRunner {
}
if (opcode == 1111) {
isp--;
component.aBoolean22 = intStack[isp] == 1;
component.modelOrtho = intStack[isp] == 1;
InterfaceList.redraw(component);
continue;
}
@ -627,7 +704,7 @@ public final class ScriptRunner {
}
if (opcode == 1113) {
isp--;
component.anInt502 = intStack[isp];
component.font = intStack[isp];
InterfaceList.redraw(component);
continue;
}
@ -641,38 +718,38 @@ public final class ScriptRunner {
}
if (opcode == 1115) {
isp--;
component.aBoolean28 = intStack[isp] == 1;
component.textAntiMacro = intStack[isp] == 1;
InterfaceList.redraw(component);
continue;
}
if (opcode == 1116) {
isp--;
component.objSelected = intStack[isp];
component.outlineThickness = intStack[isp];
InterfaceList.redraw(component);
continue;
}
if (opcode == 1117) {
isp--;
component.objShadow = intStack[isp];
component.shadowColor = intStack[isp];
InterfaceList.redraw(component);
continue;
}
if (opcode == 1118) {
isp--;
component.aBoolean21 = intStack[isp] == 1;
component.vFlip = intStack[isp] == 1;
InterfaceList.redraw(component);
continue;
}
if (opcode == 1119) {
isp--;
component.aBoolean26 = intStack[isp] == 1;
component.hFlip = intStack[isp] == 1;
InterfaceList.redraw(component);
continue;
}
if (opcode == 1120) {
isp -= 2;
component.anInt486 = intStack[isp];
component.anInt491 = intStack[isp + 1];
component.scrollMaxH = intStack[isp];
component.scrollMaxV = intStack[isp + 1];
InterfaceList.redraw(component);
if (component.type == 0) {
Static17.method531(component, false);
@ -688,7 +765,7 @@ public final class ScriptRunner {
}
if (opcode == 1122) {
isp--;
component.aBoolean18 = intStack[isp] == 1;
component.hasAlpha = intStack[isp] == 1;
InterfaceList.redraw(component);
continue;
}
@ -809,27 +886,27 @@ public final class ScriptRunner {
}
if (opcode == 1302) {
isp--;
component.aBoolean27 = intStack[isp] == 1;
component.dragRenderBehavior = intStack[isp] == 1;
continue;
}
if (opcode == 1303) {
isp--;
component.anInt472 = intStack[isp];
component.dragDeadzone = intStack[isp];
continue;
}
if (opcode == 1304) {
isp--;
component.anInt447 = intStack[isp];
component.dragDeadtime = intStack[isp];
continue;
}
if (opcode == 1305) {
ssp--;
component.opBase = stringStack[ssp];
component.optionBase = stringStack[ssp];
continue;
}
if (opcode == 1306) {
ssp--;
component.aClass100_86 = stringStack[ssp];
component.targetVerb = stringStack[ssp];
continue;
}
if (opcode == 1307) {
@ -907,20 +984,20 @@ public final class ScriptRunner {
} else if (opcode == 1404) {
component.onMouseLeave = local13000;
} else if (opcode == 1405) {
component.anObjectArray26 = local13000;
component.onDragStart = local13000;
} else if (opcode == 1406) {
component.anObjectArray27 = local13000;
component.onUseWith = local13000;
} else if (opcode == 1407) {
component.varpTriggers = local12937;
component.onVarpTransmit = local13000;
} else if (opcode == 1408) {
component.onTimer = local13000;
} else if (opcode == 1409) {
component.anObjectArray29 = local13000;
component.onOptionClick = local13000;
} else if (opcode == 1410) {
component.anObjectArray16 = local13000;
component.onDragRelease = local13000;
} else if (opcode == 1411) {
component.anObjectArray6 = local13000;
component.onDrag = local13000;
} else if (opcode == 1412) {
component.onMouseRepeat = local13000;
} else if (opcode == 1414) {
@ -930,11 +1007,11 @@ public final class ScriptRunner {
component.statTriggers = local12937;
component.onStatTransmit = local13000;
} else if (opcode == 1416) {
component.anObjectArray11 = local13000;
component.onUse = local13000;
} else if (opcode == 1417) {
component.anObjectArray10 = local13000;
component.onScroll = local13000;
} else if (opcode == 1418) {
component.onChatTransmit = local13000;
component.onMsg = local13000;
} else if (opcode == 1419) {
component.onKey = local13000;
} else if (opcode == 1420) {
@ -944,15 +1021,15 @@ public final class ScriptRunner {
} else if (opcode == 1422) {
component.onMiscTransmit = local13000;
} else if (opcode == 1423) {
component.anObjectArray12 = local13000;
component.onDialogAbort = local13000;
} else if (opcode == 1424) {
component.anObjectArray8 = local13000;
component.onWidgetsOpenClose = local13000;
} else if (opcode == 1425) {
component.onStockTransmit = local13000;
} else if (opcode == 1426) {
component.onCamFinished = local13000;
component.onMinimapUnlock = local13000;
} else if (opcode == 1427) {
component.anObjectArray17 = local13000;
component.onResize = local13000;
} else if (opcode == 1428) {
component.onVarcTransmit = local13000;
component.varcTriggers = local12937;
@ -964,34 +1041,34 @@ public final class ScriptRunner {
}
if (opcode < 1600) {
component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
if (opcode == 1500) {
if (opcode == Cs2Opcodes.getX) {
intStack[isp++] = component.x;
continue;
}
if (opcode == 1501) {
if (opcode == Cs2Opcodes.getY) {
intStack[isp++] = component.y;
continue;
}
if (opcode == 1502) {
if (opcode == Cs2Opcodes.getWidth) {
intStack[isp++] = component.width;
continue;
}
if (opcode == 1503) {
if (opcode == Cs2Opcodes.getHeight) {
intStack[isp++] = component.height;
continue;
}
if (opcode == 1504) {
if (opcode == Cs2Opcodes.getHidden) {
intStack[isp++] = component.hidden ? 1 : 0;
continue;
}
if (opcode == 1505) {
if (opcode == Cs2Opcodes.getLayer) {
intStack[isp++] = component.layer;
continue;
}
} else if (opcode < 1700) {
component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
if (opcode == 1600) {
intStack[isp++] = component.anInt489;
intStack[isp++] = component.scrollX;
continue;
}
if (opcode == 1601) {
@ -1003,11 +1080,11 @@ public final class ScriptRunner {
continue;
}
if (opcode == 1603) {
intStack[isp++] = component.anInt486;
intStack[isp++] = component.scrollMaxH;
continue;
}
if (opcode == 1604) {
intStack[isp++] = component.anInt491;
intStack[isp++] = component.scrollMaxV;
continue;
}
if (opcode == 1605) {
@ -1027,7 +1104,7 @@ public final class ScriptRunner {
continue;
}
if (opcode == 1609) {
intStack[isp++] = component.anInt476;
intStack[isp++] = component.alpha;
continue;
}
if (opcode == 1610) {
@ -1039,7 +1116,7 @@ public final class ScriptRunner {
continue;
}
if (opcode == 1612) {
intStack[isp++] = component.anInt477;
intStack[isp++] = component.spriteId;
continue;
}
} else if (opcode < 1800) {
@ -1078,10 +1155,10 @@ public final class ScriptRunner {
continue;
}
if (opcode == 1802) {
if (component.opBase == null) {
if (component.optionBase == null) {
stringStack[ssp++] = EMPTY_STRING;
} else {
stringStack[ssp++] = component.opBase;
stringStack[ssp++] = component.optionBase;
}
continue;
}
@ -1116,7 +1193,7 @@ public final class ScriptRunner {
isp--;
component = InterfaceList.getComponent(intStack[isp]);
if (opcode == 2600) {
intStack[isp++] = component.anInt489;
intStack[isp++] = component.scrollX;
continue;
}
if (opcode == 2601) {
@ -1128,11 +1205,11 @@ public final class ScriptRunner {
continue;
}
if (opcode == 2603) {
intStack[isp++] = component.anInt486;
intStack[isp++] = component.scrollMaxH;
continue;
}
if (opcode == 2604) {
intStack[isp++] = component.anInt491;
intStack[isp++] = component.scrollMaxV;
continue;
}
if (opcode == 2605) {
@ -1152,7 +1229,7 @@ public final class ScriptRunner {
continue;
}
if (opcode == 2609) {
intStack[isp++] = component.anInt476;
intStack[isp++] = component.alpha;
continue;
}
if (opcode == 2610) {
@ -1164,7 +1241,7 @@ public final class ScriptRunner {
continue;
}
if (opcode == 2612) {
intStack[isp++] = component.anInt477;
intStack[isp++] = component.spriteId;
continue;
}
} else if (opcode < 2800) {
@ -1243,10 +1320,10 @@ public final class ScriptRunner {
continue;
}
if (opcode == 2802) {
if (component.opBase == null) {
if (component.optionBase == null) {
stringStack[ssp++] = EMPTY_STRING;
} else {
stringStack[ssp++] = component.opBase;
stringStack[ssp++] = component.optionBase;
}
continue;
}
@ -1968,42 +2045,42 @@ public final class ScriptRunner {
}
@Pc(4899) long local4899;
@Pc(4892) long local4892;
if (opcode == 4007) {
if (opcode == Cs2Opcodes.addPercent) {
isp -= 2;
local4892 = intStack[isp];
local4899 = intStack[isp + 1];
intStack[isp++] = (int) (local4892 * local4899 / 100L + local4892);
continue;
}
if (opcode == 4008) {
if (opcode == Cs2Opcodes.flagBit) {
isp -= 2;
int1 = intStack[isp];
int3 = intStack[isp + 1];
intStack[isp++] = int1 | 0x1 << int3;
continue;
}
if (opcode == 4009) {
if (opcode == Cs2Opcodes.unflagBit) {
isp -= 2;
int1 = intStack[isp];
int3 = intStack[isp + 1];
intStack[isp++] = -(0x1 << int3) - 1 & int1;
continue;
}
if (opcode == 4010) {
if (opcode == Cs2Opcodes.isBitFlagged) {
isp -= 2;
int1 = intStack[isp];
int3 = intStack[isp + 1];
intStack[isp++] = (int1 & 0x1 << int3) == 0 ? 0 : 1;
continue;
}
if (opcode == 4011) {
if (opcode == Cs2Opcodes.mod) {
isp -= 2;
int3 = intStack[isp + 1];
int1 = intStack[isp];
intStack[isp++] = int1 % int3;
continue;
}
if (opcode == 4012) {
if (opcode == Cs2Opcodes.pow) {
isp -= 2;
int3 = intStack[isp + 1];
int1 = intStack[isp];
@ -2014,7 +2091,7 @@ public final class ScriptRunner {
}
continue;
}
if (opcode == 4013) {
if (opcode == Cs2Opcodes.root) {
isp -= 2;
int3 = intStack[isp + 1];
int1 = intStack[isp];
@ -2027,35 +2104,35 @@ public final class ScriptRunner {
}
continue;
}
if (opcode == 4014) {
if (opcode == Cs2Opcodes.bitAnd) {
isp -= 2;
int3 = intStack[isp + 1];
int1 = intStack[isp];
intStack[isp++] = int3 & int1;
continue;
}
if (opcode == 4015) {
if (opcode == Cs2Opcodes.bitOr) {
isp -= 2;
int1 = intStack[isp];
int3 = intStack[isp + 1];
intStack[isp++] = int1 | int3;
continue;
}
if (opcode == 4016) {
if (opcode == Cs2Opcodes.min) {
isp -= 2;
int1 = intStack[isp];
int3 = intStack[isp + 1];
intStack[isp++] = int1 < int3 ? int1 : int3;
continue;
}
if (opcode == 4017) {
if (opcode == Cs2Opcodes.max) {
isp -= 2;
int3 = intStack[isp + 1];
int1 = intStack[isp];
intStack[isp++] = int3 >= int1 ? int3 : int1;
continue;
}
if (opcode == 4018) {
if (opcode == Cs2Opcodes.multiplyDivide) {
isp -= 3;
local4892 = intStack[isp];
local4899 = intStack[isp + 1];
@ -2132,13 +2209,13 @@ public final class ScriptRunner {
intStack[isp++] = int1;
continue;
}
if (opcode == 4207) {
if (opcode == Cs2Opcodes.itemIsStackable) {
isp--;
int1 = intStack[isp];
intStack[isp++] = ObjTypeList.get(int1).members ? 1 : 0;
continue;
}
if (opcode == 4208) {
if (opcode == Cs2Opcodes.itemAttribute) {
isp -= 2;
int1 = intStack[isp];
int3 = intStack[isp + 1];
@ -2150,12 +2227,12 @@ public final class ScriptRunner {
}
continue;
}
if (opcode == 4210) {
if (opcode == Cs2Opcodes.searchItem) {
ssp--;
string = stringStack[ssp];
isp--;
int3 = intStack[isp];
Static155.method2941(int3 == 1, string);
Find.search(int3 == 1, string);
intStack[isp++] = Find.index;
continue;
}
@ -2187,11 +2264,11 @@ public final class ScriptRunner {
} else if (opcode >= 4500) {
if (opcode >= 4600) {
if (opcode < 5100) {
if (opcode == 5000) {
if (opcode == Cs2Opcodes.getPublicChatSetting) {
intStack[isp++] = Chat.publicFilter;
continue;
}
if (opcode == 5001) {
if (opcode == Cs2Opcodes.setChatSettings) {
isp -= 3;
Chat.publicFilter = intStack[isp];
Chat.privateFilter = intStack[isp + 1];
@ -2237,7 +2314,7 @@ public final class ScriptRunner {
intStack[isp++] = int3;
continue;
}
if (opcode == 5005) {
if (opcode == Cs2Opcodes.getPrivateChatSetting) {
intStack[isp++] = Chat.privateFilter;
continue;
}
@ -3691,11 +3768,11 @@ public final class ScriptRunner {
continue;
}
} else if (opcode < 6500) {
if (opcode == 6405) {
if (opcode == Cs2Opcodes.canShowVideoAd) {
intStack[isp++] = Static87.showVideoAd() ? 1 : 0;
continue;
}
if (opcode == 6406) {
if (opcode == Cs2Opcodes.isShowingVideoAd) {
intStack[isp++] = Static267.isShowingVideoAd() ? 1 : 0;
continue;
}
@ -3710,7 +3787,7 @@ public final class ScriptRunner {
}
@Pc(10247) WorldInfo local10247;
@Pc(10191) World world;
if (opcode == 6501) {
if (opcode == Cs2Opcodes.getFirstWorldData) {
world = Static18.getFirstWorld();
if (world == null) {
intStack[isp++] = -1;
@ -3730,7 +3807,7 @@ public final class ScriptRunner {
}
continue;
}
if (opcode == 6502) {
if (opcode == Cs2Opcodes.getNextWorldData) {
world = WorldList.getNextWorld();
if (world == null) {
intStack[isp++] = -1;
@ -3750,7 +3827,7 @@ public final class ScriptRunner {
}
continue;
}
if (opcode == 6503) {
if (opcode == Cs2Opcodes.setWorldHost) {
isp--;
int1 = intStack[isp];
if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0) {
@ -3837,7 +3914,7 @@ public final class ScriptRunner {
continue;
}
} else {
if (opcode == 4100) {
if (opcode == Cs2Opcodes.concatInt) {
ssp--;
string = stringStack[ssp];
isp--;
@ -3845,14 +3922,14 @@ public final class ScriptRunner {
stringStack[ssp++] = JagString.concatenate(new JagString[] { string, JagString.parseInt(int3) });
continue;
}
if (opcode == 4101) {
if (opcode == Cs2Opcodes.concatString) {
ssp -= 2;
local2522 = stringStack[ssp + 1];
string = stringStack[ssp];
stringStack[ssp++] = JagString.concatenate(new JagString[] { string, local2522 });
continue;
}
if (opcode == 4102) {
if (opcode == Cs2Opcodes.concatSignedInt) {
ssp--;
string = stringStack[ssp];
isp--;
@ -3860,24 +3937,24 @@ public final class ScriptRunner {
stringStack[ssp++] = JagString.concatenate(new JagString[] { string, JagString.parseIntTrue(int3) });
continue;
}
if (opcode == 4103) {
if (opcode == Cs2Opcodes.toLowerStr) {
ssp--;
string = stringStack[ssp];
stringStack[ssp++] = string.toLowerCase();
continue;
}
if (opcode == 4104) {
if (opcode == Cs2Opcodes.timeToStr) {
isp--;
int1 = intStack[isp];
@Pc(11770) long local11770 = (long) int1 * 86400000L + 1014768000000L;
aCalendar2.setTime(new Date(local11770));
local652 = aCalendar2.get(5);
c = aCalendar2.get(2);
local1087 = aCalendar2.get(1);
local652 = aCalendar2.get(Calendar.DATE);
c = aCalendar2.get(Calendar.MONTH);
local1087 = aCalendar2.get(Calendar.YEAR);
stringStack[ssp++] = JagString.concatenate(new JagString[] { JagString.parseInt(local652), Static163.aClass100_767, Static34.aClass100Array40[c], Static163.aClass100_767, JagString.parseInt(local1087) });
continue;
}
if (opcode == 4105) {
if (opcode == Cs2Opcodes.strForGender) {
ssp -= 2;
local2522 = stringStack[ssp + 1];
string = stringStack[ssp];
@ -3888,18 +3965,18 @@ public final class ScriptRunner {
stringStack[ssp++] = string;
continue;
}
if (opcode == 4106) {
if (opcode == Cs2Opcodes.parseInt) {
isp--;
int1 = intStack[isp];
stringStack[ssp++] = JagString.parseInt(int1);
continue;
}
if (opcode == 4107) {
if (opcode == Cs2Opcodes.compare) {
ssp -= 2;
intStack[isp++] = stringStack[ssp].method3126(stringStack[ssp + 1]);
intStack[isp++] = stringStack[ssp].compare(stringStack[ssp + 1]);
continue;
}
if (opcode == 4108) {
if (opcode == Cs2Opcodes.getLineCount) {
ssp--;
string = stringStack[ssp];
isp -= 2;
@ -3908,16 +3985,16 @@ public final class ScriptRunner {
intStack[isp++] = FontMetricsList.get(int2).getParagraphLineCount(string, int3);
continue;
}
if (opcode == 4109) {
if (opcode == Cs2Opcodes.getMaxLineWidth) {
isp -= 2;
ssp--;
string = stringStack[ssp];
int2 = intStack[isp + 1];
int3 = intStack[isp];
intStack[isp++] = FontMetricsList.get(int2).method2856(string, int3);
intStack[isp++] = FontMetricsList.get(int2).getMaxLineWidth(string, int3);
continue;
}
if (opcode == 4110) {
if (opcode == Cs2Opcodes.chooseString) {
ssp -= 2;
string = stringStack[ssp];
local2522 = stringStack[ssp + 1];
@ -3929,13 +4006,13 @@ public final class ScriptRunner {
}
continue;
}
if (opcode == 4111) {
if (opcode == Cs2Opcodes.escape) {
ssp--;
string = stringStack[ssp];
stringStack[ssp++] = Font.escape(string);
continue;
}
if (opcode == 4112) {
if (opcode == Cs2Opcodes.concatChar) {
ssp--;
string = stringStack[ssp];
isp--;
@ -3943,34 +4020,34 @@ public final class ScriptRunner {
if (int3 == -1) {
throw new RuntimeException("null char");
}
stringStack[ssp++] = string.method3128(int3);
stringStack[ssp++] = string.concatChar(int3);
continue;
}
if (opcode == 4113) {
if (opcode == Cs2Opcodes.isValidChar) {
isp--;
int1 = intStack[isp];
intStack[isp++] = method3213(int1) ? 1 : 0;
intStack[isp++] = isValidChar(int1) ? 1 : 0;
continue;
}
if (opcode == 4114) {
if (opcode == Cs2Opcodes.isAlphaNumeric) {
isp--;
int1 = intStack[isp];
intStack[isp++] = Static83.method433(int1) ? 1 : 0;
intStack[isp++] = Static83.isAlphaNumeric(int1) ? 1 : 0;
continue;
}
if (opcode == 4115) {
if (opcode == Cs2Opcodes.isLetter) {
isp--;
int1 = intStack[isp];
intStack[isp++] = Static258.method4428(int1) ? 1 : 0;
intStack[isp++] = Static258.isLetter(int1) ? 1 : 0;
continue;
}
if (opcode == 4116) {
if (opcode == Cs2Opcodes.isDigit) {
isp--;
int1 = intStack[isp];
intStack[isp++] = Static24.method671(int1) ? 1 : 0;
intStack[isp++] = Static24.isDigit(int1) ? 1 : 0;
continue;
}
if (opcode == 4117) {
if (opcode == Cs2Opcodes.length) {
ssp--;
string = stringStack[ssp];
if (string == null) {
@ -3980,7 +4057,7 @@ public final class ScriptRunner {
}
continue;
}
if (opcode == 4118) {
if (opcode == Cs2Opcodes.substr) {
isp -= 2;
ssp--;
string = stringStack[ssp];
@ -3989,7 +4066,7 @@ public final class ScriptRunner {
stringStack[ssp++] = string.substring(int2, int3);
continue;
}
if (opcode == 4119) {
if (opcode == Cs2Opcodes.removeTags) {
ssp--;
string = stringStack[ssp];
local2522 = Static87.allocate(string.length());
@ -4008,7 +4085,7 @@ public final class ScriptRunner {
stringStack[ssp++] = local2522;
continue;
}
if (opcode == 4120) {
if (opcode == Cs2Opcodes.indexOfChar) {
isp -= 2;
ssp--;
string = stringStack[ssp];
@ -4017,7 +4094,7 @@ public final class ScriptRunner {
intStack[isp++] = string.indexOf(int3, int2);
continue;
}
if (opcode == 4121) {
if (opcode == Cs2Opcodes.indexOfStr) {
ssp -= 2;
string = stringStack[ssp];
local2522 = stringStack[ssp + 1];
@ -4026,24 +4103,24 @@ public final class ScriptRunner {
intStack[isp++] = string.indexOf(local2522, int2);
continue;
}
if (opcode == 4122) {
if (opcode == Cs2Opcodes.toLower) {
isp--;
int1 = intStack[isp];
intStack[isp++] = Static231.toLowerCase(int1);
continue;
}
if (opcode == 4123) {
if (opcode == Cs2Opcodes.toUpper) {
isp--;
int1 = intStack[isp];
intStack[isp++] = Static143.toUpperCase(int1);
continue;
}
if (opcode == 4124) {
if (opcode == Cs2Opcodes.formatNumber) {
isp--;
local12388 = intStack[isp] != 0;
isp--;
int3 = intStack[isp];
stringStack[ssp++] = Static182.valueToBase10String(client.language, local12388, 0, (long) int3);
stringStack[ssp++] = Static182.formatNumber(client.language, local12388, 0, (long) int3);
continue;
}
}
@ -4056,7 +4133,7 @@ public final class ScriptRunner {
component = InterfaceList.getComponent(intStack[isp]);
opcode -= 1000;
}
if (opcode == 1000) {
if (opcode == Cs2Opcodes.setPosition) {
isp -= 4;
component.baseX = intStack[isp];
component.baseY = intStack[isp + 1];
@ -4081,7 +4158,7 @@ public final class ScriptRunner {
}
continue;
}
if (opcode == 1001) {
if (opcode == Cs2Opcodes.setSize) {
isp -= 4;
component.baseWidth = intStack[isp];
component.baseHeight = intStack[isp + 1];
@ -4108,7 +4185,7 @@ public final class ScriptRunner {
}
continue;
}
if (opcode == 1003) {
if (opcode == Cs2Opcodes.setHidden) {
isp--;
local1552 = intStack[isp] == 1;
if (local1552 != component.hidden) {
@ -4120,7 +4197,7 @@ public final class ScriptRunner {
}
continue;
}
if (opcode == 1004) {
if (opcode == Cs2Opcodes.setAspect) {
isp -= 2;
component.aspectWidth = intStack[isp];
component.aspectHeight = intStack[isp + 1];
@ -4131,7 +4208,7 @@ public final class ScriptRunner {
}
continue;
}
if (opcode == 1005) {
if (opcode == Cs2Opcodes.setNoClickThrough) {
isp--;
component.noClickThrough = intStack[isp] == 1;
continue;
@ -4171,7 +4248,7 @@ public final class ScriptRunner {
}
@OriginalMember(owner = "client!we", name = "b", descriptor = "(II)Z")
public static boolean method3213(@OriginalArg(1) int arg0) {
public static boolean isValidChar(@OriginalArg(1) int arg0) {
if (arg0 >= 32 && arg0 <= 126) {
return true;
} else if (arg0 >= 160 && arg0 <= 255) {

View file

@ -15,7 +15,7 @@ public final class Static114 {
@OriginalMember(owner = "client!j", name = "a", descriptor = "(BZLclient!na;)V")
public static void drawTextOnScreen(@OriginalArg(1) boolean arg0, @OriginalArg(2) JagString arg1) {
@Pc(24) int local24 = Fonts.p12Full.method2856(arg1, 250);
@Pc(24) int local24 = Fonts.p12Full.getMaxLineWidth(arg1, 250);
@Pc(31) int local31 = Fonts.p12Full.getParagraphLineCount(arg1, 250) * 13;
if (GlRenderer.enabled) {
GlRaster.method1186(6, 6, local24 + 4 + 4, local31 + 8, 0);

View file

@ -61,9 +61,9 @@ public final class Static150 {
if (arg2.anInt453 == 1337) {
Static280.aClass13_26 = arg2;
}
if (arg3 && arg2.anObjectArray17 != null && (local4 != arg2.width || arg2.height != local7)) {
if (arg3 && arg2.onResize != null && (local4 != arg2.width || arg2.height != local7)) {
@Pc(305) HookRequest local305 = new HookRequest();
local305.arguments = arg2.anObjectArray17;
local305.arguments = arg2.onResize;
local305.source = arg2;
InterfaceList.lowPriorityRequests.addTail(local305);
}

View file

@ -12,39 +12,6 @@ public final class Static155 {
@OriginalMember(owner = "client!me", name = "k", descriptor = "I")
public static int anInt3718 = -1;
@OriginalMember(owner = "client!me", name = "a", descriptor = "(ZLclient!na;I)V")
public static void method2941(@OriginalArg(0) boolean arg0, @OriginalArg(1) JagString arg1) {
@Pc(8) short[] local8 = new short[16];
@Pc(12) JagString local12 = arg1.toLowerCase();
@Pc(14) int local14 = 0;
for (@Pc(16) int local16 = 0; local16 < ObjTypeList.anInt3245; local16++) {
@Pc(27) ObjType local27 = ObjTypeList.get(local16);
if ((!arg0 || local27.stockMarket) && local27.certificateTemplate == -1 && local27.lentTemplate == -1 && local27.dummyItem == 0 && local27.name.toLowerCase().indexOf(local12) != -1) {
if (local14 >= 250) {
Find.results = null;
Find.index = -1;
return;
}
if (local14 >= local8.length) {
@Pc(83) short[] local83 = new short[local8.length * 2];
for (@Pc(85) int local85 = 0; local85 < local14; local85++) {
local83[local85] = local8[local85];
}
local8 = local83;
}
local8[local14++] = (short) local16;
}
}
Find.results = local8;
Find.size = 0;
Find.index = local14;
@Pc(117) JagString[] local117 = new JagString[Find.index];
for (@Pc(119) int local119 = 0; local119 < Find.index; local119++) {
local117[local119] = ObjTypeList.get(local8[local119]).name;
}
Static202.method3656(local117, Find.results);
}
@OriginalMember(owner = "client!me", name = "a", descriptor = "(II)I")
public static int getVarbit(@OriginalArg(1) int arg0) {
@Pc(13) VarbitType local13 = VarbitTypeList.get(arg0);

View file

@ -8,8 +8,8 @@ public final class Static17 {
@OriginalMember(owner = "client!bg", name = "a", descriptor = "(Lclient!be;ZI)V")
public static void method531(@OriginalArg(0) Component arg0, @OriginalArg(1) boolean arg1) {
@Pc(20) int local20 = arg0.anInt486 == 0 ? arg0.width : arg0.anInt486;
@Pc(32) int local32 = arg0.anInt491 == 0 ? arg0.height : arg0.anInt491;
@Pc(20) int local20 = arg0.scrollMaxH == 0 ? arg0.width : arg0.scrollMaxH;
@Pc(32) int local32 = arg0.scrollMaxV == 0 ? arg0.height : arg0.scrollMaxV;
Static266.method4190(arg0.id, arg1, local20, local32, InterfaceList.components[arg0.id >> 16]);
if (arg0.createdComponents != null) {
Static266.method4190(arg0.id, arg1, local20, local32, arg0.createdComponents);

View file

@ -26,7 +26,7 @@ public final class Static182 {
public static final boolean[] aBooleanArray97 = new boolean[] { true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false };
@OriginalMember(owner = "client!oj", name = "a", descriptor = "(IZIJI)Lclient!na;")
public static JagString valueToBase10String(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) long arg3) {
public static JagString formatNumber(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) long arg3) {
@Pc(9) JagString local9 = Static87.allocate(0);
if (arg3 < 0L) {
arg3 = -arg3;

View file

@ -40,13 +40,13 @@ public final class Static2 {
}
}
@Pc(72) HookRequest local72;
if (arg1 == 0 && local23.anObjectArray12 != null) {
if (arg1 == 0 && local23.onDialogAbort != null) {
local72 = new HookRequest();
local72.arguments = local23.anObjectArray12;
local72.arguments = local23.onDialogAbort;
local72.source = local23;
ScriptRunner.run(local72);
}
if (arg1 == 1 && local23.anObjectArray8 != null) {
if (arg1 == 1 && local23.onWidgetsOpenClose != null) {
if (local23.createdComponentId >= 0) {
@Pc(103) Component local103 = InterfaceList.getComponent(local23.id);
if (local103 == null || local103.createdComponents == null || local23.createdComponentId >= local103.createdComponents.length || local103.createdComponents[local23.createdComponentId] != local23) {
@ -54,7 +54,7 @@ public final class Static2 {
}
}
local72 = new HookRequest();
local72.arguments = local23.anObjectArray8;
local72.arguments = local23.onWidgetsOpenClose;
local72.source = local23;
ScriptRunner.run(local72);
}
@ -67,23 +67,23 @@ public final class Static2 {
@Pc(16) int local16 = arg0.anInt453;
if (local16 == 324) {
if (Static158.anInt3851 == -1) {
Static158.anInt3851 = arg0.anInt477;
Static158.anInt3851 = arg0.spriteId;
Static145.anInt3502 = arg0.anInt519;
}
if (PlayerAppearance.DEFAULT.gender) {
arg0.anInt477 = Static158.anInt3851;
arg0.spriteId = Static158.anInt3851;
} else {
arg0.anInt477 = Static145.anInt3502;
arg0.spriteId = Static145.anInt3502;
}
} else if (local16 == 325) {
if (Static158.anInt3851 == -1) {
Static145.anInt3502 = arg0.anInt519;
Static158.anInt3851 = arg0.anInt477;
Static158.anInt3851 = arg0.spriteId;
}
if (PlayerAppearance.DEFAULT.gender) {
arg0.anInt477 = Static145.anInt3502;
arg0.spriteId = Static145.anInt3502;
} else {
arg0.anInt477 = Static158.anInt3851;
arg0.spriteId = Static158.anInt3851;
}
} else if (local16 == 327) {
arg0.modelXAngle = 150;

View file

@ -24,7 +24,7 @@ public final class Static24 {
}
@OriginalMember(owner = "client!bn", name = "d", descriptor = "(II)Z")
public static boolean method671(@OriginalArg(1) int arg0) {
public static boolean isDigit(@OriginalArg(1) int arg0) {
return arg0 >= 48 && arg0 <= 57;
}
}

View file

@ -657,10 +657,10 @@ public final class Static247 {
@OriginalMember(owner = "client!ub", name = "b", descriptor = "(IIIIIII)V")
public static void method4246(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) {
@Pc(8) Component local8 = Static201.method1418(arg0, arg1);
if (local8 != null && local8.anObjectArray11 != null) {
if (local8 != null && local8.onUse != null) {
@Pc(19) HookRequest local19 = new HookRequest();
local19.source = local8;
local19.arguments = local8.anObjectArray11;
local19.arguments = local8.onUse;
ScriptRunner.run(local19);
}
MiniMenu.anInt506 = arg1;

View file

@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static258 {
@OriginalMember(owner = "client!va", name = "a", descriptor = "(IB)Z")
public static boolean method4428(@OriginalArg(0) int arg0) {
public static boolean isLetter(@OriginalArg(0) int arg0) {
return arg0 >= 97 && arg0 <= 122 || arg0 >= 65 && arg0 <= 90;
}

View file

@ -22,17 +22,17 @@ public final class Static266 {
if (local19 != null && local19.layer == arg0) {
Static150.method2801(arg3, arg2, local19, arg1);
Static111.method2291(local19, arg3, arg2);
if (local19.anInt486 - local19.width < local19.anInt489) {
local19.anInt489 = local19.anInt486 - local19.width;
if (local19.scrollMaxH - local19.width < local19.scrollX) {
local19.scrollX = local19.scrollMaxH - local19.width;
}
if (local19.scrollY > local19.anInt491 - local19.height) {
local19.scrollY = local19.anInt491 - local19.height;
if (local19.scrollY > local19.scrollMaxV - local19.height) {
local19.scrollY = local19.scrollMaxV - local19.height;
}
if (local19.scrollY < 0) {
local19.scrollY = 0;
}
if (local19.anInt489 < 0) {
local19.anInt489 = 0;
if (local19.scrollX < 0) {
local19.scrollX = 0;
}
if (local19.type == 0) {
Static17.method531(local19, arg1);

View file

@ -137,7 +137,7 @@ public final class Static270 {
}
return local11 - local14;
} else if (arg1 == 2) {
return arg0.getWorldInfo().name.method3126(arg2.getWorldInfo().name);
return arg0.getWorldInfo().name.compare(arg2.getWorldInfo().name);
} else if (arg1 == 3) {
if (arg0.activity.strEquals(aClass100_570)) {
if (arg2.activity.strEquals(aClass100_570)) {
@ -150,7 +150,7 @@ public final class Static270 {
} else if (arg2.activity.strEquals(aClass100_570)) {
return arg3 ? 1 : -1;
} else {
return arg0.activity.method3126(arg2.activity);
return arg0.activity.compare(arg2.activity);
}
} else if (arg1 == 4) {
return arg0.isLootShare() ? (arg2.isLootShare() ? 0 : 1) : arg2.isLootShare() ? -1 : 0;

View file

@ -131,12 +131,12 @@ public final class Static36 {
}
if (component.aBoolean25 || component.anInt453 != 0) {
@Pc(399) HookRequest request;
if (local207 && Static58.wheelRotation != 0 && component.anObjectArray10 != null) {
if (local207 && Static58.wheelRotation != 0 && component.onScroll != null) {
request = new HookRequest();
request.aBoolean158 = true;
request.source = component;
request.mouseY = Static58.wheelRotation;
request.arguments = component.anObjectArray10;
request.arguments = component.onScroll;
InterfaceList.lowPriorityRequests.addTail(request);
}
if (Static105.aClass13_14 != null || Static118.aClass13_15 != null || Static60.aBoolean108 || component.anInt453 != 1400 && Static137.anInt3337 > 0) {
@ -217,13 +217,13 @@ public final class Static36 {
InterfaceList.lowPriorityRequests.addTail(request);
}
}
if (component.aBoolean24 && local212 && component.anObjectArray6 != null) {
if (component.aBoolean24 && local212 && component.onDrag != null) {
request = new HookRequest();
request.aBoolean158 = true;
request.source = component;
request.mouseX = Mouse.anInt4873 - local50;
request.mouseY = Mouse.anInt5032 - local55;
request.arguments = component.anObjectArray6;
request.arguments = component.onDrag;
InterfaceList.lowPriorityRequests.addTail(request);
}
if (component.aBoolean24 && !local212) {
@ -399,10 +399,10 @@ public final class Static36 {
}
component.updatedStatsReaderIndex = PlayerSkillXpTable.updatedStatsWriterIndex;
}
if (Chat.transmitAt > component.lastTransmitTimer && component.onChatTransmit != null) {
if (Chat.transmitAt > component.lastTransmitTimer && component.onMsg != null) {
request = new HookRequest();
request.source = component;
request.arguments = component.onChatTransmit;
request.arguments = component.onMsg;
InterfaceList.lowPriorityRequests.addTail(request);
}
if (FriendsList.transmitAt > component.lastTransmitTimer && component.onFriendTransmit != null) {
@ -440,10 +440,10 @@ public final class Static36 {
InterfaceList.lowPriorityRequests.addTail(local1430);
}
}
if (Static13.aBoolean16 && component.onCamFinished != null) {
if (Static13.aBoolean16 && component.onMinimapUnlock != null) {
request = new HookRequest();
request.source = component;
request.arguments = component.onCamFinished;
request.arguments = component.onMinimapUnlock;
InterfaceList.lowPriorityRequests.addTail(request);
}
}
@ -459,14 +459,14 @@ public final class Static36 {
if (component.type == 8 && Mouse.anInt4873 >= local61 && Mouse.anInt5032 >= local63 && Mouse.anInt4873 < local65 && Mouse.anInt5032 < local67) {
Static43.aClass13_11 = component;
}
if (component.anInt491 > component.height) {
Static236.method4049(Mouse.anInt5032, component.height, component, Mouse.anInt4873, local50 + component.width, local55, component.anInt491);
if (component.scrollMaxV > component.height) {
Static236.method4049(Mouse.anInt5032, component.height, component, Mouse.anInt4873, local50 + component.width, local55, component.scrollMaxV);
}
}
if (component.type == 0) {
method946(arg0, component.id, local61, local63, local65, local67, local50 - component.anInt489, local55 - component.scrollY);
method946(arg0, component.id, local61, local63, local65, local67, local50 - component.scrollX, local55 - component.scrollY);
if (component.createdComponents != null) {
method946(component.createdComponents, component.id, local61, local63, local65, local67, local50 - component.anInt489, local55 - component.scrollY);
method946(component.createdComponents, component.id, local61, local63, local65, local67, local50 - component.scrollX, local55 - component.scrollY);
}
@Pc(1595) ComponentPointer local1595 = (ComponentPointer) InterfaceList.openInterfaces.get((long) component.id);
if (local1595 != null) {

View file

@ -107,7 +107,7 @@ public final class Static49 {
if (local59 == null) {
local59 = Fonts.b12Full;
}
local59.method2878(local24, arg2, arg1, arg0.width, arg0.height, arg0.color, arg0.objShadow, arg0.anInt460, arg0.anInt478, client.aRandom1, Static60.gregorianDateSeed, Static50.anIntArray132);
local59.method2878(local24, arg2, arg1, arg0.width, arg0.height, arg0.color, arg0.shadowColor, arg0.anInt460, arg0.anInt478, client.aRandom1, Static60.gregorianDateSeed, Static50.anIntArray132);
Static133.method4012(Static50.anIntArray132[0], Static50.anIntArray132[2], Static50.anIntArray132[1], Static50.anIntArray132[3]);
}

View file

@ -68,9 +68,9 @@ public final class Static53 {
return;
}
@Pc(19) Component local19 = Static201.method1418(MiniMenu.anInt2512, MiniMenu.anInt506);
if (local19 != null && local19.anObjectArray27 != null) {
if (local19 != null && local19.onUseWith != null) {
@Pc(29) HookRequest local29 = new HookRequest();
local29.arguments = local19.anObjectArray27;
local29.arguments = local19.onUseWith;
local29.source = local19;
ScriptRunner.run(local29);
}

View file

@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static83 {
@OriginalMember(owner = "client!gj", name = "a", descriptor = "(II)Z")
public static boolean method433(@OriginalArg(0) int arg0) {
public static boolean isAlphaNumeric(@OriginalArg(0) int arg0) {
if (arg0 >= 97 && arg0 <= 122) {
return true;
} else if (arg0 >= 65 && arg0 <= 90) {

View file

@ -105,7 +105,7 @@ public final class Static87 {
Static2.method13(local30);
}
@Pc(114) int local114 = arg1 + local30.y;
@Pc(117) int local117 = local30.anInt476;
@Pc(117) int local117 = local30.alpha;
@Pc(123) int local123 = local30.x + arg2;
if (Static121.aBoolean154 && (InterfaceList.getServerActiveProperties(local30).accessMask != 0 || local30.type == 0) && local117 > 127) {
local117 = 127;
@ -113,7 +113,7 @@ public final class Static87 {
@Pc(166) int local166;
@Pc(164) int local164;
if (local30 == Static105.aClass13_14) {
if (arg5 != -1412584499 && !local30.aBoolean27) {
if (arg5 != -1412584499 && !local30.dragRenderBehavior) {
Static80.anInt4696 = arg2;
Static127.anInt3126 = arg1;
Static241.aClass13Array13 = arg3;
@ -139,7 +139,7 @@ public final class Static87 {
}
local123 = local166;
}
if (!local30.aBoolean27) {
if (!local30.dragRenderBehavior) {
local117 = 128;
}
}
@ -307,7 +307,7 @@ public final class Static87 {
}
local571 = local556 * 10000 / cardMemory;
local563 = objId * 100 / cardMemory;
@Pc(968) JagString local968 = JagString.concatenate(new JagString[] { Cheat.DEBUG_CAHE, Static182.valueToBase10String(0, true, 2, (long) local571), Static147.aClass100_672, JagString.parseInt(local563), Static14.aClass100_80 });
@Pc(968) JagString local968 = JagString.concatenate(new JagString[] { Cheat.DEBUG_CAHE, Static182.formatNumber(0, true, 2, (long) local571), Static147.aClass100_672, JagString.parseInt(local563), Static14.aClass100_80 });
Fonts.p11Full.renderRight(local968, local270, local276, 16776960, 0);
local276 += 12;
Static186.aBooleanArray100[local57] = true;
@ -338,16 +338,16 @@ public final class Static87 {
continue;
}
if (!local30.usingScripts) {
if (local30.anInt491 - local30.height < local30.scrollY) {
local30.scrollY = local30.anInt491 - local30.height;
if (local30.scrollMaxV - local30.height < local30.scrollY) {
local30.scrollY = local30.scrollMaxV - local30.height;
}
if (local30.scrollY < 0) {
local30.scrollY = 0;
}
}
method1809(local166, local114 - local30.scrollY, -local30.anInt489 + local123, arg3, local302, local30.id, local164, local291, local57);
method1809(local166, local114 - local30.scrollY, -local30.scrollX + local123, arg3, local302, local30.id, local164, local291, local57);
if (local30.createdComponents != null) {
method1809(local166, local114 - local30.scrollY, -local30.anInt489 + local123, local30.createdComponents, local302, local30.id, local164, local291, local57);
method1809(local166, local114 - local30.scrollY, -local30.scrollX + local123, local30.createdComponents, local302, local30.id, local164, local291, local57);
}
@Pc(1186) ComponentPointer local1186 = (ComponentPointer) InterfaceList.openInterfaces.get((long) local30.id);
if (local1186 != null) {
@ -368,8 +368,8 @@ public final class Static87 {
}
}
if (Static223.aBooleanArray116[local57] || Cheat.rectDebug > 1) {
if (local30.type == 0 && !local30.usingScripts && local30.anInt491 > local30.height) {
Static74.method1624(local30.scrollY, local30.anInt491, local30.width + local123, local114, local30.height);
if (local30.type == 0 && !local30.usingScripts && local30.scrollMaxV > local30.height) {
Static74.method1624(local30.scrollY, local30.scrollMaxV, local30.width + local123, local114, local30.height);
}
if (local30.type != 1) {
@ -448,14 +448,14 @@ public final class Static87 {
InterfaceList.redraw(local1571);
}
if (bottom < dragY + y + 32 && local1571.scrollY < local1571.anInt491 - local1571.height) {
if (bottom < dragY + y + 32 && local1571.scrollY < local1571.scrollMaxV - local1571.height) {
local1611 = (y + dragY + 32 - bottom) * Static178.anInt4247 / 3;
if (local1611 > Static178.anInt4247 * 10) {
local1611 = Static178.anInt4247 * 10;
}
if (local1571.anInt491 - local1571.scrollY - local1571.height < local1611) {
local1611 = local1571.anInt491 - local1571.height - local1571.scrollY;
if (local1571.scrollMaxV - local1571.scrollY - local1571.height < local1611) {
local1611 = local1571.scrollMaxV - local1571.height - local1571.scrollY;
}
local1571.scrollY += local1611;
@ -555,7 +555,7 @@ public final class Static87 {
if (!local30.usingScripts) {
local1934 = Static127.method2465(local30, local1934);
}
local1921.method2852(local1934, local123, local114, local30.width, local30.height, local276, local30.aBoolean28 ? 0 : -1, local30.anInt460, local30.anInt478, local30.anInt467);
local1921.method2852(local1934, local123, local114, local30.width, local30.height, local276, local30.textAntiMacro ? 0 : -1, local30.anInt460, local30.anInt478, local30.anInt467);
} else if (Static211.aBoolean72) {
InterfaceList.redraw(local30);
}
@ -565,14 +565,14 @@ public final class Static87 {
if (local30.objId == -1) {
sprite = local30.method489(false);
} else {
sprite = Inv.getObjectSprite(local30.objSelected, local30.objId, local30.objDrawText, local30.objCount, local30.objShadow);
sprite = Inv.getObjectSprite(local30.outlineThickness, local30.objId, local30.objDrawText, local30.objCount, local30.shadowColor);
}
if (sprite != null) {
local276 = sprite.anInt1860;
local468 = sprite.anInt1866;
if (local30.aBoolean23) {
if (local30.spriteTiling) {
memory = (local276 + local30.width - 1) / local276;
color = (local30.height + local468 - 1) / local468;
@ -621,8 +621,8 @@ public final class Static87 {
SoftwareRaster.method2498(local123, local114, local123 + local30.width, local114 - -local30.height);
for (cardMemory = 0; cardMemory < memory; cardMemory++) {
for (local556 = 0; local556 < color; local556++) {
if (local30.anInt521 != 0) {
sprite.method1420(local114 + local468 * local556 + local468 / 2, local30.anInt521, 4096, cardMemory * local276 + local123 + local276 / 2);
if (local30.angle2d != 0) {
sprite.method1420(local114 + local468 * local556 + local468 / 2, local30.angle2d, 4096, cardMemory * local276 + local123 + local276 / 2);
} else if (local117 == 0) {
sprite.render(cardMemory * local276 + local123, local468 * local556 + local114);
} else {
@ -635,8 +635,8 @@ public final class Static87 {
}
} else {
memory = local30.width * 4096 / local276;
if (local30.anInt521 != 0) {
sprite.method1420(local114 + local30.height / 2, local30.anInt521, memory, local123 + local30.width / 2);
if (local30.angle2d != 0) {
sprite.method1420(local114 + local30.height / 2, local30.angle2d, memory, local123 + local30.width / 2);
} else if (local117 != 0) {
sprite.method1422(local123, local114, local30.width, local30.height, 256 - (local117 & 0xFF));
} else if (local276 == local30.width && local468 == local30.height) {
@ -720,7 +720,7 @@ public final class Static87 {
local556 = local123 + local30.width / 2 + (color * local30.anInt495 >> 8);
objId = local30.height / 2 + local114 + (cardMemory * local30.anInt481 >> 8);
if (GlRenderer.enabled) {
if (local30.aBoolean22) {
if (local30.modelOrtho) {
GlRenderer.method4182(local556, objId, local30.modelZoom, local30.aShort11, color, cardMemory);
} else {
GlRenderer.method4148(local556, objId, color, cardMemory);
@ -755,7 +755,7 @@ public final class Static87 {
local571 = local30.modelZoom * MathUtils.cos[local30.modelXAngle] >> 16;
if (!local30.usingScripts) {
local2589.setCamera(local30.modelYAngle, 0, local30.modelXAngle, 0, local563, local571, -1L);
} else if (local30.aBoolean22) {
} else if (local30.modelOrtho) {
((SoftwareModel) local2589).method4591(local30.modelYAngle, local30.modelYOffset, local30.modelXAngle, local30.modelXOffset, local30.modelZOffset + memory + local563, local571 + local30.modelZOffset, local30.modelZoom);
} else {
local2589.setCamera(local30.modelYAngle, local30.modelYOffset, local30.modelXAngle, local30.modelXOffset, local30.modelZOffset + local563 + memory, local571 + local30.modelZOffset, -1L);
@ -786,11 +786,11 @@ public final class Static87 {
local556 = local123 + memory * (local30.anInt512 + 115);
objId = (local30.anInt516 + 12) * local468 + local114;
if (local30.anInt460 == 0) {
local1921.renderLeft(local3159, local556, objId, local30.color, local30.aBoolean28 ? 0 : -1);
local1921.renderLeft(local3159, local556, objId, local30.color, local30.textAntiMacro ? 0 : -1);
} else if (local30.anInt460 == 1) {
local1921.renderCenter(local3159, local556 + 57, objId, local30.color, local30.aBoolean28 ? 0 : -1);
local1921.renderCenter(local3159, local556 + 57, objId, local30.color, local30.textAntiMacro ? 0 : -1);
} else {
local1921.renderRight(local3159, local556 + 115 - 1, objId, local30.color, local30.aBoolean28 ? 0 : -1);
local1921.renderRight(local3159, local556 + 115 - 1, objId, local30.color, local30.textAntiMacro ? 0 : -1);
}
}
local276++;
@ -865,16 +865,16 @@ public final class Static87 {
memory = local114 + local30.height;
local468 = local123 + local30.width;
}
if (local30.anInt490 == 1) {
if (local30.lineWidth == 1) {
if (GlRenderer.enabled) {
GlRaster.method1185(local123, local276, local468, memory, local30.color);
} else {
SoftwareRaster.method2500(local123, local276, local468, memory, local30.color);
}
} else if (GlRenderer.enabled) {
GlRaster.method1181(local123, local276, local468, memory, local30.color, local30.anInt490);
GlRaster.method1181(local123, local276, local468, memory, local30.color, local30.lineWidth);
} else {
SoftwareRaster.method2494(local123, local276, local468, memory, local30.color, local30.anInt490);
SoftwareRaster.method2494(local123, local276, local468, memory, local30.color, local30.lineWidth);
}
}
}

View file

@ -99,10 +99,10 @@ public final class Static97 {
public static JagString getTargetVerb(@OriginalArg(0) Component arg0) {
if (InterfaceList.getServerActiveProperties(arg0).getTargetMask() == 0) {
return null;
} else if (arg0.aClass100_86 == null || arg0.aClass100_86.trim().length() == 0) {
} else if (arg0.targetVerb == null || arg0.targetVerb.trim().length() == 0) {
return Static121.aBoolean154 ? Static143.aClass100_668 : null;
} else {
return arg0.aClass100_86;
return arg0.targetVerb;
}
}
}